Index: trunk/admin/save_redirect.php =================================================================== diff -u -r2772 -r2853 --- trunk/admin/save_redirect.php (.../save_redirect.php) (revision 2772) +++ trunk/admin/save_redirect.php (.../save_redirect.php) (revision 2853) @@ -15,76 +15,15 @@ define('REDIRECT_REQUIRED', 1); - if( !(isset($pathtoroot) && $pathtoroot) ) - { - $path=dirname(realpath(__FILE__)); - if(strlen($path)) - { - /* determine the OS type for path parsing */ - $pos = strpos($path,":"); - if ($pos === false) - { - $gOS_TYPE="unix"; - $pathchar = "/"; - } - else - { - $gOS_TYPE="win"; - $pathchar="\\"; - } - $p = $path.$pathchar; - /*Start looking for the root flag file */ - if( !isset($pathtoroot) ) $pathtoroot = ''; - while(!strlen($pathtoroot) && strlen($p)) - { - $sub = substr($p,strlen($pathchar)*-1); - if($sub==$pathchar) - { - $filename = $p."root.flg"; - } - else - $filename = $p.$pathchar."root.flg"; - if(file_exists($filename)) - { - $pathtoroot = $p; - } - else - { - $parent = realpath($p.$pathchar."..".$pathchar); - if($parent!=$p) - { - $p = $parent; - } - else - $p = ""; - } - } - if( !(isset($pathtoroot) && $pathtoroot) ) - $pathtoroot = ".".$pathchar; - } - else - { - $pathtoroot = ".".$pathchar; - } - } - - $sub = substr($pathtoroot,strlen($pathchar)*-1); - if($sub!=$pathchar) - { - $pathtoroot = $pathtoroot.$pathchar; - } + // new startup: begin + define('REL_PATH', 'admin'); + $relation_level = count( explode('/', REL_PATH) ); + define('FULL_PATH', realpath(dirname(__FILE__) . str_repeat('/..', $relation_level) ) ); + require_once FULL_PATH.'/kernel/startup.php'; + // new startup: end - require_once($pathtoroot.'kernel/startup.php'); + require_login(); - if( !admin_login() ) - { - if( !headers_sent() ) setcookie('sid',' ',time() - 3600, '', $_SERVER['HTTP_HOST']); - $objSession->Logout(); - header("Location: ".$adminURL."/index.php?logout=1"); - exit; - - } - /*$m = GetModuleArray(); foreach($m as $key=>$value) {