Changeset 3225 for branches/2.2/workflow/inc/class.CachedLDAP.inc.php

Timestamp:

09/09/10 15:56:47 (14 years ago)

Author:

viani

Message:

Ticket #1186 - Correção no array de atributos Ldap retornados pela pesquisa de employee

File:

• branches/2.2/workflow/inc/class.CachedLDAP.inc.php (modified) (3 diffs)

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

@@ -72 +72 @@
         */
         private $entryAttributes = array('uid', 'cn', 'givenname', 'mail', 'sn', 'accountstatus', 'uidnumber', 'dn', 'employeenumber', 'cpf', 'telephonenumber');
-        
-        /**
-         * @var array $entryAttributesLDAP Os atributos que serão buscados somente no LDAP. 
-         * (Alguns campos não são armazenados no banco, e o campo mobile pode ser mais do que um por funcionário)
+
+        /**
+         * @var array $entryAttributesLDAP Attributes thats only exists in LDAP.
+         * The attributes mobile and homePhone are not present in databaseCache, because they may have more
+         * This is not the very best approach because the best solution should be store all attributes
+         * from Ldap into databaseCache
+         * than one value
          * @access private
          * */
@@ -135 +138 @@
                 /* load the information and establish the connection */
                 $this->loadLDAP();
-                
+
                 $ldapfields = array();
-        
+
+                // Merge the arrays os attributes from databaseCache and Ldap
                 $ldapfields = array_merge($this->entryAttributes,$this->entryAttributesLDAP);
-                
+
                 /* perform the search */
                 $resourceIdentifier = ldap_search($this->dataSource, $this->userContext, $ldapQuery, $ldapfields);
@@ -147 +151 @@
                 if ($entries['count'] != 1)
                         return false;
-                        
-            //print_r($entries);
 
                 /* format the output */
                 $output = array();
                 foreach ($ldapfields as $attribute)
-                        if ($attribute == 'dn')
+                        if ($attribute == 'dn' or $attribute == 'mobile' or $attribute == 'homePhone')
+                                // Retrieve all occurrencies of mobile and homePhone
                                 $output[$attribute] = $entries[0][$attribute];
                         else
-                                $output[$attribute] = $entries[0][$attribute];
-                                
+                                // Retrieve first occurrence of other attributes
+                                $output[$attribute] = $entries[0][$attribute][0];
 
                 /* insert the timestamp of the last update */