X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Flogout.php;h=787a021ba0d0679dbf622fbc083a76711fbe6616;hb=7ab8650a80c1bf158361c1f68d9397a2657e7065;hp=31454b15cadc932f689ba69ee7243211266445cc;hpb=d42c43568d90d34cb0dd3afddb58e8383b76d00c;p=gosa.git

diff --git a/gosa-core/html/logout.php b/gosa-core/html/logout.php
index 31454b15c..787a021ba 100644
--- a/gosa-core/html/logout.php
+++ b/gosa-core/html/logout.php
@@ -29,13 +29,13 @@ header("Content-type: text/html; charset=UTF-8");
   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);
@@ -51,7 +51,6 @@ if ((!isset($config)) || $config->get_cfg_value("language") == ""){
   $lang= $config->get_cfg_value("language");
 }
 
-$lang.=".UTF-8";
 putenv("LANGUAGE=");
 putenv("LANG=$lang");
 setlocale(LC_ALL, $lang);
@@ -70,9 +69,10 @@ if (isset($config)){
 } else {
 	$smarty->compile_dir= '/var/spool/gosa/';
 }
+$smarty->assign ("title","GOsa");
     
 /* If GET request is posted, the logout was forced by pressing the link */
-if (isset($_GET['request'])){
+if (isset($_POST['forcedlogout']) || isset($_GET['forcedlogout'])){
   
   /* destroy old session */
   session::destroy ();
@@ -81,6 +81,8 @@ if (isset($_GET['request'])){
   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;
@@ -91,6 +93,7 @@ if (isset($_GET['request'])){
 
 }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;