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

only ask IMAP for getUserData, if quota is needed

Browse Source 
specially imported for managementserver_imap who needs to ask mserver
This commit is contained in:
Ralf Becker 2019-07-03 14:13:53 +02:00
parent d9ec6bf3e1
commit 690a19c77e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,9 +299,10 @@ class Account implements \ArrayAccess
/** /**
* Query quota, aliases, forwards, ... from imap and smtp backends and sets them as parameters on current object * Query quota, aliases, forwards, ... from imap and smtp backends and sets them as parameters on current object
* *
* @param boolean $need_quota =true false: qutoa not needed, do NOT query IMAP server
* @return array with values for keys in self::$user_data * @return array with values for keys in self::$user_data
*/ */
public function getUserData() public function getUserData($need_quota=true)
{ {
if ($this->acc_smtp_type != __NAMESPACE__.'\\Smtp' && $this->smtpServer() && if ($this->acc_smtp_type != __NAMESPACE__.'\\Smtp' && $this->smtpServer() &&
($smtp_data = $this->smtpServer->getUserData($this->user))) ($smtp_data = $this->smtpServer->getUserData($this->user)))
@ -312,7 +313,7 @@ class Account implements \ArrayAccess
try { try {
if ($this->acc_imap_type != __NAMESPACE__.'\\Imap' && if ($this->acc_imap_type != __NAMESPACE__.'\\Imap' &&
// do NOT query IMAP server, if we are in forward-only delivery-mode, imap will NOT answer, as switched off for that account! // do NOT query IMAP server, if we are in forward-only delivery-mode, imap will NOT answer, as switched off for that account!
$this->params['deliveryMode'] != Smtp::FORWARD_ONLY && $this->params['deliveryMode'] != Smtp::FORWARD_ONLY && $need_quota &&
$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))))
{ {
@ -407,7 +408,7 @@ class Account implements \ArrayAccess
return false; // no imap host or credentials return false; // no imap host or credentials
} }
// if we are not managing the mail-server, we do NOT need to check deliveryMode and accountStatus // if we are not managing the mail-server, we do NOT need to check deliveryMode and accountStatus
if ($this->acc_smtp_type == __NAMESPACE__.'\\Smtp') if ($this->acc_smtp_type == __NAMESPACE__.'\\Imap')
{ {
return true; return true;
} }
@ -833,7 +834,8 @@ class Account implements \ArrayAccess
// if user-data is requested, check if it is already loaded and load it if not // if user-data is requested, check if it is already loaded and load it if not
if (in_array($name, self::$user_data) && !array_key_exists($name, $this->params)) if (in_array($name, self::$user_data) && !array_key_exists($name, $this->params))
{ {
$this->getUserData(); // let getUserData "know" if we are interested in quota (requiring IMAP login) or not
$this->getUserData(substr($name, 0, 5) === 'quota');
} }
return $this->params[$name]; return $this->params[$name];
} }