diff options
Diffstat (limited to 'program/lib/Roundcube/rcube_ldap_generic.php')
| -rw-r--r-- | program/lib/Roundcube/rcube_ldap_generic.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_ldap_generic.php b/program/lib/Roundcube/rcube_ldap_generic.php index 40adbedbe..abe16760d 100644 --- a/program/lib/Roundcube/rcube_ldap_generic.php +++ b/program/lib/Roundcube/rcube_ldap_generic.php @@ -336,7 +336,8 @@ class rcube_ldap_generic extends Net_LDAP3 } $groups = array(); - $words = rcube_utils::tokenize_string($value, 1); + $value = str_replace('*', '', $value); + $words = $mode == 0 ? rcube_utils::tokenize_string($value, 1) : array($value); // set wildcards $wp = $ws = ''; @@ -354,7 +355,7 @@ class rcube_ldap_generic extends Net_LDAP3 $groups[] = '(|' . join('', $parts) . ')'; } - return empty($groups) ? '' : '(&' . join('', $groups) . ')'; + return count($groups) > 1 ? '(&' . join('', $groups) . ')' : join('', $groups); } } |