From 6292ca5f3f4430a6d2a66775a406c62bbfc6ab22 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Mon, 17 Feb 2014 18:56:36 -0600
Subject: [PATCH] Client tweaks

---
 www/assets/js/data.js |  4 ++--
 www/assets/js/util.js | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/www/assets/js/data.js b/www/assets/js/data.js
index 5e747dd9..5c50b71e 100644
--- a/www/assets/js/data.js
+++ b/www/assets/js/data.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.
 */
 
-var CL_VERSION = "2.4.3";
+var CL_VERSION = "3.0.0";
 
 var CLIENT = {
     rank: -1,
@@ -117,7 +117,7 @@ var USEROPTS = {
     first_visit          : getOrDefault("first_visit", true),
     ignore_channelcss    : getOrDefault("ignore_channelcss", false),
     ignore_channeljs     : getOrDefault("ignore_channeljs", false),
-    sort_rank            : getOrDefault("sort_rank", false),
+    sort_rank            : getOrDefault("sort_rank", true),
     sort_afk             : getOrDefault("sort_afk", false),
     default_quality      : getOrDefault("default_quality", ""),
     boop                 : getOrDefault("boop", false),
diff --git a/www/assets/js/util.js b/www/assets/js/util.js
index a52f6f55..83027039 100644
--- a/www/assets/js/util.js
+++ b/www/assets/js/util.js
@@ -587,7 +587,15 @@ function showUserOptions() {
     $("#us-layout").val(USEROPTS.layout);
     $("#us-no-channelcss").prop("checked", USEROPTS.ignore_channelcss);
     $("#us-no-channeljs").prop("checked", USEROPTS.ignore_channeljs);
-    $("#us-ssl").prop("checked", USEROPTS.secure_connection);
+    if (!ALLOW_SSL) {
+        $("#us-ssl").prop("checked", false);
+        $("#us-ssl").attr("disabled", true);
+        $("#us-ssl").attr("title", "This server has not enabled SSL");
+    } else {
+        $("#us-ssl").prop("checked", USEROPTS.secure_connection);
+        $("#us-ssl").attr("disabled", false);
+        $("#us-ssl").attr("title", "");
+    }
 
     $("#us-synch").prop("checked", USEROPTS.synch);
     $("#us-synch-accuracy").val(USEROPTS.synch_accuracy);
@@ -926,6 +934,12 @@ function handlePermissionChange() {
 
     setVisible("#clearplaylist", hasPermission("playlistclear"));
     setVisible("#shuffleplaylist", hasPermission("playlistshuffle"));
+    if (!hasPermission("addnontemp")) {
+        $(".add-temp").prop("checked", true);
+        $(".add-temp").attr("disabled", true);
+    } else {
+        $(".add-temp").attr("disabled", false);
+    }
 
     fixWeirdButtonAlignmentIssue();