holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Mail/ActiveDirectory: fix empty identity in mail compose and account not active in AD controled mail-server

Browse Source
This commit is contained in:
Ralf Becker 2017-07-05 17:55:08 +02:00
parent 637b579637
commit 0528b72744
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/Mail/Smtp/Ldap.php
View File

@ -429,7 +429,7 @@ class Ldap extends Mail\Smtp
if (static::FORWARD_ONLY_ATTR)
{
// Univention has no extra forward-only attr, but requires primary mail to be in forwards, to have also local delivery
if (static::FORWARD_ONLY_ATTR === static::FORWARD_ATTR)
if (static::FORWARD_ONLY_ATTR === static::FORWARD_ATTR && !static::FORWARD_PREFIX)
{
$deliveryMode = '';
if ($values[static::FORWARD_ATTR])
@ -516,6 +516,7 @@ class Ldap extends Mail\Smtp
($k = array_search($userData['mailLocalAddress'],$userData['mailAlternateAddress'])) !== false)
{
unset($userData['mailAlternateAddress'][$k]);
$userData['mailAlternateAddress'] = array_values($userData['mailAlternateAddress']);
}
if (static::QUOTA_ATTR && isset($values[static::QUOTA_ATTR]))