Merge branch 'master' of ssh://mng.ber.c3voc.de/streaming-website

Conflicts:
	configs/conferences/ffrl-routing-days-2016/download.sh

2 files changed, 25 insertions, 7 deletions

diff --git a/configs/conferences/chaosradio/config.php b/configs/conferences/chaosradio/config.php
index 5657957..6b971d9 100644
--- a/configs/conferences/chaosradio/config.php
+++ b/configs/conferences/chaosradio/config.php
@@ -1,9 +1,18 @@
 <?php
 
-$EPISODE = 219;
-$DATE = strtotime("2016-01-28 22:00");
-$TITLE = "Chaosradio $EPISODE - Backstage im Netz";
-$IM_CCCB = false; // im CCCB=false oder im Fritz-Studio=true
+$upcoming = new Upcoming();
+$upcoming_events = $upcoming->getNextEvents();
+$upcoming_crs = array_values(array_filter($upcoming_events, function($event) {
+	return preg_match('/^cr[0-9]+$/i', $event['short_name']);
+}));
+$upcoming_cr = $upcoming_crs[0];
+
+preg_match('/^cr([0-9]+)$/i', $upcoming_cr['short_name'], $m);
+
+$EPISODE = intval($m[1]);
+$DATE = strtotime($upcoming_cr['start_date'].' 22:00');
+$TITLE = "Chaosradio $EPISODE";
+$IM_CCCB = ($upcoming_cr['location'] == 'CCCB');
 
 $STREAM = $IM_CCCB ? 's5' : 'q2';
 
diff --git a/configs/conferences/datengarten/config.php b/configs/conferences/datengarten/config.php
index 39b80b7..557260b 100644
--- a/configs/conferences/datengarten/config.php
+++ b/configs/conferences/datengarten/config.php
@@ -1,8 +1,17 @@
 <?php
 
-$EPISODE = 63;
-$DATE = strtotime("2016-02-09 20:00");
-$TITLE = 'Anna-Lena Baecker - WLAN in Hochgeschwindigkeitszügen';
+$upcoming = new Upcoming();
+$upcoming_events = $upcoming->getNextEvents();
+$upcoming_dgs = array_values(array_filter($upcoming_events, function($event) {
+	return preg_match('/^dg[0-9]+$/i', $event['short_name']);
+}));
+$upcoming_dg = $upcoming_dgs[0];
+
+preg_match('/^dg([0-9]+)$/i', $upcoming_dg['short_name'], $m);
+
+$EPISODE = intval($m[1]);
+$DATE = strtotime($upcoming_dg['start_date'].' 22:00');
+$TITLE = "Datengarten $EPISODE";
 
 
 $GLOBALS['CONFIG']['CONFERENCE'] = array(