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

* Mail: fix mail acl can't save or retrieve after changing mailbox via folder selectbox

Browse Source
This commit is contained in:
Hadi Nategh 2020-01-31 15:03:56 +01:00
parent c2bd211123
commit 23449272e2
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,7 +108,7 @@ class mail_acl
/** /**
* Edit folder ACLs of account(s) * Edit folder ACLs of account(s)
* *
* @param string $content = null * @param array $content = null
* @param string $msg = '' * @param string $msg = ''
* *
*/ */
@ -132,8 +132,7 @@ class mail_acl
$account = Mail\Account::read($acc_id, $account_id); $account = Mail\Account::read($acc_id, $account_id);
$this->imap = $account->imapServer(isset($account_id) ? (int)$account_id : false); $this->imap = $account->imapServer(isset($account_id) ? (int)$account_id : false);
$mailbox = $_GET['mailbox']? base64_decode($_GET['mailbox']): $mailbox = $_GET['mailbox']? base64_decode($_GET['mailbox']): self::_extract_mailbox($content['mailbox'], $acc_id);
preg_replace("/^".$acc_id."::/",'',$content['mailbox'][0]);
if (empty($mailbox)) if (empty($mailbox))
{ {
$mailbox = $this->imap->isAdminConnection ? $this->imap->getUserMailboxString($account_id) : 'INBOX'; $mailbox = $this->imap->isAdminConnection ? $this->imap->getUserMailboxString($account_id) : 'INBOX';
@ -148,7 +147,7 @@ class mail_acl
//Todo: Implement autocomplete_url function with admin stuffs consideration //Todo: Implement autocomplete_url function with admin stuffs consideration
} }
// Unset the content if folder is changed, in order to read acl rights for new selected folder // Unset the content if folder is changed, in order to read acl rights for new selected folder
if (!is_array($content['button']) && is_array($content['mailbox']) && !is_array($content['grid']['delete'])) unset($content); if (!is_array($content['button']) && self::_extract_mailbox($content['mailbox'], $acc_id) && !is_array($content['grid']['delete'])) unset($content);
if (!is_array($content)) if (!is_array($content))
{ {
@ -210,13 +209,15 @@ class mail_acl
{ {
$button = 'delete'; $button = 'delete';
} }
$data = $content;
$data['mailbox'] = self::_extract_mailbox($content['mailbox'], $acc_id);
switch ($button) switch ($button)
{ {
case 'save': case 'save':
case 'apply': case 'apply':
if ($content) if ($content)
{ {
$validation_err = $this->update_acl($content,$msg); $validation_err = $this->update_acl($data,$msg);
if ($validation_err) if ($validation_err)
{ {
foreach ($validation_err as &$row) foreach ($validation_err as &$row)
@ -240,7 +241,7 @@ class mail_acl
exit; exit;
case 'delete': case 'delete':
$aclRvmCnt = $this->remove_acl($content, $msg); $aclRvmCnt = $this->remove_acl($data, $msg);
if (is_array($aclRvmCnt)) if (is_array($aclRvmCnt))
{ {
$content['grid'] = $aclRvmCnt; $content['grid'] = $aclRvmCnt;
@ -337,10 +338,9 @@ class mail_acl
* Update ACL rights of a folder or including subfolders for an account(s) * Update ACL rights of a folder or including subfolders for an account(s)
* *
* @param array $content content including the acl rights * @param array $content content including the acl rights
* @param Boolean $recursive boolean flag FALSE|TRUE. If it is FALSE, only the folder take in to account, but in case of TRUE
* the mailbox including all its subfolders will be considered.
* @param string $msg Message * @param string $msg Message
* *
* @return Array | void return array of validation messages or nothing
*/ */
function update_acl ($content, &$msg) function update_acl ($content, &$msg)
{ {
@ -401,6 +401,10 @@ class mail_acl
/** /**
* Retrieve Folder ACL rights * Retrieve Folder ACL rights
* @param string $mailbox
* @param string &$msg
*
* @return Array | Boolean returns array of acl or false on failure
* @todo rights 'c' and 'd' should be fixed * @todo rights 'c' and 'd' should be fixed
*/ */
function retrieve_acl ($mailbox, &$msg) function retrieve_acl ($mailbox, &$msg)
@ -425,7 +429,7 @@ class mail_acl
* @param Array $content content array of popup window * @param Array $content content array of popup window
* @param string $msg message * @param string $msg message
* *
* @return Array An array as new content for grid * @return Array | Boolean An array as new content for grid or false in case of error
*/ */
function remove_acl($content, &$msg) function remove_acl($content, &$msg)
{ {
@ -562,14 +566,13 @@ class mail_acl
* Get ACL rights of a folder from an account * Get ACL rights of a folder from an account
* *
* @param String $mailbox folder name that needs to be read * @param String $mailbox folder name that needs to be read
* @return Boolean FALSE in case of any exceptions and if TRUE in case of success, * @return Array|Boolean FALSE in case of any exceptions and returns Array in case of success,
*/ */
function getACL ($mailbox) function getACL ($mailbox)
{ {
try try
{ {
$acl = $this->imap->getACL($mailbox); return $this->imap->getACL($mailbox);
return $acl;
} catch (Exception $e) { } catch (Exception $e) {
error_log(__METHOD__. "Could not get ACL rights from folder " . $mailbox . "." .$e->getMessage()); error_log(__METHOD__. "Could not get ACL rights from folder " . $mailbox . "." .$e->getMessage());
return false; return false;
@ -587,4 +590,16 @@ class mail_acl
{ {
return is_array($acc_id)?$acc_id[0]:$acc_id; return is_array($acc_id)?$acc_id[0]:$acc_id;
} }
/**
* @param string | array $mailbox
* @param string $acc_id
*
* @return string | NULL return sanitate mailbox of acc id and delimiter and return it as string
*/
private static function _extract_mailbox ($mailbox, $acc_id)
{
$mailbox = is_array($mailbox) ? $mailbox[0] : $mailbox;
return preg_replace("/^".$acc_id."::/",'', $mailbox);
}
} }