Check things only once

[gosa.git] / gosa-core / html / logout.php

diff --git a/gosa-core/html/logout.php b/gosa-core/html/logout.php
index a29726d59babb7ad83e91a7c6978333066f6f633..93532c9d88dbb8e7d3a1685abd7fc449c0939496 100644 (file)
--- a/gosa-core/html/logout.php
+++ b/gosa-core/html/logout.php
@@ -45,10 +45,10 @@ if(session::global_is_set('ui')){
 }
 
 /* Language setup */
-if ((!isset($config)) || $config->get_cfg_value("language") == ""){
+if ((!isset($config)) || $config->get_cfg_value("core","language") == ""){
   $lang= get_browser_language();
 } else {
-  $lang= $config->get_cfg_value("language");
+  $lang= $config->get_cfg_value("core","language");
 }
 
 putenv("LANGUAGE=");
@@ -65,23 +65,22 @@ textdomain($domain);
 /* Create smarty & Set template compile directory */
 $smarty= new smarty();
 if (isset($config)){
-       $smarty->compile_dir= $config->get_cfg_value("compile", '/var/spool/gosa/');
+       $smarty->compile_dir= $config->get_cfg_value("core","templateCompileDirectory");
 } 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 ();
   
   /* If we're not using htaccess authentication, just redirect... */
-  if (isset($config) && $config->get_cfg_value("htaccessAuthentication") == "true"){
+  if (isset($config) && $config->get_cfg_value("core","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,7 +91,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;