--- a/fhiiqm/inc/func_lib.inc.php	Wed Aug 06 09:42:40 2014 +0200
+++ b/fhiiqm/inc/func_lib.inc.php	Fri Feb 05 14:03:40 2016 +0100
@@ -273,7 +273,7 @@
                     if ($ldapbind = @ldap_bind($ldapconn, $ldaprdn, $ldappwd))
                     {
                         ldap_close($ldapconn);
-                        if (!isset($_SESSION['user'])) $_SESSION = array();  // zerstoert alle Session-Variablen,wenn keine Anmeldung an apartvw
+                        if (!isset($_SESSION['user']) && !isset($_SESSION['useridz'])) $_SESSION = array();  // zerstoert alle Session-Variablen,wenn keine Anmeldung an apartvw oder timerec
                         $_SESSION["userid"] = $userid;
 
                         // Recht
@@ -510,7 +510,7 @@
                 }        
                 if (is_array($ag) && $ag)
                 {
-                    $entry3["physicalDeliveryOfficeName"] = array();
+                    $entry2["physicalDeliveryOfficeName"] = array();
                     $result = ldap_mod_del($ldapconn, $dn, $entry3);
                     if (!$result)
                     {
@@ -578,7 +578,7 @@
     } 
     function ldap_search_uid($sn,$gn)
     {
-        /** Suchrt uid des gegebenen Nutzers
+        /** Sucht uid des gegebenen Nutzers
          * 
          * Parameter
          * $sn
@@ -605,16 +605,14 @@
             $snr = str_replace($su,$rp,$sn); 
             $gnu = utf8_encode($gn);
             $snu = utf8_encode($sn);
-            if (!ldap_count_entries($ldapconn,$search))
-            {
-                if ($gn && $sn)
-                    $filter = "(|(&(sn=$sn*)(givenName=$gn*))(mail=$gn*)(mail=$sn*))";
-                if ($sn && !$gn)
-                    $filter = "(|(&(sn=$sn*)(givenName=$gn*))(mail=$sn*))";
-                if (!$sn && $gn)
-                    $filter = "(|(&(sn=$sn*)(givenName=$gn*))(mail=$gn*))";
-                $search=@ldap_search($ldapconn,$base,$filter,$afields);
-            }
+            $search = null;
+            if ($gn && $sn)
+                $filter = "(|(&(sn=$sn*)(givenName=$gn*))(mail=$gn*)(mail=$sn*))";
+            if ($sn && !$gn)
+                $filter = "(|(&(sn=$sn*)(givenName=$gn*))(mail=$sn*))";
+            if (!$sn && $gn)
+                $filter = "(|(&(sn=$sn*)(givenName=$gn*))(mail=$gn*))";
+            $search=@ldap_search($ldapconn,$base,$filter,$afields);
             if (!ldap_count_entries($ldapconn,$search))
             {
                 if ($gn && $sn)