Changeset 2094

Timestamp:

03/01/10 10:29:06 (14 years ago)

Author:

pedroerp

Message:

Ticket #928 - Utilizando CachedLDAP para encontrar usuários excluídos na busca do organograma.

File:

• trunk/workflow/inc/class.so_userinterface.inc.php (modified) (1 diff)

trunk/workflow/inc/class.so_userinterface.inc.php

@@ -474 +474 @@
                         $ldapResult[$entries[$i]['uidnumber'][0]] = array('cn' => $entries[$i]['cn'][0], 'telephoneNumber' => $entries[$i]['telephonenumber'][0]);
 
+                /* we will need to search into database 'cache' for users deleted in ldap */
+                $cachedLDAP = $GLOBALS[ 'workflow' ][ 'factory' ] -> newInstance( 'CachedLDAP' );
+                $cachedLDAP -> setOperationMode( $cachedLDAP -> OPERATION_MODE_DATABASE );
+
                 /* filling return array with employee's information */
                 $employees = array();
                 for ($i = 0; $i < count($result); $i++) {
-                        $employees []= array(
-                                        'area'                          => $result[$i]['area'],
-                                        'area_id'                       => $result[$i]['area_id'],
-                                        'funcionario_id'        => $result[$i]['funcionario_id'],
-                                        'cn'                            => empty($ldapResult[$result[$i]['funcionario_id']]['cn']) ? $result[$i]['funcionario_id'] : $ldapResult[$result[$i]['funcionario_id']]['cn'],
-                                        'telephoneNumber'       => empty($ldapResult[$result[$i]['funcionario_id']]['telephoneNumber']) ? '': $ldapResult[$result[$i]['funcionario_id']]['telephoneNumber']
-                        );
+
+                        $employee = array();
+
+                        /* user deleted in ldap. Let's try to find him into database 'cache' */
+                        if (empty($ldapResult[$result[$i]['funcionario_id']]['cn'])) {
+                                $entry = $cachedLDAP->getEntryByID($result[$i]['funcionario_id']);
+
+                                $employee['removed'] = is_null($entry['last_update']);
+
+                                if ($entry && !empty($entry['cn']))
+                                        $employee['cn'] = $entry['cn'];
+                                /* we cant find it anywhere */
+                                else
+                                        $employee['cn'] = $result[$i]['funcionario_id'];
+                        }
+                        else
+                                $employee['cn'] = $ldapResult[$result[$i]['funcionario_id']]['cn'];
+
+                        $employee['area']                               = $result[$i]['area'];
+                        $employee['area_id']                    = $result[$i]['area_id'];
+                        $employee['funcionario_id']     = $result[$i]['funcionario_id'];
+                        $employee['telephoneNumber']    = empty($ldapResult[$result[$i]['funcionario_id']]['telephoneNumber']) ? '': $ldapResult[$result[$i]['funcionario_id']]['telephoneNumber'];
+
+                        $employees []= $employee;
                 }