diff --git a/lists/tritoen.json b/lists/tritoen.json index 307f557d..a861b0af 100755 --- a/lists/tritoen.json +++ b/lists/tritoen.json @@ -1 +1 @@ -{"nowPlaying":{"ZyhrYis509A":{"id":"ZyhrYis509A","title":"Aqua - Barbie Girl","votes":0,"added":1413805530,"guids":[]}},"songs":{"aZg2pEokcFw":{"id":"aZg2pEokcFw","title":"H\u00f8vlerivisa","votes":0,"added":1413805864,"guids":[]},"afOH2SGDiK0":{"id":"afOH2SGDiK0","title":"dde vi ska f\u00e6st","votes":0,"added":1413806149,"guids":[]},"bLLMPnPK0fU":{"id":"bLLMPnPK0fU","title":"D.D.E. - Bondekn\u00f8l","votes":0,"added":1413806157,"guids":[]},"byp94CCWKSI":{"id":"byp94CCWKSI","title":"Jason Derulo - \\"The Other Side\\" (Official HD Music Video)","votes":0,"added":1413806422,"guids":[]},"cN-ZjkDBaX8":{"id":"cN-ZjkDBaX8","title":"\u00c5ge Aleksandersen - Fire Pils og en Pizza - Rockefeller, 03.2009. HQ.","votes":0,"added":1413806661,"guids":[]},"cNvjKkXFBvU":{"id":"cNvjKkXFBvU","title":"WEKEED - Wild Child","votes":0,"added":1413807028,"guids":[]},"cjEwjDvh_2c":{"id":"cjEwjDvh_2c","title":"Pelle Politibil Intro Sang","votes":0,"added":1413807168,"guids":[]},"fIMz0nTp2sA":{"id":"fIMz0nTp2sA","title":"E-Type ft. Na Na - Life","votes":0,"added":1413807409,"guids":[]},"iMP4BwvJSwo":{"id":"iMP4BwvJSwo","title":"LMFAO - Sexy And I Know It (Mord Fustang Remix)","votes":0,"added":1413807542,"guids":[]},"kHue-HaXXzg":{"id":"kHue-HaXXzg","title":"Demi Lovato - Let It Go (from \\"Frozen\\") [Official]","votes":0,"added":1413807545,"guids":[]},"kTHNpusq654":{"id":"kTHNpusq654","title":"Katy Perry - Hot N Cold","votes":0,"added":1413807549,"guids":[]},"nI_MVldpxDQ":{"id":"nI_MVldpxDQ","title":"Daddy DJ","votes":0,"added":1413807552,"guids":[]},"qQ31INpjXX0":{"id":"qQ31INpjXX0","title":"Albatraoz - Albatraoz","votes":0,"added":1413807556,"guids":[]},"smwj7ISnwXM":{"id":"smwj7ISnwXM","title":"tribalistas ja sei namorar","votes":0,"added":1413807780,"guids":[]},"tenz01ic1D8":{"id":"tenz01ic1D8","title":"Avicii - Levels","votes":0,"added":1413808022,"guids":[]},"w15oWDh02K4":{"id":"w15oWDh02K4","title":"Gigi D\\'Agostino - L\\'Amour Toujours ( Official Video )","votes":0,"added":1413808717,"guids":[]},"-1jPUB7gRyg":{"id":"-1jPUB7gRyg","title":"Aqua - Doctor Jones","votes":0,"added":1413808929,"guids":[]},"llyiQ4I-mcQ":{"id":"llyiQ4I-mcQ","title":"Vengaboys - Boom, Boom, Boom, Boom!!","votes":0,"added":1413809137,"guids":[]},"-N6O0xI3A2o":{"id":"-N6O0xI3A2o","title":"Guy Sebastian - Like a Drum","votes":0,"added":1413809333,"guids":[]},"2CGF_Z3yZAo":{"id":"2CGF_Z3yZAo","title":"Jason Derulo - Don\\'t Wanna Go Home (Official Video)","votes":0,"added":1413809590,"guids":[]},"4fndeDfaWCg":{"id":"4fndeDfaWCg","title":"Backstreet Boys - I Want It That Way","votes":0,"added":1413809813,"guids":[]},"7x3CCKaOlfU":{"id":"7x3CCKaOlfU","title":"Peaches - Rosa Helikopter","votes":0,"added":1413810040,"guids":[]},"87JabMupbB8":{"id":"87JabMupbB8","title":"Bodybangers Inc. - Kompani Linge 2012","votes":0,"added":1413810263,"guids":[]},"CduA0TULnow":{"id":"CduA0TULnow","title":"Britney Spears - Oops!...I Did It Again","votes":0,"added":1413810519,"guids":[]},"Eo-KmOd3i7s":{"id":"Eo-KmOd3i7s","title":"\\'N Sync - Bye Bye Bye","votes":0,"added":1413810765,"guids":[]},"EpbjEttizy8":{"id":"EpbjEttizy8","title":"David Guetta - Lovers On The Sun (Official Audio) ft Sam Martin","votes":0,"added":1413810973,"guids":[]},"GMoud3dub6U":{"id":"GMoud3dub6U","title":"\u00c5ge Aleksandersen - Levva Livet","votes":0,"added":1413811320,"guids":[]},"J_DV9b0x7v4":{"id":"J_DV9b0x7v4","title":"CaramellDansen (Full Version + Lyrics)","votes":0,"added":1413811502,"guids":[]},"LOZuxwVk7TU":{"id":"LOZuxwVk7TU","title":"Britney Spears - Toxic","votes":0,"added":1413811718,"guids":[]},"MXXRHpVed3M":{"id":"MXXRHpVed3M","title":"Vengaboys - We\\'re Going to Ibiza!","votes":0,"added":1413811942,"guids":[]},"O1OTWCd40bc":{"id":"O1OTWCd40bc","title":"The Weeknd - Wicked Games (Explicit)","votes":0,"added":1413893479,"guids":[]},"ZKuOB1HGWMY":{"id":"ZKuOB1HGWMY","title":"Robert er du neger?","votes":0,"added":1413893541,"guids":["MTI3NzY1"]},"Z7YrFLIyYIw":{"id":"Z7YrFLIyYIw","title":"Tuuli - Do It Like A Dru [[WoW Parody]]","votes":0,"added":1413893741,"guids":[]},"bESGLojNYSo":{"id":"bESGLojNYSo","title":"Lady Gaga - Poker Face","votes":0,"added":1413893762,"guids":["MTI3NzY1"]},"_ovdm2yX4MA":{"id":"_ovdm2yX4MA","title":"Avicii - Levels","votes":0,"added":1413893765,"guids":["MTI3NzY1"]}},"conf":{"startTime":1413893741,"views":2,"skips":[]}} \ No newline at end of file +{"nowPlaying":{"D4V8PgTPK1g":{"id":"D4V8PgTPK1g","title":"ENO - \u1796\u17c1\u179b\u1794\u1784\u1792\u17d2\u179c\u17be\u1796\u17d2\u179a\u17b6\u1793\u1791\u17be\u1794\u17a2\u17bc\u1793\u1785\u17c1\u17c7\u179f\u17d2\u1798\u17c4\u17c7 - Pel Bong Tver Prean Terb Oun Jes Smos [MV]","votes":0,"added":1414013585,"guids":["ODYyMDk1"]}},"songs":{"fIMz0nTp2sA":{"id":"fIMz0nTp2sA","title":"E-Type ft. Na Na - Life","votes":0,"added":1413807409,"guids":[]},"iMP4BwvJSwo":{"id":"iMP4BwvJSwo","title":"LMFAO - Sexy And I Know It (Mord Fustang Remix)","votes":0,"added":1413807542,"guids":[]},"kHue-HaXXzg":{"id":"kHue-HaXXzg","title":"Demi Lovato - Let It Go (from \\"Frozen\\") [Official]","votes":0,"added":1413807545,"guids":[]},"kTHNpusq654":{"id":"kTHNpusq654","title":"Katy Perry - Hot N Cold","votes":0,"added":1413807549,"guids":[]},"nI_MVldpxDQ":{"id":"nI_MVldpxDQ","title":"Daddy DJ","votes":0,"added":1413807552,"guids":[]},"qQ31INpjXX0":{"id":"qQ31INpjXX0","title":"Albatraoz - Albatraoz","votes":0,"added":1413807556,"guids":[]},"smwj7ISnwXM":{"id":"smwj7ISnwXM","title":"tribalistas ja sei namorar","votes":0,"added":1413807780,"guids":[]},"tenz01ic1D8":{"id":"tenz01ic1D8","title":"Avicii - Levels","votes":0,"added":1413808022,"guids":[]},"w15oWDh02K4":{"id":"w15oWDh02K4","title":"Gigi D\\'Agostino - L\\'Amour Toujours ( Official Video )","votes":0,"added":1413808717,"guids":[]},"-1jPUB7gRyg":{"id":"-1jPUB7gRyg","title":"Aqua - Doctor Jones","votes":0,"added":1413808929,"guids":[]},"llyiQ4I-mcQ":{"id":"llyiQ4I-mcQ","title":"Vengaboys - Boom, Boom, Boom, Boom!!","votes":0,"added":1413809137,"guids":[]},"-N6O0xI3A2o":{"id":"-N6O0xI3A2o","title":"Guy Sebastian - Like a Drum","votes":0,"added":1413809333,"guids":[]},"2CGF_Z3yZAo":{"id":"2CGF_Z3yZAo","title":"Jason Derulo - Don\\'t Wanna Go Home (Official Video)","votes":0,"added":1413809590,"guids":[]},"4fndeDfaWCg":{"id":"4fndeDfaWCg","title":"Backstreet Boys - I Want It That Way","votes":0,"added":1413809813,"guids":[]},"7x3CCKaOlfU":{"id":"7x3CCKaOlfU","title":"Peaches - Rosa Helikopter","votes":0,"added":1413810040,"guids":[]},"87JabMupbB8":{"id":"87JabMupbB8","title":"Bodybangers Inc. - Kompani Linge 2012","votes":0,"added":1413810263,"guids":[]},"CduA0TULnow":{"id":"CduA0TULnow","title":"Britney Spears - Oops!...I Did It Again","votes":0,"added":1413810519,"guids":[]},"Eo-KmOd3i7s":{"id":"Eo-KmOd3i7s","title":"\\'N Sync - Bye Bye Bye","votes":0,"added":1413810765,"guids":[]},"EpbjEttizy8":{"id":"EpbjEttizy8","title":"David Guetta - Lovers On The Sun (Official Audio) ft Sam Martin","votes":0,"added":1413810973,"guids":[]},"GMoud3dub6U":{"id":"GMoud3dub6U","title":"\u00c5ge Aleksandersen - Levva Livet","votes":0,"added":1413811320,"guids":[]},"J_DV9b0x7v4":{"id":"J_DV9b0x7v4","title":"CaramellDansen (Full Version + Lyrics)","votes":0,"added":1413811502,"guids":[]},"LOZuxwVk7TU":{"id":"LOZuxwVk7TU","title":"Britney Spears - Toxic","votes":0,"added":1413811718,"guids":[]},"MXXRHpVed3M":{"id":"MXXRHpVed3M","title":"Vengaboys - We\\'re Going to Ibiza!","votes":0,"added":1413811942,"guids":[]},"O1OTWCd40bc":{"id":"O1OTWCd40bc","title":"The Weeknd - Wicked Games (Explicit)","votes":0,"added":1413893479,"guids":[]},"ZKuOB1HGWMY":{"id":"ZKuOB1HGWMY","title":"Robert er du neger?","votes":0,"added":1413893541,"guids":["MTI3NzY1"]},"Z7YrFLIyYIw":{"id":"Z7YrFLIyYIw","title":"Tuuli - Do It Like A Dru [[WoW Parody]]","votes":0,"added":1413893741,"guids":[]},"bESGLojNYSo":{"id":"bESGLojNYSo","title":"Lady Gaga - Poker Face","votes":0,"added":1413893762,"guids":["MTI3NzY1"]},"_ovdm2yX4MA":{"id":"_ovdm2yX4MA","title":"Avicii - Levels","votes":0,"added":1413893765,"guids":["MTI3NzY1"]},"ZyhrYis509A":{"id":"ZyhrYis509A","title":"Aqua - Barbie Girl","votes":0,"added":1414012410,"guids":[]},"aZg2pEokcFw":{"id":"aZg2pEokcFw","title":"H\u00f8vlerivisa","votes":0,"added":1414012594,"guids":[]},"afOH2SGDiK0":{"id":"afOH2SGDiK0","title":"dde vi ska f\u00e6st","votes":0,"added":1414012746,"guids":[]},"bLLMPnPK0fU":{"id":"bLLMPnPK0fU","title":"D.D.E. - Bondekn\u00f8l","votes":0,"added":1414012750,"guids":[]},"byp94CCWKSI":{"id":"byp94CCWKSI","title":"Jason Derulo - \\"The Other Side\\" (Official HD Music Video)","votes":0,"added":1414013014,"guids":[]},"cN-ZjkDBaX8":{"id":"cN-ZjkDBaX8","title":"\u00c5ge Aleksandersen - Fire Pils og en Pizza - Rockefeller, 03.2009. HQ.","votes":0,"added":1414013261,"guids":[]},"cNvjKkXFBvU":{"id":"cNvjKkXFBvU","title":"WEKEED - Wild Child","votes":0,"added":1414013540,"guids":[]},"cjEwjDvh_2c":{"id":"cjEwjDvh_2c","title":"Pelle Politibil Intro Sang","votes":0,"added":1414013683,"guids":[]},"7TQZw7NcMJQ":{"id":"7TQZw7NcMJQ","title":"\u9c57(ap fes11)","votes":0,"added":1414014317,"guids":[]}},"conf":{"startTime":1414014317,"views":2,"skips":[],"adminpass":"$6$rounds=9001$tritoenFuck0ffuS$oTH4CCbgC3OKjtyx9eRmx5oh7DzwJDZe0w.nBaxyIC5aU.nutyG6FzybE4qb0uA3RQtub32Vy1rmE\/Q5CgRIl.","vote":"false","addsongs":"false","longsongs":"false","frontpage":"false","onlymusic":"false","removeplay":"false"}} \ No newline at end of file diff --git a/php/change.php b/php/change.php index cd5ba639..b27ae86f 100755 --- a/php/change.php +++ b/php/change.php @@ -39,11 +39,11 @@ if(isset($_REQUEST['thisUrl'])){ if(!is_null($np[0]["id"]) && !is_null($firstToAdd)){ array_shift($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()); - } + $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"]); @@ -80,28 +80,30 @@ if(isset($_REQUEST['thisUrl'])){ echo $newPlaying[0]["id"]; } else if(isset($_GET['v'])){ //add - $video = htmlspecialchars($_GET['v']); - $name = htmlspecialchars($_GET['n']); - if(!in_array($video, $data["songs"])) + if($data["conf"]["addsongs"] == "false") { - if(count($data["nowPlaying"]) > 0) $place = "songs"; - else $place = "nowPlaying"; - $data[$place][$video] = array("id" => $video, "title" => $name, "votes" => 0, "added" => time(), "guids" => array()); - $data[$place][$video]["votes"] = 1; - array_push($data[$place][$video]["guids"], $guid); - $sort = array(); - if($place != "nowPlaying") + $video = htmlspecialchars($_GET['v']); + $name = htmlspecialchars($_GET['n']); + if(!in_array($video, $data["songs"])) { - foreach($data["songs"] as $k=>$v) { - $sort['votes'][$k] = $v['votes']; - $sort['added'][$k] = $v['added']; + if(count($data["nowPlaying"]) > 0) $place = "songs"; + else $place = "nowPlaying"; + $data[$place][$video] = array("id" => $video, "title" => $name, "votes" => 0, "added" => time(), "guids" => array()); + $data[$place][$video]["votes"] = 1; + array_push($data[$place][$video]["guids"], $guid); + $sort = array(); + if($place != "nowPlaying") + { + 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"]); } - array_multisort($sort['votes'], SORT_DESC, $sort['added'], SORT_ASC, $data["songs"]); + file_put_contents($list, json_encode($data)); + print("added"); } - file_put_contents($list, json_encode($data)); - print("added"); } - } else if(isset($_GET['vote'])){ //add vote @@ -179,18 +181,25 @@ else if(isset($_GET['skip'])){ //skip song request }else if(isset($_POST['conf'])) { - $vote = $_POST['vote']; - $addsongs = $_POST['addsongs']; - $longsongs = $_POST['longsongs']; - $frontpage = $_POST['frontpage']; - $onlymusic = $_POST['onlymusic']; - $removeplay = $_POST['removeplay']; + $data["conf"]["vote"] = $_POST['vote']; + $data["conf"]["addsongs"] = $_POST['addsongs']; + $data["conf"]["longsongs"] = $_POST['longsongs']; + $$data["conf"]["frontpage"] = $_POST['frontpage']; + $data["conf"]["onlymusic"] = $_POST['onlymusic']; + $data["conf"]["removeplay"] = $_POST['removeplay']; $pass = $_POST['pass']; $x = explode("/", htmlspecialchars(strtolower($_SERVER["REQUEST_URI"]))); $pass=crypt($pass, '$6$rounds=9001$'.$x[1].'Fuck0ffuSn34kyn!ggerzZ$'); $data['conf']['adminpass'] = $pass; $q = $data["conf"]; $q = array_key_exists("adminpass", $q); + + //$data["conf"]["vote"] = $vote; + //$data["conf"]["addsongs"] = $addsongs; + //$data["conf"]["longsongs"] = $longsongs; + //$data["conf"]["frontpage"] = $frontpage; + //$data["conf"]["onlymusic"] = $onlymusic; + //$data["conf"]["removeplay"] = $removeplay; if($data["conf"]["adminpass"] == $pass || $q != 1) { echo "correct"; diff --git a/php/panel.php b/php/panel.php index 7f230d76..1abaea71 100755 --- a/php/panel.php +++ b/php/panel.php @@ -2,12 +2,13 @@
- - - - - - + + + + + + +
diff --git a/static/style.css b/static/style.css index efeb41b9..444aad84 100755 --- a/static/style.css +++ b/static/style.css @@ -68,7 +68,7 @@ body{background:#000; margin:0; } #adminForm{text-align:left;} #adminForm label{display: block; cursor: pointer;} .adminBox{float:right;} -#adminPanel{color:white; height:180px; padding: 10px; overflow:hidden; background-color: rgba(0,0,0,0.2);} +#adminPanel{color:white; height:200px; padding: 10px; overflow:hidden; background-color: rgba(0,0,0,0.2);} .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); }