Merge branch 'master' of git://github.com/Pita/etherpad-lite

node/db/API.js

@@ -19,6 +19,7 @@
  */
 
 var ERR = require("async-stacktrace");
+var customError = require("../utils/customError");
 var padManager = require("./PadManager");
 var padMessageHandler = require("../handler/PadMessageHandler");
 var readOnlyManager = require("./ReadOnlyManager");
@@ -88,7 +89,7 @@ exports.getText = function(padID, rev, callback)
     }
     else
     {
-      callback({stop: "rev is not a number"});
+      callback(new customError("rev is not a number", "apierror"));
       return;
     }
   }
@@ -96,14 +97,14 @@ exports.getText = function(padID, rev, callback)
   //ensure this is not a negativ number
   if(rev !== undefined && rev < 0)
   {
-    callback({stop: "rev is a negativ number"});
+    callback(new customError("rev is a negativ number","apierror"));
     return;
   }
   
   //ensure this is not a float value
   if(rev !== undefined && !is_int(rev))
   {
-    callback({stop: "rev is a float value"});
+    callback(new customError("rev is a float value","apierror"));
     return;
   }
   
@@ -118,7 +119,7 @@ exports.getText = function(padID, rev, callback)
       //check if this is a valid revision
       if(rev > pad.getHeadRevisionNumber())
       {
-        callback({stop: "rev is higher than the head revision of the pad"});
+        callback(new customError("rev is higher than the head revision of the pad","apierror"));
         return;
       }
       
@@ -188,20 +189,20 @@ exports.getHTML = function(padID, rev, callback)
     }
     else
     {
-      callback({stop: "rev is not a number"});
+      callback(new customError("rev is not a number","apierror"));
       return;
     }
   }
 
   if(rev !== undefined && rev < 0)
   {
-     callback({stop: "rev is a negative number"});
+     callback(new customError("rev is a negative number","apierror"));
      return;
   }
 
   if(rev !== undefined && !is_int(rev))
   {
-    callback({stop: "rev is a float value"});
+    callback(new customError("rev is a float value","apierror"));
     return;
   }
 
@@ -215,7 +216,7 @@ exports.getHTML = function(padID, rev, callback)
       //check if this is a valid revision
       if(rev > pad.getHeadRevisionNumber())
       {
-        callback({stop: "rev is higher than the head revision of the pad"});
+        callback(new customError("rev is higher than the head revision of the pad","apierror"));
         return;
       }
      
@@ -294,7 +295,7 @@ exports.createPad = function(padID, text, callback)
   //ensure there is no $ in the padID
   if(padID.indexOf("$") != -1)
   {
-    callback({stop: "createPad can't create group pads"});
+    callback(new customError("createPad can't create group pads","apierror"));
     return;
   }
   
@@ -361,7 +362,7 @@ exports.setPublicStatus = function(padID, publicStatus, callback)
   //ensure this is a group pad
   if(padID.indexOf("$") == -1)
   {
-    callback({stop: "You can only get/set the publicStatus of pads that belong to a group"});
+    callback(new customError("You can only get/set the publicStatus of pads that belong to a group","apierror"));
     return;
   }
 
@@ -394,7 +395,7 @@ exports.getPublicStatus = function(padID, callback)
   //ensure this is a group pad
   if(padID.indexOf("$") == -1)
   {
-    callback({stop: "You can only get/set the publicStatus of pads that belong to a group"});
+    callback(new customError("You can only get/set the publicStatus of pads that belong to a group","apierror"));
     return;
   }
   
@@ -420,7 +421,7 @@ exports.setPassword = function(padID, password, callback)
   //ensure this is a group pad
   if(padID.indexOf("$") == -1)
   {
-    callback({stop: "You can only get/set the password of pads that belong to a group"});
+    callback(new customError("You can only get/set the password of pads that belong to a group","apierror"));
     return;
   }
   
@@ -449,7 +450,7 @@ exports.isPasswordProtected = function(padID, callback)
   //ensure this is a group pad
   if(padID.indexOf("$") == -1)
   {
-    callback({stop: "You can only get/set the password of pads that belong to a group"});
+    callback(new customError("You can only get/set the password of pads that belong to a group","apierror"));
     return;
   }
 
@@ -484,14 +485,14 @@ function getPadSafe(padID, shouldExist, text, callback)
   //check if padID is a string
   if(typeof padID != "string")
   {
-    callback({stop: "padID is not a string"});
+    callback(new customError("padID is not a string","apierror"));
     return;
   }
   
   //check if the padID maches the requirements
   if(!padManager.isValidPadId(padID))
   {
-    callback({stop: "padID did not match requirements"});
+    callback(new customError("padID did not match requirements","apierror"));
     return;
   }
   
@@ -503,12 +504,12 @@ function getPadSafe(padID, shouldExist, text, callback)
     //does not exist, but should
     if(exists == false && shouldExist == true)
     {
-      callback({stop: "padID does not exist"});
+      callback(new customError("padID does not exist","apierror"));
     }
     //does exists, but shouldn't
     else if(exists == true && shouldExist == false)
     {
-      callback({stop: "padID does already exist"});
+      callback(new customError("padID does already exist","apierror"));
     }
     //pad exists, let's get it
     else

node/db/GroupManager.js

@@ -19,6 +19,7 @@
  */
  
 var ERR = require("async-stacktrace");
+var customError = require("../utils/customError");
 var db = require("./DB").db;
 var async = require("async");
 var padManager = require("./PadManager");
@@ -40,7 +41,7 @@ exports.deleteGroup = function(groupID, callback)
         //group does not exist
         if(_group == null)
         {
-          callback({stop: "groupID does not exist"});
+          callback(new customError("groupID does not exist","apierror"));
         }
         //group exists, everything is fine
         else
@@ -135,7 +136,7 @@ exports.createGroupIfNotExistsFor = function(groupMapper, callback)
   //ensure mapper is optional
   if(typeof groupMapper != "string")
   {
-    callback({stop: "groupMapper is no string"});
+    callback(new customError("groupMapper is no string","apierror"));
     return;
   }
   
@@ -182,7 +183,7 @@ exports.createGroupPad = function(groupID, padName, text, callback)
         //group does not exist
         if(exists == false)
         {
-          callback({stop: "groupID does not exist"});
+          callback(new customError("groupID does not exist","apierror"));
         }
         //group exists, everything is fine
         else
@@ -201,7 +202,7 @@ exports.createGroupPad = function(groupID, padName, text, callback)
         //pad exists already
         if(exists == true)
         {
-          callback({stop: "padName does already exist"});
+          callback(new customError("padName does already exist","apierror"));
         }
         //pad does not exist, everything is fine
         else
@@ -241,7 +242,7 @@ exports.listPads = function(groupID, callback)
     //group does not exist
     if(exists == false)
     {
-      callback({stop: "groupID does not exist"});
+      callback(new customError("groupID does not exist","apierror"));
     }
     //group exists, let's get the pads
     else

node/db/PadManager.js

@@ -19,6 +19,7 @@
  */
 
 var ERR = require("async-stacktrace");
+var customError = require("../utils/customError");
 require("../db/Pad");
 var db = require("./DB").db;
 
@@ -31,7 +32,7 @@ var db = require("./DB").db;
  * If this is needed in other places, it would be wise to make this a prototype
  * that's defined somewhere more sensible.
  */
-globalPads = {
+var globalPads = {
     get: function (name) { return this[':'+name]; },
     set: function (name, value) { this[':'+name] = value; },
     remove: function (name) { delete this[':'+name]; }
@@ -47,7 +48,7 @@ exports.getPad = function(id, text, callback)
   //check if this is a valid padId
   if(!exports.isValidPadId(id))
   {
-    callback({stop: id + " is not a valid padId"});
+    callback(new customError(id + " is not a valid padId","apierror"));
     return;
   }
   
@@ -64,14 +65,14 @@ exports.getPad = function(id, text, callback)
     //check if text is a string
     if(typeof text != "string")
     {
-      callback({stop: "text is not a string"});
+      callback(new customError("text is not a string","apierror"));
       return;
     }
     
     //check if text is less than 100k chars
     if(text.length > 100000)
     {
-      callback({stop: "text must be less than 100k chars"});
+      callback(new customError("text must be less than 100k chars","apierror"));
       return;
     }
   }

node/db/SecurityManager.js

@@ -118,7 +118,7 @@ exports.checkAccess = function (padID, sessionID, token, password, callback)
           sessionManager.getSessionInfo(sessionID, function(err, sessionInfo)
           {
             //skip session validation if the session doesn't exists
-            if(err && err.stop == "sessionID does not exist")
+            if(err && err.message == "sessionID does not exist")
             {
               callback();
               return;

node/db/SessionManager.js

@@ -19,6 +19,7 @@
  */
  
 var ERR = require("async-stacktrace");
+var customError = require("../utils/customError");
 var db = require("./DB").db;
 var async = require("async");
 var groupMangager = require("./GroupManager");
@@ -52,7 +53,7 @@ exports.createSession = function(groupID, authorID, validUntil, callback)
         //group does not exist
         if(exists == false)
         {
-          callback({stop: "groupID does not exist"});
+          callback(new customError("groupID does not exist","apierror"));
         }
         //everything is fine, continue
         else
@@ -71,7 +72,7 @@ exports.createSession = function(groupID, authorID, validUntil, callback)
         //author does not exist
         if(exists == false)
         {
-          callback({stop: "authorID does not exist"});
+          callback(new customError("authorID does not exist","apierror"));
         }
         //everything is fine, continue
         else
@@ -93,7 +94,7 @@ exports.createSession = function(groupID, authorID, validUntil, callback)
         }
         else
         {
-          callback({stop: "validUntil is not a number"});
+          callback(new customError("validUntil is not a number","apierror"));
           return;
         }
       }
@@ -101,21 +102,21 @@ exports.createSession = function(groupID, authorID, validUntil, callback)
       //ensure this is not a negativ number
       if(validUntil < 0)
       {
-        callback({stop: "validUntil is a negativ number"});
+        callback(new customError("validUntil is a negativ number","apierror"));
         return;
       }
       
       //ensure this is not a float value
       if(!is_int(validUntil))
       {
-        callback({stop: "validUntil is a float value"});
+        callback(new customError("validUntil is a float value","apierror"));
         return;
       }
     
       //check if validUntil is in the future
       if(Math.floor(new Date().getTime()/1000) > validUntil)
       {
-        callback({stop: "validUntil is in the past"});
+        callback(new customError("validUntil is in the past","apierror"));
         return;
       }
       
@@ -192,7 +193,7 @@ exports.getSessionInfo = function(sessionID, callback)
     //session does not exists
     if(session == null)
     {
-      callback({stop: "sessionID does not exist"})
+      callback(new customError("sessionID does not exist","apierror"))
     }
     //everything is fine, return the sessioninfos
     else
@@ -221,7 +222,7 @@ exports.deleteSession = function(sessionID, callback)
         //session does not exists
         if(session == null)
         {
-          callback({stop: "sessionID does not exist"})
+          callback(new customError("sessionID does not exist","apierror"))
         }
         //everything is fine, return the sessioninfos
         else
@@ -285,7 +286,7 @@ exports.listSessionsOfGroup = function(groupID, callback)
     //group does not exist
     if(exists == false)
     {
-      callback({stop: "groupID does not exist"});
+      callback(new customError("groupID does not exist","apierror"));
     }
     //everything is fine, continue
     else
@@ -304,7 +305,7 @@ exports.listSessionsOfAuthor = function(authorID, callback)
     //group does not exist
     if(exists == false)
     {
-      callback({stop: "authorID does not exist"});
+      callback(new customError("authorID does not exist","apierror"));
     }
     //everything is fine, continue
     else

node/handler/APIHandler.js

@@ -115,9 +115,9 @@ exports.handle = function(functionName, fields, req, res)
       res.send({code: 0, message: "ok", data: data});
     }
     // parameters were wrong and the api stopped execution, pass the error
-    else if(err.stop)
+    else if(err.name == "apierror")
     {
-      res.send({code: 1, message: err.stop, data: null});
+      res.send({code: 1, message: err.message, data: null});
     }
     //an unkown error happend
     else

node/handler/ExportHandler.js

@@ -20,6 +20,7 @@
 
 var ERR = require("async-stacktrace");
 var exporthtml = require("../utils/ExportHtml");
+var exportdokuwiki = require("../utils/ExportDokuWiki");
 var padManager = require("../db/PadManager");
 var async = require("async");
 var fs = require("fs");
@@ -56,6 +57,26 @@ exports.doExport = function(req, res, padId, type)
       res.send(pad.text());
     });
   }
+  else if(type == 'dokuwiki')
+  {
+    var randNum;
+    var srcFile, destFile;
+
+    async.series([
+      //render the dokuwiki document
+      function(callback)
+      {
+        exportdokuwiki.getPadDokuWikiDocument(padId, null, function(err, dokuwiki)
+        {
+          res.send(dokuwiki);
+          callback("stop");
+        });
+      },
+    ], function(err)
+    {
+      if(err && err != "stop") throw err;
+    });
+  }
   else
   {
     var html;

node/server.js

@@ -273,7 +273,7 @@ async.waterfall([
         return;
       }
     
-      var types = ["pdf", "doc", "txt", "html", "odt"];
+      var types = ["pdf", "doc", "txt", "html", "odt", "dokuwiki"];
       //send a 404 if we don't support this filetype
       if(types.indexOf(req.params.type) == -1)
       {
@@ -282,7 +282,8 @@ async.waterfall([
       }
       
       //if abiword is disabled, and this is a format we only support with abiword, output a message
-      if(settings.abiword == null && req.params.type != "html" && req.params.type != "txt" )
+      if(settings.abiword == null &&
+         ["odt", "pdf", "doc"].indexOf(req.params.type) !== -1)
       {
         res.send("Abiword is not enabled at this Etherpad Lite instance. Set the path to Abiword in settings.json to enable this feature");
         return;

node/utils/Changeset.js

@@ -3,6 +3,12 @@
  * Can be found in https://github.com/ether/pad/blob/master/infrastructure/ace/www/easysync2.js
  */ 
 
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /*
  * Copyright 2009 Google Inc., 2011 Peter 'Pita' Martischka (Primary Technology Ltd)
  *

node/utils/ExportDokuWiki.js

@@ -0,0 +1,344 @@
+/**
+ * Copyright 2011 Adrian Lang
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var async = require("async");
+var Changeset = require("./Changeset");
+var padManager = require("../db/PadManager");
+
+function getPadDokuWiki(pad, revNum, callback)
+{
+  var atext = pad.atext;
+  var dokuwiki;
+  async.waterfall([
+  // fetch revision atext
+
+
+  function (callback)
+  {
+    if (revNum != undefined)
+    {
+      pad.getInternalRevisionAText(revNum, function (err, revisionAtext)
+      {
+        atext = revisionAtext;
+        callback(err);
+      });
+    }
+    else
+    {
+      callback(null);
+    }
+  },
+
+  // convert atext to dokuwiki text
+
+  function (callback)
+  {
+    dokuwiki = getDokuWikiFromAtext(pad, atext);
+    callback(null);
+  }],
+  // run final callback
+
+
+  function (err)
+  {
+    callback(err, dokuwiki);
+  });
+}
+
+function getDokuWikiFromAtext(pad, atext)
+{
+  var apool = pad.apool();
+  var textLines = atext.text.slice(0, -1).split('\n');
+  var attribLines = Changeset.splitAttributionLines(atext.attribs, atext.text);
+
+  var tags = ['======', '=====', '**', '//', '__', 'del>'];
+  var props = ['heading1', 'heading2', 'bold', 'italic', 'underline', 'strikethrough'];
+  var anumMap = {};
+
+  props.forEach(function (propName, i)
+  {
+    var propTrueNum = apool.putAttrib([propName, true], true);
+    if (propTrueNum >= 0)
+    {
+      anumMap[propTrueNum] = i;
+    }
+  });
+
+  function getLineDokuWiki(text, attribs)
+  {
+    var propVals = [false, false, false];
+    var ENTER = 1;
+    var STAY = 2;
+    var LEAVE = 0;
+
+    // Use order of tags (b/i/u) as order of nesting, for simplicity
+    // and decent nesting.  For example,
+    // <b>Just bold<b> <b><i>Bold and italics</i></b> <i>Just italics</i>
+    // becomes
+    // <b>Just bold <i>Bold and italics</i></b> <i>Just italics</i>
+    var taker = Changeset.stringIterator(text);
+    var assem = Changeset.stringAssembler();
+
+    function emitOpenTag(i)
+    {
+      if (tags[i].indexOf('>') !== -1) {
+        assem.append('<');
+      }
+      assem.append(tags[i]);
+    }
+
+    function emitCloseTag(i)
+    {
+      if (tags[i].indexOf('>') !== -1) {
+        assem.append('</');
+      }
+      assem.append(tags[i]);
+    }
+
+    var urls = _findURLs(text);
+
+    var idx = 0;
+
+    function processNextChars(numChars)
+    {
+      if (numChars <= 0)
+      {
+        return;
+      }
+
+      var iter = Changeset.opIterator(Changeset.subattribution(attribs, idx, idx + numChars));
+      idx += numChars;
+
+      while (iter.hasNext())
+      {
+        var o = iter.next();
+        var propChanged = false;
+        Changeset.eachAttribNumber(o.attribs, function (a)
+        {
+          if (a in anumMap)
+          {
+            var i = anumMap[a]; // i = 0 => bold, etc.
+            if (!propVals[i])
+            {
+              propVals[i] = ENTER;
+              propChanged = true;
+            }
+            else
+            {
+              propVals[i] = STAY;
+            }
+          }
+        });
+        for (var i = 0; i < propVals.length; i++)
+        {
+          if (propVals[i] === true)
+          {
+            propVals[i] = LEAVE;
+            propChanged = true;
+          }
+          else if (propVals[i] === STAY)
+          {
+            propVals[i] = true; // set it back
+          }
+        }
+        // now each member of propVal is in {false,LEAVE,ENTER,true}
+        // according to what happens at start of span
+        if (propChanged)
+        {
+          // leaving bold (e.g.) also leaves italics, etc.
+          var left = false;
+          for (var i = 0; i < propVals.length; i++)
+          {
+            var v = propVals[i];
+            if (!left)
+            {
+              if (v === LEAVE)
+              {
+                left = true;
+              }
+            }
+            else
+            {
+              if (v === true)
+              {
+                propVals[i] = STAY; // tag will be closed and re-opened
+              }
+            }
+          }
+
+          for (var i = propVals.length - 1; i >= 0; i--)
+          {
+            if (propVals[i] === LEAVE)
+            {
+              emitCloseTag(i);
+              propVals[i] = false;
+            }
+            else if (propVals[i] === STAY)
+            {
+              emitCloseTag(i);
+            }
+          }
+          for (var i = 0; i < propVals.length; i++)
+          {
+            if (propVals[i] === ENTER || propVals[i] === STAY)
+            {
+              emitOpenTag(i);
+              propVals[i] = true;
+            }
+          }
+          // propVals is now all {true,false} again
+        } // end if (propChanged)
+        var chars = o.chars;
+        if (o.lines)
+        {
+          chars--; // exclude newline at end of line, if present
+        }
+        var s = taker.take(chars);
+
+        assem.append(_escapeDokuWiki(s));
+      } // end iteration over spans in line
+      for (var i = propVals.length - 1; i >= 0; i--)
+      {
+        if (propVals[i])
+        {
+          emitCloseTag(i);
+          propVals[i] = false;
+        }
+      }
+    } // end processNextChars
+    if (urls)
+    {
+      urls.forEach(function (urlData)
+      {
+        var startIndex = urlData[0];
+        var url = urlData[1];
+        var urlLength = url.length;
+        processNextChars(startIndex - idx);
+        assem.append('[[');
+
+        // Do not use processNextChars since a link does not contain syntax and
+        // needs no escaping
+        var iter = Changeset.opIterator(Changeset.subattribution(attribs, idx, idx + urlLength));
+        idx += urlLength;
+        assem.append(taker.take(iter.next().chars));
+
+        assem.append(']]');
+      });
+    }
+    processNextChars(text.length - idx);
+
+    return assem.toString() + "\n";
+  } // end getLineDokuWiki
+  var pieces = [];
+
+  for (var i = 0; i < textLines.length; i++)
+  {
+    var line = _analyzeLine(textLines[i], attribLines[i], apool);
+    var lineContent = getLineDokuWiki(line.text, line.aline);
+
+    if (line.listLevel && lineContent)
+    {
+      pieces.push(new Array(line.listLevel + 1).join('  ') + '* ');
+    }
+    pieces.push(lineContent);
+  }
+
+  return pieces.join('');
+}
+
+function _analyzeLine(text, aline, apool)
+{
+  var line = {};
+
+  // identify list
+  var lineMarker = 0;
+  line.listLevel = 0;
+  if (aline)
+  {
+    var opIter = Changeset.opIterator(aline);
+    if (opIter.hasNext())
+    {
+      var listType = Changeset.opAttributeValue(opIter.next(), 'list', apool);
+      if (listType)
+      {
+        lineMarker = 1;
+        listType = /([a-z]+)([12345678])/.exec(listType);
+        if (listType)
+        {
+          line.listTypeName = listType[1];
+          line.listLevel = Number(listType[2]);
+        }
+      }
+    }
+  }
+  if (lineMarker)
+  {
+    line.text = text.substring(1);
+    line.aline = Changeset.subattribution(aline, 1);
+  }
+  else
+  {
+    line.text = text;
+    line.aline = aline;
+  }
+
+  return line;
+}
+
+exports.getPadDokuWikiDocument = function (padId, revNum, callback)
+{
+  padManager.getPad(padId, function (err, pad)
+  {
+    if (err)
+    {
+      callback(err);
+      return;
+    }
+
+    getPadDokuWiki(pad, revNum, callback);
+  });
+}
+
+function _escapeDokuWiki(s)
+{
+  s = s.replace(/(\/\/|\*\*|__)/g, '%%$1%%');
+  return s;
+}
+
+// copied from ACE
+var _REGEX_WORDCHAR = /[\u0030-\u0039\u0041-\u005A\u0061-\u007A\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\u1FFF\u3040-\u9FFF\uF900-\uFDFF\uFE70-\uFEFE\uFF10-\uFF19\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFDC]/;
+var _REGEX_SPACE = /\s/;
+var _REGEX_URLCHAR = new RegExp('(' + /[-:@a-zA-Z0-9_.,~%+\/\\?=&#;()$]/.source + '|' + _REGEX_WORDCHAR.source + ')');
+var _REGEX_URL = new RegExp(/(?:(?:https?|s?ftp|ftps|file|smb|afp|nfs|(x-)?man|gopher|txmt):\/\/|mailto:)/.source + _REGEX_URLCHAR.source + '*(?![:.,;])' + _REGEX_URLCHAR.source, 'g');
+
+// returns null if no URLs, or [[startIndex1, url1], [startIndex2, url2], ...]
+
+
+function _findURLs(text)
+{
+  _REGEX_URL.lastIndex = 0;
+  var urls = null;
+  var execResult;
+  while ((execResult = _REGEX_URL.exec(text)))
+  {
+    urls = (urls || []);
+    var startIndex = execResult.index;
+    var url = execResult[0];
+    urls.push([startIndex, url]);
+  }
+
+  return urls;
+}

node/utils/customError.js

@@ -0,0 +1,17 @@
+/*
+ This helper modules allows us to create different type of errors we can throw
+*/
+function customError(message, errorName)
+{
+  this.name = errorName || "Error";
+  this.message = message;
+  
+  var stackParts = new Error().stack.split("\n");
+  stackParts.splice(0,2);
+  stackParts.unshift(this.name + ": " + message);
+  
+  this.stack = stackParts.join("\n");
+}
+customError.prototype = Error.prototype;
+
+module.exports = customError;

static/css/pad.css

@@ -1003,7 +1003,7 @@ position: relative;
   padding: 10px;
   -moz-border-radius: 6px;
   border-radius: 6px;
-  height:170px;
+  height:190px;
   display:none;
 }
 
@@ -1032,7 +1032,7 @@ position: relative;
 
 #importexportline{
   border: dotted 1px;
-  height: 165px;
+  height: 185px;
   position:absolute;
   width:0px;
   left:260px;
@@ -1068,6 +1068,10 @@ position: relative;
   background-position: 2px -49px;
 }
 
+#exportdokuwiki{
+  background-position: 2px -144px;
+}
+
 #export a{
   text-decoration: none;
 }
@@ -1158,7 +1162,6 @@ label[for=readonlyinput] {
   margin-left:10px;
 }
 
-
 @media screen and (max-width: 960px) {
   .modaldialog {
     position: relative;
@@ -1246,4 +1249,7 @@ label[for=readonlyinput] {
   #sidediv {
     display:none;
   }
-}
+}
+.rtl{
+  direction:RTL;
+} 

static/js/ace.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/ace2_common.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *
@@ -142,4 +148,4 @@ function htmlPrettyEscape(str)
 if (typeof exports !== "undefined")
 {
   exports.map = map;
-}
+}

static/js/ace2_inner.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *
@@ -1127,6 +1133,10 @@ function OUTER(gscope)
     {
       setTextSize(value);
     }
+    else if (k == 'rtlistrue')
+    {
+      setClassPresence(root, "rtl", !! value);
+    }
   }
 
   editorInfo.ace_setBaseText = function(txt)

static/js/broadcast.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/broadcast_revisions.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/broadcast_slider.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/changesettracker.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/chat.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc., 2011 Peter 'Pita' Martischka (Primary Technology Ltd)
  *
@@ -20,18 +26,24 @@ var chat = (function()
   var isAndroid = ua.indexOf("android") > -1;
   var isMobileSafari = ua.indexOf("mobile") > -1;
   var bottomMargin = "0px";
+  var sDuration = 500;
+  var hDuration = 750;
   var chatMentions = 0;
   var title = document.title;
+  if (isAndroid || isMobileSafari){
+   sDuration = 0;
+   hDuration = 0;
+  }
   var self = {
     show: function () 
     {      
       $("#chaticon").hide("slide", {
         direction: "down"
-      }, 500, function ()
+      }, hDuration, function ()
       {
         $("#chatbox").show("slide", {
           direction: "down"
-        }, 750, self.scrollDown);
+        }, sDuration, self.scrollDown);
         $("#chatbox").resizable(
         {
           handles: 'nw',
@@ -60,14 +72,10 @@ var chat = (function()
     hide: function () 
     {
       $("#chatcounter").text("0");
-      if(isAndroid || isMobileSafari) {
+      $("#chatbox").hide("slide", { direction: "down" }, sDuration, function()
-        $("#chatbox").toggle();
-      }
-      else
       {
-        $("#chatbox").toggle("slide", { direction: "down" }, 625);
+        $("#chaticon").show("slide", { direction: "down" }, hDuration);
-      }
+      });
-
     },
     scrollDown: function()
     {
@@ -166,4 +174,4 @@ var chat = (function()
   }
 
   return self;
-}());
+}());

static/js/collab_client.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/colorutils.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 // DO NOT EDIT THIS FILE, edit infrastructure/ace/www/colorutils.js
 // THIS FILE IS ALSO SERVED AS CLIENT-SIDE JS
 /**

static/js/contentcollector.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 // THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.contentcollector
 // %APPJET%: import("etherpad.collab.ace.easysync2.Changeset");
 // %APPJET%: import("etherpad.admin.plugins");

static/js/cssmanager.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/cssmanager_client.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 // DO NOT EDIT THIS FILE, edit infrastructure/ace/www/cssmanager.js
 /**
  * Copyright 2009 Google Inc.

static/js/domline.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 // THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.domline
 // %APPJET%: import("etherpad.admin.plugins");
 /**

static/js/domline_client.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 // DO NOT EDIT THIS FILE, edit infrastructure/ace/www/domline.js
 // THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.domline
 /**

static/js/draggable.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/easysync2.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 // THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.easysync2
 // %APPJET%: jimport("com.etherpad.Easysync2Support");
 /**

static/js/easysync2_client.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 // DO NOT EDIT THIS FILE, edit infrastructure/ace/www/easysync2.js
 // THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.easysync2
 /**

static/js/linestylefilter.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 // THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.linestylefilter
 // %APPJET%: import("etherpad.collab.ace.easysync2.Changeset");
 // %APPJET%: import("etherpad.admin.plugins");

static/js/linestylefilter_client.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 // DO NOT EDIT THIS FILE, edit infrastructure/ace/www/linestylefilter.js
 // THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.linestylefilter
 /**

static/js/pad2.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc., 2011 Peter 'Pita' Martischka (Primary Technology Ltd)
  *
@@ -22,6 +28,7 @@ var noColors = false;
 var useMonospaceFontGlobal = false;
 var globalUserName = false;
 var hideQRCode = false;
+var rtlIsTrue = false;
 
 $(document).ready(function()
 {
@@ -88,6 +95,7 @@ function getParams()
   var useMonospaceFont = params["useMonospaceFont"];
   var IsnoColors = params["noColors"];
   var hideQRCode = params["hideQRCode"];
+  var rtl = params["rtl"];
 
   if(IsnoColors)
   {
@@ -135,6 +143,13 @@ function getParams()
   {
     $('#qrcode').hide();
   }
+  if(rtl)
+  {
+    if(rtl == "true")
+    {
+      rtlIsTrue = true
+    }
+  }
 }
 
 function getUrlVars()
@@ -293,6 +308,11 @@ function handshake()
       {
         pad.changeViewOption('noColors', true);
       }
+      
+      if (rtlIsTrue == true)
+      {
+        pad.changeViewOption('rtl', true);
+      }
 
       // If the Monospacefont value is set to true then change it to monospace.
       if (useMonospaceFontGlobal == true)

static/js/pad_connectionstatus.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/pad_cookie.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/pad_docbar.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/pad_editbar.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/pad_editor.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *
@@ -89,6 +95,7 @@ var padeditor = (function()
 
       self.ace.setProperty("showsauthorcolors", noColors);
 
+      self.ace.setProperty("rtlIsTrue", rtlIsTrue);
     },
     initViewZoom: function()
     {

static/js/pad_impexp.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *
@@ -234,6 +240,7 @@ var padimpexp = (function()
       $("#exporthtmla").attr("href", document.location.pathname + "/export/html");
       $("#exportplaina").attr("href", document.location.pathname + "/export/txt");
       $("#exportwordlea").attr("href", document.location.pathname + "/export/wordle");
+      $("#exportdokuwikia").attr("href", document.location.pathname + "/export/dokuwiki");
       
       //hide stuff thats not avaible if abiword is disabled
       if(clientVars.abiwordAvailable == "no")
@@ -241,8 +248,8 @@ var padimpexp = (function()
         $("#exportworda").remove();
         $("#exportpdfa").remove();
         $("#exportopena").remove();
-        $("#importexport").css({"height":"95px"});
+        $("#importexport").css({"height":"115px"});
-        $("#importexportline").css({"height":"95px"});
+        $("#importexportline").css({"height":"115px"});
         $("#import").html("Import is not available");
       }
       else if(clientVars.abiwordAvailable == "withoutPDF")

static/js/pad_modals.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/pad_savedrevs.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/pad_userlist.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/pad_utils.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/plugins.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 plugins = {
   callHook: function(hookName, args)
   {

static/js/skiplist.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/undo-xpopup.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/undomodule.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/virtual_lines.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/pad.html

@@ -204,6 +204,7 @@
   <a id="exportworda" target="_blank" class="exportlink"><div class="exporttype" id="exportword">Microsoft Word</div></a>
   <a id="exportpdfa" target="_blank" class="exportlink"><div class="exporttype" id="exportpdf">PDF</div></a>
   <a id="exportopena" target="_blank" class="exportlink"><div class="exporttype" id="exportopen">OpenDocument</div></a>
+  <a id="exportdokuwikia" target="_blank" class="exportlink"><div class="exporttype" id="exportdokuwiki">DokuWiki text</div></a>
   <a id="exportwordlea" target="_blank" onClick="padimpexp.export2Wordle();return false;" class="exportlink"><div class="exporttype" id="exportwordle">Wordle</div></a>
   <form id="wordlepost" name="wall" action="http://wordle.net/advanced" method="POST" style="margin-left:0px;"> 
     <div id="hidetext" style=""><textarea id="text" name="text" id="text" style="display:none;">Coming soon!</textarea></div>