extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01: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

7
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') &&
($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);
}
}
@ -1266,7 +1271,7 @@ class Account implements \ArrayAccess
{
Credentials::delete($data['acc_id'], $data['account_id'][0], Credentials::SMIME);
}
// store or delete admin credentials
if ($data['acc_imap_admin_username'] && $data['acc_imap_admin_password'])
{