shuffle things around on the way to a bootstrap-based configurable website

1 files changed, 10 insertions, 14 deletions

diff --git a/index.php b/index.php
index ed8faf5..7ac4c8e 100644
--- a/index.php
+++ b/index.php
@@ -7,10 +7,10 @@ $route = rtrim($route, '/');
 
 if($route == '')
 {
-	include('pages/rooms.php');
+	include('pages/overview.php');
 }
 
-else if(preg_match('@^(saal1|saal2|saalg|saal6|sendezentrum)$@', $route, $m))
+else if(preg_match('@^([^/]+)$@', $route, $m))
 {
 	$_GET = array(
 		'room' => $m[1],
@@ -20,7 +20,7 @@ else if(preg_match('@^(saal1|saal2|saalg|saal6|sendezentrum)$@', $route, $m))
 	include('pages/room.php');
 }
 
-else if(preg_match('@^(saal1|saal2|saalg|saal6)/translated$@', $route, $m))
+else if(preg_match('@^([^/]+)/translated$@', $route, $m))
 {
 	$_GET = array(
 		'room' => $m[1],
@@ -30,7 +30,7 @@ else if(preg_match('@^(saal1|saal2|saalg|saal6)/translated$@', $route, $m))
 	include('pages/room.php');
 }
 
-else if(preg_match('@^(saal1|saal2|saalg|saal6|sendezentrum)/(hd|audio|slides)$@', $route, $m))
+else if(preg_match('@^([^/]+)/(hd|audio|slides)$@', $route, $m))
 {
 	$_GET = array(
 		'room' => $m[1],
@@ -40,7 +40,7 @@ else if(preg_match('@^(saal1|saal2|saalg|saal6|sendezentrum)/(hd|audio|slides)$@
 	include('pages/room.php');
 }
 
-else if(preg_match('@^(saal1|saal2|saalg|saal6)/(hd|audio|slides)/translated$@', $route, $m))
+else if(preg_match('@^([^/]+)/(hd|audio|slides)/translated$@', $route, $m))
 {
 	$_GET = array(
 		'room' => $m[1],
@@ -50,15 +50,6 @@ else if(preg_match('@^(saal1|saal2|saalg|saal6)/(hd|audio|slides)/translated$@',
 	include('pages/room.php');
 }
 
-else if(preg_match('@^(lounge|ambient)$@', $route, $m))
-{
-	$_GET = array(
-		'room' => $m[1],
-		'format' => 'audio',
-	);
-	include('pages/party.php');
-}
-
 else if(preg_match('@^about$@', $route, $m))
 {
 	include('pages/about.php');
@@ -74,6 +65,11 @@ else if(preg_match('@^feedback$@', $route, $m))
 	include('pages/feedback.php');
 }
 
+else if(preg_match('@^feedback/read$@', $route, $m))
+{
+	include('pages/feedback-read.php');
+}
+
 else if(preg_match('@^relive/([0-9]+)$@', $route, $m))
 {
 	$_GET = array(