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

diff --git a/gosa-core/html/logout.php b/gosa-core/html/logout.php
index fef58fb1b..3dc371e2e 100644
--- a/gosa-core/html/logout.php
+++ b/gosa-core/html/logout.php
@@ -1,21 +1,23 @@
 <?php
 /*
-   This code is part of GOsa (https://gosa.gonicus.de)
-   Copyright (C) 2003  Cajus Pollmeier
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id$$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* Basic setup, remove eventually registered sessions */
@@ -25,14 +27,15 @@ 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();
+session::set('errorsAlreadyPosted',array());
+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 +60,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,8 +76,7 @@ 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']) && preg_match('/^(true|yes)$/i', $config->data['MAIN']['HTACCESS_AUTH'])){