index b0e5b0beff50ee5712bf59001eaa9bdfc7dbfdee..f4c2c3d4d62e250687e4f8c57d4f1c47246a5e45 100644 (file)
if the old session is still available */
@session::start();
session::set('errorsAlreadyPosted',array());
-if(session::is_set('ui')){
+if(session::global_is_set('ui')){
/* Get config & ui informations */
- $ui= session::get("ui");
+ $ui= session::global_get("ui");
/* config used for del_user_locks & some lines below to detect the language */
- $config= session::get("config");
+ $config= session::global_get("config");
/* Remove all locks of this user */
del_user_locks($ui->dn);
}
/* Language setup */
-if ((!isset($config)) || $config->get_cfg_value("lang") == ""){
+if ((!isset($config)) || $config->get_cfg_value("language") == ""){
$lang= get_browser_language();
} else {
- $lang= $config->get_cfg_value("lang");
+ $lang= $config->get_cfg_value("language");
}
-$lang.=".UTF-8";
putenv("LANGUAGE=");
putenv("LANG=$lang");
setlocale(LC_ALL, $lang);
}
/* If GET request is posted, the logout was forced by pressing the link */
-if (isset($_GET['request'])){
+if (isset($_POST['forcedlogout'])){
/* destroy old session */
session::destroy ();
/* If we're not using htaccess authentication, just redirect... */
- if ($config->get_cfg_value("htaccess_auth") == "true"){
+ if (isset($config) && $config->get_cfg_value("htaccessAuthentication") == "true"){
/* Else notice that the user has to close the browser... */
+ $smarty->assign("iePngWorkaround", FALSE);
+ $smarty->assign("usePrototype", "false");
$smarty->display (get_template_path('headers.tpl'));
$smarty->display (get_template_path('logout-close.tpl'));
exit;
}else{ // The logout wasn't forced, so the session is invalid
+ $smarty->assign("usePrototype", "false");
$smarty->display (get_template_path('headers.tpl'));
$smarty->display (get_template_path('logout.tpl'));
exit;