From e2cb71d1afae3642772a427b96e98218211c4db5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kassto2@hotmail.com>
Date: Mon, 9 Feb 2015 23:41:16 +0100
Subject: [PATCH] Added shufflebutton

---
 js/admin.js      | 33 +++++++++++++++++++++++++++++++--
 php/change.php   |  7 ++++---
 php/nochan.php   |  4 +---
 php/panel.php    |  5 ++---
 static/style.css |  2 +-
 5 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/js/admin.js b/js/admin.js
index 1bb84dde..b651b085 100755
--- a/js/admin.js
+++ b/js/admin.js
@@ -4,8 +4,9 @@ var pass_corr = "";
 function admin()
 {
 	adminTogg = !adminTogg;
+	if(adminTogg)
 	
-	if(adminTogg) $("#playlist").height($("#player").height()-210+30); //opening
+	if(adminTogg) $("#playlist").height($("#player").height()-250+30); //opening
 	if(!adminTogg)$("#playlist").height($("#player").height()+30);; //closing
 
 	$("#adminPanel").toggleClass("hiddenAdmin");
@@ -41,7 +42,7 @@ function submitAdmin(form)
 		document.getElementById("sBar").innerHTML = "Successfully applied settings.";
 		$("#sBar").addClass("opacityFull");
 		document.getElementById("passbox").value = "";
-	}else{ $("#eBar").addClass("opacityFull");/*$("#adminPanel").addClass("fadeerror");*/}
+	}else{ $("#eBar").addClass("opacityFull");document.getElementById("passbox").value = "";/*$("#adminPanel").addClass("fadeerror");*/}
 
 	console.log(pass_corr);
 	updateList();
@@ -52,3 +53,31 @@ function submitAdmin(form)
 		$("#sBar").removeClass("opacityFull");
 	},1500);
 }
+
+function shuffle(form)
+{
+	console.log(adminpass);
+	confRes = $.ajax({
+		type: "GET",
+		url: "php/change.php",
+		async: false,
+		data: "shuffle=true&pass="+adminpass,
+
+		success: function() {
+			console.log("configurations response: "+response);
+		}
+	}).responseText;
+	if(confRes == "shuffled")
+	{
+		document.getElementById("sBar").innerHTML = "Successfully shuffled playlist.";
+		$("#sBar").addClass("opacityFull");
+		updateList();
+	}else if(confRes = "wrong!")
+		$("#eBar").addClass("opacityFull");
+	setTimeout(function(){
+		$("#adminPanel").removeClass("success");
+		$("#adminPanel").removeClass("fadeerror");
+		$("#eBar").removeClass("opacityFull");
+		$("#sBar").removeClass("opacityFull");
+	},1500);
+}
diff --git a/php/change.php b/php/change.php
index 0268e087..4048ceeb 100755
--- a/php/change.php
+++ b/php/change.php
@@ -24,11 +24,11 @@ $save = false;                                                      //declares t
 if(isset($_REQUEST['shuffle'])){ //shuffle songs  in list
 
     $q = $data["conf"];
-    $q = array_key_exists("addsongs", $q);
+    $q = array_key_exists("adminpass", $q);
     $pass = htmlspecialchars($_GET['pass']);
     $x = explode("/", htmlspecialchars(strtolower($_SERVER["REQUEST_URI"])));
     $pass=crypt($pass, '$6$rounds=9001$'.$x[1].'Fuck0ffuSn34kyn!ggerzZ$');
-    if($pass == $data['conf']['adminpass'] || $data['conf']['addsongs'] == "false" || $q != 1) {
+    if($pass == $data["conf"]["adminpass"]) {
 
         //shuffle($data["songs"]);
         foreach($data["songs"] as $k=>$v) { 
@@ -39,7 +39,8 @@ if(isset($_REQUEST['shuffle'])){ //shuffle songs  in list
         array_multisort($sort['votes'], SORT_DESC, $sort['added'], SORT_ASC, $data["songs"]);
         file_put_contents($list, json_encode($data));
         //die("shuffeled");
-
+        echo "shuffled";
+        die();
     }else{
         die("wrong!");
     }
diff --git a/php/nochan.php b/php/nochan.php
index 96888e4c..5815c2fc 100755
--- a/php/nochan.php
+++ b/php/nochan.php
@@ -15,13 +15,11 @@ foreach($dir as $files){
 		$time_lasted = time() - filemtime('./lists/'.$files);
 		if($time_lasted > $to)
 		{
-			$file = file_get_contents('./lists/'.$files); //Checking if the channel has the setting for showing on the frontpage set to true.
+			$file = file_get_contents('./lists/'.$files); 
 			$data = json_decode($file, TRUE);
 			$q = array_values($data["nowPlaying"]);
 			if($q[0]["id"] == "30H2Z8Lr-4c");
-			{
 				unlink("./lists/".$files);
-			}
 		}
 		if($time_lasted < $time){
 			$file = file_get_contents('./lists/'.$files); //Checking if the channel has the setting for showing on the frontpage set to true.
diff --git a/php/panel.php b/php/panel.php
index 507cd68c..9f32c604 100755
--- a/php/panel.php
+++ b/php/panel.php
@@ -1,4 +1,4 @@
-<b>Admin Panel</b> <span id="setpass"></span>
+<b>Admin Panel</b> <span id="setpass"></span><input type="button" class="button" value="Shuffle" onclick="shuffle(this.form);" title="Shuffle the playlist">
 
 <form id="adminForm" onsubmit="return false" name="ufo" action="" class="daform nomargin" id="base">
     <div class="toggles">
@@ -41,7 +41,6 @@
         categories allowed<br>
         songs after playing<br>
     </div>
-
 	<input type="password" name="pass" id="passbox" class="passbox" placeholder="Password">
-	<input type="submit" class="button" value="Login/Save" onclick="submitAdmin(this.form);" title="Save settings/Login">   
+	<input type="submit" class="button" value="Login/Save" onclick="submitAdmin(this.form);" title="Save settings/Login">
 </form>
diff --git a/static/style.css b/static/style.css
index 90ebde38..090a8560 100755
--- a/static/style.css
+++ b/static/style.css
@@ -95,7 +95,7 @@ input[type="radio"]{display: none;}
 
 .clickthrough{pointer-events: none;}
 
-#adminPanel{border-bottom: none; color:white; height:190px; padding: 10px; overflow:hidden; background-color: rgba(0,0,0,0.2); transition: height 0.5s;}
+#adminPanel{border-bottom: none; color:white; height:230px; padding: 10px; overflow:hidden; background-color: rgba(0,0,0,0.2); transition: height 0.5s;}
 .hiddenAdmin{padding:0 !important; margin:0 !important; height: 0 !important;}
 .button{background-color: rgba(255,255,255,0.2); border-radius: 4px; border: none;color: white;padding: 5px 15px; margin-top: 15px; transition: all 0.1s ease-in-out;}
 .button:hover{background-color: rgba(255,255,255,0.4); }