Added (!(uid=*$)) to searchfilter

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

diff --git a/plugins/addons/addressbook/class_addressbook.inc b/plugins/addons/addressbook/class_addressbook.inc
index 6a964bfdc79c895e671d721422479d0a259bbb92..082e828c234647dc1b0d7ab7fd62aed440039dd6 100644 (file)
--- a/plugins/addons/addressbook/class_addressbook.inc
+++ b/plugins/addons/addressbook/class_addressbook.inc
@@ -315,11 +315,11 @@ class addressbook extends plugin
        foreach ($bases as $base){
                $ldap->cd ($base);
                if ($phonefilter['object_type'] == '*'){
-                       $ldap->search ("(&(objectClass=person)$filter(!(objectClass=gosaUserTemplate))".
+                       $ldap->search ("(&(objectClass=person)$filter(!(objectClass=gosaUserTemplate))(!(uid=*$))".
                                "(|(uid=$s)(homePhone=$s)(telephoneNumber=$s)".
                                "(facsimileTelephoneNumber=$s)(mobile=$s)(givenName=$s)(sn=$s)))", array("sn", "givenName", "telephoneNumber", "facsimileTelephoneNumber", "mobile", "homePhone", "uid", "mail", "cn"));
                } else {
-                       $ldap->search ("(&$filter(!(objectClass=gosaUserTemplate))".
+                       $ldap->search ("(&$filter(!(uid=*$))(!(objectClass=gosaUserTemplate))".
                                "(".$phonefilter['object_type']."=$s))", array("sn", "givenName", "telephoneNumber", "facsimileTelephoneNumber", "mobile", "homePhone", "uid", "mail", "cn"));
                }