mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' of github.com:Pita/etherpad-lite

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-11-25 16:08:24 -08:00
commit dc6d0cda68
7 changed files with 47 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
node/handler/APIHandler.js
View file

@ -70,7 +70,7 @@ var functions = {
exports.handle = function(functionName, fields, req, res)
{
//check the api key!
if(fields["apikey"] != apikey)
if(fields["apikey"] != apikey.trim())
{
res.send({code: 4, message: "no or wrong API Key", data: null});
return;

8
node/server.js
View file

@ -442,19 +442,19 @@ async.waterfall([
io.set('logger', {
debug: function (str)
{
socketIOLogger.debug(str);
socketIOLogger.debug.apply(socketIOLogger, arguments);
},
info: function (str)
{
socketIOLogger.info(str);
socketIOLogger.info.apply(socketIOLogger, arguments);
},
warn: function (str)
{
socketIOLogger.warn(str);
socketIOLogger.warn.apply(socketIOLogger, arguments);
},
error: function (str)
{
socketIOLogger.error(str);
socketIOLogger.error.apply(socketIOLogger, arguments);
},
});