From f652ae2be38e74796ed63ba72e23fcb632818118 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 19 Oct 2014 12:12:20 +0200
Subject: restructure room site to produce a unique room/player/formats page

---
 .htaccess | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to '.htaccess')

diff --git a/.htaccess b/.htaccess
index 8915f0a..26818bd 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,23 +1,31 @@
 RewriteEngine On
 
+# Deliver literal files as-is
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteCond %{REQUEST_FILENAME} !-l
 
-
 # / -> index.php - room/streams list
 DirectoryIndex index.php
 
-# /room/ -> formats.php - list of qualities/formats
-RewriteRule ^(saal1|saal2|saalg|saalz)/?$ formats.php?room=$1 [L]
+# /room/ -> room.php - native av-player in hq (with format switcher included)
+RewriteRule ^(saal1|saal2|saalg|saal6)/?$ room.php?room=$1&format=hq&language=native& [L]
+
+# /room/ -> room.php - translated av-player in hq (with format switcher included)
+RewriteRule ^(saal1|saal2|saalg|saal6)/translated/?$ room.php?room=$1&format=hq&language=translated& [L]
 
-# /room/format/ -> player.php - native av-player for room
-RewriteRule ^(saal1|saal2|saalg|saalz)/(hd|hq|lq|audio|slides)/?$ player.php?room=$1&format=$2&language=native [L]
+# /room/format/ -> room.php - native av-player in $format (with format switcher included)
+RewriteRule ^(saal1|saal2|saalg|saal6)/(hd|lq|audio|slides)/?$ room.php?room=$1&format=$2&language=native [L]
 
-# /room/format/translated -> player.php - translated av-player for room
-RewriteRule ^(saal1|saal2|saalg|saalz)/(hd|hq|lq|audio|slides)/translated/?$ player.php?room=$1&format=$2&language=translated [L]
+# /room/format/translated -> room.php - translated av-player in $format (with format switcher included)
+RewriteRule ^(saal1|saal2|saalg|saal6)/(hd|lq|audio|slides)/translated/?$ room.php?room=$1&format=$2&language=translated [L]
 
 # /party/ -> player.php - simple audio-player for party
-RewriteRule ^(lounge|sendezentrum)/?$ player.php?room=$1&format=audio&language=native [L]
+RewriteRule ^(lounge|ambient|sendezentrum)/?$ audio.php?room=$1&format=audio [L]
 
+# Show a known page in case of as miss
 ErrorDocument 404 404.php
+
+# Allow Caches & Proxies to Cache all resources
+#ExpiresActive On
+#ExpiresDefault "access plus 4 hours"
-- 
cgit v1.2.3