Index: /trunk/contactcenter/inc/class.bo_ldap_manager.inc.php =================================================================== --- /trunk/contactcenter/inc/class.bo_ldap_manager.inc.php (revision 4806) +++ /trunk/contactcenter/inc/class.bo_ldap_manager.inc.php (revision 4838) @@ -57,5 +57,6 @@ 'branch' => $ou, //strtolower('ou'), 'montaDN'=> $subLevels, //$data['cc_ldap_subLevels'], - 'visible'=> $data['cc_ldap_query_automatic'], + 'visible' => $data['cc_ldap_query_automatic'], + 'max_results' => $data['cc_ldap_max_results'], 'recursive' => $data['cc_ldap_recursive'] ) Index: /trunk/contactcenter/inc/class.bo_global_ldap_catalog.inc.php =================================================================== --- /trunk/contactcenter/inc/class.bo_global_ldap_catalog.inc.php (revision 4544) +++ /trunk/contactcenter/inc/class.bo_global_ldap_catalog.inc.php (revision 4838) @@ -534,4 +534,17 @@ } break; + + case 'LIKE and ~=': + if (array_key_exists($rule['field'], $trans_table)) + { + $value = str_replace('%', '*', $rule['value']); + + foreach($trans_table[$rule['field']] as $field) + { + $t[] = '('.$field.'=*'.$value.'*)'.'('.$field.'~='.$value.')'; + } + $return_t[] = '(|'.implode(' ',$t).')'; + } + break; } } @@ -594,4 +607,5 @@ case 'NOT LIKE': case 'NOT iLIKE': + case 'LIKE and ~=': array_push($fields, $restrict_data); break; Index: /trunk/contactcenter/inc/class.ui_data.inc.php =================================================================== --- /trunk/contactcenter/inc/class.ui_data.inc.php (revision 4806) +++ /trunk/contactcenter/inc/class.ui_data.inc.php (revision 4838) @@ -3224,6 +3224,8 @@ array_push($rules, array( 'field' => $data['fields']['search'], - 'type' => 'iLIKE', - 'value' => '%'.$name.'%' + //'type' => 'iLIKE', + //'value' => '%'.$name.'%' + 'type' => 'LIKE and ~=', + 'value' => $name )); } Index: /trunk/contactcenter/templates/default/config.tpl =================================================================== --- /trunk/contactcenter/templates/default/config.tpl (revision 4808) +++ /trunk/contactcenter/templates/default/config.tpl (revision 4838) @@ -90,4 +90,9 @@ +