KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

reverting

Browse Source
This commit is contained in:
kasperrt
2014-12-28 13:04:45 +01:00
parent 6f30b14ca5
commit 10c2b01af1
5 changed files with 103 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
php/change.php
View File

@@ -57,11 +57,6 @@ if(is_array($data["conf"]["views"])){
//If test for either saving when the song is done, or an error has occured
if(isset($_REQUEST['thisUrl'])){
if(count($data["nowPlaying"]) == 0 && count($data["songs"]) == 0)
{
echo "empty";
return;
}
$string = $_REQUEST['thisUrl']; //saving string as the id of the song
$action = isset($_REQUEST['act']); //checking the action of the request, either save or del
$firstToAdd = $firstSong[0]["id"]; //getting the id of the first in the queue
@@ -242,8 +237,8 @@ else if(isset($_GET['skip'])){ //skip,
//$data["conf"]["addsongs"] = $addsongs;
//$data["conf"]["longsongs"] = $longsongs;
//$data["conf"]["frontpage"] = $frontpage;
//$data["conf"]["allvideos"] = $allvideos;
//$data["conf"]["removeplay"] = $removeplay;
//$data["conf"]["allvideos"] = $allvideos;
//$data["conf"]["removeplay"] = $removeplay;
if($data["conf"]["adminpass"] == $pass || $q != 1 || $data["conf"]["adminpass"] == "") //if the password is the same as the one in the jsonfile, we are updating the settings (not in use yet)
{
$data["conf"]["adminpass"] = $pass;
@@ -254,11 +249,6 @@ else if(isset($_GET['skip'])){ //skip,
echo "wrong";
}
}else{ //printing the whole data array json encoded for youtube.js or list.js to pick up
if(count($data["nowPlaying"]) == 0 && count($data["songs"]) == 0)
{
echo "empty";
return;
}
echo json_encode($data);
}
@@ -291,4 +281,4 @@ function nextSong(){
$data[5]=array();
$data[1][0] = time();
}
?>
?>