X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Flogout.php;h=a29726d59babb7ad83e91a7c6978333066f6f633;hb=7b85e027ce5de44c9a81feafd7eb601bf987a8c3;hp=3dc371e2e147e8f82c1ed2a97b73cddf46fd0679;hpb=c26845a09ed3142dd8805effefce01b35f7ded46;p=gosa.git

diff --git a/gosa-core/html/logout.php b/gosa-core/html/logout.php
index 3dc371e2e..a29726d59 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);
@@ -45,13 +45,12 @@ if(session::is_set('ui')){
 }
 
 /* Language setup */
-if ((!isset($config))||(empty($config->data['MAIN']['LANG']))){
+if ((!isset($config)) || $config->get_cfg_value("language") == ""){
   $lang= get_browser_language();
 } else {
-  $lang= $config->data['MAIN']['LANG'];
+  $lang= $config->get_cfg_value("language");
 }
 
-$lang.=".UTF-8";
 putenv("LANGUAGE=");
 putenv("LANG=$lang");
 setlocale(LC_ALL, $lang);
@@ -65,12 +64,11 @@ textdomain($domain);
 
 /* Create smarty & Set template compile directory */
 $smarty= new smarty();
-if (isset ($config->data['MAIN']['COMPILE'])){
-  $smarty->compile_dir= $config->data['MAIN']['COMPILE'];
+if (isset($config)){
+	$smarty->compile_dir= $config->get_cfg_value("compile", '/var/spool/gosa/');
 } else {
-  $smarty->compile_dir= '/var/spool/gosa/';
+	$smarty->compile_dir= '/var/spool/gosa/';
 }
-
     
 /* If GET request is posted, the logout was forced by pressing the link */
 if (isset($_GET['request'])){
@@ -79,9 +77,11 @@ if (isset($_GET['request'])){
   session::destroy ();
   
   /* If we're not using htaccess authentication, just redirect... */
-  if (isset($config->data['MAIN']['HTACCESS_AUTH']) && preg_match('/^(true|yes)$/i', $config->data['MAIN']['HTACCESS_AUTH'])){
+  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;
@@ -92,6 +92,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;