From 3575feaf922d32ccd17829476c23b945c6f48c6f Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Mon, 2 Mar 2015 16:39:53 +0100
Subject: Remove Relive-Testfile

---
 config.php     |  2 +-
 lib/helper.php |  4 ++--
 test-vod.json  | 32 --------------------------------
 3 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 test-vod.json

diff --git a/config.php b/config.php
index dd23f8a..9743017 100644
--- a/config.php
+++ b/config.php
@@ -70,7 +70,7 @@ $GLOBALS['CONFIG']['OVERVIEW'] = array(
 	 * Wird beides aktiviert, hat der externe Link Vorrang!
 	 * Wird beides auskommentiert, wird der Link nicht angezeigt
 	 */
-	'RELIVE_JSON' => 'http://localhost/streaming-website/test-vod.json',
+	'RELIVE_JSON' => 'http://vod.c3voc.de/index.json',
 );
 
 
diff --git a/lib/helper.php b/lib/helper.php
index d21b4c6..4beef4d 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -236,9 +236,9 @@ function startswith($needle, $haystack)
 
 function relive_talks()
 {
-	$talks = file_get_contents(get('OVERVIEW.RELIVE_JSON'));
+	$talks = @file_get_contents(get('OVERVIEW.RELIVE_JSON'));
 	$talks = utf8_decode($talks);
-	$talks = json_decode($talks, true);
+	$talks = (array)json_decode($talks, true);
 
 	usort($talks, function($a, $b) {
 		$sort = array('live', 'recorded', 'released');
diff --git a/test-vod.json b/test-vod.json
deleted file mode 100644
index f4ac6f1..0000000
--- a/test-vod.json
+++ /dev/null
@@ -1,32 +0,0 @@
-[
-	{
-		"status": "live",
-		"release_url": "",
-		"title": "Title",
-		"id": 123,
-		"thumbnail": "http://vod.c3voc.de/123.png",
-		"playlist": "http://vod.c3voc.de/123.m3u8",
-		"duration": 3600,
-		"room": "Saal 1"
-	},
-	{
-		"status": "released",
-		"release_url": "http://media.ccc.de/",
-		"title": "Title",
-		"id": 234,
-		"thumbnail": "http://vod.c3voc.de/234.png",
-		"playlist": "http://vod.c3voc.de/234.m3u8",
-		"duration": 3600,
-		"room": "Saal 1"
-	},
-	{
-		"status": "recorded",
-		"release_url": "",
-		"title": "Title",
-		"id": 456,
-		"thumbnail": "http://vod.c3voc.de/456.png",
-		"playlist": "http://vod.c3voc.de/456.m3u8",
-		"duration": 3600,
-		"room": "Saal 1"
-	}
-]
-- 
cgit v1.2.3