diff options
author | Marcel Klehr <mklehr@gmx.net> | 2012-09-22 13:51:39 +0200 |
---|---|---|
committer | Marcel Klehr <mklehr@gmx.net> | 2012-09-22 13:51:39 +0200 |
commit | 71579d14783aa0f020664353f6596142dddfb069 (patch) | |
tree | 507a1fcbf320ddd31e6477435b6eace67a6eb4fb /src/node/hooks | |
parent | ff7cf991c9f6bb6b7d1c9f9d1bd0963050170bb8 (diff) | |
download | etherpad-lite-71579d14783aa0f020664353f6596142dddfb069.zip |
Fix res.send (migrate to express v3)
Diffstat (limited to 'src/node/hooks')
-rw-r--r-- | src/node/hooks/express/adminplugins.js | 8 | ||||
-rw-r--r-- | src/node/hooks/express/padreadonly.js | 2 | ||||
-rw-r--r-- | src/node/hooks/express/padurlsanitize.js | 4 | ||||
-rw-r--r-- | src/node/hooks/express/webaccess.js | 4 |
4 files changed, 7 insertions, 11 deletions
diff --git a/src/node/hooks/express/adminplugins.js b/src/node/hooks/express/adminplugins.js index fc274a07..97a0d602 100644 --- a/src/node/hooks/express/adminplugins.js +++ b/src/node/hooks/express/adminplugins.js @@ -12,14 +12,10 @@ exports.expressCreateServer = function (hook_name, args, cb) { errors: [], }; - res.send(eejs.require( - "ep_etherpad-lite/templates/admin/plugins.html", - render_args), {}); + res.send( eejs.require("ep_etherpad-lite/templates/admin/plugins.html", render_args) ); }); args.app.get('/admin/plugins/info', function(req, res) { - res.send(eejs.require( - "ep_etherpad-lite/templates/admin/plugins-info.html", - {}), {}); + res.send( eejs.require("ep_etherpad-lite/templates/admin/plugins-info.html", {}) ); }); } diff --git a/src/node/hooks/express/padreadonly.js b/src/node/hooks/express/padreadonly.js index 60ece0ad..af5cbed3 100644 --- a/src/node/hooks/express/padreadonly.js +++ b/src/node/hooks/express/padreadonly.js @@ -56,7 +56,7 @@ exports.expressCreateServer = function (hook_name, args, cb) { ERR(err); if(err == "notfound") - res.send('404 - Not Found', 404); + res.send(404, '404 - Not Found'); else res.send(html); }); diff --git a/src/node/hooks/express/padurlsanitize.js b/src/node/hooks/express/padurlsanitize.js index 24ec2c3d..29782b69 100644 --- a/src/node/hooks/express/padurlsanitize.js +++ b/src/node/hooks/express/padurlsanitize.js @@ -7,7 +7,7 @@ exports.expressCreateServer = function (hook_name, args, cb) { //ensure the padname is valid and the url doesn't end with a / if(!padManager.isValidPadId(padId) || /\/$/.test(req.url)) { - res.send('Such a padname is forbidden', 404); + res.send(404, 'Such a padname is forbidden'); } else { @@ -19,7 +19,7 @@ exports.expressCreateServer = function (hook_name, args, cb) { 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); + res.send(302, 'You should be redirected to <a href="' + real_url + '">' + real_url + '</a>'); } //the pad id was fine, so just render it else diff --git a/src/node/hooks/express/webaccess.js b/src/node/hooks/express/webaccess.js index a6a270c0..99971206 100644 --- a/src/node/hooks/express/webaccess.js +++ b/src/node/hooks/express/webaccess.js @@ -56,10 +56,10 @@ exports.basicAuth = function (req, res, next) { res.header('WWW-Authenticate', 'Basic realm="Protected Area"'); if (req.headers.authorization) { setTimeout(function () { - res.send('Authentication required', 401); + res.send(401, 'Authentication required'); }, 1000); } else { - res.send('Authentication required', 401); + res.send(401, 'Authentication required'); } })); } |