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

fixed merge conflicts

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-08-13 22:18:42 +01:00
commit b300dc1d2c
12 changed files with 231 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

10
node/server.js
View file

@ -166,7 +166,7 @@ async.waterfall([
//ensure the padname is valid and the url doesn't end with a /
if(!padManager.isValidPadId(req.params.pad) || /\/$/.test(req.url))
{
next();
res.send('Such a padname is forbidden', 404);
return;
}
@ -181,7 +181,7 @@ async.waterfall([
//ensure the padname is valid and the url doesn't end with a /
if(!padManager.isValidPadId(req.params.pad) || /\/$/.test(req.url))
{
next();
res.send('Such a padname is forbidden', 404);
return;
}
@ -196,7 +196,7 @@ async.waterfall([
//ensure the padname is valid and the url doesn't end with a /
if(!padManager.isValidPadId(req.params.pad) || /\/$/.test(req.url))
{
next();
res.send('Such a padname is forbidden', 404);
return;
}
@ -225,10 +225,10 @@ async.waterfall([
//ensure the padname is valid and the url doesn't end with a /
if(!padManager.isValidPadId(req.params.pad) || /\/$/.test(req.url))
{
next();
res.send('Such a padname is forbidden', 404);
return;
}
//if abiword is disabled, skip handling this request
if(settings.abiword == null)
{