Changeset 3225 for branches/2.2/workflow/inc/class.so_orgchart.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.so_orgchart.inc.php (modified) (7 diffs)

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