Merge pull request #15 from cweiske/master

[contagged] / login.php

diff --git a/login.php b/login.php
index 5ea09ea7379485c66b4aa5a8d0f57f7011689bef..96d0c4f850bc8a35237d3aa216ed1c053ef3e7ad 100644 (file)
--- a/login.php
+++ b/login.php
@@ -13,8 +13,8 @@ if(!empty($_REQUEST['username'])){
         //create private address book if simple enough
         if(preg_match('/ou=([^,]+)$/',$conf['privatebook'],$match)){
             $privatedn = $conf['privatebook'].', '.$_SESSION['ldapab']['binddn'];
-            if(!ldap_read($LDAP_CON,$privatedn,'')){
-                ldap_add($LDAP_CON,$privatedn,
+            if(!@ldap_read($LDAP_CON,$privatedn,'')){
+                @ldap_add($LDAP_CON,$privatedn,
                          array('objectClass' => array ('organizationalUnit','top'),
                                'ou' => $match[1]));
             }
@@ -30,6 +30,9 @@ if(!empty($_REQUEST['username'])){
     }else{
         $msg = $lang['msg_loginfail'];;
     }
+}else{
+    //logout
+    unset($_SESSION['ldapab']);
 }
 
 //prepare templates