- Add mail_domain to LDAP email entries without @ sign (#1485201)

release-0.6
alecpl 15 years ago
parent 0e2b643ae4
commit ea18c594a5

@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
- Add mail_domain to LDAP email entries without @ sign (#1485201)
- Fix saving empty values in LDAP contact data (#1485781)
- Fix LDAP contact update when RDN field is changed (#1485788)
- Fix LDAP attributes case senitivity problems (#1485830)

@ -570,6 +570,8 @@ class rcube_ldap extends rcube_addressbook
*/
function _ldap2result($rec)
{
global $RCMAIL;
$out = array();
if ($rec['dn'])
@ -577,9 +579,13 @@ class rcube_ldap extends rcube_addressbook
foreach ($this->fieldmap as $rf => $lf)
{
if ($rec[$lf]['count'])
if ($rec[$lf]['count']) {
if ($rf == 'email' && !strpos($rec[$lf][0], '@'))
$out[$rf] = sprintf('%s@%s', $rec[$lf][0] , $RCMAIL->config->mail_domain($_SESSION['imap_host']));
else
$out[$rf] = $rec[$lf][0];
}
}
return $out;
}

Loading…
Cancel
Save