git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10511
7612ce4b-ef26-0410-bec9-
ea0150e637f0
Issue is specific to sqBodyWrap() and string function wrappers introduced in
1.5.1.
- MagicHTML fix for comments in styles.
Issue is specific to sqBodyWrap() and string function wrappers introduced in
1.5.1.
- MagicHTML fix for comments in styles.
+ - Added 'mail' and 'sn' attributes to address book LDAP backend search
+ expression (#1368154).
Version 1.5.0 - 2 February 2004
-------------------------------
Version 1.5.0 - 2 February 2004
-------------------------------
/* Convert search from user's charset to the one used in ldap */
$expr = $this->charset_encode($expr);
/* Convert search from user's charset to the one used in ldap */
$expr = $this->charset_encode($expr);
- /* Make sure that search does not contain ldap special chars */
- $expression = '(cn=*' . $this->ldapspecialchars($expr) . '*)';
+ /* sanitize search string */
+ $expr = $this->ldapspecialchars($expr);
+
+ /* Search for same string in cn, main and sn */
+ $expression = '(|(cn=*'.$expr.'*)(mail=*'.$expr.'*)(sn=*'.$expr.'*))';
/* Undo sanitizing of * symbol */
$expression = str_replace('\2a','*',$expression);
/* Undo sanitizing of * symbol */
$expression = str_replace('\2a','*',$expression);
- /* TODO: implement any single character (?) matching */
}
/* Add search filtering */
}
/* Add search filtering */