summaryrefslogtreecommitdiff
path: root/lib/response.js
diff options
context:
space:
mode:
authorYukai Huang2017-01-21 12:08:52 +0800
committerYukai Huang2017-01-21 12:08:52 +0800
commit4bbe035beb41ad2c9f43434d0d90209850a62f70 (patch)
tree53095b529b1220b6e2d23f0dbc255af2ca54d7d7 /lib/response.js
parenta9a38c3d75b1cf467bb3b4484abfc09dcbcea107 (diff)
parent1de4242473b74afdb2d3e358e3b213ef156ca0de (diff)
Merge branch 'master' into frontend-next
Diffstat (limited to 'lib/response.js')
-rwxr-xr-xlib/response.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/response.js b/lib/response.js
index 9014a0a0..585d1d54 100755
--- a/lib/response.js
+++ b/lib/response.js
@@ -97,7 +97,8 @@ function responseHackMD(res, note) {
dropbox: config.dropbox,
google: config.google,
ldap: config.ldap,
- email: config.email
+ email: config.email,
+ allowemailregister: config.allowemailregister
});
}
@@ -126,10 +127,10 @@ function checkViewPermission(req, note) {
else
return true;
} else if (note.permission == 'limited' || note.permission == 'protected') {
- if( !req.isAuthenticated() ) {
+ if(!req.isAuthenticated())
return false;
- }
- return true;
+ else
+ return true;
} else {
return true;
}