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

* Mail/Admin: fix setting ACL or vaction notice from Admin app, if IMAP auth uses email address from account

Browse Source
This commit is contained in:
Ralf Becker 2017-01-31 18:01:08 +01:00
parent 0f066574fc
commit 126116584c
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Mail/Imap.php
View File

@ -1123,7 +1123,7 @@ class Imap extends Horde_Imap_Client_Socket implements Imap\Iface
} }
$username = $this->getMailBoxUserName($_username); $username = $this->getMailBoxUserName($_username);
if($this->loginType == 'vmailmgr' || $this->loginType == 'email' || $this->loginType == 'uidNumber') { if($this->loginType == 'vmailmgr' || $this->loginType == 'uidNumber') {
$username .= '@'. $this->domainName; $username .= '@'. $this->domainName;
} }

1
api/src/Mail/Sieve.php
View File

@ -95,6 +95,7 @@ class Sieve extends Horde\ManageSieve
'user' => $params->isAdminConnection ? $params->acc_imap_admin_username : $params->acc_imap_username, 'user' => $params->isAdminConnection ? $params->acc_imap_admin_username : $params->acc_imap_username,
'password' => $params->isAdminConnection ? $params->acc_imap_admin_password : $params->acc_imap_password, 'password' => $params->isAdminConnection ? $params->acc_imap_admin_password : $params->acc_imap_password,
'euser' => $params->isAdminConnection ? $params->acc_imap_username : null, 'euser' => $params->isAdminConnection ? $params->acc_imap_username : null,
//'logger' => new \admin_mail_logger('/tmp/sieve.log'),
); );
} }
parent::__construct($params); parent::__construct($params);

2
mail/inc/class.mail_acl.inc.php
View File

@ -84,7 +84,7 @@ class mail_acl
$mailbox = $_GET['mailbox']? base64_decode($_GET['mailbox']): $content['mailbox'][0]; $mailbox = $_GET['mailbox']? base64_decode($_GET['mailbox']): $content['mailbox'][0];
if (empty($mailbox)) if (empty($mailbox))
{ {
$mailbox = $this->imap->isAdminConnection ? $this->imap->getUserMailboxString($this->imap->isAdminConnection) : 'INBOX'; $mailbox = $this->imap->isAdminConnection ? $this->imap->getUserMailboxString($account_id) : 'INBOX';
} }
if (!$this->imap->isAdminConnection) if (!$this->imap->isAdminConnection)
{ {