extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-26 15:59:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

* eMail/UCS: fix setting of mailbox ACL for IMAP login-type "email"

Browse Source
This commit is contained in:
Ralf Becker 2016-07-26 14:51:18 +02:00
parent bf3c3d9499
commit aa16561fe5
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1050,7 +1050,7 @@ class Imap extends Horde_Imap_Client_Socket implements Imap\Iface
{ {
if (is_numeric($_username)) if (is_numeric($_username))
{ {
$_username = $GLOBALS['egw']->accounts->id2name($_username); $_username = $GLOBALS['egw']->accounts->id2name($accountID=$_username);
} }
else else
{ {
@ -1059,16 +1059,7 @@ class Imap extends Horde_Imap_Client_Socket implements Imap\Iface
switch ($this->loginType) switch ($this->loginType)
{ {
case 'email': case 'email':
$accountemail = $GLOBALS['egw']->accounts->id2name($accountID,'account_email'); $_username = $GLOBALS['egw']->accounts->id2name($accountID,'account_email');
//$accountemail = $GLOBALS['egw']->accounts->read($GLOBALS['egw']->accounts->name2id($_username,'account_email'));
if (!empty($accountemail))
{
list($lusername,$domain) = explode('@',$accountemail,2);
if (strtolower($domain) == strtolower($this->domainName) && !empty($lusername))
{
$_username = $lusername;
}
}
break; break;
case 'vmailmgr': case 'vmailmgr':
@ -1078,6 +1069,7 @@ class Imap extends Horde_Imap_Client_Socket implements Imap\Iface
case 'uidNumber': case 'uidNumber':
$_username = 'u'.$accountID; $_username = 'u'.$accountID;
break; break;
default: default:
if (empty($this->loginType)) if (empty($this->loginType))
{ {
@ -1104,11 +1096,6 @@ class Imap extends Horde_Imap_Client_Socket implements Imap\Iface
{ {
case 'email': case 'email':
$account_id = $GLOBALS['egw']->accounts->name2id($_username, 'account_email'); $account_id = $GLOBALS['egw']->accounts->name2id($_username, 'account_email');
if (!$account_id)
{
list($uid) = explode('@', $_username);
$account_id = $GLOBALS['egw']->accounts->name2id($uid, 'account_lid');
}
break; break;
case 'uidNumber': case 'uidNumber':