Changes in branches [3435:3433]

Location:

branches/2.2

Files:

• index.php (modified) (2 diffs)
• home.php (modified) (2 diffs)

branches/2.2/index.php

@@ -10 +10 @@
         \**************************************************************************/
 
-        $current_url = substr($_SERVER["SCRIPT_NAME"], 0, strpos($_SERVER["SCRIPT_NAME"],'index.php'));
 
         $phpgw_info = array();
         if(!file_exists('header.inc.php'))
         {
-                Header('Location: '.$current_url.'setup/index.php');
+                Header('Location: setup/index.php');
                 exit;
         }
@@ -22 +21 @@
         if(!$GLOBALS['sessionid'])
         {
-                Header('Location: '.$current_url.'login.php'.
+                Header('Location: login.php'.
                 (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING']) ?
                 '?phpgw_forward='.urlencode('/index.php?'.$_SERVER['QUERY_STRING']):''));

branches/2.2/home.php

@@ -12 +12 @@
         \**************************************************************************/
         $phpgw_info = array();
-        $current_url = substr($_SERVER["SCRIPT_NAME"], 0, strpos($_SERVER["SCRIPT_NAME"],'home.php'));
-
         if (!is_file('header.inc.php'))
         {
-                Header('Location: '.$current_url.'setup/index.php');
+                Header('Location: setup/index.php');
                 exit;
         }
@@ -23 +21 @@
         if (!isset($GLOBALS['sessionid']) || !$GLOBALS['sessionid'])
         {
-                Header('Location: '.$current_url.'login.php?cd=10');
+                Header('Location: login.php?cd=10');
                 exit;
         }