extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 12:51:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

give quota-limit from SMTP/SQL precedence over (cached) quota from Dovecot

Browse Source
This commit is contained in:
Ralf Becker 2017-02-28 18:39:05 +01:00
parent 32a5cdb151
commit 832276f969
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Mail/Account.php
View File

@ -316,6 +316,11 @@ class Account implements \ArrayAccess
$this->imapServer($this->user) && is_a($this->imapServer, __NAMESPACE__.'\\Imap') && $this->imapServer($this->user) && is_a($this->imapServer, __NAMESPACE__.'\\Imap') &&
($data = $this->imapServer->getUserData($GLOBALS['egw']->accounts->id2name($this->user)))) ($data = $this->imapServer->getUserData($GLOBALS['egw']->accounts->id2name($this->user))))
{ {
// give quota-limit from SMTP/SQL precedence over (cached) quota from Dovecot
if (isset($this->params['quotaLimit']) && is_a($this->imapServer, __NAMESPACE__.'\\Imap\\Dovecot'))
{
unset($data['quotaLimit']);
}
$this->params = array_merge($this->params, $data); $this->params = array_merge($this->params, $data);
} }
} }