Changeset 6459 for trunk/expressoMail1_2/inc
- Timestamp:
- 06/11/12 18:05:43 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
r6139 r6459 436 436 $ldapService->connection = $this->ds; 437 437 $campos_extras = ''; 438 $justthese = array("cn", "mail", "telephonenumber", "mobile", "phpgwaccountvisible", "uid", "employeenumber", "ou" );438 $justthese = array("cn", "mail", "telephonenumber", "mobile", "phpgwaccountvisible", "uid", "employeenumber", "ou","vacationActive","vacationInfo"); 439 439 foreach($searchable_fields as $fields_ldap => $value_field) 440 440 { … … 473 473 $this->ldapConnect(true,$i); 474 474 $filter="(|(cn=*$search_for*)(mail=*$search_for*))"; 475 $justthese = array("cn", "mail", "telephoneNumber", "mobile", "phpgwAccountVisible", "uid","employeeNumber", "ou" );475 $justthese = array("cn", "mail", "telephoneNumber", "mobile", "phpgwAccountVisible", "uid","employeeNumber", "ou","vacationActive","vacationInfo"); 476 476 $sr=@ldap_search($this->ds, $this->ldap_context, $filter, $justthese, 0, $this->max_result+1); 477 477 if(!$sr) … … 496 496 497 497 $info_return['search_for'] = $params['search_for']; 498 return $ info_return;498 return $this->toISO8859($info_return); 499 499 } 500 500 501 /*Converte um parametro de UTF-8 para ISO8859*/ 502 function toISO8859($data) 503 { 504 if(!is_array($data)) 505 return mb_convert_encoding( $data , 'ISO-8859-1' , 'UTF-8 , ISO-8859-1' ); 506 $return = array(); 507 foreach ($data as $i => $v) 508 $return[$this->toISO8859($i)] = $this->toISO8859($v); 509 return $return; 510 } 511 501 512 function make_quicksearch_card($info, $cn) 502 513 {
Note: See TracChangeset
for help on using the changeset viewer.