diff --git a/js/admin.js b/js/admin.js
index df8dd77a..40f72631 100755
--- a/js/admin.js
+++ b/js/admin.js
@@ -2,7 +2,10 @@ var adminTogg;
function admin()
{
+ adminTogg = !adminTogg;
+ if(!adminTogg) $("#playlist").height($("#playlist").height()+$("#adminPanel").outerHeight(true));
$("#adminPanel").toggleClass("hiddenAdmin");
+ if(adminTogg) $("#playlist").height($("#playlist").height()-$("#adminPanel").outerHeight(true));
}
diff --git a/js/search.js b/js/search.js
index 67338d07..e02760cb 100755
--- a/js/search.js
+++ b/js/search.js
@@ -95,6 +95,7 @@ $(document).ready(function()
$("#search").removeClass("success");
$("#search").removeClass("error");
},1500);
+ updateList();
}
// if(reply=="added"){$("#search").removeClass('success'); $("#search").addClass('success');}
diff --git a/php/change.php b/php/change.php
index 574898bd..cebc9224 100755
--- a/php/change.php
+++ b/php/change.php
@@ -155,18 +155,23 @@ else if(isset($_GET['skip'])){ //skip song request
//$data["conf"]["skips"]=$skips;
if($skips>=$viewers/2){
array_shift($data["songs"]);
- $data["songs"][$np[0]["id"]] = array("id" => $np[0]["id"], "title" => $np[0]["title"], "votes" => $np[0]["votes"], "added" => time(), "guids" => array());
- array_shift($data["nowPlaying"]);
- $data["nowPlaying"][$firstSong[0]["id"]] = array("id" => $firstSong[0]["id"], "title" => $firstSong[0]["title"], "votes" => 0, "added" => $firstSong[0]["added"], "guids" => $firstSong[0]["guids"]);
- //array_push($data["songs"], $add);
- $data["conf"]["skips"] = array();
- $data["conf"]["startTime"] = time();
- $data["conf"]["views"] = 1;
- foreach($data["songs"] as $k=>$v) {
- $sort['votes'][$k] = $v['votes'];
- $sort['added'][$k] = $v['added'];
- }
- array_multisort($sort['votes'], SORT_DESC, $sort['added'], SORT_ASC, $data["songs"]);
+ $q = $data["conf"];
+ $q = array_key_exists("delsongs", $q);
+ if(!$data["conf"]["delsongs"] || $q != 1)
+ {
+ $data["songs"][$np[0]["id"]] = array("id" => $np[0]["id"], "title" => $np[0]["title"], "votes" => $np[0]["votes"], "added" => time(), "guids" => array());
+ }
+ array_shift($data["nowPlaying"]);
+ $data["nowPlaying"][$firstSong[0]["id"]] = array("id" => $firstSong[0]["id"], "title" => $firstSong[0]["title"], "votes" => 0, "added" => $firstSong[0]["added"], "guids" => $firstSong[0]["guids"]);
+ //array_push($data["songs"], $add);
+ $data["conf"]["skips"] = array();
+ $data["conf"]["startTime"] = time();
+ $data["conf"]["views"] = 1;
+ foreach($data["songs"] as $k=>$v) {
+ $sort['votes'][$k] = $v['votes'];
+ $sort['added'][$k] = $v['added'];
+ }
+ array_multisort($sort['votes'], SORT_DESC, $sort['added'], SORT_ASC, $data["songs"]);
}
file_put_contents($list, json_encode($data));
}
diff --git a/php/panel.php b/php/panel.php
index bdf0e912..b1db8c4f 100755
--- a/php/panel.php
+++ b/php/panel.php
@@ -2,11 +2,11 @@