From 0beac83b9546908eeb390592bcd2a0a147465232 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Mon, 26 Dec 2016 00:30:23 +0100
Subject: repair routing under apache mod_php/mod_redir

---
 .htaccess | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3


From 6d0d635e518389291db8f7f38eea54c37a6e2260 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Mon, 26 Dec 2016 00:30:40 +0100
Subject: repair main-css when hosted in a subdir

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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(),
 	));
-- 
cgit v1.2.3


From af2e20a833de7d0ea1e1f9f76381d6f9eb215fca Mon Sep 17 00:00:00 2001
From: Florian Larysch
Date: Tue, 27 Dec 2016 04:47:28 +0100
Subject: 33c3: disable slidestream

We didn't configure this yet, so let's disable it in the website for the
moment.
---
 configs/conferences/33c3/config.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/conferences/33c3/config.php b/configs/conferences/33c3/config.php
index 48298d8..4907cf3 100644
--- a/configs/conferences/33c3/config.php
+++ b/configs/conferences/33c3/config.php
@@ -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
@@ -371,7 +371,7 @@ $CONFIG['ROOMS'] = array(
 		'HD_VIDEO' => true,
 		'DASH' => true,
 		'AUDIO' => true,
-		'SLIDES' => true,
+		'SLIDES' => false,
 		'MUSIC' => false,
 
 		'SCHEDULE' => true,
@@ -402,7 +402,7 @@ $CONFIG['ROOMS'] = array(
 		'HD_VIDEO' => true,
 		'DASH' => true,
 		'AUDIO' => true,
-		'SLIDES' => true,
+		'SLIDES' => false,
 		'MUSIC' => false,
 
 		'SCHEDULE' => true,
@@ -432,7 +432,7 @@ $CONFIG['ROOMS'] = array(
 		'HD_VIDEO' => true,
 		'DASH' => true,
 		'AUDIO' => true,
-		'SLIDES' => true,
+		'SLIDES' => false,
 		'MUSIC' => false,
 
 		'SCHEDULE' => true,
-- 
cgit v1.2.3


From 4f9d6c1ac4ac924b28f82e0ed177b42fd7c25a61 Mon Sep 17 00:00:00 2001
From: Florian Larysch
Date: Tue, 27 Dec 2016 05:11:55 +0100
Subject: disable DASH

DASH is not working yet, disable it.
---
 configs/conferences/33c3/config.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configs/conferences/33c3/config.php b/configs/conferences/33c3/config.php
index 4907cf3..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
@@ -369,7 +369,7 @@ $CONFIG['ROOMS'] = array(
 		'TRANSLATION' => true,
 		'SD_VIDEO' => true,
 		'HD_VIDEO' => true,
-		'DASH' => true,
+		'DASH' => false,
 		'AUDIO' => true,
 		'SLIDES' => false,
 		'MUSIC' => false,
@@ -400,7 +400,7 @@ $CONFIG['ROOMS'] = array(
 		'TRANSLATION' => true,
 		'SD_VIDEO' => true,
 		'HD_VIDEO' => true,
-		'DASH' => true,
+		'DASH' => false,
 		'AUDIO' => true,
 		'SLIDES' => false,
 		'MUSIC' => false,
@@ -430,7 +430,7 @@ $CONFIG['ROOMS'] = array(
 		'TRANSLATION' => true,
 		'SD_VIDEO' => true,
 		'HD_VIDEO' => true,
-		'DASH' => true,
+		'DASH' => false,
 		'AUDIO' => true,
 		'SLIDES' => false,
 		'MUSIC' => false,
@@ -475,7 +475,7 @@ $CONFIG['ROOMS'] = array(
 
 		'SD_VIDEO' => true,
 		'HD_VIDEO' => true,
-		'DASH' => true,
+		'DASH' => false,
 		'AUDIO' => true,
 
 		'SCHEDULE' => true,
-- 
cgit v1.2.3