- Timestamp:
- 11/28/11 14:47:30 (12 years ago)
- Location:
- trunk/expressoMail1_2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
r5202 r5209 268 268 function quicksearchcontact($params) 269 269 { 270 if( $params['Type'] != "undefined" && $params['Type'] != null){270 if(array_key_exists('Type', $params)){ 271 271 return $this->quickSearch($params); 272 272 } … … 351 351 $DBService = ServiceLocator::getService('db'); 352 352 $results = $DBService->search_contacts($params['search_for']); 353 $ DBService = ServiceLocator::getService('db');353 $results2 = array(); 354 354 $results2 = $DBService->search_groups($params['search_for']); 355 $results = array_merge($results, $results2); 355 356 if(is_array($results)){ 357 if(is_array($results2)){ 358 $results = array_merge($results, $results2); 359 } 360 } 361 else if(is_array($results2)){ 362 $results = $results2; 363 } 356 364 357 365 if(!$all) … … 362 370 363 371 $results['search_for'] = $params['search_for']; 372 364 373 return $results; 365 374 } -
trunk/expressoMail1_2/js/common_functions.js
r5198 r5209 611 611 return false; 612 612 } 613 if(Type == = 'undefined')613 if(Type == undefined) 614 614 cExecute ("$this.ldap_functions.quicksearchcontact&search_for="+search_for+"&field="+field+"&ID="+ID, handler_emQuickSearch); 615 615 else
Note: See TracChangeset
for help on using the changeset viewer.