extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix folder taglist searches the wrong mail account if it gets called from none active profile

Browse Source
This commit is contained in:
Hadi Nategh 2017-03-14 10:53:50 +01:00
parent 23bf37b98e
commit cbfa9e1d14
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@ class mail_acl
); );
/** /**
* static used define abbrevations for common access rights * static used define abbreviations for common access rights
* *
* @array * @array
* *
@ -42,7 +42,7 @@ class mail_acl
); );
/** /**
* imap object instanciated in constructor for account to edit * imap object instantiated in constructor for account to edit
* *
* @var Mail\Imap * @var Mail\Imap
*/ */
@ -81,7 +81,8 @@ 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']): $content['mailbox'][0]; $mailbox = $_GET['mailbox']? base64_decode($_GET['mailbox']):
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';
@ -89,6 +90,7 @@ class mail_acl
if (!$this->imap->isAdminConnection) if (!$this->imap->isAdminConnection)
{ {
$tmpl->setElementAttribute('mailbox', 'autocomplete_url', 'mail.mail_compose.ajax_searchFolder'); $tmpl->setElementAttribute('mailbox', 'autocomplete_url', 'mail.mail_compose.ajax_searchFolder');
$tmpl->setElementAttribute('mailbox', 'autocomplete_params', array('mailaccount' => $acc_id));
} }
else else
{ {
@ -179,9 +181,6 @@ class mail_acl
//Send message //Send message
Framework::message($msg); Framework::message($msg);
if ($button == "apply") break; if ($button == "apply") break;
//Fall through
case 'cancel':
Framework::window_close(); Framework::window_close();
exit; exit;
@ -428,7 +427,7 @@ class mail_acl
} }
catch (Exception $e) catch (Exception $e)
{ {
error_log(__METHOD__. "Could not delete ACL rights of folder " . $mailbox . " for account ". $identifier ." because of " .$e->getMessage()); error_log(__METHOD__. "Could not delete ACL rights of folder " . $mailbox . " for account ". $identifier ."." .$e->getMessage());
return false; return false;
} }
} }
@ -490,7 +489,7 @@ class mail_acl
catch (Exception $e) catch (Exception $e)
{ {
$msg = $e->getMessage(); $msg = $e->getMessage();
error_log(__METHOD__. "Could not set ACL rights on folder " . $mailbox . " for account ". $identifier . " because of " .$e->getMessage()); error_log(__METHOD__. "Could not set ACL rights on folder " . $mailbox . " for account ". $identifier . "." .$e->getMessage());
return false; return false;
} }
} }
@ -510,7 +509,7 @@ class mail_acl
$acl = $this->imap->getACL($mailbox); $acl = $this->imap->getACL($mailbox);
return $acl; return $acl;
} catch (Exception $e) { } catch (Exception $e) {
error_log(__METHOD__. "Could not get ACL rights from folder " . $mailbox . " because of " .$e->getMessage()); error_log(__METHOD__. "Could not get ACL rights from folder " . $mailbox . "." .$e->getMessage());
return false; return false;
} }
} }