Changeset 3225

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

Location:

branches/2.2/workflow

Files:

• doc/change_log.txt (modified) (1 diff)
• inc/class.CachedLDAP.inc.php (modified) (3 diffs)
• inc/class.so_orgchart.inc.php (modified) (7 diffs)
• inc/local/classes/class.wf_orgchart.php (modified) (4 diffs)

branches/2.2/workflow/doc/change_log.txt

@@ -22 +22 @@
 [2.2.000]
 
+        #1186 - Exibição dos atributos mobile e homePhone, do Ldap, no cartão de visita do organograma (pereira.jair)
+        #1177 - Correção da máscara de ano no componete wf_calendar (adeildosantos)
         #1176 - Otimização da query de busca ldap na classe WorkflowLDAP, e prevenção contra loop infinito (fabianok)
         #1172 - Ajustar a preparação do ambiente do Workflow para chamadas de webservices (asaikawa)

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 */

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

@@ -1104 +1104 @@
                 $cachedLDAP->setOperationMode($cachedLDAP->OPERATION_MODE_LDAP_DATABASE);
 
-                
                 /* here we need fresh information. Let's access ldap first */
                 $employeeEntry = $cachedLDAP->getEntryByID($employeeID);
-                
+
                 if ($entry === false)
                         return array('error' => 'Funcionário não encontrado.');
-                
-                $employeeInfo                           = $orgchart->getEmployee($employeeID);
-                $employeeStatusInfo             = $orgchart->getEmployeeStatus($employeeInfo['funcionario_status_id']);
-                $account_id                             = $_SESSION['phpgw_info']['workflow']['account_id'];
-                $organization_supervisors       = $orgchart->getOrganizationSupervisors($employeeInfo['organizacao_id']);
-                
-                /* 
-                 * Verify the supervisor of the organization
-                 * if the logged user is the supervisor of the selected user
-                 * then will show the mobile and homePhone number.
-                 */ 
+
+                $employeeInfo                           = $orgchart->getEmployee($employeeID);
+                $employeeStatusInfo                     = $orgchart->getEmployeeStatus($employeeInfo['funcionario_status_id']);
+                $account_id                                     = $_SESSION['phpgw_info']['workflow']['account_id'];
+                $organization_supervisors       = $orgchart->getOrganizationSupervisors($employeeInfo['organizacao_id']);
+
+                // Make an array with all supervisors and their substitures
                 $arr_supervisores = array();
                 foreach ($organization_supervisors as $supervisor) {
@@ -1128 +1123 @@
                         }
                 }
-                
+
                 $mobile         = '';
                 $homePhone  = '';
-                
+
+                /*
+                 * Check if the current user can view the mobile and homePhone of the employee
+                 * This condition is true if the current user is a supervisor or is the same user
+                 * that's being retrieved
+                 */
                 if (in_array($account_id,$arr_supervisores) || ($account_id == $employeeID)) {
                         $mobile         = $employeeEntry['mobile'];
                         $homePhone      = $employeeEntry['homephone'];
-                } 
-                
+                }
+
                 $outputInfo[] = array(
                         'name' => 'Mobile',
                         'value' => ( ! empty( $mobile ) ? $mobile : '' ) );
-                        
+
                 $outputInfo[] = array(
                         'name' => 'homePhone',
@@ -1164 +1164 @@
                         'name' => 'UIDNumber',
                         'value' => $employeeID);
-
-                
 
                 $outputInfo[] = array(
@@ -1430 +1428 @@
                 * I'm not supose to be here.. (date validations speaking)
                 * move me to some validation class!
-                */ 
+                */
 
                 /* validating dates */
@@ -1505 +1503 @@
                 $result = $this -> db -> query( $query, array( $areaID, $substituteID, $date_start, $date_end ) );
                 $this->_checkError( $result );
-                
+
                 return ( ( $result === false ) ? false : true );
         }
@@ -1533 +1531 @@
                 $result = $this -> db -> query( $query, array( $substituteID, $date_start, $date_end, $substitutionID ) );
                 $this->_checkError( $result );
-                
+
                 return ( ( $result === false ) ? false : true );
         }
@@ -1575 +1573 @@
          * @param int $organizationID Organization's ID
          * @param int $telephoneID Substitution's ID
-         * @return bool 
+         * @return bool
          * @access public
          */

branches/2.2/workflow/inc/local/classes/class.wf_orgchart.php

@@ -157 +157 @@
                 return $output;
         }
-        
+
         /**
          * Searches for all the supervisors of an organization.
          *
-         * This method will search in table areas for all the supervisors and replacement in the organization., todas as áreas que pertencem à organização solicitada.
+         * This method will search in table areas for all the supervisors and replacement in the organization.
          * @param int $organizationID the ID of the Organization.
          * @return array Uma array seqüencial contendo as áreas de uma organização e seus titulares e substitutos. Cada linha do array conterá:
@@ -170 +170 @@
          */
         function getOrganizationSupervisors($organizationID) {
-                $query = "  SELECT 
-                                                a.titular_funcionario_id, 
-                                                s.funcionario_id as substituto_funcionario_id, 
+                $query = "  SELECT
+                                                a.titular_funcionario_id,
+                                                s.funcionario_id as substituto_funcionario_id,
                                                 a.area_id
-                                        FROM 
-                                                area a 
-                                                LEFT OUTER JOIN substituicao s 
+                                        FROM
+                                                area a
+                                                LEFT OUTER JOIN substituicao s
                                                 ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim))
-                                        WHERE 
-                                                a.titular_funcionario_id is not null 
-                                                and a.ativa = 'S' 
-                                                AND organizacao_id = ?
-                                        GROUP BY 
+                                        WHERE
+                                                a.titular_funcionario_id is not null
+                                                and a.ativa = 'S'
+                                                AND a.organizacao_id = ?
+                                        GROUP BY
                                                 a.titular_funcionario_id,
-                                                s.funcionario_id, 
+                                                s.funcionario_id,
                                                 a.area_id";
                 $result = $this->db->query($query, array($organizationID));
@@ -518 +518 @@
                 return $output;
         }
-        
+
         /**
          * Return all areas that the employee is a supervisor.
-         * 
+         *
          * Search in the organization for all areas that the employee is a supervisor.
          * @param int $employeeID The ID of employee
@@ -533 +533 @@
                 }
 
-                $query = "SELECT 
+                $query = "SELECT
                                                 a.area_id
-                                        FROM 
-                                                area a 
-                                                LEFT OUTER JOIN substituicao s ON ((a.area_id = s.area_id) 
-                                                AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) 
-                                        WHERE 
-                                                a.titular_funcionario_id = ? OR 
+                                        FROM
+                                                area a
+                                                LEFT OUTER JOIN substituicao s ON ((a.area_id = s.area_id)
+                                                AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim))
+                                        WHERE
+                                                a.titular_funcionario_id = ? OR
                                                 s.funcionario_id = ?
                                         GROUP BY
                                                 a.area_id";
-                
+
                 $result = $this->db->query($query, array($employeeID,$employeeID));
                 if (!$result)
                         return false;
-                
+
                 $output = $result->GetArray(-1);
                 return $output;