From 97428d62ffabac32a706d0c17f36a73b06c7d8ef Mon Sep 17 00:00:00 2001
From: Florian Larysch
Date: Wed, 21 Dec 2016 14:06:27 +0100
Subject: update desktop player hint

In-browser playback has gotten better in recent years, so we can
moderate the suggestion to use a desktop player a bit.
---
 template/assemblies/desktop-player.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/assemblies/desktop-player.phtml b/template/assemblies/desktop-player.phtml
index b5ed0c6..ffb8a93 100644
--- a/template/assemblies/desktop-player.phtml
+++ b/template/assemblies/desktop-player.phtml
@@ -1,5 +1,5 @@
 <div class="desktop-player-hint">
-	<h3>Use a desktop player!</h3>
-	<p>Browsers and video doesn't go together well, even in <?=h(date('Y'))?> and especially when it's live. So for your best viewing experience please use a desktop player like VLC or mplayer.</p>
+	<h3>Try a desktop player!</h3>
+	<p>If you're experiencing problems with the web player, please try a desktop player such as VLC.</p>
 	<p>Beware that downloading the HLS playlist file is useless because of the way HLS works. You need to play the URL from your player.</p>
 </div>
-- 
cgit v1.2.3


From 4d7e3732c1641308f7ad3fdf0f6e8afa78f5144b Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Wed, 21 Dec 2016 16:50:13 +0100
Subject: fail gracefully on missing schedule

---
 model/Schedule.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/model/Schedule.php b/model/Schedule.php
index b54709e..917d70b 100644
--- a/model/Schedule.php
+++ b/model/Schedule.php
@@ -36,10 +36,10 @@ class Schedule
 
 	private function fetchSchedule()
 	{
-		$schedule = file_get_contents($this->getScheduleCache());
+		$schedule = @file_get_contents($this->getScheduleCache());
 
 		if(!$schedule)
-			throw new ScheduleException("Error Loading Schedule from ".$this->getScheduleCache());
+			return null;
 
 		return simplexml_load_string($schedule);
 	}
@@ -49,6 +49,11 @@ class Schedule
 		// download schedule-xml
 		$schedule = $this->fetchSchedule();
 
+		// not failing gracefully here will result in a broken page in case
+		// no schedule is present
+		if(!$schedule)
+			return [];
+
 		$mapping = $this->getScheduleToRoomSlugMapping();
 		$program = array();
 
-- 
cgit v1.2.3