From eb8b6af7fb83270dfe88e0f7238555972f7bf180 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Thu, 4 Feb 2016 14:36:22 -0500
Subject: [PATCH] Fix global mod priv check and styling for flags page

---
 public/less/admin/admin.less              | 3 ++-
 public/less/{admin/manage => }/flags.less | 6 ++++++
 src/meta/css.js                           | 1 +
 src/socket.io/posts/flag.js               | 6 +++---
 4 files changed, 12 insertions(+), 4 deletions(-)
 rename public/less/{admin/manage => }/flags.less (72%)

diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less
index 7886bd23a0..930e518412 100644
--- a/public/less/admin/admin.less
+++ b/public/less/admin/admin.less
@@ -10,7 +10,6 @@
 @import "./general/navigation";
 @import "./manage/categories";
 @import "./manage/tags";
-@import "./manage/flags";
 @import "./manage/groups";
 @import "./manage/users";
 @import "./appearance/customise";
@@ -21,6 +20,8 @@
 @import "./advanced/logs";
 @import "./settings";
 
+@import "../flags";
+
 @import "./modules/alerts";
 @import "./modules/selectable";
 @import "./modules/snackbar";
diff --git a/public/less/admin/manage/flags.less b/public/less/flags.less
similarity index 72%
rename from public/less/admin/manage/flags.less
rename to public/less/flags.less
index 504767e934..4b634dea18 100644
--- a/public/less/admin/manage/flags.less
+++ b/public/less/flags.less
@@ -1,3 +1,9 @@
+/*
+	Flags page CSS
+	  - Originally in ACP
+	  - Now available in front-end for global mods as well
+*/
+
 .flag-reporters {
 	font-size: 1.2rem;
 
diff --git a/src/meta/css.js b/src/meta/css.js
index ce7c97dd7c..effd560526 100644
--- a/src/meta/css.js
+++ b/src/meta/css.js
@@ -69,6 +69,7 @@ module.exports = function(Meta) {
 				source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css";';
 				source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/textcomplete/jquery.textcomplete.css";';
 				source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/colorpicker/colorpicker.css";';
+				source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/flags.less";';
 				source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/generics.less";';
 				source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/mixins.less";';
 
diff --git a/src/socket.io/posts/flag.js b/src/socket.io/posts/flag.js
index f5febe9ea7..eaefcea1e2 100644
--- a/src/socket.io/posts/flag.js
+++ b/src/socket.io/posts/flag.js
@@ -108,7 +108,7 @@ module.exports = function(SocketPosts) {
 		}
 		async.waterfall([
 			function (next) {
-				user.isAdminOrGlobalModerator(socket.uid, next);
+				user.isAdminOrGlobalMod(socket.uid, next);
 			},
 			function (isAdminOrGlobalModerator, next) {
 				if (!isAdminOrGlobalModerator) {
@@ -122,7 +122,7 @@ module.exports = function(SocketPosts) {
 	SocketPosts.dismissAllFlags = function(socket, data, callback) {
 		async.waterfall([
 			function (next) {
-				user.isAdminOrGlobalModerator(socket.uid, next);
+				user.isAdminOrGlobalMod(socket.uid, next);
 			},
 			function (isAdminOrGlobalModerator, next) {
 				if (!isAdminOrGlobalModerator) {
@@ -144,7 +144,7 @@ module.exports = function(SocketPosts) {
 
 		async.waterfall([
 			function (next) {
-				user.isAdminOrGlobalModerator(socket.uid, next);
+				user.isAdminOrGlobalMod(socket.uid, next);
 			},
 			function (isAdminOrGlobalModerator, next) {
 				if (!isAdminOrGlobalModerator) {