Changeset 3210 for branches/2.0
- Timestamp:
- 09/02/10 11:51:12 (14 years ago)
- Location:
- branches/2.0/contactcenter/inc
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.0/contactcenter/inc/class.bo_catalog_group_catalog.inc.php
r285 r3210 71 71 72 72 */ 73 function find($what, $rules, $other )73 function find($what, $rules, $other, $recursive=false) 74 74 { 75 75 if ($ldap_info = $this->catalog['ldap']) 76 76 { 77 77 $meta_catalog =& CreateObject('contactcenter.bo_global_ldap_catalog',$ldap_info['id_source'], $ldap_info['context'], $this->external); 78 return $meta_catalog->find($what, $rules, $other );78 return $meta_catalog->find($what, $rules, $other, $recursive); 79 79 } 80 80 … … 95 95 } 96 96 97 $temp_res = $this->bo_contactcenter->catalog->find($what, $rules, $other );97 $temp_res = $this->bo_contactcenter->catalog->find($what, $rules, $other, $recursive); 98 98 if (is_array($temp_res) and count($temp_res)) 99 99 { -
branches/2.0/contactcenter/inc/class.bo_contactcenter.inc.php
r752 r3210 206 206 207 207 */ 208 function find($what, $rules=false, $other=false )209 { 210 return $this->catalog->find($what, $rules, $other );208 function find($what, $rules=false, $other=false, $recursive=false) 209 { 210 return $this->catalog->find($what, $rules, $other, $recursive); 211 211 } 212 212 -
branches/2.0/contactcenter/inc/class.bo_global_ldap_catalog.inc.php
r3134 r3210 115 115 116 116 */ 117 function find($what, $rules=false, $other=false )117 function find($what, $rules=false, $other=false, $recursive=false) 118 118 { 119 119 $restric_fields = $this->get_restrictions_without_branch($rules); … … 138 138 { 139 139 $ldap = $GLOBALS['phpgw']->common->ldapConnect($this->src_info['host'], $this->src_info['acc'], $this->src_info['pw'], true); 140 $result_r = ldap_search($ldap , $this->src_info['context'], $filter, $fields, 0, $this->src_info['max_results']); 140 $result_r = $recursive ? ldap_search($ldap , $this->src_info['context'], $filter, $fields, 0, $this->src_info['max_results']) : 141 ldap_list($ldap , $this->src_info['context'], $filter, $fields, 0, $this->src_info['max_results']); 141 142 } 142 143 else -
branches/2.0/contactcenter/inc/class.ui_data.inc.php
r3197 r3210 964 964 } 965 965 966 $result = $this->bo->find($find_field[0],$find_restric[0],$find_other[0] );966 $result = $this->bo->find($find_field[0],$find_restric[0],$find_other[0], $data['search_for'] != null); 967 967 968 968 $n_entries = count($result); … … 1210 1210 $final[3][$i][0] = $contact['companies']['company1']['company_name']?$contact['companies']['company1']['company_name']:'none'; 1211 1211 if($this->page_info['actual_catalog']['class']!='bo_global_ldap_catalog'){ 1212 $final[3][$i][1] = $contact['names_ordered'] ? urldecode( $contact['names_ordered']) : 'none';1212 $final[3][$i][1] = $contact['names_ordered'] ? urldecode(is_array($contact['names_ordered']) ? $contact['names_ordered'][0] : $contact['names_ordered']) : 'none'; 1213 1213 } 1214 1214 else { … … 2378 2378 //'contact.account_status', 2379 2379 'contact.account_visible' 2380 ), $rules, array('order' => $data['fields']['search'], 'sort' => 'ASC') );2380 ), $rules, array('order' => $data['fields']['search'], 'sort' => 'ASC'), $data['search_for'] != null); 2381 2381 } 2382 2382
Note: See TracChangeset
for help on using the changeset viewer.