From 531b35f5c931cf6be243b9b444048d0e0edb3027 Mon Sep 17 00:00:00 2001
From: "Nicolas A. Tonne" <nixatto@gmail.com>
Date: Fri, 10 Oct 2014 14:30:54 +0200
Subject: [PATCH] Fixed error

---
 index.php              | 1 -
 js/list.js             | 0
 js/youtube.js          | 0
 lists/tritoen.json     | 2 +-
 php/change.php         | 0
 php/timedifference.php | 2 +-
 6 files changed, 2 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 js/list.js
 mode change 100644 => 100755 js/youtube.js
 mode change 100644 => 100755 php/change.php
 mode change 100644 => 100755 php/timedifference.php

diff --git a/index.php b/index.php
index acdcb0e6..000ec53c 100755
--- a/index.php
+++ b/index.php
@@ -34,7 +34,6 @@
 		<div class="footer small centered top anim">&copy; 2014 <a class="anim" href="//nixo.no">Nixo</a> &amp; <a class="anim" href="//kasperrt.no">KasperRT</a> </div>
 
 		<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-		<script type="text/javascript" src="/js/swfobject.js"></script>
 		<script type="text/javascript" src="/js/iscroll.js"></script>  
 		<script type="text/javascript" src="/js/list.js"></script>  
 		<script type="text/javascript" src="/js/youtube.js"></script>
diff --git a/js/list.js b/js/list.js
old mode 100644
new mode 100755
diff --git a/js/youtube.js b/js/youtube.js
old mode 100644
new mode 100755
diff --git a/lists/tritoen.json b/lists/tritoen.json
index 3e7fe9b9..4a3777a3 100755
--- a/lists/tritoen.json
+++ b/lists/tritoen.json
@@ -1 +1 @@
-{"nowPlaying":{"Sb1XfrCtjVU":{"id":"Sb3XfrCtjVU","title":"The Notorious BIG ft. Ja Rule - Old Thing Back (Matoma Remix)","votes":0,"added":1412940931,"guids":[]}},"songs":{"b24ALjuvR3M":{"id":"b24ALjuvR3M","title":"Philter - Revolver (OFFICIAL MUSIC VIDEO)","votes":1,"added":1412941390,"guids":["MTYwMjcx"]},"jEgX64n3T7g":{"id":"jEgX64n3T7g","title":"Massive Attack - Paradise Circus","votes":1,"added":1412942005,"guids":["MTYwMjcx"]},"u7K72X4eo_s":{"id":"u7K72X4eo_s","title":"Massive Attack - Teardrop","votes":1,"added":1412942256,"guids":["MTYwMjcx"]},"V40EjCjP3VU":{"id":"V40EjCjP3VU","title":"Philter - The Seven Seas","votes":0,"added":1412941171,"guids":[]}},"conf":{"startTime":1412942005,"views":1,"skips":[]}}
\ No newline at end of file
+{"nowPlaying":{"b24ALjuvR3M":{"id":"b24ALjuvR3M","title":"Philter - Revolver (OFFICIAL MUSIC VIDEO)","votes":0,"added":1412941390,"guids":["MTYwMjcx"]}},"songs":{"jEgX64n3T7g":{"id":"jEgX64n3T7g","title":"Massive Attack - Paradise Circus","votes":2,"added":1412944217,"guids":["MTYwMjcx","MjQ3Mjk5"]},"u7K72X4eo_s":{"id":"u7K72X4eo_s","title":"Massive Attack - Teardrop","votes":2,"added":1412944232,"guids":["MTYwMjcx","MjQ3Mjk5"]},"Sb3XfrCtjVU":{"id":"Sb3XfrCtjVU","title":"The Notorious BIG ft. Ja Rule - Old Thing Back (Matoma Remix)","votes":1,"added":1412944219,"guids":["MjQ3Mjk5"]},"V40EjCjP3VU":{"id":"V40EjCjP3VU","title":"Philter - The Seven Seas","votes":1,"added":1412944225,"guids":["MjQ3Mjk5"]}},"conf":{"startTime":1412944204,"views":1,"skips":[]}}
\ No newline at end of file
diff --git a/php/change.php b/php/change.php
old mode 100644
new mode 100755
diff --git a/php/timedifference.php b/php/timedifference.php
old mode 100644
new mode 100755
index 2815278b..d19eb82b
--- a/php/timedifference.php
+++ b/php/timedifference.php
@@ -2,7 +2,7 @@
 	$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";
+	$list="../lists/".$list.".json";
 	$data = json_decode(file_get_contents($list), true);
 	$songs = $data["nowPlaying"];
 	$id = array_values($songs);