Added dependency to libnet-pcap-perl.

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

diff --git a/gosa-core/html/logout.php b/gosa-core/html/logout.php
index c06a7866e1f5530d07fe632cbea311242fbe4b16..3c60db50bfd9bf4b2efaa3f8c39ae8ae6444cac6 100644 (file)
--- a/gosa-core/html/logout.php
+++ b/gosa-core/html/logout.php
@@ -25,14 +25,14 @@ header("Content-type: text/html; charset=UTF-8");
 
 /* try to start session, so we can remove userlocks, 
   if the old session is still available */
-@session_start();
-if(isset($_SESSION['ui'])){
+@session::start();
+if(session::is_set('ui')){
   
   /* Get config & ui informations */
-  $ui= $_SESSION["ui"];
+  $ui= session::get("ui");
   
   /* config used for del_user_locks & some lines below to detect the language */  
-  $config= $_SESSION["config"];
+  $config= session::get("config");
 
   /* Remove all locks of this user */
   del_user_locks($ui->dn);
@@ -57,7 +57,7 @@ $GLOBALS['t_gettext_message_dir'] = $BASE_DIR.'/locale/';
 
 /* Set the text domain as 'messages' */
 $domain = 'messages';
-bindtextdomain($domain, "$BASE_DIR/locale");
+bindtextdomain($domain, LOCALE_DIR);
 textdomain($domain);
 
 /* Create smarty & Set template compile directory */
@@ -73,19 +73,19 @@ if (isset ($config->data['MAIN']['COMPILE'])){
 if (isset($_GET['request'])){
   
   /* destroy old session */
-  @session_unset ();
-  @session_destroy ();
+  session::destroy ();
   
   /* If we're not using htaccess authentication, just redirect... */
-  if (!isset($config->data['MAIN']['HTACCESS_AUTH']) && !isset($_SERVER['REMOTE_USER'])){
-    header ("Location: index.php");
-    exit();
+  if (isset($config->data['MAIN']['HTACCESS_AUTH']) && preg_match('/^(true|yes)$/i', $config->data['MAIN']['HTACCESS_AUTH'])){
+
+    /* Else notice that the user has to close the browser... */
+    $smarty->display (get_template_path('headers.tpl'));
+    $smarty->display (get_template_path('logout-close.tpl'));
+    exit;
   }
 
-  /* Else notice that the user has to close the browser... */
-  $smarty->display (get_template_path('headers.tpl'));
-  $smarty->display (get_template_path('logout-close.tpl'));
-  exit;
+  header ("Location: index.php");
+  exit();
 
 }else{  // The logout wasn't forced, so the session is invalid