Changes in branches [3433:3435]


Ignore:
Location:
branches/2.2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2/index.php

    r237 r3435  
    1010        \**************************************************************************/ 
    1111 
     12        $current_url = substr($_SERVER["SCRIPT_NAME"], 0, strpos($_SERVER["SCRIPT_NAME"],'index.php')); 
    1213 
    1314        $phpgw_info = array(); 
    1415        if(!file_exists('header.inc.php')) 
    1516        { 
    16                 Header('Location: setup/index.php'); 
     17                Header('Location: '.$current_url.'setup/index.php'); 
    1718                exit; 
    1819        } 
     
    2122        if(!$GLOBALS['sessionid']) 
    2223        { 
    23                 Header('Location: login.php'. 
     24                Header('Location: '.$current_url.'login.php'. 
    2425                (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING']) ? 
    2526                '?phpgw_forward='.urlencode('/index.php?'.$_SERVER['QUERY_STRING']):'')); 
  • branches/2.2/home.php

    r223 r3435  
    1212        \**************************************************************************/ 
    1313        $phpgw_info = array(); 
     14        $current_url = substr($_SERVER["SCRIPT_NAME"], 0, strpos($_SERVER["SCRIPT_NAME"],'home.php')); 
     15 
    1416        if (!is_file('header.inc.php')) 
    1517        { 
    16                 Header('Location: setup/index.php'); 
     18                Header('Location: '.$current_url.'setup/index.php'); 
    1719                exit; 
    1820        } 
     
    2123        if (!isset($GLOBALS['sessionid']) || !$GLOBALS['sessionid']) 
    2224        { 
    23                 Header('Location: login.php?cd=10'); 
     25                Header('Location: '.$current_url.'login.php?cd=10'); 
    2426                exit; 
    2527        } 
Note: See TracChangeset for help on using the changeset viewer.