Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-06 14:05:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #308

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-09-19 20:43:56 -04:00
parent 21efda4a84
commit 6be5bcc4c8
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/templates/admin/header.tpl
View File

@@ -17,8 +17,10 @@
<script type="text/javascript" src="{relative_path}/src/app.js"></script> <script type="text/javascript" src="{relative_path}/src/app.js"></script>
<script type="text/javascript" src="{relative_path}/src/templates.js"></script> <script type="text/javascript" src="{relative_path}/src/templates.js"></script>
<script type="text/javascript" src="{relative_path}/src/ajaxify.js"></script> <script type="text/javascript" src="{relative_path}/src/ajaxify.js"></script>
<script src="{relative_path}/vendor/jquery/js/jquery.timeago.js"></script>
<script src="{relative_path}/vendor/requirejs/require.js"></script> <script src="{relative_path}/vendor/requirejs/require.js"></script>
<script src="{relative_path}/vendor/bootbox/bootbox.min.js"></script> <script src="{relative_path}/vendor/bootbox/bootbox.min.js"></script>
<script> <script>
require.config({ require.config({
baseUrl: "{relative_path}/src/modules", baseUrl: "{relative_path}/src/modules",

2
public/templates/config.json
View File

@@ -8,7 +8,7 @@
"admin/index[^]*": "admin/index", "admin/index[^]*": "admin/index",
"admin/themes[^]*": "admin/themes", "admin/themes[^]*": "admin/themes",
"admin/plugins[^]*": "admin/plugins", "admin/plugins[^]*": "admin/plugins",
"admin/settings[^]*": "admin/settings", "^admin/settings[^]*": "admin/settings",
"admin/twitter[^]*": "admin/twitter", "admin/twitter[^]*": "admin/twitter",
"admin/facebook[^]*": "admin/facebook", "admin/facebook[^]*": "admin/facebook",
"admin/gplus[^]*": "admin/gplus", "admin/gplus[^]*": "admin/gplus",

10
src/routes/user.js
View File

@@ -332,12 +332,14 @@ var user = require('./../user.js'),
return; return;
} }
if (uid !== callerUID || callerUID === '0') { if (uid != callerUID || callerUID == '0') {
res.json(403, { res.json(403, {
error: 'Not allowed!' error: 'Not allowed!'
}); });
return; return;
} }
user.getUserFields(uid, ['username', 'userslug', 'showemail'], function(err, userData) { user.getUserFields(uid, ['username', 'userslug', 'showemail'], function(err, userData) {
if (err) if (err)
return next(err); return next(err);
@@ -368,7 +370,7 @@ var user = require('./../user.js'),
return; return;
} }
if (uid !== callerUID || callerUID === '0') { if (uid != callerUID || callerUID == '0') {
res.json(403, { res.json(403, {
error: 'Not allowed!' error: 'Not allowed!'
}); });
@@ -491,13 +493,13 @@ var user = require('./../user.js'),
} }
function canSeeEmail() { function canSeeEmail() {
return callerUID === uid || (data.email && (data.showemail && data.showemail === "1")); return callerUID == uid || (data.email && (data.showemail && data.showemail === "1"));
} }
if (!canSeeEmail()) if (!canSeeEmail())
data.email = ""; data.email = "";
if (callerUID === uid && (!data.showemail || data.showemail === "0")) if (callerUID == uid && (!data.showemail || data.showemail === "0"))
data.emailClass = ""; data.emailClass = "";
else else
data.emailClass = "hide"; data.emailClass = "hide";