Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

server.js

@@ -169,8 +169,6 @@ if (config.privKeyAndCertFiles) {
     };
 }
 
-app.get('/api/config', function(req, res){
-    var host = req.headers.host.replace(/\:[0-9]+/, '');
 var admins = [];
 try {
     admins = (config.adminKeys || []).map(function (k) {
@@ -179,6 +177,10 @@ app.get('/api/config', function(req, res){
         return s[s.length-1].replace(/-/g, '/');
     });
 } catch (e) { console.error("Can't parse admin keys"); }
+
+app.get('/api/config', function(req, res){
+    // TODO precompute any data that isn't dynamic to save some CPU time
+    var host = req.headers.host.replace(/\:[0-9]+/, '');
     res.setHeader('Content-Type', 'text/javascript');
     res.send('define(function(){\n' + [
         'var obj = ' + JSON.stringify({
@@ -192,6 +194,7 @@ app.get('/api/config', function(req, res){
             websocketURL:'ws' + ((useSecureWebsockets) ? 's' : '') + '://' + host + ':' +
                 websocketPort + '/cryptpad_websocket',
             httpUnsafeOrigin: config.httpUnsafeOrigin,
+            adminEmail: config.adminEmail,
             adminKeys: admins,
         }, null, '\t'),
         'obj.httpSafeOrigin = ' + (function () {