From 9350ef6d7528ea32b0c020eb32229e2bbed1505d Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Mon, 29 Apr 2013 11:26:01 -0500
Subject: [PATCH] Change some permissions to channel admins (#67)

---
 channel.js                 |  9 +++++++++
 package.json               |  2 +-
 rank.js                    |  2 +-
 server.js                  |  2 +-
 www/assets/js/callbacks.js |  1 +
 www/assets/js/client.js    | 36 +++++++++++++++++++++++-------------
 www/assets/js/functions.js |  9 +++++++++
 7 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/channel.js b/channel.js
index f1159182..65e0b091 100644
--- a/channel.js
+++ b/channel.js
@@ -1111,8 +1111,17 @@ Channel.prototype.tryUpdateOptions = function(user, data) {
         return;
     }
 
+    const adminonly = {
+        opt_pagetitle: true,
+        opt_customcss: true,
+        opt_customjs: true
+    };
+
     for(var key in this.opts) {
         if(key in data) {
+            if(key in adminonly && user.rank < Rank.Owner) {
+                continue;
+            }
             this.opts[key] = data[key];
         }
     }
diff --git a/package.json b/package.json
index 4c751e41..fd17b976 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "author": "Calvin Montgomery",
     "name": "CyTube",
     "description": "Online media synchronizer and chat",
-    "version": "1.4.2",
+    "version": "1.4.3",
     "repository": {
         "url": "http://github.com/calzoneman/sync"
     },
diff --git a/rank.js b/rank.js
index 68f8281c..6d5fe0bc 100644
--- a/rank.js
+++ b/rank.js
@@ -20,6 +20,7 @@ var permissions = {
     announce        : exports.Siteadmin,
     registerChannel : exports.Owner,
     acl             : exports.Owner,
+    chatFilter      : exports.Owner,
     queue           : exports.Moderator,
     assignLeader    : exports.Moderator,
     kick            : exports.Moderator,
@@ -30,7 +31,6 @@ var permissions = {
     shout           : exports.Moderator,
     channelOpts     : exports.Moderator,
     jump            : exports.Moderator,
-    chatFilter      : exports.Moderator,
     updateMotd      : exports.Moderator,
     drink           : exports.Moderator,
     seeVoteskip     : exports.Moderator,
diff --git a/server.js b/server.js
index 99fe5408..8bc48459 100644
--- a/server.js
+++ b/server.js
@@ -9,7 +9,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-const VERSION = "1.4.2";
+const VERSION = "1.4.3";
 
 var fs = require("fs");
 var Logger = require("./logger.js");
diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index 0ce9effd..21a9e099 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -181,6 +181,7 @@ function initCallbacks() {
     socket.on("updateUser", function(data) {
         if(data.name == uname) {
             LEADER = data.leader;
+            RANK = data.rank;
             handleRankChange();
             if(LEADER) {
                 // I'm a leader!  Set up sync function
diff --git a/www/assets/js/client.js b/www/assets/js/client.js
index 3e31c51d..4e74929b 100644
--- a/www/assets/js/client.js
+++ b/www/assets/js/client.js
@@ -429,22 +429,32 @@ $("#show_motdeditor").click(function() {
 });
 
 $("#show_filtereditor").click(function() {
-    $("#modnav li").each(function() {
-        $(this).removeClass("active");
-    });
-    $(".modonly").hide();
-    $("#show_filtereditor").parent().addClass("active");
-    $("#filtereditor").show();
+    if(RANK >= Rank.Owner) {
+        $("#modnav li").each(function() {
+            $(this).removeClass("active");
+        });
+        $(".modonly").hide();
+        $("#show_filtereditor").parent().addClass("active");
+        $("#filtereditor").show();
+    }
+    else {
+        alert("Only channel administrators can change filters");
+    }
 });
 
 $("#show_acl").click(function() {
-    $("#modnav li").each(function() {
-        $(this).removeClass("active");
-    });
-    $(".modonly").hide();
-    $("#show_acl").parent().addClass("active");
-    $("#channelranks").show();
-    socket.emit("requestAcl");
+    if(RANK >= Rank.Owner) {
+        $("#modnav li").each(function() {
+            $(this).removeClass("active");
+        });
+        $(".modonly").hide();
+        $("#show_acl").parent().addClass("active");
+        $("#channelranks").show();
+        socket.emit("requestAcl");
+    }
+    else {
+        alert("Only channel administrators can use the ACL");
+    }
 });
 
 function searchLibrary() {
diff --git a/www/assets/js/functions.js b/www/assets/js/functions.js
index 2ab54f5e..c117b438 100644
--- a/www/assets/js/functions.js
+++ b/www/assets/js/functions.js
@@ -760,6 +760,15 @@ function handleRankChange() {
         $("#shuffleplaylist").css("display", "");
         $("#modnav").show();
         $("#chancontrols").show();
+        var val =  false;
+        if(RANK < Rank.Owner) {
+            val = "disabled";
+        }
+        $("#opt_pagetitle").attr("disabled", val);
+        $("#opt_customcss").attr("disabled", val);
+        $("#opt_customjs").attr("disabled", val);
+        $("#show_filtereditor").attr("disabled", val);
+        $("#show_acl").attr("disabled", val);
     }
     else if(!LEADER) {
         if(OPENQUEUE) {