From 810f68605e001723eb55c70017e84d28f7105548 Mon Sep 17 00:00:00 2001
From: sebastian <sebastian@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Sat, 16 Aug 2008 10:16:07 +0000
Subject: [PATCH] #2307 improve redirect to htmlUI

---
 campcaster/bin/user_setup.sh                     | 1 +
 campcaster/src/modules/htmlUI/etc/Makefile.in    | 2 ++
 campcaster/src/modules/htmlUI/var/html/index.php | 3 ---
 campcaster/src/modules/htmlUI/var/index.php      | 3 ---
 campcaster/src/modules/htmlUI/var/redirect.php   | 9 ++++++++-
 5 files changed, 11 insertions(+), 7 deletions(-)
 delete mode 100644 campcaster/src/modules/htmlUI/var/html/index.php
 delete mode 100644 campcaster/src/modules/htmlUI/var/index.php

diff --git a/campcaster/bin/user_setup.sh b/campcaster/bin/user_setup.sh
index 679654f7c..370709104 100755
--- a/campcaster/bin/user_setup.sh
+++ b/campcaster/bin/user_setup.sh
@@ -376,6 +376,7 @@ chmod g+sw $modules_dir/htmlUI/var/html/img
 cp $modules_dir/htmlUI/var/redirect.php $modules_dir/index.php
 cp $modules_dir/htmlUI/var/redirect.php $modules_dir/htmlUI/index.php
 cp $modules_dir/htmlUI/var/redirect.php $modules_dir/htmlUI/var/index.php
+cp $modules_dir/htmlUI/var/redirect.php $modules_dir/htmlUI/var/html/index.php
 
 
 #-------------------------------------------------------------------------------
diff --git a/campcaster/src/modules/htmlUI/etc/Makefile.in b/campcaster/src/modules/htmlUI/etc/Makefile.in
index 7a2ce419f..f6454b1f1 100644
--- a/campcaster/src/modules/htmlUI/etc/Makefile.in
+++ b/campcaster/src/modules/htmlUI/etc/Makefile.in
@@ -161,6 +161,8 @@ install: configure_apache
 
 	${CP} ${VAR_DIR}/redirect.php ${USR_VAR_DIR}/Campcaster/index.php
 	${CP} ${VAR_DIR}/redirect.php ${USR_VAR_DIR}/Campcaster/htmlUI/index.php
+	${CP} ${VAR_DIR}/redirect.php ${USR_VAR_DIR}/Campcaster/htmlUI/var/index.php
+	${CP} ${VAR_DIR}/redirect.php ${USR_VAR_DIR}/Campcaster/htmlUI/var/html/index.php
 	${CP} ${VAR_DIR}/*.php ${USR_VAR_DIR}/Campcaster/htmlUI/var
 	${CAT} ${VAR_DIR}/ui_conf.php.template | ${SED} -e ${REPLACE_SED_STRING} > ${USR_VAR_DIR}/Campcaster/htmlUI/var/ui_conf.php
 	${CP} ${VAR_DIR}/.htaccess ${USR_VAR_DIR}/Campcaster/htmlUI/var
diff --git a/campcaster/src/modules/htmlUI/var/html/index.php b/campcaster/src/modules/htmlUI/var/html/index.php
deleted file mode 100644
index e2d91473a..000000000
--- a/campcaster/src/modules/htmlUI/var/html/index.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-header('LOCATION: ui_browser.php');
-?>
\ No newline at end of file
diff --git a/campcaster/src/modules/htmlUI/var/index.php b/campcaster/src/modules/htmlUI/var/index.php
deleted file mode 100644
index b93dfd6f1..000000000
--- a/campcaster/src/modules/htmlUI/var/index.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-header('LOCATION: /campcaster/htmlUI/var/html/ui_browser.php');
-?>
\ No newline at end of file
diff --git a/campcaster/src/modules/htmlUI/var/redirect.php b/campcaster/src/modules/htmlUI/var/redirect.php
index b93dfd6f1..5e1959825 100644
--- a/campcaster/src/modules/htmlUI/var/redirect.php
+++ b/campcaster/src/modules/htmlUI/var/redirect.php
@@ -1,3 +1,10 @@
 <?php
-header('LOCATION: /campcaster/htmlUI/var/html/ui_browser.php');
+if (strpos($_SERVER['PHP_SELF'], '~') !== false) {
+    list(, $user, ) = explode('/', $_SERVER['PHP_SELF']);
+    $base = "/$user/campcaster";
+} else {
+    $base = "/campcaster";   
+}
+
+header("LOCATION: $base/htmlUI/var/html/ui_browser.php");
 ?>
\ No newline at end of file