Index: trunk/admin/users/user_list.php =================================================================== diff -u -N -r822 -r927 --- trunk/admin/users/user_list.php (.../user_list.php) (revision 822) +++ trunk/admin/users/user_list.php (.../user_list.php) (revision 927) @@ -78,7 +78,7 @@ if(!headers_sent()) setcookie("sid"," ",time()-3600); $objSession->Logout(); - header("Location: ".$adminURL."/login.php"); + header("Location: ".$adminURL."/index.php?logout=1"); die(); //require_once($pathtoroot."admin/login.php"); } Index: trunk/admin/config/edit_customfields.php =================================================================== diff -u -N -r667 -r927 --- trunk/admin/config/edit_customfields.php (.../edit_customfields.php) (revision 667) +++ trunk/admin/config/edit_customfields.php (.../edit_customfields.php) (revision 927) @@ -78,7 +78,7 @@ if(!headers_sent()) setcookie("sid"," ",time()-3600); $objSession->Logout(); - header("Location: ".$adminURL."/login.php"); + header("Location: ".$adminURL."/index.php?logout=1"); die(); //require_once($pathtoroot."admin/login.php"); } Index: trunk/admin/advanced_view.php =================================================================== diff -u -N -r898 -r927 --- trunk/admin/advanced_view.php (.../advanced_view.php) (revision 898) +++ trunk/admin/advanced_view.php (.../advanced_view.php) (revision 927) @@ -84,7 +84,7 @@ if(!headers_sent()) setcookie("sid"," ",time()-3600); $objSession->Logout(); - header("Location: ".$adminURL."/login.php"); + header("Location: ".$adminURL."/index.php?logout=1"); die(); //require_once($pathtoroot."admin/login.php"); } @@ -135,7 +135,7 @@ if(!headers_sent()) setcookie("sid"," ",time()-3600); $objSession->Logout(); - header("Location: ".$adminURL."/login.php"); + header("Location: ".$adminURL."/index.php?logout=1"); die(); //require_once($pathtoroot."admin/login.php"); } Index: trunk/admin/config/config_search.php =================================================================== diff -u -N -r881 -r927 --- trunk/admin/config/config_search.php (.../config_search.php) (revision 881) +++ trunk/admin/config/config_search.php (.../config_search.php) (revision 927) @@ -78,7 +78,7 @@ if(!headers_sent()) setcookie("sid"," ",time()-3600); $objSession->Logout(); - header("Location: ".$adminURL."/login.php"); + header("Location: ".$adminURL."/index.php?logout=1"); die(); //require_once($pathtoroot."admin/login.php"); } Index: trunk/admin/index.php =================================================================== diff -u -N -r922 -r927 --- trunk/admin/index.php (.../index.php) (revision 922) +++ trunk/admin/index.php (.../index.php) (revision 927) @@ -102,7 +102,7 @@ if(!headers_sent()) setcookie("sid"," ",time()-3600); $objSession->Logout(); - require_once($pathtoroot.$admin."/login.php"); + require_once($pathtoroot.$admin."/index.php?logout=1"); } $envar = "env=" . BuildEnv(); Index: trunk/admin/config/edit_config.php =================================================================== diff -u -N -r374 -r927 --- trunk/admin/config/edit_config.php (.../edit_config.php) (revision 374) +++ trunk/admin/config/edit_config.php (.../edit_config.php) (revision 927) @@ -63,7 +63,7 @@ if(!headers_sent()) setcookie("sid"," ",time()-3600); $objSession->Logout(); - header("Location: ".$adminURL."/login.php"); + header("Location: ".$adminURL."/index.php?logout=1"); die(); //require_once($pathtoroot."admin/login.php"); } Index: trunk/admin/browse.php =================================================================== diff -u -N -r898 -r927 --- trunk/admin/browse.php (.../browse.php) (revision 898) +++ trunk/admin/browse.php (.../browse.php) (revision 927) @@ -84,7 +84,7 @@ if(!headers_sent()) setcookie("sid"," ",time()-3600); $objSession->Logout(); - header("Location: ".$adminURL."/login.php"); + header("Location: ".$adminURL."/index.php?logout=1"); die(); //require_once($pathtoroot."admin/login.php"); } @@ -142,7 +142,7 @@ if(!headers_sent()) setcookie("sid"," ",time()-3600); $objSession->Logout(); - header("Location: ".$adminURL."/login.php"); + header("Location: ".$adminURL."/index.php?logout=1"); die(); //require_once($pathtoroot."admin/login.php"); } Index: trunk/kernel/startup.php =================================================================== diff -u -N -r861 -r927 --- trunk/kernel/startup.php (.../startup.php) (revision 861) +++ trunk/kernel/startup.php (.../startup.php) (revision 927) @@ -176,7 +176,7 @@ if( !headers_sent() ) setcookie("sid"," ",time()-3600); $objSession->Logout(); $url_add = isset($_GET['expired']) && $_GET['expired'] ? '?expired=1' : ''; - header("Location: ".$adminURL.'/login.php'.$url_add); + header("Location: ".$adminURL.'/index.php'.$url_add); die(); //require_once($pathtoroot."admin/login.php"); } Index: trunk/admin/config/module_email.php =================================================================== diff -u -N -r872 -r927 --- trunk/admin/config/module_email.php (.../module_email.php) (revision 872) +++ trunk/admin/config/module_email.php (.../module_email.php) (revision 927) @@ -80,7 +80,7 @@ if(!headers_sent()) setcookie("sid"," ",time()-3600); $objSession->Logout(); - header("Location: ".$adminURL."/login.php"); + header("Location: ".$adminURL."/index.php?logout=1"); die(); //require_once($pathtoroot."admin/login.php"); } Index: trunk/admin/include/elements.php =================================================================== diff -u -N -r898 -r927 --- trunk/admin/include/elements.php (.../elements.php) (revision 898) +++ trunk/admin/include/elements.php (.../elements.php) (revision 927) @@ -22,7 +22,7 @@ setcookie("sid"," ",time()-3600); } $objSession->Logout(); - header("Location: ".$adminURL."/login.php"); + header("Location: ".$adminURL."/index.php?logout=1"); die(); //require_once($pathtoroot."admin/login.php"); } Index: trunk/kernel/action.php =================================================================== diff -u -N -r923 -r927 --- trunk/kernel/action.php (.../action.php) (revision 923) +++ trunk/kernel/action.php (.../action.php) (revision 927) @@ -24,7 +24,7 @@ if(!headers_sent()) setcookie("sid"," ",time()-3600); $objSession->Logout(); - header("Location: ".$adminURL.'/login.php?env='.BuildEnv().'&expired=1'); + header("Location: ".$adminURL.'/index.php?env='.BuildEnv().'&expired=1'); die(); //require_once($pathtoroot."admin/login.php"); } Index: trunk/admin/users/user_select.php =================================================================== diff -u -N -r789 -r927 --- trunk/admin/users/user_select.php (.../user_select.php) (revision 789) +++ trunk/admin/users/user_select.php (.../user_select.php) (revision 927) @@ -79,7 +79,7 @@ if(!headers_sent()) setcookie("sid"," ",time()-3600); $objSession->Logout(); - header("Location: ".$adminURL."/login.php"); + header("Location: ".$adminURL."/index.php?logout=1"); die(); //require_once($pathtoroot."admin/login.php"); }