From 27f25b8c61b18f290a72cf154aa8462ed5bce338 Mon Sep 17 00:00:00 2001
From: Egil Moeller <egil.moller@freecode.no>
Date: Wed, 30 May 2012 17:18:43 +0200
Subject: [PATCH 01/21] Added hook to catch edit events

---
 src/static/js/ace2_inner.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index 723d410f..cc9f1288 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -341,6 +341,11 @@ function Ace2Inner(){
     return rep;
   };
 
+  editorInfo.ace_getAuthor = function()
+  {
+    return thisAuthor;
+  }
+
   var currentCallStack = null;
 
   function inCallStack(type, action)
@@ -439,6 +444,14 @@ function Ace2Inner(){
     try
     {
       result = action();
+
+      hooks.callAll('aceEditEvent', {
+        callstack: currentCallStack,
+        editorInfo: editorInfo,
+        rep: rep,
+        documentAttributeManager: documentAttributeManager
+      });
+
       //console.log("Just did action for: "+type);
       cleanExit = true;
     }
@@ -522,6 +535,7 @@ function Ace2Inner(){
   {
     return rep.lines.atOffset(charOffset).key;
   }
+    
   
   function dispose()
   {

From d5faefdeaef04811c7f6059c413c816e5f8b2d49 Mon Sep 17 00:00:00 2001
From: Jordan Hollinger <jordan.hollinger@gmail.com>
Date: Sat, 9 Jun 2012 10:53:51 -0400
Subject: [PATCH 02/21] Bugfix to setPadHTML. resolves #764

---
 src/node/utils/ImportHtml.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/node/utils/ImportHtml.js b/src/node/utils/ImportHtml.js
index 4b50b032..5c6bb634 100644
--- a/src/node/utils/ImportHtml.js
+++ b/src/node/utils/ImportHtml.js
@@ -50,9 +50,7 @@ function setPadHTML(pad, html, callback)
   }
 
   // Get the new plain text and its attributes
-  var newText = map(result.lines, function (e) {
-    return e + '\n';
-  }).join('');
+  var newText = result.lines.join('\n');
   apiLogger.debug('newText:');
   apiLogger.debug(newText);
   var newAttribs = result.lineAttribs.join('|1+1') + '|1+1';

From 486f7c904e08f1a524335afe44372fc056f2a0f6 Mon Sep 17 00:00:00 2001
From: Jordan Hollinger <jordan.hollinger@gmail.com>
Date: Mon, 11 Jun 2012 23:33:17 -0400
Subject: [PATCH 03/21] Bugfix to setHTML - it was ignoring the last letter of
 each line. fixes issue #768

---
 src/node/utils/ImportHtml.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/node/utils/ImportHtml.js b/src/node/utils/ImportHtml.js
index 5c6bb634..7c638fb8 100644
--- a/src/node/utils/ImportHtml.js
+++ b/src/node/utils/ImportHtml.js
@@ -20,7 +20,6 @@ var log4js = require('log4js');
 
 var Changeset = require("ep_etherpad-lite/static/js/Changeset");
 var contentcollector = require("ep_etherpad-lite/static/js/contentcollector");
-var map = require("ep_etherpad-lite/static/js/ace2_common").map;
 
 function setPadHTML(pad, html, callback)
 {
@@ -60,7 +59,7 @@ function setPadHTML(pad, html, callback)
     var attribsIter = Changeset.opIterator(attribs);
     var textIndex = 0;
     var newTextStart = 0;
-    var newTextEnd = newText.length - 1;
+    var newTextEnd = newText.length;
     while (attribsIter.hasNext())
     {
       var op = attribsIter.next();

From 23075138b9ffb643cda3c1842dcbd4fb737ed373 Mon Sep 17 00:00:00 2001
From: Jordan Hollinger <jordan.hollinger@gmail.com>
Date: Tue, 12 Jun 2012 11:03:09 -0400
Subject: [PATCH 04/21] Lock down npm version to avaoid bug in later version

---
 src/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/package.json b/src/package.json
index c46abbbf..48750fbc 100644
--- a/src/package.json
+++ b/src/package.json
@@ -25,7 +25,7 @@
                       "log4js"              : "0.4.1",
                       "jsdom-nocontextifiy" : "0.2.10",
                       "async-stacktrace"    : "0.0.2",
-                      "npm"                 : "1.1",
+                      "npm"                 : "1.1.24",
                       "ejs"                 : "0.6.1",
                       "graceful-fs"         : "1.1.5",
                       "slide"               : "1.1.3",

From 048380284189e09ad0012a8e8f57a651402591c6 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Tue, 12 Jun 2012 22:52:22 +0200
Subject: [PATCH 05/21] resolve issue #384 and also clear chat counter whenever
 focus is on chat input. Just a slightly nicer chat experience

---
 src/static/js/chat.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/static/js/chat.js b/src/static/js/chat.js
index 23b47667..47b0ae3c 100644
--- a/src/static/js/chat.js
+++ b/src/static/js/chat.js
@@ -114,9 +114,13 @@ var chat = (function()
       {
         var count = Number($("#chatcounter").text());
         count++;
+        
+        // is the users focus already in the chatbox?
+        var alreadyFocused = $("#chatinput").is(":focus");
+        
         $("#chatcounter").text(count);
         // chat throb stuff -- Just make it throw for twice as long
-        if(wasMentioned)
+        if(wasMentioned && !alreadyFocused)
         { // If the user was mentioned show for twice as long and flash the browser window
           if (chatMentions == 0){
             title = document.title;
@@ -130,7 +134,11 @@ var chat = (function()
           $('#chatthrob').html("<b>"+authorName+"</b>" + ": " + text).show().delay(2000).hide(400);
         }
       }
-      
+       // Clear the chat mentions when the user clicks on the chat input box
+      $('#chatinput').click(function(){
+        chatMentions = 0;
+        document.title = title;
+      });
       self.scrollDown();
 
     },

From 2cbe29eb45ba14bab3196f0e5b0500928164884b Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 12 Jun 2012 14:20:54 -0700
Subject: [PATCH 06/21] Fix pad.js' customStart.

Appears that sourcing of static/custom/pad.js was removed from
templates/pad.html. This prevented static/custom/pad.js:customStart
from running. Add it back to get customStart working again.
---
 src/templates/pad.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/templates/pad.html b/src/templates/pad.html
index 97aaa817..e1babca8 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -320,6 +320,8 @@
         <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script>
         <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/ace2_common.js?callback=require.define"></script>
 
+	<script type="text/javascript" src="../static/custom/pad.js"></script>
+
         <!-- Bootstrap page -->
         <script type="text/javascript">
             var clientVars = {};

From 48daf83a30199d5b316f2ca1add76704ffd14e61 Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Wed, 13 Jun 2012 13:56:09 +0300
Subject: [PATCH 07/21] #763: Use spaces instead of tabs

---
 src/templates/pad.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/templates/pad.html b/src/templates/pad.html
index e1babca8..02af9b10 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -320,7 +320,7 @@
         <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script>
         <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/ace2_common.js?callback=require.define"></script>
 
-	<script type="text/javascript" src="../static/custom/pad.js"></script>
+        <script type="text/javascript" src="../static/custom/pad.js"></script>
 
         <!-- Bootstrap page -->
         <script type="text/javascript">

From 6f37c0aaa6cf908a8d541720fc5deb9aa0378387 Mon Sep 17 00:00:00 2001
From: Jordan Hollinger <jordan.hollinger@gmail.com>
Date: Wed, 13 Jun 2012 15:20:29 -0400
Subject: [PATCH 08/21] The pad name sanitizer shouldn't drop query params.
 issue #779

---
 src/node/hooks/express/padurlsanitize.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/node/hooks/express/padurlsanitize.js b/src/node/hooks/express/padurlsanitize.js
index 4f5dd7a5..229d013d 100644
--- a/src/node/hooks/express/padurlsanitize.js
+++ b/src/node/hooks/express/padurlsanitize.js
@@ -1,4 +1,5 @@
 var padManager = require('../../db/PadManager');
+var url = require('url');
 
 exports.expressCreateServer = function (hook_name, args, cb) {
   //redirects browser to the pad's sanitized url if needed. otherwise, renders the html
@@ -14,9 +15,11 @@ exports.expressCreateServer = function (hook_name, args, cb) {
 	//the pad id was sanitized, so we redirect to the sanitized version
 	if(sanitizedPadId != padId)
 	{
-	  var real_path = req.path.replace(/^\/p\/[^\/]+/, '/p/' + sanitizedPadId);
-	  res.header('Location', real_path);
-	  res.send('You should be redirected to <a href="' + real_path + '">' + real_path + '</a>', 302);
+          var real_url = req.url.replace(/^\/p\/[^\/]+/, '/p/' + sanitizedPadId);
+          var query = url.parse(req.url).query;
+          if ( query ) real_url += '?' + query;
+	  res.header('Location', real_url);
+	  res.send('You should be redirected to <a href="' + real_url + '">' + real_url + '</a>', 302);
 	}
 	//the pad id was fine, so just render it
 	else

From bee9a05ec3d320e70a358841ffcbd7684cd48976 Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@notmyidea.org>
Date: Wed, 20 Jun 2012 17:36:05 +0200
Subject: [PATCH 09/21] mention postgres in the default settings

---
 settings.json.template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings.json.template b/settings.json.template
index f89fcd8e..7d175a34 100644
--- a/settings.json.template
+++ b/settings.json.template
@@ -8,8 +8,8 @@
   "ip": "0.0.0.0",
   "port" : 9001,
   
-  //The Type of the database. You can choose between dirty, sqlite and mysql
-  //You should use mysql or sqlite for anything else than testing or development
+  //The Type of the database. You can choose between dirty, postgres, sqlite and mysql
+  //You shouldn't use "dirty" for for anything else than testing or development
   "dbType" : "dirty",
   //the database specific settings
   "dbSettings" : {

From 854e1092d9dcce1c25b89c0a5960025612bf53ba Mon Sep 17 00:00:00 2001
From: Mark Holmquist <mtraceur@member.fsf.org>
Date: Tue, 26 Jun 2012 14:10:42 -0700
Subject: [PATCH 10/21] Add in a new hook for handleMessage

Add a new hook: handleMessage. Whenever a message comes in, it is
intercepted by this hook.
---
 src/node/handler/PadMessageHandler.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js
index 8d2ca6cd..b101a547 100644
--- a/src/node/handler/PadMessageHandler.js
+++ b/src/node/handler/PadMessageHandler.js
@@ -33,6 +33,7 @@ var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins.js");
 var log4js = require('log4js');
 var messageLogger = log4js.getLogger("message");
 var _ = require('underscore');
+var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks.js");
 
 /**
  * A associative array that saves which sessions belong to a pad
@@ -158,6 +159,11 @@ exports.handleDisconnect = function(client)
  */
 exports.handleMessage = function(client, message)
 { 
+  _.map(hooks.callAll( "handleMessage", { client: client, message: message }), function ( newmessage ) {
+    if ( newmessage || newmessage === null ) {
+      message = newmessage;
+    }
+  });
   if(message == null)
   {
     messageLogger.warn("Message is null!");

From 79ca5f3e7c4a6fe0764fc492cb9e1da8c62964a0 Mon Sep 17 00:00:00 2001
From: Mark Holmquist <mtraceur@member.fsf.org>
Date: Tue, 26 Jun 2012 15:28:18 -0700
Subject: [PATCH 11/21] Refuse connection if the user is no longer authorized

This should do the trick for issue 815. Please review and merge if
it works.

Try again: Fewer variables.
---
 src/node/handler/PadMessageHandler.js | 78 +++++++++++++++++++--------
 1 file changed, 55 insertions(+), 23 deletions(-)

diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js
index 8d2ca6cd..671735a1 100644
--- a/src/node/handler/PadMessageHandler.js
+++ b/src/node/handler/PadMessageHandler.js
@@ -168,31 +168,63 @@ exports.handleMessage = function(client, message)
     messageLogger.warn("Message has no type attribute!");
     return;
   }
-  
-  //Check what type of message we get and delegate to the other methodes
-  if(message.type == "CLIENT_READY") {
-    handleClientReady(client, message);
-  } else if(message.type == "CHANGESET_REQ") {
-    handleChangesetRequest(client, message);
-  } else if(message.type == "COLLABROOM") {
-    if (sessioninfos[client.id].readonly) {
-      messageLogger.warn("Dropped message, COLLABROOM for readonly pad");
-    } else if (message.data.type == "USER_CHANGES") {
-      handleUserChanges(client, message);
-    } else if (message.data.type == "USERINFO_UPDATE") {
-      handleUserInfoUpdate(client, message);
-    } else if (message.data.type == "CHAT_MESSAGE") {
-      handleChatMessage(client, message);
-    } else if (message.data.type == "SAVE_REVISION") {
-      handleSaveRevisionMessage(client, message);
-    } else if (message.data.type == "CLIENT_MESSAGE" &&
-               message.data.payload.type == "suggestUserName") {
-      handleSuggestUserName(client, message);
+
+  var finalHandler = function () {
+    //Check what type of message we get and delegate to the other methodes
+    if(message.type == "CLIENT_READY") {
+      handleClientReady(client, message);
+    } else if(message.type == "CHANGESET_REQ") {
+      handleChangesetRequest(client, message);
+    } else if(message.type == "COLLABROOM") {
+      if (sessioninfos[client.id].readonly) {
+        messageLogger.warn("Dropped message, COLLABROOM for readonly pad");
+      } else if (message.data.type == "USER_CHANGES") {
+        handleUserChanges(client, message);
+      } else if (message.data.type == "USERINFO_UPDATE") {
+        handleUserInfoUpdate(client, message);
+      } else if (message.data.type == "CHAT_MESSAGE") {
+        handleChatMessage(client, message);
+      } else if (message.data.type == "SAVE_REVISION") {
+        handleSaveRevisionMessage(client, message);
+      } else if (message.data.type == "CLIENT_MESSAGE" &&
+                 message.data.payload.type == "suggestUserName") {
+        handleSuggestUserName(client, message);
+      } else {
+        messageLogger.warn("Dropped message, unknown COLLABROOM Data  Type " + message.data.type);
+      }
     } else {
-      messageLogger.warn("Dropped message, unknown COLLABROOM Data  Type " + message.data.type);
+      messageLogger.warn("Dropped message, unknown Message Type " + message.type);
     }
-  } else {
-    messageLogger.warn("Dropped message, unknown Message Type " + message.type);
+  };
+
+  if (message && message.padId) {
+    async.series([
+      //check permissions
+      function(callback)
+      {
+        // Note: message.sessionID is an entirely different kind of
+        // session from the sessions we use here! Beware! FIXME: Call
+        // our "sessions" "connections".
+        // FIXME: Use a hook instead
+        // FIXME: Allow to override readwrite access with readonly
+        securityManager.checkAccess(message.padId, message.sessionID, message.token, message.password, function(err, statusObject)
+        {
+          if(ERR(err, callback)) return;
+
+          //access was granted
+          if(statusObject.accessStatus == "grant")
+          {
+            callback();
+          }
+          //no access, send the client a message that tell him why
+          else
+          {
+            client.json.send({accessStatus: statusObject.accessStatus})
+          }
+        });
+      },
+      finalHandler
+    ]);
   }
 }
 

From c4e660b2062d66ec2224d2b8babab1f669d3184b Mon Sep 17 00:00:00 2001
From: Mark Holmquist <mtraceur@member.fsf.org>
Date: Tue, 26 Jun 2012 16:07:08 -0700
Subject: [PATCH 12/21] Fix glaring problem with pull request

I accidentally forgot to call finalHandler if there was no padID
.... :)
---
 src/node/handler/PadMessageHandler.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js
index 671735a1..495827f5 100644
--- a/src/node/handler/PadMessageHandler.js
+++ b/src/node/handler/PadMessageHandler.js
@@ -225,6 +225,8 @@ exports.handleMessage = function(client, message)
       },
       finalHandler
     ]);
+  } else {
+    finalHandler();
   }
 }
 

From 6f9d7a5db79076747584ebd289bf380b2bb95038 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Wed, 27 Jun 2012 18:23:17 +0200
Subject: [PATCH 13/21] Add 2 new APIs: listPadsOfAuthor and listAuthorsOfPad

Return all pads that a given author has contributed to (not just
created) and return all authors who has contributed to a given pad.
---
 src/node/db/API.js             | 21 ++++++++
 src/node/db/AuthorManager.js   | 91 ++++++++++++++++++++++++++++++++++
 src/node/db/Pad.js             | 16 ++++++
 src/node/handler/APIHandler.js |  6 ++-
 4 files changed, 132 insertions(+), 2 deletions(-)

diff --git a/src/node/db/API.js b/src/node/db/API.js
index 37fd3f16..c766c80a 100644
--- a/src/node/db/API.js
+++ b/src/node/db/API.js
@@ -47,6 +47,7 @@ exports.createGroupPad = groupManager.createGroupPad;
 
 exports.createAuthor = authorManager.createAuthor;
 exports.createAuthorIfNotExistsFor = authorManager.createAuthorIfNotExistsFor;
+exports.listPadsOfAuthor = authorManager.listPadsOfAuthor;
 
 /**********************/
 /**SESSION FUNCTIONS***/
@@ -463,6 +464,26 @@ exports.isPasswordProtected = function(padID, callback)
   });
 }
 
+/**
+listAuthorsOfPad(padID) returns an array of authors who contributed to this pad 
+
+Example returns:
+
+{code: 0, message:"ok", data: {authorIDs : ["a.s8oes9dhwrvt0zif", "a.akf8finncvomlqva"]}
+{code: 1, message:"padID does not exist", data: null}
+*/
+exports.listAuthorsOfPad = function(padID, callback)
+{
+  //get the pad
+  getPadSafe(padID, true, function(err, pad)
+  {
+    if(ERR(err, callback)) return;
+    
+    callback(null, {authorIDs: pad.getAllAuthors()});
+  });
+}
+
+
 /******************************/
 /** INTERNAL HELPER FUNCTIONS */
 /******************************/
diff --git a/src/node/db/AuthorManager.js b/src/node/db/AuthorManager.js
index f644de12..99f9444b 100644
--- a/src/node/db/AuthorManager.js
+++ b/src/node/db/AuthorManager.js
@@ -55,6 +55,7 @@ exports.getAuthor4Token = function (token, callback)
 /**
  * Returns the AuthorID for a mapper. 
  * @param {String} token The mapper
+ * @param {String} name The name of the author (optional)
  * @param {Function} callback callback (err, author) 
  */
 exports.createAuthorIfNotExistsFor = function (authorMapper, name, callback)
@@ -153,6 +154,7 @@ exports.getAuthorColorId = function (author, callback)
 /**
  * Sets the color Id of the author
  * @param {String} author The id of the author
+ * @param {String} colorId The color id of the author
  * @param {Function} callback (optional)
  */
 exports.setAuthorColorId = function (author, colorId, callback)
@@ -163,6 +165,7 @@ exports.setAuthorColorId = function (author, colorId, callback)
 /**
  * Returns the name of the author
  * @param {String} author The id of the author
+ * @param {String} name The name of the author
  * @param {Function} callback callback(err, name)
  */
 exports.getAuthorName = function (author, callback)
@@ -179,3 +182,91 @@ exports.setAuthorName = function (author, name, callback)
 {
   db.setSub("globalAuthor:" + author, ["name"], name, callback);
 }
+
+/**
+ * Returns an array of all pads this author contributed to
+ * @param {String} author The id of the author
+ * @param {String} name The name of the author
+ * @param {Function} callback (optional)
+ */
+exports.listPadsOfAuthor = function (authorID, callback)
+{
+  /* There are two other places where this array is manipulated:
+   * (1) When the author is added to a pad, the author object is also updated
+   * (2) When a pad is deleted, each author of that pad is also updated
+   */
+  //get the globalAuthor
+  db.get("globalAuthor:" + authorID, function(err, author)
+  {
+    if(ERR(err, callback)) return;
+
+    //author does not exists
+    if(author == null)
+    {
+      callback(new customError("authorID does not exist","apierror"))
+    }
+    //everything is fine, return the pad IDs
+    else
+    {     
+      var pads = [];
+      if(author.padIDs != null)
+      {
+        for (var padId in author.padIDs)
+        {
+          pads.push(padId);
+        }
+      }
+      callback(null, {padIDs: pads});
+    }
+  });
+}
+
+/**
+ * Adds a new pad to the list of contributions
+ * @param {String} author The id of the author
+ * @param {String} padID The id of the pad the author contributes to
+ * @param {Function} callback (optional)
+ */
+exports.addPad = function (authorID, padID)
+{
+  //get the entry
+  db.get("globalAuthor:" + authorID, function(err, author)
+  {
+    if(ERR(err)) return;
+    if(author == null) return;
+    
+    //the entry doesn't exist so far, let's create it
+    if(author.padIDs == null)
+    {
+      author.padIDs = {padIDs : {}};
+    }
+      
+    //add the entry for this pad
+    author.padIDs[padID] = 1;
+      
+    //save the new element back
+    db.set("globalAuthor:" + authorID, author);
+  });
+}
+
+/**
+ * Removes a pad from the list of contributions
+ * @param {String} author The id of the author
+ * @param {String} padID The id of the pad the author contributes to
+ * @param {Function} callback (optional)
+ */
+exports.removePad = function (authorID, padID)
+{
+  db.get("globalAuthor:" + authorID, function (err, author)
+  {
+    if(ERR(err)) return;
+    if(author == null) return;
+    
+    if(author.padIDs != null)
+    {
+      //remove pad from author
+      delete author.padIDs[padID];   
+      db.set("globalAuthor:" + authorID, author);
+    }
+  });
+}
\ No newline at end of file
diff --git a/src/node/db/Pad.js b/src/node/db/Pad.js
index b4a39c17..5e005606 100644
--- a/src/node/db/Pad.js
+++ b/src/node/db/Pad.js
@@ -82,6 +82,10 @@ Pad.prototype.appendRevision = function appendRevision(aChangeset, author) {
 
   db.set("pad:"+this.id+":revs:"+newRev, newRevData);             
   this.saveToDatabase();
+  
+  // set the author to pad
+  if(author != '')
+    authorManager.addPad(author, this.id);
 };
 
 //save all attributes to the database
@@ -436,6 +440,18 @@ Pad.prototype.remove = function remove(callback) {
             db.remove("pad:"+padID+":revs:"+i);
           }
 
+          callback();
+        },
+        //remove pad from all authors who contributed
+        function(callback)
+        {
+          var authorIDs = _this.getAllAuthors();
+
+          authorIDs.forEach(function (authorID)
+          {
+        	authorManager.removePad(authorID, padID);
+          });
+
           callback();
         }
       ], callback);
diff --git a/src/node/handler/APIHandler.js b/src/node/handler/APIHandler.js
index 98b1ed16..b6bb93bd 100644
--- a/src/node/handler/APIHandler.js
+++ b/src/node/handler/APIHandler.js
@@ -40,13 +40,14 @@ catch(e)
 //a list of all functions
 var functions = {
   "createGroup"               : [],
-  "createGroupIfNotExistsFor"  : ["groupMapper"], 
+  "createGroupIfNotExistsFor" : ["groupMapper"], 
   "deleteGroup"               : ["groupID"], 
   "listPads"                  : ["groupID"], 
   "createPad"                 : ["padID", "text"], 
   "createGroupPad"            : ["groupID", "padName", "text"],
   "createAuthor"              : ["name"], 
   "createAuthorIfNotExistsFor": ["authorMapper" , "name"], 
+  "listPadsOfAuthor"          : ["authorID"], 
   "createSession"             : ["groupID", "authorID", "validUntil"], 
   "deleteSession"             : ["sessionID"], 
   "getSessionInfo"            : ["sessionID"], 
@@ -62,7 +63,8 @@ var functions = {
   "setPublicStatus"           : ["padID", "publicStatus"], 
   "getPublicStatus"           : ["padID"], 
   "setPassword"               : ["padID", "password"], 
-  "isPasswordProtected"       : ["padID"]
+  "isPasswordProtected"       : ["padID"], 
+  "listAuthorsOfPad"          : ["padID"]
 };
 
 /**

From ab0d3c87cb6b34a3545c58226d8c5c52a08762ec Mon Sep 17 00:00:00 2001
From: Mark Holmquist <mtraceur@member.fsf.org>
Date: Wed, 27 Jun 2012 09:55:03 -0700
Subject: [PATCH 14/21] Add in getLastEdited API call

This new HTTP API call, getLastEdited, will return the time of the
last revision, in UNIX timestamp format.
---
 src/node/db/API.js             | 18 ++++++++++++++++++
 src/node/db/Pad.js             |  8 +++++++-
 src/node/handler/APIHandler.js |  1 +
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/node/db/API.js b/src/node/db/API.js
index 37fd3f16..b3cffbe3 100644
--- a/src/node/db/API.js
+++ b/src/node/db/API.js
@@ -282,6 +282,24 @@ exports.getRevisionsCount = function(padID, callback)
   });
 }
 
+/**
+getLastEdited(padID) returns the timestamp of the last revision of the pad
+
+Example returns:
+
+{code: 0, message:"ok", data: {lastEdited: 1340815946602}}
+{code: 1, message:"padID does not exist", data: null}
+*/
+exports.getLastEdited = function(padID, callback)
+{
+  //get the pad
+  getPadSafe(padID, true, function(err, pad)
+  {
+    if(ERR(err, callback)) return;
+    callback(null, {lastEdited: pad.getLastEdited()});
+  });
+}
+
 /**
 createPad(padName [, text]) creates a new pad in this group 
 
diff --git a/src/node/db/Pad.js b/src/node/db/Pad.js
index b4a39c17..b486a44d 100644
--- a/src/node/db/Pad.js
+++ b/src/node/db/Pad.js
@@ -80,7 +80,7 @@ Pad.prototype.appendRevision = function appendRevision(aChangeset, author) {
     newRevData.meta.atext = this.atext;
   }
 
-  db.set("pad:"+this.id+":revs:"+newRev, newRevData);             
+  db.set("pad:"+this.id+":revs:"+newRev, newRevData);
   this.saveToDatabase();
 };
 
@@ -102,6 +102,12 @@ Pad.prototype.saveToDatabase = function saveToDatabase(){
   db.set("pad:"+this.id, dbObject);
 }
 
+// get time of last edit (changeset application)
+Pad.prototype.getLastEdit = function getLastEdit(callback){
+  var revNum = this.getHeadRevisionNumber();
+  db.getSub("pad:"+this.id+":revs:"+revNum, ["meta", "timestamp"], callback);
+}
+
 Pad.prototype.getRevisionChangeset = function getRevisionChangeset(revNum, callback) {
   db.getSub("pad:"+this.id+":revs:"+revNum, ["changeset"], callback);
 };
diff --git a/src/node/handler/APIHandler.js b/src/node/handler/APIHandler.js
index 98b1ed16..a7b1a8ab 100644
--- a/src/node/handler/APIHandler.js
+++ b/src/node/handler/APIHandler.js
@@ -57,6 +57,7 @@ var functions = {
   "getHTML"                   : ["padID", "rev"],
   "setHTML"                   : ["padID", "html"],
   "getRevisionsCount"         : ["padID"], 
+  "getLastEdited"             : ["padID"],
   "deletePad"                 : ["padID"], 
   "getReadOnlyID"             : ["padID"],
   "setPublicStatus"           : ["padID", "publicStatus"], 

From 93b50d4a29f39a49bf00f1cdfb08007e9380fc9a Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Wed, 27 Jun 2012 21:02:41 +0200
Subject: [PATCH 15/21] Some fixes to the contributor API methods

Mostly these are coding style adjustments
---
 src/node/db/AuthorManager.js | 9 +++------
 src/node/db/Pad.js           | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/node/db/AuthorManager.js b/src/node/db/AuthorManager.js
index 99f9444b..06b69051 100644
--- a/src/node/db/AuthorManager.js
+++ b/src/node/db/AuthorManager.js
@@ -165,7 +165,6 @@ exports.setAuthorColorId = function (author, colorId, callback)
 /**
  * Returns the name of the author
  * @param {String} author The id of the author
- * @param {String} name The name of the author
  * @param {Function} callback callback(err, name)
  */
 exports.getAuthorName = function (author, callback)
@@ -176,6 +175,7 @@ exports.getAuthorName = function (author, callback)
 /**
  * Sets the name of the author
  * @param {String} author The id of the author
+ * @param {String} name The name of the author
  * @param {Function} callback (optional)
  */
 exports.setAuthorName = function (author, name, callback)
@@ -186,7 +186,6 @@ exports.setAuthorName = function (author, name, callback)
 /**
  * Returns an array of all pads this author contributed to
  * @param {String} author The id of the author
- * @param {String} name The name of the author
  * @param {Function} callback (optional)
  */
 exports.listPadsOfAuthor = function (authorID, callback)
@@ -225,7 +224,6 @@ exports.listPadsOfAuthor = function (authorID, callback)
  * Adds a new pad to the list of contributions
  * @param {String} author The id of the author
  * @param {String} padID The id of the pad the author contributes to
- * @param {Function} callback (optional)
  */
 exports.addPad = function (authorID, padID)
 {
@@ -238,11 +236,11 @@ exports.addPad = function (authorID, padID)
     //the entry doesn't exist so far, let's create it
     if(author.padIDs == null)
     {
-      author.padIDs = {padIDs : {}};
+      author.padIDs = {};
     }
       
     //add the entry for this pad
-    author.padIDs[padID] = 1;
+    author.padIDs[padID] = 1;// anything, because value is not used
       
     //save the new element back
     db.set("globalAuthor:" + authorID, author);
@@ -253,7 +251,6 @@ exports.addPad = function (authorID, padID)
  * Removes a pad from the list of contributions
  * @param {String} author The id of the author
  * @param {String} padID The id of the pad the author contributes to
- * @param {Function} callback (optional)
  */
 exports.removePad = function (authorID, padID)
 {
diff --git a/src/node/db/Pad.js b/src/node/db/Pad.js
index 5e005606..d51e3275 100644
--- a/src/node/db/Pad.js
+++ b/src/node/db/Pad.js
@@ -84,7 +84,7 @@ Pad.prototype.appendRevision = function appendRevision(aChangeset, author) {
   this.saveToDatabase();
   
   // set the author to pad
-  if(author != '')
+  if(author)
     authorManager.addPad(author, this.id);
 };
 

From b0d369883b17d8ab60eff0738f2f4ec8bb82e29f Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Thu, 28 Jun 2012 15:58:28 +0200
Subject: [PATCH 16/21] Fix plugin loader to work with windows paths (e.g.
 'D:\foo\...')

---
 src/static/js/pluginfw/plugins.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js
index 1d486223..455dd203 100644
--- a/src/static/js/pluginfw/plugins.js
+++ b/src/static/js/pluginfw/plugins.js
@@ -54,10 +54,22 @@ exports.formatHooks = function (hook_set_name) {
 };
 
 exports.loadFn = function (path, hookName) {
-  var x = path.split(":");
-  var fn = require(x[0]);
-  var functionName = x[1] ? x[1] : hookName;  
+  var functionName
+    , parts = path.split(":");
   
+  // on windows
+  if(process.platform == 'win32') {
+    if(parts.length == 3)
+      functionName = parts.pop();
+    path = parts.join(":");
+  }else{
+    path = parts[0];
+    functionName = parts[1];
+  }
+  
+  var fn = require(path);
+  functionName = functionName ? functionName : hookName;  
+
   _.each(functionName.split("."), function (name) {
     fn = fn[name];
   });

From c0ee0d8430a9d998a0383db3f856ef0f976a54ea Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Thu, 28 Jun 2012 15:58:39 +0200
Subject: [PATCH 17/21] Add windows install script

---
 bin/installOnWindows.bat | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 bin/installOnWindows.bat

diff --git a/bin/installOnWindows.bat b/bin/installOnWindows.bat
new file mode 100644
index 00000000..b6f699de
--- /dev/null
+++ b/bin/installOnWindows.bat
@@ -0,0 +1,35 @@
+@echo off
+set NODE_VERSION=0.6.5
+set JQUERY_VERSION=1.7
+
+:: change directory to etherpad-lite root
+cd bin
+cd ..
+
+echo _
+echo Setting up settings.json...
+copy settings.json.template_windows settings.json
+
+echo _
+echo Updating node...
+curl -lo bin\node.exe http://nodejs.org/dist/v%NODE_VERSION%/node.exe
+
+echo _
+echo Installing etherpad-lite and dependencies...
+cmd /C npm install src/
+
+echo _
+echo Updating jquery...
+curl -lo "node_modules\ep_etherpad-lite\static\js\jquery.min.js" "http://code.jquery.com/jquery-%JQUERY_VERSION%.min.js"
+
+echo _
+echo Some other stuff...
+copy node_modules\ep_etherpad-lite\static\custom\js.template node_modules\ep_etherpad-lite\static\custom\index.template
+copy node_modules\ep_etherpad-lite\static\custom\js.template node_modules\ep_etherpad-lite\static\custom\pad.template
+copy node_modules\ep_etherpad-lite\static\custom\js.template node_modules\ep_etherpad-lite\static\custom\timeslider.template
+copy node_modules\ep_etherpad-lite\static\custom\css.template node_modules\ep_etherpad-lite\static\custom\index.template
+copy node_modules\ep_etherpad-lite\static\custom\css.template node_modules\ep_etherpad-lite\static\custom\pad.template
+copy node_modules\ep_etherpad-lite\static\custom\css.template node_modules\ep_etherpad-lite\static\custom\timeslider.template
+
+echo _
+echo Installed Etherpad-lite!
\ No newline at end of file

From 227477967f98ceb9accbb7b331199e090742e722 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Fri, 29 Jun 2012 12:40:16 +0200
Subject: [PATCH 18/21] Fix plugin loader

make it work on client side and with relative paths
---
 src/static/js/pluginfw/plugins.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js
index 455dd203..7efcb49c 100644
--- a/src/static/js/pluginfw/plugins.js
+++ b/src/static/js/pluginfw/plugins.js
@@ -57,8 +57,8 @@ exports.loadFn = function (path, hookName) {
   var functionName
     , parts = path.split(":");
   
-  // on windows
-  if(process.platform == 'win32') {
+  // on windows: C:\foo\bar:xyz
+  if(parts[0].length == 1) {
     if(parts.length == 3)
       functionName = parts.pop();
     path = parts.join(":");

From 3d397b1bc25c6a1fa75bccde08b96e534d36ce41 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Fri, 29 Jun 2012 12:41:50 +0200
Subject: [PATCH 19/21] Fix windows install script

* would overwrite settings.json
* didn't correctly copy custom templates
* cleans var/minified* now
---
 bin/installOnWindows.bat | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/bin/installOnWindows.bat b/bin/installOnWindows.bat
index b6f699de..0e3e2099 100644
--- a/bin/installOnWindows.bat
+++ b/bin/installOnWindows.bat
@@ -6,10 +6,6 @@ set JQUERY_VERSION=1.7
 cd bin
 cd ..
 
-echo _
-echo Setting up settings.json...
-copy settings.json.template_windows settings.json
-
 echo _
 echo Updating node...
 curl -lo bin\node.exe http://nodejs.org/dist/v%NODE_VERSION%/node.exe
@@ -23,13 +19,20 @@ echo Updating jquery...
 curl -lo "node_modules\ep_etherpad-lite\static\js\jquery.min.js" "http://code.jquery.com/jquery-%JQUERY_VERSION%.min.js"
 
 echo _
-echo Some other stuff...
-copy node_modules\ep_etherpad-lite\static\custom\js.template node_modules\ep_etherpad-lite\static\custom\index.template
-copy node_modules\ep_etherpad-lite\static\custom\js.template node_modules\ep_etherpad-lite\static\custom\pad.template
-copy node_modules\ep_etherpad-lite\static\custom\js.template node_modules\ep_etherpad-lite\static\custom\timeslider.template
-copy node_modules\ep_etherpad-lite\static\custom\css.template node_modules\ep_etherpad-lite\static\custom\index.template
-copy node_modules\ep_etherpad-lite\static\custom\css.template node_modules\ep_etherpad-lite\static\custom\pad.template
-copy node_modules\ep_etherpad-lite\static\custom\css.template node_modules\ep_etherpad-lite\static\custom\timeslider.template
+echo Copying custom templates...
+set custom_dir=node_modules\ep_etherpad-lite\static\custom
+FOR %%f IN (index pad timeslider) DO (
+  if NOT EXIST %custom_dir%\%%f.js copy %custom_dir%\js.template %custom_dir%\%%f.js
+  if NOT EXIST %custom_dir%\%%f.css copy %custom_dir%\css.template %custom_dir%\%%f.css
+)
+
+echo _
+echo Clearing cache.
+del /S var\minified*
+
+echo _
+echo Setting up settings.json...
+IF NOT EXIST settings.json copy settings.json.template_windows settings.json
 
 echo _
 echo Installed Etherpad-lite!
\ No newline at end of file

From a71a8a7efc074be7d0ab86a240d95afefb38df53 Mon Sep 17 00:00:00 2001
From: Mark Holmquist <mtraceur@member.fsf.org>
Date: Fri, 29 Jun 2012 11:26:12 -0700
Subject: [PATCH 20/21] Add in padUsersCount method and API call

The PadMessageHandler objects now have a new API call associated
with them. I'm sure that's a funny place to put it, but the
pad2sessions object in that file seems to be the only place user
counts are stored!

Anyway, I hope this is helpful. I know it would be for me :)
---
 src/node/db/API.js                    |  1 +
 src/node/handler/APIHandler.js        |  3 ++-
 src/node/handler/PadMessageHandler.js | 11 +++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/node/db/API.js b/src/node/db/API.js
index e2b6f6f8..661b7859 100644
--- a/src/node/db/API.js
+++ b/src/node/db/API.js
@@ -48,6 +48,7 @@ exports.createGroupPad = groupManager.createGroupPad;
 exports.createAuthor = authorManager.createAuthor;
 exports.createAuthorIfNotExistsFor = authorManager.createAuthorIfNotExistsFor;
 exports.listPadsOfAuthor = authorManager.listPadsOfAuthor;
+exports.padUsersCount = padMessageHandler.padUsersCount;
 
 /**********************/
 /**SESSION FUNCTIONS***/
diff --git a/src/node/handler/APIHandler.js b/src/node/handler/APIHandler.js
index 567a90d2..40c08441 100644
--- a/src/node/handler/APIHandler.js
+++ b/src/node/handler/APIHandler.js
@@ -65,7 +65,8 @@ var functions = {
   "getPublicStatus"           : ["padID"], 
   "setPassword"               : ["padID", "password"], 
   "isPasswordProtected"       : ["padID"], 
-  "listAuthorsOfPad"          : ["padID"]
+  "listAuthorsOfPad"          : ["padID"],
+  "padUsersCount"             : ["padID"]
 };
 
 /**
diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js
index b356230c..9cf39669 100644
--- a/src/node/handler/PadMessageHandler.js
+++ b/src/node/handler/PadMessageHandler.js
@@ -1348,3 +1348,14 @@ function composePadChangesets(padId, startNum, endNum, callback)
     callback(null, changeset);
   });
 }
+
+/**
+ * Get the number of users in a pad
+ */
+exports.padUsersCount = function (padID, callback) {
+  if (!pad2sessions[padID] || typeof pad2sessions[padID] != typeof []) {
+    callback(null, {padUsersCount: 0});
+  } else {
+    callback(null, {padUsersCount: pad2sessions[padID].length});
+  }
+}

From 91ed1f57c5fb8fdb74e54a0ff065f3a5a06f045f Mon Sep 17 00:00:00 2001
From: Mark Holmquist <mtraceur@member.fsf.org>
Date: Mon, 2 Jul 2012 16:46:31 -0700
Subject: [PATCH 21/21] Don't rewrite in a stupid way

Since we're already in the proper path for the pad, why worry
about it? Replacing the entire path of the URL with /p/padname may
have seemed like a good idea at the time, but really, for a 302 we
only need a relative pathname. This patch provides the proper way.
---
 src/node/hooks/express/padurlsanitize.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/hooks/express/padurlsanitize.js b/src/node/hooks/express/padurlsanitize.js
index 229d013d..24ec2c3d 100644
--- a/src/node/hooks/express/padurlsanitize.js
+++ b/src/node/hooks/express/padurlsanitize.js
@@ -15,7 +15,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
 	//the pad id was sanitized, so we redirect to the sanitized version
 	if(sanitizedPadId != padId)
 	{
-          var real_url = req.url.replace(/^\/p\/[^\/]+/, '/p/' + sanitizedPadId);
+          var real_url = sanitizedPadId;
           var query = url.parse(req.url).query;
           if ( query ) real_url += '?' + query;
 	  res.header('Location', real_url);