Merge branch 'events/33c3' of ssh://mng.ber.c3voc.de/streaming-website into events/33c3

3 files changed, 15 insertions, 11 deletions

diff --git a/.htaccess b/.htaccess
index 85a4c06..b688582 100644
--- a/.htaccess
+++ b/.htaccess
@@ -5,4 +5,8 @@ RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteCond %{REQUEST_FILENAME} !-l
 
-RewriteRule (.*) index.php?route=$1&htaccess=1 [L]
+RewriteRule (.*) index.php?route=$1&htaccess=1 [L,QSA]
+RewriteRule ^/?$ index.php?route=$1&htaccess=1 [L,QSA]
+
+#DirectoryIndex index.php?htaccess=1
+DirectoryIndex disabled
diff --git a/configs/conferences/33c3/config.php b/configs/conferences/33c3/config.php
index 48298d8..f4f5285 100644
--- a/configs/conferences/33c3/config.php
+++ b/configs/conferences/33c3/config.php
@@ -207,7 +207,7 @@ $CONFIG['ROOMS'] = array(
 		 * als Default-Stream angenommen.
 		 */
 		'HD_VIDEO' => true,
-		'DASH' => true,
+		'DASH' => false,
 
 		/**
 		 * Slide-Only-Stream (1024×576) verfügbar
@@ -218,7 +218,7 @@ $CONFIG['ROOMS'] = array(
 		 * In diesem Fall wird, sofern jeweils aktiviert, Audio und zuletzt Musik als
 		 * Default-Stream angenommen.
 		 */
-		'SLIDES' => true,
+		'SLIDES' => false,
 
 		/**
 		 * Audio-Only-Stream verfügbar
@@ -369,9 +369,9 @@ $CONFIG['ROOMS'] = array(
 		'TRANSLATION' => true,
 		'SD_VIDEO' => true,
 		'HD_VIDEO' => true,
-		'DASH' => true,
+		'DASH' => false,
 		'AUDIO' => true,
-		'SLIDES' => true,
+		'SLIDES' => false,
 		'MUSIC' => false,
 
 		'SCHEDULE' => true,
@@ -400,9 +400,9 @@ $CONFIG['ROOMS'] = array(
 		'TRANSLATION' => true,
 		'SD_VIDEO' => true,
 		'HD_VIDEO' => true,
-		'DASH' => true,
+		'DASH' => false,
 		'AUDIO' => true,
-		'SLIDES' => true,
+		'SLIDES' => false,
 		'MUSIC' => false,
 
 		'SCHEDULE' => true,
@@ -430,9 +430,9 @@ $CONFIG['ROOMS'] = array(
 		'TRANSLATION' => true,
 		'SD_VIDEO' => true,
 		'HD_VIDEO' => true,
-		'DASH' => true,
+		'DASH' => false,
 		'AUDIO' => true,
-		'SLIDES' => true,
+		'SLIDES' => false,
 		'MUSIC' => false,
 
 		'SCHEDULE' => true,
@@ -475,7 +475,7 @@ $CONFIG['ROOMS'] = array(
 
 		'SD_VIDEO' => true,
 		'HD_VIDEO' => true,
-		'DASH' => true,
+		'DASH' => false,
 		'AUDIO' => true,
 
 		'SCHEDULE' => true,
diff --git a/index.php b/index.php
index 3b128c4..3c814f9 100644
--- a/index.php
+++ b/index.php
@@ -79,7 +79,7 @@ try {
 		'canonicalurl' => forceslash(baseurl()).forceslash($route),
 		'assemblies' => 'template/assemblies/',
 		'assets' => forceslash('assets'),
-		'conference_assets' => '/',
+		'conference_assets' => '',
 
 		'conference' => new GenericConference(),
 	));