创建您的群组时出现问题。 请稍后再试！
", - "alerts.confirm-delete": "确认要删除这个群组么？", + "alerts.confirm-delete": "你确定要删除此群组吗？", - "edit.name": "名字", + "edit.name": "名称", "edit.description": "描述", "edit.user-title": "成员标题", "edit.icon": "群组标志", diff --git a/public/language/zh-CN/admin/manage/tags.json b/public/language/zh-CN/admin/manage/tags.json index bef7caba4e..3c8394d360 100644 --- a/public/language/zh-CN/admin/manage/tags.json +++ b/public/language/zh-CN/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "通过点击或拖动选择话题，按住shift进行多选。", "create": "创建话题", "modify": "修改话题", + "rename": "重命名话题", "delete": "删除所选话题", "search": "搜索话题...", "settings": "点击此处 访问话题设置页面。", diff --git a/public/language/zh-CN/admin/manage/users.json b/public/language/zh-CN/admin/manage/users.json index 4538b91287..1db4cafdc1 100644 --- a/public/language/zh-CN/admin/manage/users.json +++ b/public/language/zh-CN/admin/manage/users.json @@ -30,7 +30,7 @@ "search.uid": "通过用户名", "search.uid-placeholder": "搜索用户ID", "search.username": "通过用户名", - "search.username-placeholder": "输入你想找的用户名", + "search.username-placeholder": "输入你想查询的用户名", "search.email": "通过邮箱", "search.email-placeholder": "输入你想查询的邮箱地址", "search.ip": "通过IP地址", @@ -68,18 +68,18 @@ "alerts.ban-success": "用户已封禁！", "alerts.button-ban-x": "封禁 %1 名用户", "alerts.unban-success": "用户已解封!", - "alerts.lockout-reset-success": "闭锁已重置！", + "alerts.lockout-reset-success": "锁定已重置！", "alerts.flag-reset-success": "举报已重置！", "alerts.no-remove-yourself-admin": "你无法撤销自己的管理员身份！", - "alerts.make-admin-success": "用户已成为管理员", - "alerts.confirm-remove-admin": "真的想要删除这个管理员？", - "alerts.remove-admin-success": "此用户不再是管理员", - "alerts.make-global-mod-success": "User is now global moderator.", - "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", - "alerts.make-moderator-success": "User is now moderator.", - "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", - "alerts.remove-moderator-success": "User is no longer moderator.", + "alerts.make-admin-success": "该用户已成为管理员", + "alerts.confirm-remove-admin": "你确定要删除该管理员？", + "alerts.remove-admin-success": " 该用户不再是管理员", + "alerts.make-global-mod-success": " 该用户已成为管理员", + "alerts.confirm-remove-global-mod": "你确定要删除该管理员？", + "alerts.remove-global-mod-success": "该用户已不再是管理员", + "alerts.make-moderator-success": " 该用户已成为管理员", + "alerts.confirm-remove-moderator": "你确定要删除此管理员？", + "alerts.remove-moderator-success": "该用户已不再是管理员", "alerts.confirm-validate-email": "你确定要验证这些用户的电子邮箱吗？", "alerts.validate-email-success": "电子邮箱已验证", "alerts.password-reset-confirm": "你确定要向这些用户发送密码重置邮件吗？", diff --git a/public/language/zh-CN/admin/menu.json b/public/language/zh-CN/admin/menu.json index 91f24b525b..a44c8d9f94 100644 --- a/public/language/zh-CN/admin/menu.json +++ b/public/language/zh-CN/admin/menu.json @@ -9,10 +9,10 @@ "section-manage": "管理", "manage/categories": "版块", - "manage/privileges": "Privileges", + "manage/privileges": "权限", "manage/tags": "话题", "manage/users": "用户", - "manage/admins-mods": "Admins & Mods", + "manage/admins-mods": "管理员插件", "manage/registration": "注册申请", "manage/post-queue": "提交列表", "manage/groups": "群组", diff --git a/public/language/zh-CN/admin/settings/chat.json b/public/language/zh-CN/admin/settings/chat.json index 558758befb..6228ed8410 100644 --- a/public/language/zh-CN/admin/settings/chat.json +++ b/public/language/zh-CN/admin/settings/chat.json @@ -6,6 +6,6 @@ "max-length": "聊天信息的最大长度", "max-room-size": "聊天室的最多用户数", "delay": "聊天信息间的毫秒数", - "restrictions.seconds-edit-after": "Number of seconds before users are allowed to edit chat messages after posting. (0 disabled)", - "restrictions.seconds-delete-after": "Number of seconds before users are allowed to delete chat messages after posting. (0 disabled)" + "restrictions.seconds-edit-after": "用户在发布后允许编辑帖子的时间（0为禁用，单位：秒）", + "restrictions.seconds-delete-after": "用户在发布后允许删除帖子的时间（0为禁用，单位：秒）" } \ No newline at end of file diff --git a/public/language/zh-CN/admin/settings/post.json b/public/language/zh-CN/admin/settings/post.json index 69717bb2fc..02761f9ad7 100644 --- a/public/language/zh-CN/admin/settings/post.json +++ b/public/language/zh-CN/admin/settings/post.json @@ -6,25 +6,25 @@ "sorting.most-votes": "最多投票", "sorting.most-posts": "最多回复", "sorting.topic-default": "默认主题排序", - "length": "Post Length", + "length": "帖子长度", "restrictions": "发帖限制", - "restrictions-new": "New User Restrictions", + "restrictions-new": "新用户限制", "restrictions.post-queue": "启用发布队列", - "restrictions-new.post-queue": "Enable new user restrictions", + "restrictions-new.post-queue": "启用新的用户限制", "restrictions.post-queue-help": "启用发布队列将会使新用户的发布内容进入批准队列", - "restrictions-new.post-queue-help": "Enabling new user restrictions will set restrictions on posts created by new users.", - "restrictions.seconds-between": "Seconds between posts", - "restrictions.seconds-between-new": "Seconds between posts for new users", - "restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted", + "restrictions-new.post-queue-help": "启用新的用户限制将对新用户创建的帖子设置限制。", + "restrictions.seconds-between": "秒之间的帖子", + "restrictions.seconds-between-new": "新用户发帖间隔（单位：秒）", + "restrictions.rep-threshold": "取消发帖限制所需的声望值", "restrictions.seconds-defore-new": "见习时间（单位：秒）", - "restrictions.seconds-edit-after": "Number of seconds before users are allowed to edit posts after posting. (0 disabled)", - "restrictions.seconds-delete-after": "Number of seconds before users are allowed to delete posts after posting. (0 disabled)", + "restrictions.seconds-edit-after": "用户在发布后允许编辑帖子的时间（0为禁用，单位：秒）", + "restrictions.seconds-delete-after": "用户在发布后允许编辑帖子的时间（0为禁用，单位：秒）", "restrictions.replies-no-delete": "在用户被禁止删除自己的主题后的回复数。 (0为禁用) ", "restrictions.min-title-length": "最小标题长度", "restrictions.max-title-length": "最大标题长度", "restrictions.min-post-length": "最小帖子长度", "restrictions.max-post-length": "最大帖子长度", - "restrictions.days-until-stale": "Days until topic is considered stale", + "restrictions.days-until-stale": "天，直到话题被视为失效", "restrictions.stale-help": "如果某个主题被视为“过时”，则会向尝试回复该主题的用户显示警告。", "timestamp": "时间戳", "timestamp.cut-off": "日期截止日期（单位：天）", diff --git a/public/language/zh-CN/admin/settings/reputation.json b/public/language/zh-CN/admin/settings/reputation.json index ec3f657d1e..775c975840 100644 --- a/public/language/zh-CN/admin/settings/reputation.json +++ b/public/language/zh-CN/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "所有投票是公开的", "thresholds": "活动闸值", "min-rep-downvote": "踩帖子所需要声望的最小值", - "min-rep-flag": "举报帖子需要的最小声望" + "min-rep-flag": "举报帖子需要的最小声望", + "min-rep-website": "设置网站所需要的最小声望", + "min-rep-aboutme": "设置关于我所需要的最小声望", + "min-rep-signature": "设置签名档所需要的最小声望" } \ No newline at end of file diff --git a/public/language/zh-CN/error.json b/public/language/zh-CN/error.json index 087018bcd3..9c5344881a 100644 --- a/public/language/zh-CN/error.json +++ b/public/language/zh-CN/error.json @@ -17,7 +17,7 @@ "invalid-login-credentials": "无效登录凭证", "invalid-username-or-password": "请确认用户名和密码", "invalid-search-term": "无效的搜索关键字", - "invalid-url": "Invalid URL", + "invalid-url": "无效的 URL", "csrf-invalid": "可能是由于会话过期，登录失败。请重试。", "invalid-pagination-value": "无效的分页数值，必须介于 %1 和 %2 之间", "username-taken": "此用户名已被占用", @@ -114,13 +114,16 @@ "cant-edit-chat-message": "您不能编辑这条信息", "cant-remove-last-user": "您不能移除这个用户", "cant-delete-chat-message": "您不允许删除这条消息", - "chat-edit-duration-expired": "You are only allowed to edit chat messages for %1 second(s) after posting", - "chat-delete-duration-expired": "You are only allowed to delete chat messages for %1 second(s) after posting", + "chat-edit-duration-expired": "您只能在发布 %1 秒后修改聊天信息", + "chat-delete-duration-expired": "您只能在发布 %1 秒后删除聊天信息", "already-voting-for-this-post": "您已为此帖回复投过票了。", "reputation-system-disabled": "声望系统已禁用。", "downvoting-disabled": "踩已被禁用", "not-enough-reputation-to-downvote": "您的声望不足以踩此帖", "not-enough-reputation-to-flag": "您的声望不足以举报此帖", + "not-enough-reputation-min-rep-website": "你的声望不足以设置网站", + "not-enough-reputation-min-rep-aboutme": "你的声望不足以设置关于我", + "not-enough-reputation-min-rep-signature": "你的声望不足以设置签名档", "already-flagged": "您已举报此帖", "self-vote": "你不能在您自己的帖子内投票", "reload-failed": "刷新 NodeBB 时遇到问题: \"%1\"。NodeBB 保持给已连接的客户端服务，您应该撤销刷新前做的更改。", diff --git a/public/language/zh-CN/global.json b/public/language/zh-CN/global.json index f0bff3fb22..7bc70157b7 100644 --- a/public/language/zh-CN/global.json +++ b/public/language/zh-CN/global.json @@ -53,7 +53,7 @@ "topics": "主题", "posts": "帖子", "best": "最佳", - "votes": "Votes", + "votes": "投票", "upvoters": "顶的人", "upvoted": "顶", "downvoters": "踩的人", diff --git a/public/language/zh-CN/pages.json b/public/language/zh-CN/pages.json index 950334ccfb..2b0c8e73e2 100644 --- a/public/language/zh-CN/pages.json +++ b/public/language/zh-CN/pages.json @@ -6,7 +6,7 @@ "popular-month": "当月热门话题", "popular-alltime": "热门主题", "recent": "最新主题", - "top": "Top Voted Topics", + "top": "票数最高的主题", "moderator-tools": "版主工具", "flagged-content": "已举报的内容", "ip-blacklist": "IP 黑名单", @@ -20,7 +20,7 @@ "users/search": "会员搜索", "notifications": "提醒", "tags": "话题", - "tag": "\"%1\" 下的主题", + "tag": "话题为\"%1\"的主题", "register": "注册帐号", "registration-complete": "注册完成", "login": "登录帐号", diff --git a/public/language/zh-CN/topic.json b/public/language/zh-CN/topic.json index 039964e1d6..6f9f559818 100644 --- a/public/language/zh-CN/topic.json +++ b/public/language/zh-CN/topic.json @@ -52,7 +52,7 @@ "not-watching.description": "不要在有新回复时通知我。<head> section of your forum's markup. Script tags are allowed, but are discouraged, as the Custom Javascript tab is available.",
"custom-header.enable": "Enable Custom Header",
diff --git a/public/language/zh-TW/admin/manage/tags.json b/public/language/zh-TW/admin/manage/tags.json
index db40e9f098..df597a6166 100644
--- a/public/language/zh-TW/admin/manage/tags.json
+++ b/public/language/zh-TW/admin/manage/tags.json
@@ -6,6 +6,7 @@
"description": "Select tags via clicking and/or dragging, use shift to select multiple.",
"create": "Create Tag",
"modify": "Modify Tags",
+ "rename": "Rename Tags",
"delete": "Delete Selected Tags",
"search": "Search for tags...",
"settings": "Click here to visit the tag settings page.",
diff --git a/public/language/zh-TW/admin/manage/users.json b/public/language/zh-TW/admin/manage/users.json
index 9dcc1a0f32..2e4cfa2a5c 100644
--- a/public/language/zh-TW/admin/manage/users.json
+++ b/public/language/zh-TW/admin/manage/users.json
@@ -76,7 +76,7 @@
"alerts.remove-admin-success": "User is no longer administrator.",
"alerts.make-global-mod-success": "User is now global moderator.",
"alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?",
- "alerts.remove-global-mod-success": "User is no longer global noderator",
+ "alerts.remove-global-mod-success": "User is no longer global moderator.",
"alerts.make-moderator-success": "User is now moderator.",
"alerts.confirm-remove-moderator": "Do you really want to remove this moderator?",
"alerts.remove-moderator-success": "User is no longer moderator.",
diff --git a/public/language/zh-TW/admin/settings/reputation.json b/public/language/zh-TW/admin/settings/reputation.json
index f0e59e8db9..c698592cff 100644
--- a/public/language/zh-TW/admin/settings/reputation.json
+++ b/public/language/zh-TW/admin/settings/reputation.json
@@ -5,5 +5,8 @@
"votes-are-public": "All Votes Are Public",
"thresholds": "Activity Thresholds",
"min-rep-downvote": "Minimum reputation to downvote posts",
- "min-rep-flag": "Minimum reputation to flag posts"
+ "min-rep-flag": "Minimum reputation to flag posts",
+ "min-rep-website": "Minimum reputation to add \"Website\" to user profile",
+ "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",
+ "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile"
}
\ No newline at end of file
diff --git a/public/language/zh-TW/error.json b/public/language/zh-TW/error.json
index 07bfbb39ed..325fa6d8f5 100644
--- a/public/language/zh-TW/error.json
+++ b/public/language/zh-TW/error.json
@@ -121,6 +121,9 @@
"downvoting-disabled": "反向投票已停用",
"not-enough-reputation-to-downvote": "你沒有足夠的信譽可以對這個張貼進行反向投票",
"not-enough-reputation-to-flag": "你沒有足夠的信譽來舉報這個帖子",
+ "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website",
+ "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me",
+ "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature",
"already-flagged": "你已經對這個張貼標記過了",
"self-vote": "You cannot vote on your own post",
"reload-failed": "NodeBB重載\"%1\"時遇到了問題。 NodeBB將繼續提供現有的客戶端資源，但請你撤消重載前的動作。",
diff --git a/public/language/zh-TW/pages.json b/public/language/zh-TW/pages.json
index b512e4c36a..43749be35d 100644
--- a/public/language/zh-TW/pages.json
+++ b/public/language/zh-TW/pages.json
@@ -20,7 +20,7 @@
"users/search": "使用者搜尋",
"notifications": "新訊息通知",
"tags": "標籤",
- "tag": "有\"%1\"標籤的主題",
+ "tag": "Topics tagged under "%1"",
"register": "註冊帳號",
"registration-complete": "Registration complete",
"login": "登入帳號",
diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js
index 3dc22afd62..be224d2812 100644
--- a/public/src/admin/admin.js
+++ b/public/src/admin/admin.js
@@ -31,8 +31,6 @@
}
$(document).ready(function () {
- setupKeybindings();
-
if (!/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) {
require(['admin/modules/search'], function (search) {
search.init();
@@ -63,24 +61,6 @@
});
}
- function setupKeybindings() {
- require(['mousetrap', 'admin/modules/instance'], function (mousetrap, instance) {
- mousetrap.bind('ctrl+shift+a r', function () {
- instance.reload();
- });
-
- mousetrap.bind('ctrl+shift+a R', function () {
- socket.emit('admin.restart');
- });
-
- mousetrap.bind('/', function () {
- $('#acp-search input').focus();
-
- return false;
- });
- });
- }
-
function selectMenuItem(url) {
require(['translator'], function (translator) {
url = url
diff --git a/public/src/client/topic/move-post.js b/public/src/client/topic/move-post.js
index bd9d542ead..0c08e030da 100644
--- a/public/src/client/topic/move-post.js
+++ b/public/src/client/topic/move-post.js
@@ -4,45 +4,37 @@
define('forum/topic/move-post', [], function () {
var MovePost = {};
-
MovePost.openMovePostModal = function (button) {
app.parseAndTranslate('partials/move_post_modal', {}, function (html) {
- var moveModal = $(html);
+ var dialog = bootbox.dialog({
+ title: '[[topic:move_post]]',
+ message: html,
+ show: true,
+ buttons: {
+ submit: {
+ label: '[[topic:confirm_move]]',
+ className: 'btn-primary submit-btn',
+ callback: function () {
+ var topicIdEl = dialog.find('#topicId');
+ if (!topicIdEl.val()) {
+ return;
+ }
- var moveBtn = moveModal.find('#move_post_commit');
- var topicId = moveModal.find('#topicId');
-
- moveModal.on('hidden.bs.modal', function () {
- moveModal.remove();
+ movePost(button.parents('[data-pid]'), button.parents('[data-pid]').attr('data-pid'), topicIdEl.val(), function () {
+ topicIdEl.val('');
+ });
+ },
+ },
+ },
});
+ dialog.find('.submit-btn').attr('disabled', true);
- showMoveModal(moveModal);
-
- moveModal.find('.close, #move_post_cancel').on('click', function () {
- moveModal.addClass('hide');
- });
-
- topicId.on('keyup change', function () {
- moveBtn.attr('disabled', !topicId.val());
- });
-
- moveBtn.on('click', function () {
- movePost(button.parents('[data-pid]'), button.parents('[data-pid]').attr('data-pid'), topicId.val(), function () {
- moveModal.modal('hide');
- topicId.val('');
- });
+ dialog.find('#topicId').on('keyup change', function () {
+ dialog.find('.submit-btn').attr('disabled', !dialog.find('#topicId').val());
});
});
};
- function showMoveModal(modal) {
- modal.modal('show')
- .css('position', 'fixed')
- .css('left', Math.max(0, (($(window).width() - modal.outerWidth()) / 2) + $(window).scrollLeft()) + 'px')
- .css('top', '0px')
- .css('z-index', '2000');
- }
-
function movePost(post, pid, tid, callback) {
socket.emit('posts.movePost', { pid: pid, tid: tid }, function (err) {
if (err) {
diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.js
index a854fd0a1b..0a99d83af1 100644
--- a/src/controllers/accounts/helpers.js
+++ b/src/controllers/accounts/helpers.js
@@ -62,6 +62,9 @@ helpers.getUserDataByUserSlug = function (userslug, callerUID, callback) {
sso: function (next) {
plugins.fireHook('filter:auth.list', { uid: uid, associations: [] }, next);
},
+ canEdit: function (next) {
+ privileges.users.canEdit(callerUID, uid, next);
+ },
canBanUser: function (next) {
privileges.users.canBanUser(callerUID, uid, next);
},
@@ -113,7 +116,7 @@ helpers.getUserDataByUserSlug = function (userslug, callerUID, callback) {
userData.isAdminOrGlobalModerator = isAdmin || isGlobalModerator;
userData.isAdminOrGlobalModeratorOrModerator = isAdmin || isGlobalModerator || isModerator;
userData.isSelfOrAdminOrGlobalModerator = isSelf || isAdmin || isGlobalModerator;
- userData.canEdit = isAdmin || (isGlobalModerator && !results.isTargetAdmin);
+ userData.canEdit = results.canEdit;
userData.canBan = results.canBanUser;
userData.canChangePassword = isAdmin || (isSelf && parseInt(meta.config['password:disableEdit'], 10) !== 1);
userData.isSelf = isSelf;
diff --git a/src/controllers/admin/dashboard.js b/src/controllers/admin/dashboard.js
index 8b1751d2a6..b5ae760727 100644
--- a/src/controllers/admin/dashboard.js
+++ b/src/controllers/admin/dashboard.js
@@ -48,6 +48,7 @@ dashboardController.get = function (req, res, next) {
version: nconf.get('version'),
notices: results.notices,
stats: results.stats,
+ canRestart: !!process.send,
});
},
], next);
diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js
index 260069ce4e..319f10e841 100644
--- a/src/controllers/helpers.js
+++ b/src/controllers/helpers.js
@@ -129,7 +129,7 @@ helpers.buildCategoryBreadcrumbs = function (cid, callback) {
return callback(err);
}
- if (!meta.config.homePageRoute && meta.config.homePageCustom) {
+ if (meta.config.homePageRoute && meta.config.homePageRoute !== 'categories') {
breadcrumbs.unshift({
text: '[[global:header.categories]]',
url: nconf.get('relative_path') + '/categories',
diff --git a/src/flags.js b/src/flags.js
index f906954318..7bbb5168f8 100644
--- a/src/flags.js
+++ b/src/flags.js
@@ -387,7 +387,7 @@ Flags.create = function (type, id, uid, reason, timestamp, callback) {
tasks.push(async.apply(Flags.update, flagId, uid, { state: 'open' }));
}
- async.parallel(tasks, function (err) {
+ async.series(tasks, function (err) {
next(err, flagId);
});
},
diff --git a/src/meta/build.js b/src/meta/build.js
index 552c9aa55c..52037b702c 100644
--- a/src/meta/build.js
+++ b/src/meta/build.js
@@ -143,6 +143,11 @@ function build(targets, callback) {
target = target.toLowerCase().replace(/-/g, '');
if (!aliases[target]) {
winston.warn('[build] Unknown target: ' + target);
+ if (target.indexOf(',') !== -1) {
+ winston.warn('[build] Are you specifying multiple targets? Separate them with spaces:');
+ winston.warn('[build] e.g. `./nodebb build adminjs tpl`');
+ }
+
return false;
}
diff --git a/src/posts/edit.js b/src/posts/edit.js
index 991639af40..8780fa6016 100644
--- a/src/posts/edit.js
+++ b/src/posts/edit.js
@@ -12,6 +12,7 @@ var plugins = require('../plugins');
var cache = require('./cache');
var pubsub = require('../pubsub');
var utils = require('../utils');
+var translator = require('../translator');
module.exports = function (Posts) {
pubsub.on('post:edit', function (pid) {
@@ -149,6 +150,7 @@ module.exports = function (Posts) {
topicData.tags = data.tags;
topicData.oldTitle = results.topic.title;
topicData.timestamp = results.topic.timestamp;
+ var renamed = translator.escape(validator.escape(String(title))) !== results.topic.title;
plugins.fireHook('action:topic.edit', { topic: topicData, uid: data.uid });
next(null, {
tid: tid,
@@ -158,7 +160,7 @@ module.exports = function (Posts) {
oldTitle: results.topic.title,
slug: topicData.slug,
isMainPost: true,
- renamed: title !== results.topic.title,
+ renamed: renamed,
tags: tags,
});
},
diff --git a/src/privileges/users.js b/src/privileges/users.js
index 5e48750dc9..c656ab0b8d 100644
--- a/src/privileges/users.js
+++ b/src/privileges/users.js
@@ -141,9 +141,13 @@ module.exports = function (privileges) {
}, next);
},
function (results, next) {
- var canEdit = results.isAdmin || (results.isGlobalMod && !results.isTargetAdmin);
-
- next(null, canEdit);
+ results.canEdit = results.isAdmin || (results.isGlobalMod && !results.isTargetAdmin);
+ results.callerUid = callerUid;
+ results.uid = uid;
+ plugins.fireHook('filter:user.canEdit', results, next);
+ },
+ function (data, next) {
+ next(null, data.canEdit);
},
], callback);
};
diff --git a/src/socket.io/user/profile.js b/src/socket.io/user/profile.js
index 792b55200d..d9c89df6a0 100644
--- a/src/socket.io/user/profile.js
+++ b/src/socket.io/user/profile.js
@@ -15,7 +15,7 @@ module.exports = function (SocketUser) {
async.waterfall([
function (next) {
- isAdminOrSelfAndPasswordMatch(socket.uid, data, next);
+ isPrivilegedOrSelfAndPasswordMatch(socket.uid, data, next);
},
function (next) {
SocketUser.updateProfile(socket, data, next);
@@ -29,7 +29,7 @@ module.exports = function (SocketUser) {
}
async.waterfall([
function (next) {
- user.isAdminOrSelf(socket.uid, data.uid, next);
+ user.isAdminOrGlobalModOrSelf(socket.uid, data.uid, next);
},
function (next) {
user.updateCoverPicture(data, next);
@@ -43,7 +43,7 @@ module.exports = function (SocketUser) {
}
async.waterfall([
function (next) {
- user.isAdminOrSelf(socket.uid, data.uid, next);
+ user.isAdminOrGlobalModOrSelf(socket.uid, data.uid, next);
},
function (next) {
user.uploadCroppedPicture(data, next);
@@ -58,7 +58,7 @@ module.exports = function (SocketUser) {
async.waterfall([
function (next) {
- user.isAdminOrSelf(socket.uid, data.uid, next);
+ user.isAdminOrGlobalModOrSelf(socket.uid, data.uid, next);
},
function (next) {
user.removeCoverPicture(data, next);
@@ -66,11 +66,13 @@ module.exports = function (SocketUser) {
], callback);
};
- function isAdminOrSelfAndPasswordMatch(uid, data, callback) {
+ function isPrivilegedOrSelfAndPasswordMatch(uid, data, callback) {
async.waterfall([
function (next) {
async.parallel({
isAdmin: async.apply(user.isAdministrator, uid),
+ isTargetAdmin: async.apply(user.isAdministrator, data.uid),
+ isGlobalMod: async.apply(user.isGlobalModerator, uid),
hasPassword: async.apply(user.hasPassword, data.uid),
passwordMatch: function (next) {
if (data.password) {
@@ -84,7 +86,11 @@ module.exports = function (SocketUser) {
function (results, next) {
var isSelf = parseInt(uid, 10) === parseInt(data.uid, 10);
- if (!results.isAdmin && !isSelf) {
+ if (results.isTargetAdmin && !results.isAdmin) {
+ return next(new Error('[[error:no-privileges]]'));
+ }
+
+ if ((!results.isAdmin || !results.isGlobalMod) && !isSelf) {
return next(new Error('[[error:no-privileges]]'));
}
diff --git a/src/topics/tools.js b/src/topics/tools.js
index 7ff9d23348..bacfe20b4d 100644
--- a/src/topics/tools.js
+++ b/src/topics/tools.js
@@ -253,16 +253,13 @@ module.exports = function (Topics) {
async.waterfall([
function (next) {
- Topics.exists(tid, next);
- },
- function (exists, next) {
- if (!exists) {
- return next(new Error('[[error:no-topic]]'));
- }
- Topics.getTopicFields(tid, ['cid', 'lastposttime', 'pinned', 'deleted', 'postcount', 'upvotes', 'downvotes'], next);
+ Topics.getTopicData(tid, next);
},
function (topicData, next) {
topic = topicData;
+ if (!topic) {
+ return next(new Error('[[error:no-topic]]'));
+ }
if (parseInt(cid, 10) === parseInt(topic.cid, 10)) {
return next(new Error('[[error:cant-move-topic-to-same-category]]'));
}
@@ -273,11 +270,15 @@ module.exports = function (Topics) {
'cid:' + topicData.cid + ':tids:votes',
'cid:' + topicData.cid + ':tids:lastposttime',
'cid:' + topicData.cid + ':recent_tids',
+ 'cid:' + topicData.cid + ':uid:' + topicData.uid + ':tids',
], tid, next);
},
function (next) {
db.sortedSetAdd('cid:' + cid + ':tids:lastposttime', topic.lastposttime, tid, next);
},
+ function (next) {
+ db.sortedSetAdd('cid:' + cid + ':uid:' + topic.uid + ':tids', topic.timestamp, tid, next);
+ },
function (next) {
if (parseInt(topic.pinned, 10)) {
db.sortedSetAdd('cid:' + cid + ':tids:pinned', Date.now(), tid, next);
diff --git a/src/upgrades/1.7.0/generate-custom-html.js b/src/upgrades/1.7.0/generate-custom-html.js
index 5de0238920..58ac2adf61 100644
--- a/src/upgrades/1.7.0/generate-custom-html.js
+++ b/src/upgrades/1.7.0/generate-custom-html.js
@@ -1,37 +1,43 @@
'use strict';
+var db = require('../../database');
var meta = require('../../meta');
module.exports = {
name: 'Generate customHTML block from old customJS setting',
timestamp: Date.UTC(2017, 9, 12),
method: function (callback) {
- var newHTML = meta.config.customJS;
- var newJS = [];
-
- // Forgive me for parsing HTML with regex...
- var scriptMatch = /^-
+
+ [[admin/general/dashboard:restart-warning]] + + [[admin/general/dashboard:restart-disabled]] +
[[admin/general/dashboard:maintenance-mode]] diff --git a/test/user.js b/test/user.js index 9a098f4708..8de7491761 100644 --- a/test/user.js +++ b/test/user.js @@ -471,6 +471,40 @@ describe('User', function () { }); }); }); + + it('.commit() should invalidate old codes', function (done) { + var code1; + var code2; + var uid; + async.waterfall([ + function (next) { + User.create({ username: 'doublereseter', email: 'sorry@forgot.com', password: '123456' }, next); + }, + function (_uid, next) { + uid = _uid; + User.reset.generate(uid, next); + }, + function (code, next) { + code1 = code; + User.reset.generate(uid, next); + }, + function (code, next) { + code2 = code; + User.reset.validate(code1, next); + }, + function (isValid, next) { + assert(isValid); + User.reset.commit(code2, 'newPwd123', next); + }, + function (next) { + User.reset.validate(code1, next); + }, + function (isValid, next) { + assert(!isValid); + next(); + }, + ], done); + }); }); describe('hash methods', function () {