From: janw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 12 Mar 2010 08:42:05 +0000 (+0000)
Subject: Revert
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fc74fb7c027d286c673935f3152489c972726019;p=gosa.git

Revert


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16476 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php
index 7e27691e0..ebae5e52f 100644
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
@@ -307,7 +307,6 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
 
   if ($ok) {
 
-    session::global_set('config',$config);
     /* Login as user, initialize user ACL's */
     if ($htaccess_authenticated){
       $ui= ldap_login_user_htaccess($username);
@@ -321,6 +320,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
     if ($ui === NULL || !$ui){
       $message= _("Please check the username/password combination.");
       $smarty->assign ('nextfield', 'password');
+      session::global_set('config',$config);
       new log("security","login","",array(),"Authentication failed for user \"$username\"");
     } else {
       /* Remove all locks of this user */