extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix issue with getMailBoxUserName; insufficient assumptions on creating an imap-username from given username or id and logintype

Browse Source
This commit is contained in:
Klaus Leithoff 2014-05-15 14:33:27 +00:00
parent ef07aebbd4
commit 16b94ae4b8
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,6 +230,7 @@ class mail_acl
} }
} }
$username = $content['grid'][$keys]['acc_id'][0]; $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))) if (is_numeric($username) && ($u = $this->mail_bo->icServer->getMailBoxUserName($username)))
{ {
$username = $u; $username = $u;
@ -287,7 +288,11 @@ class mail_acl
if ($row_num) $row_num = $row_num[0]; if ($row_num) $row_num = $row_num[0];
$recursive = $content['grid'][$row_num]['acl_recursive']; $recursive = $content['grid'][$row_num]['acl_recursive'];
$identifier = $content['grid'][$row_num]['acc_id'][0]; $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))) if(($res = $this->deleteACL($content['mailbox'], $identifier,$recursive)))
{ {
unset($content['grid'][$row_num]); unset($content['grid'][$row_num]);