Changeset 3186

Timestamp:

08/31/10 16:23:09 (14 years ago)

Author:

fabianok

Message:

Ticket #1176 - Correção do problema de busca na base ldap

File:

• branches/2.2/workflow/inc/class.WorkflowLDAP.inc.php (modified) (2 diffs)

branches/2.2/workflow/inc/class.WorkflowLDAP.inc.php

@@ -513 +513 @@
         function getNames($entitiesID)
         {
+
+                /* if parameter is not array make a new array with value in entitiesID */
+                if(!is_array($entitiesID))
+                        $entitiesID = array($entitiesID);
+
                 /* check if the required information is in cache */
                 $methodName = 'getNames';
@@ -530 +535 @@
                 /* load the entity information ten entities at a time. This approach was proven to be faster on some systems */
                 $result = array();
+
                 while (count($entitiesID) > 0)
                 {
                         $selectedEntitiesID = array_splice($entitiesID, 0, 10);
-                        $resourceIdentifier = ldap_search($this->dataSource, $this->ldapContext, "(|" . implode('', array_map(create_function('$a', 'return "(|(&(uidnumber={$a})(|(phpgwaccounttype=u)(phpgwaccounttype=l)))(&(gidnumber={$a})(phpgwaccounttype=g)))";'), array_unique($selectedEntitiesID))) . ')', array('cn', 'uidnumber', 'gidnumber', 'phpgwaccounttype'));
+
+                        /* if parameter is null make array without values */
+                        if(!is_array($entitiesID))
+                                $entitiesID = array();
+                        $resourceIdentifier = ldap_search(
+                                $this->dataSource,
+                                $this->ldapContext, 
+                                sprintf(
+                                        '(&(|%s)(|(phpgwaccounttype=u)(phpgwaccounttype=l)(phpgwaccounttype=g)))',
+                                        implode(
+                                                '', 
+                                                array_map(
+                                                        create_function('$a', 'return "(uidnumber={$a})(gidnumber={$a})";'),
+                                                        array_unique($selectedEntitiesID)
+                                                )
+                                        )
+                                ),
+                                array('cn', 'uidnumber', 'gidnumber', 'phpgwaccounttype')
+                        );
+
                         $result = array_merge($result, ldap_get_entries($this->dataSource, $resourceIdentifier));
                         unset($result['count']);
                 }
+                
 
                 $output = array();