Fixed merge issues

This commit is contained in:
Nicolas A. Tonne
2014-10-10 14:23:47 +02:00
5 changed files with 110 additions and 59 deletions

11
php/timedifference.php Executable file → Normal file
View File

@@ -2,11 +2,12 @@
$list = explode("/", htmlspecialchars(strtolower($_SERVER["REQUEST_URI"])));
if($list[1]==""||!isset($list[1])||count($list)<=1)$list="videos";
else $list=$list[1];
$list="../lists/".$list.".json";
$data = json_decode(file_get_contents($list));
$diff = (time() - $data[1][0]);
$returnArray = array($diff, $data[0][0], time(), $data[1][0], $data[3][0], $data[4][0]);
$list="..lists/".$list.".json";
$data = json_decode(file_get_contents($list), true);
$songs = $data["nowPlaying"];
$id = array_values($songs);
$diff = (time() - $data["conf"]["startTime"]);
$returnArray = array($diff, $id[0]["id"], time(), $data["conf"]["startTime"], $id[0]["title"], $data["conf"]["views"]);
$returnArray = json_encode($returnArray);
echo $returnArray;