Changeset 5172 for trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
- Timestamp:
- 11/11/11 16:42:49 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
r5134 r5172 316 316 //$retorno = $retorno_personal + $retorno_global; 317 317 $retorno = array_merge($retorno_personal, $retorno_global); 318 $retorno['search_for'] = $params['search_for']; 318 319 319 $retorno['type_catalog'] = "A"; 320 $retorno['search_for'] = $params['search_for']; 320 321 return $retorno; 321 322 } … … 336 337 $DBService = ServiceLocator::getService('db'); 337 338 $results = $DBService->search_contacts($params['search_for']); 339 $DBService = ServiceLocator::getService('db'); 340 $results2 = $DBService->search_groups($params['search_for']); 341 $results = array_merge($results, $results2); 338 342 339 343 if(!$all) 340 344 $results['type_catalog'] = "P"; 341 $results['search_for'] = $params['search_for'];342 345 343 346 foreach($results as $i=>$value) 344 347 $results[$i]['type_contact'] = "P"; 345 348 349 $results['search_for'] = $params['search_for']; 346 350 return $results; 347 351 } … … 444 448 $info_return['type_catalog'] = "G"; 445 449 446 $info_return['search_for'] = $params['search_for'];447 450 $info_return['extra_ldap_fields'] = $campos_extras; 448 451 449 452 foreach($info_return as $i=>$value) 450 453 $info_return[$i]['type_contact'] = "G"; 454 455 $info_return['search_for'] = $params['search_for']; 451 456 return $info_return; 452 457 }
Note: See TracChangeset
for help on using the changeset viewer.