Merge branch 'develop' into improve_cookies

4 files changed, 17 insertions, 4 deletions

diff --git a/src/node/hooks/express/adminsettings.js b/src/node/hooks/express/adminsettings.js
index 4986f093..73691837 100644
--- a/src/node/hooks/express/adminsettings.js
+++ b/src/node/hooks/express/adminsettings.js
@@ -30,7 +30,13 @@ exports.socketio = function (hook_name, args, cb) {
         }
         else
         {
-          socket.emit("settings", {results: data});
+          //if showSettingsInAdminPage is set to false, then return NOT_ALLOWED in the result
+          if(settings.showSettingsInAdminPage === false) {
+            socket.emit("settings", {results:'NOT_ALLOWED'});
+          }
+          else {
+            socket.emit("settings", {results: data});
+          }
         }
       });
     });
diff --git a/src/node/hooks/express/padreadonly.js b/src/node/hooks/express/padreadonly.js
index 66be3339..bff8adf7 100644
--- a/src/node/hooks/express/padreadonly.js
+++ b/src/node/hooks/express/padreadonly.js
@@ -7,7 +7,7 @@ var exporthtml = require("../../utils/ExportHtml");
 exports.expressCreateServer = function (hook_name, args, cb) {
   //serve read only pad
   args.app.get('/ro/:id', function(req, res)
-  { 
+  {
     var html;
     var padId;
 
@@ -40,7 +40,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
         hasPadAccess(req, res, function()
         {
           //render the html document
-          exporthtml.getPadHTMLDocument(padId, null, false, function(err, _html)
+          exporthtml.getPadHTMLDocument(padId, null, function(err, _html)
           {
             if(ERR(err, callback)) return;
             html = _html;
diff --git a/src/node/hooks/express/specialpages.js b/src/node/hooks/express/specialpages.js
index e8d7795a..2840f82c 100644
--- a/src/node/hooks/express/specialpages.js
+++ b/src/node/hooks/express/specialpages.js
@@ -16,6 +16,13 @@ exports.expressCreateServer = function (hook_name, args, cb) {
     res.send(eejs.require("ep_etherpad-lite/templates/index.html"));
   });
 
+  //serve javascript.html
+  args.app.get('/javascript', function(req, res)
+  {
+    res.send(eejs.require("ep_etherpad-lite/templates/javascript.html"));
+  });
+
+
   //serve robots.txt
   args.app.get('/robots.txt', function(req, res)
   {
diff --git a/src/node/hooks/i18n.js b/src/node/hooks/i18n.js
index d0be2d6f..1b5b354d 100644
--- a/src/node/hooks/i18n.js
+++ b/src/node/hooks/i18n.js
@@ -5,7 +5,7 @@ var languages = require('languages4translatewiki')
   , npm = require('npm')
   , plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins.js').plugins
   , semver = require('semver')
-  , existsSync = fs.statSync || fs.existsSync || path.existsSync
+  , existsSync = require('../utils/path_exists')
 ;