- Timestamp:
- 11/03/11 11:17:35 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/contactcenter/inc/class.bo_global_ldap_catalog.inc.php
r4838 r5131 127 127 } 128 128 129 if(!((strlen($find) == 2 && substr($find, -1) == '%') || $find == '%' ) )129 if(!((strlen($find) == 2 && substr($find, -1) == '%') || $find == '%' ) && !$this->external) 130 130 return $this->findAddress($find,$other); 131 131 … … 160 160 $ldap = $GLOBALS['phpgw']->common->ldapConnect($this->src_info['host'], $this->src_info['acc'], $this->src_info['pw'], true); 161 161 $result_r = $recursive ? ldap_search($ldap , $this->src_info['context'], $filter, $fields, 0, $this->src_info['max_results']) : 162 ldap_list($ldap , $this->src_info['context'], $filter, $fields, 0, $this->src_info['max_results']); 162 //Traz apenas 10 resultados, 163 //ldap_list($ldap , $this->src_info['context'], $filter, $fields, 0, $this->src_info['max_results']); 164 //Traz todos os usuários 165 ldap_list($ldap , $this->src_info['context'], $filter, $fields, 0, 0); 163 166 164 167 if (!$result_r) … … 350 353 351 354 */ 352 function process_restrictions( $rules, &$trans_table, $join_type='&' )355 function process_restrictions( &$rules, &$trans_table, $join_type='&' ) 353 356 { 354 357 if (!is_array($rules) or !count($rules)) … … 832 835 case 'connections': 833 836 $preferences = ExecMethod('contactcenter.ui_preferences.get_preferences'); 834 if (!is_array($preferences)) 835 { 836 $preferences['personCardEmail'] = 1; 837 $preferences['personCardPhone'] = 2; 838 } 837 838 if(!array_key_exists('personCardEmail', $preferences)) $preferences['personCardEmail'] = 1; 839 if(!array_key_exists('personCardPhone', $preferences)) $preferences['personCardPhone'] = 2; 840 839 841 unset($l_fields); 840 842 $l_fields['connection_name'] = $this->trans_table['contact.connection.connection_name'];
Note: See TracChangeset
for help on using the changeset viewer.