mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-03 04:29:28 +01:00
fix issue with getMailBoxUserName; insufficient assumptions on creating an imap-username from given username or id and logintype
This commit is contained in:
parent
ef07aebbd4
commit
16b94ae4b8
@ -230,6 +230,7 @@ class mail_acl
|
||||
}
|
||||
}
|
||||
$username = $content['grid'][$keys]['acc_id'][0];
|
||||
//error_log(__METHOD__."(".__LINE__.") setACL($content[mailbox], $username, ".array2string($options).", $recursive)");
|
||||
if (is_numeric($username) && ($u = $this->mail_bo->icServer->getMailBoxUserName($username)))
|
||||
{
|
||||
$username = $u;
|
||||
@ -287,7 +288,11 @@ class mail_acl
|
||||
if ($row_num) $row_num = $row_num[0];
|
||||
$recursive = $content['grid'][$row_num]['acl_recursive'];
|
||||
$identifier = $content['grid'][$row_num]['acc_id'][0];
|
||||
|
||||
if (is_numeric($identifier) && ($u = $this->mail_bo->icServer->getMailBoxUserName($identifier)))
|
||||
{
|
||||
$identifier = $u;
|
||||
}
|
||||
//error_log(__METHOD__.__LINE__."(".$content['mailbox'].", ".$identifier.", ".$recursive.")");
|
||||
if(($res = $this->deleteACL($content['mailbox'], $identifier,$recursive)))
|
||||
{
|
||||
unset($content['grid'][$row_num]);
|
||||
|
Loading…
Reference in New Issue
Block a user