Changeset 5141 for trunk/phpgwapi/inc/class.accounts_ldap.inc.php

Timestamp:

11/03/11 13:53:15 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus, modulo phpgwapi.

File:

• trunk/phpgwapi/inc/class.accounts_ldap.inc.php (modified) (9 diffs)

trunk/phpgwapi/inc/class.accounts_ldap.inc.php

@@ -64 +64 @@
                                 /* jakjr: using justthese with ldap_search */
                                 $justthese = array("uidnumber", "gidnumber", "uid", "cn", "givenname", "sn", "mail", "phpgwaccountstatus", "phpgwaccountexpires", "phpgwaccounttype", "phpgwlastpasswdchange","phpgwagreeterm","telephonenumber","mobile","homephone","datanascimento");
-                                $sri = @ldap_search($this->ds, $this->user_context, ("(&(uidnumber=" . (int)$this->account_id.")(phpgwaccounttype=u))"), $justthese);
+                                $sri = @ldap_search($this->ds, $this->user_context, ("(&(uidnumber=" . (int)$this->account_id.")(|(phpgwaccounttype=u)(phpgwaccounttype=s)))"), $justthese);
                         }
                         if(!$sri)
@@ -427 +427 @@
                         if(!$allValues[0]['dn'])
                         {
-                                $sri = ldap_search($this->ds, $this->user_context, "(&(uid=" . (string)$account_lid.")(phpgwaccounttype=u))");
+                                $sri = ldap_search($this->ds, $this->user_context, "(&(uid=" . (string)$account_lid.")(|(phpgwaccounttype=u)(phpgwaccounttype=s)))");
                                 if($sri)
                                 {
@@ -477 +477 @@
                         if($_type == 'accounts' || $_type == 'both')
                         {
-                                $filter = "(&(uidnumber=*)(phpgwaccounttype=u)";
+                                $filter = "(&(uidnumber=*)(|(phpgwaccounttype=u)(phpgwaccounttype=s))";
                                 if (!empty($query) && $query != '*')
                                 {
@@ -600 +600 @@
                         if (!isset($to_ldap[$which])) return False;
                         
-                        $sri = ldap_search($this->ds, $this->user_context, '(&('.$to_ldap[$which].'=' . (string)$name . ')(phpgwaccounttype=u))', array("uidnumber"));
+                        $sri = ldap_search($this->ds, $this->user_context, '(&('.$to_ldap[$which].'=' . (string)$name . ')(|(phpgwaccounttype=u)(phpgwaccounttype=s)))', array("uidnumber"));
                         $allValues = ldap_get_entries($this->ds, $sri);
 
@@ -651 +651 @@
                         /* jakjr: using justthese with ldap_search */
                         $justthese = array("uid","mail","surname","cn","phpgwaccounttype");
-                        $sri = @ldap_search($this->ds, $this->user_context, '(&(uidnumber=' . (int)$account_id . ')(phpgwaccounttype=u))', $justthese);
+                        $sri = @ldap_search($this->ds, $this->user_context, '(&(uidnumber=' . (int)$account_id . ')(|(phpgwaccounttype=u)(phpgwaccounttype=s)))', $justthese);
                         if(!$sri)
                                 return False;
@@ -667 +667 @@
                         $allValues = array();
                         /* jakjr: using justthese with ldap_search */
-                        $sri = @ldap_search($this->ds, $this->user_context, '(&(uidnumber=' . (int)$account_id . ')(phpgwaccounttype=u))', array("phpgwaccounttype"));
+                        $sri = @ldap_search($this->ds, $this->user_context, '(&(uidnumber=' . (int)$account_id . ')(|(phpgwaccounttype=u)(phpgwaccounttype=s)))', array("phpgwaccounttype"));
                         if(!$sri)
                                 return False;
@@ -1115 +1115 @@
                         else
                         {
-                                $sri = @ldap_search($this->ds, $this->user_context, '(&(uidnumber=' . (int)$account_id . ')(phpgwAccountType=u))', $justthese);
+                                $sri = @ldap_search($this->ds, $this->user_context, '(&(uidnumber=' . (int)$account_id . ')(|(phpgwaccounttype=u)(phpgwaccounttype=s)))', $justthese);
                         }
                         if(!$sri)
@@ -1176 +1176 @@
                 {
                         $allValues = array();
-                        $sri = @ldap_search($this->ds, $this->user_context, '(&(uidnumber=' . (int)$account_id . ')(phpgwaccounttype=u))');
+                        $sri = @ldap_search($this->ds, $this->user_context, '(&(uidnumber=' . (int)$account_id . ')(|(phpgwaccounttype=u)(phpgwaccounttype=s)))');
                         if(!$sri)
                                 return False;
@@ -1190 +1190 @@
                 {
                         $allValues = array();
-                        $sri = @ldap_search($this->ds, $this->user_context, '(&(mail=' . $mail . ')(phpgwaccounttype=u))');
+                        $sri = @ldap_search($this->ds, $this->user_context, '(&(mail=' . $mail . ')(|(phpgwaccounttype=u)(phpgwaccounttype=s)))');
                         if(!$sri)
                                 return False;