From ae179ba01ddba0b717c71aab232ecff3337a9b2d Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 7 Jun 2012 10:58:29 -0700
Subject: [PATCH 1/6] 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 daca671e..1f9526ea 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -319,6 +319,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 6653a3b6f09a6a1ea33c5b23315f9ebf3b60e431 Mon Sep 17 00:00:00 2001
From: Jordan Hollinger <jordan.hollinger@gmail.com>
Date: Sat, 9 Jun 2012 11:32:05 -0400
Subject: [PATCH 2/6] 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 b118903f4e76d9ee086f44a59601e9d71c264fa6 Mon Sep 17 00:00:00 2001
From: Jordan Hollinger <jordan.hollinger@gmail.com>
Date: Mon, 11 Jun 2012 23:34:28 -0400
Subject: [PATCH 3/6] 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 e0540122fef772860423ccc31d88381ff5160414 Mon Sep 17 00:00:00 2001
From: Jordan Hollinger <jordan.hollinger@gmail.com>
Date: Tue, 12 Jun 2012 10:59:11 -0400
Subject: [PATCH 4/6] 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 08a00af6171b9bae0365d8d9a9fdf7d7bf5b605a Mon Sep 17 00:00:00 2001
From: Jordan Hollinger <jordan.hollinger@gmail.com>
Date: Wed, 13 Jun 2012 15:48:58 -0400
Subject: [PATCH 5/6] 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..957da42a 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 b438a278a16fbac3b38ad2105c3431b7e669df83 Mon Sep 17 00:00:00 2001
From: Egil Moeller <egil.moller@freecode.no>
Date: Tue, 3 Jul 2012 23:30:40 +0200
Subject: [PATCH 6/6] Make the server restart on plugin install

---
 src/ep.json                         |  4 ++
 src/node/hooks/express.js           | 62 +++++++++++++++++++++++++++++
 src/node/hooks/express/webaccess.js | 11 ++++-
 src/node/server.js                  | 45 +--------------------
 src/static/js/pluginfw/installer.js | 10 ++++-
 5 files changed, 85 insertions(+), 47 deletions(-)
 create mode 100644 src/node/hooks/express.js

diff --git a/src/ep.json b/src/ep.json
index 6bc77735..ce6d3a00 100644
--- a/src/ep.json
+++ b/src/ep.json
@@ -1,5 +1,9 @@
 {
   "parts": [
+    { "name": "express", "hooks": {
+      "createServer": "ep_etherpad-lite/node/hooks/express:createServer",
+      "restartServer": "ep_etherpad-lite/node/hooks/express:restartServer"
+      } },
     { "name": "static", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/static:expressCreateServer" } },
     { "name": "specialpages", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/specialpages:expressCreateServer" } },
     { "name": "padurlsanitize", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/padurlsanitize:expressCreateServer" } },
diff --git a/src/node/hooks/express.js b/src/node/hooks/express.js
new file mode 100644
index 00000000..c7897e77
--- /dev/null
+++ b/src/node/hooks/express.js
@@ -0,0 +1,62 @@
+var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks");
+var express = require('express');
+var settings = require('../utils/Settings');
+var fs = require('fs');
+var path = require('path');
+var  _ = require("underscore");
+
+var server;
+var serverName;
+
+exports.createServer = function () {
+  //try to get the git version
+  var version = "";
+  try
+  {
+    var rootPath = path.resolve(npm.dir, '..');
+    var ref = fs.readFileSync(rootPath + "/.git/HEAD", "utf-8");
+    var refPath = rootPath + "/.git/" + ref.substring(5, ref.indexOf("\n"));
+    version = fs.readFileSync(refPath, "utf-8");
+    version = version.substring(0, 7);
+    console.log("Your Etherpad Lite git version is " + version);
+  }
+  catch(e) 
+  {
+    console.warn("Can't get git version for server header\n" + e.message)
+  }
+  console.log("Report bugs at https://github.com/Pita/etherpad-lite/issues")
+
+  serverName = "Etherpad-Lite " + version + " (http://j.mp/ep-lite)";
+
+  exports.restartServer();
+
+  console.log("You can access your Etherpad-Lite instance at http://" + settings.ip + ":" + settings.port + "/");
+  if(!_.isEmpty(settings.users)){
+    console.log("The plugin admin page is at http://" + settings.ip + ":" + settings.port + "/admin/plugins");
+  }
+  else{
+    console.warn("Admin username and password not set in settings.json.  To access admin please uncomment and edit 'users' in settings.json");
+  }
+
+}
+
+exports.restartServer = function () {
+  if (server) {
+    console.log("Restarting express server");
+    server.close();
+  }
+
+  server = express.createServer();
+
+  server.use(function (req, res, next) {
+    res.header("Server", serverName);
+    next();
+  });
+
+  server.configure(function() {
+    hooks.callAll("expressConfigure", {"app": server});
+  });
+  hooks.callAll("expressCreateServer", {"app": server});
+
+  server.listen(settings.port, settings.ip);
+}
\ No newline at end of file
diff --git a/src/node/hooks/express/webaccess.js b/src/node/hooks/express/webaccess.js
index 028d8ab1..ffced047 100644
--- a/src/node/hooks/express/webaccess.js
+++ b/src/node/hooks/express/webaccess.js
@@ -88,6 +88,8 @@ exports.basicAuth = function (req, res, next) {
   });
 }
 
+var secret = null;
+
 exports.expressConfigure = function (hook_name, args, cb) {
   // If the log level specified in the config file is WARN or ERROR the application server never starts listening to requests as reported in issue #158.
   // Not installing the log4js connect logger when the log level has a higher severity than INFO since it would not log at that level anyway.
@@ -100,10 +102,15 @@ exports.expressConfigure = function (hook_name, args, cb) {
    * name) to a javascript identifier compatible string. Makes code
    * handling it cleaner :) */
 
-  args.app.sessionStore = new express.session.MemoryStore();
+  if (!exports.sessionStore) {
+    exports.sessionStore = new express.session.MemoryStore();
+    secret = randomString(32);
+  }
+
+  args.app.sessionStore = exports.sessionStore;
   args.app.use(express.session({store: args.app.sessionStore,
                                 key: 'express_sid',
-                                secret: apikey = randomString(32)}));
+                                secret: secret}));
 
   args.app.use(exports.basicAuth);
 }
diff --git a/src/node/server.js b/src/node/server.js
index 4eb38ea7..2cfcde82 100755
--- a/src/node/server.js
+++ b/src/node/server.js
@@ -22,36 +22,13 @@
  */
 
 var log4js = require('log4js');
-var fs = require('fs');
 var settings = require('./utils/Settings');
 var db = require('./db/DB');
 var async = require('async');
-var express = require('express');
-var path = require('path');
 var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins");
 var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks");
 var npm = require("npm/lib/npm.js");
-var  _ = require("underscore");
 
-//try to get the git version
-var version = "";
-try
-{
-  var rootPath = path.resolve(npm.dir, '..');
-  var ref = fs.readFileSync(rootPath + "/.git/HEAD", "utf-8");
-  var refPath = rootPath + "/.git/" + ref.substring(5, ref.indexOf("\n"));
-  version = fs.readFileSync(refPath, "utf-8");
-  version = version.substring(0, 7);
-  console.log("Your Etherpad Lite git version is " + version);
-}
-catch(e) 
-{
-  console.warn("Can't get git version for server header\n" + e.message)
-}
-
-console.log("Report bugs at https://github.com/Pita/etherpad-lite/issues")
-
-var serverName = "Etherpad-Lite " + version + " (http://j.mp/ep-lite)";
 
 //set loglevel
 log4js.setGlobalLogLevel(settings.loglevel);
@@ -75,27 +52,7 @@ async.waterfall([
   //initalize the http server
   function (callback)
   {
-    //create server
-    var app = express.createServer();
-
-    app.use(function (req, res, next) {
-      res.header("Server", serverName);
-      next();
-    });
-    
-    app.configure(function() { hooks.callAll("expressConfigure", {"app": app}); });
-    
-    hooks.callAll("expressCreateServer", {"app": app});
-    
-    //let the server listen
-    app.listen(settings.port, settings.ip);
-    console.log("You can access your Etherpad-Lite instance at http://" + settings.ip + ":" + settings.port + "/");
-    if(!_.isEmpty(settings.users)){
-      console.log("The plugin admin page is at http://" + settings.ip + ":" + settings.port + "/admin/plugins");
-    }
-    else{
-      console.warn("Admin username and password not set in settings.json.  To access admin please uncomment and edit 'users' in settings.json");
-    }
+    hooks.callAll("createServer", {});
     callback(null);  
   }
 ]);
diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js
index 1bb8db9e..e7c6fb80 100644
--- a/src/static/js/pluginfw/installer.js
+++ b/src/static/js/pluginfw/installer.js
@@ -3,7 +3,7 @@ var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks");
 var npm = require("npm");
 var registry = require("npm/lib/utils/npm-registry-client/index.js");
 
-var withNpm = function (npmfn, cb) {
+var withNpm = function (npmfn, final, cb) {
   npm.load({}, function (er) {
     if (er) return cb({progress:1, error:er});
     npm.on("log", function (message) {
@@ -15,6 +15,7 @@ var withNpm = function (npmfn, cb) {
       data.progress = 1;
       data.message = "Done.";
       cb(data);
+      final();
     });
   });
 }
@@ -36,6 +37,9 @@ exports.uninstall = function(plugin_name, cb) {
         });
       });
     },
+    function () {
+      hooks.aCallAll("restartServer", {}, function () {});                
+    },
     cb
   );
 };
@@ -51,6 +55,9 @@ exports.install = function(plugin_name, cb) {
         });
       });
     },
+    function () {
+      hooks.aCallAll("restartServer", {}, function () {});                
+    },
     cb
   );
 };
@@ -93,6 +100,7 @@ exports.search = function(query, cache, cb) {
         }
       );
     },
+    function () { },
     cb
   );
 };