libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-31 19:02:59 +01:00
Code Issues Projects Releases Wiki Activity

quick formatting clean up

Browse source
This commit is contained in:
John McLear 2014-03-17 19:20:32 +00:00
parent 8cd9b98b76
commit e1fa43e640
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/node/hooks/express/webaccess.js
View file

@ -41,7 +41,7 @@ exports.basicAuth = function (req, res, next) {
req.session.user = settings.users[username]; req.session.user = settings.users[username];
return cb(true); return cb(true);
} }
return hooks.aCallFirst("authenticate", {req: req, res:res, next:next, username: username, password: password}, hookResultMangle(cb)); return hooks.aCallFirst("authenticate", {req: req, res:res, next:next, username: username, password: password}, hookResultMangle(cb));
} }
hooks.aCallFirst("authenticate", {req: req, res:res, next:next}, hookResultMangle(cb)); hooks.aCallFirst("authenticate", {req: req, res:res, next:next}, hookResultMangle(cb));
} }

3
src/static/js/pad.js
View file

@ -254,8 +254,9 @@ function handshake()
//the access was not granted, give the user a message //the access was not granted, give the user a message
if(obj.accessStatus) if(obj.accessStatus)
{ {
if(!receivedClientVars) if(!receivedClientVars){
$('.passForm').submit(require(module.id).savePassword); $('.passForm').submit(require(module.id).savePassword);
}
if(obj.accessStatus == "deny") if(obj.accessStatus == "deny")
{ {