extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-16 13:03:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

backport: its quicker to try to connect, assuming that we want to do it anyway, instead of reading userdata

Browse Source
This commit is contained in:
Klaus Leithoff 2014-09-26 08:27:24 +00:00
parent 338c625180
commit 38c2d730f4
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
emailadmin/inc/class.emailadmin_account.inc.php
View File

@ -308,13 +308,35 @@ class emailadmin_account implements ArrayAccess
*
* Checks if an imap host, username and for managaged mail-servers accountStatus="active" and NOT deliveryMode="forwardOnly" is set
*
* return boolean
* @param boolean $try_connect =true true: try connecting for validation, false: read user-data to determine it's imap
* (matters only for imap servers managed by EGroupware!)
* @return boolean
*/
public function is_imap()
public function is_imap($try_connect=true)
{
return !empty($this->acc_imap_host) && !empty($this->acc_imap_username) && !empty($this->acc_imap_password) &&
($this->acc_smtp_type == 'emailadmin_smtp' ||
$this->deliveryMode != emailadmin_smtp::FORWARD_ONLY && $this->accountStatus == emailadmin_smtp::MAIL_ENABLED);
if (empty($this->acc_imap_host) || empty($this->acc_imap_username) || empty($this->acc_imap_password))
{
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 ($this->acc_smtp_type == 'emailadmin_smtp')
{
return true;
}
// it is quicker to try connection, assuming we want to do that anyway, instead of reading user-data
if ($try_connect)
{
// as querying user-data is a lot slower then just trying to connect, and we need probably need to connect anyway, we try that
$imap = $this->imapserver();
try {
$imap->login();
return true;
}
catch (Exception $ex) {
unset($ex);
}
}
return $this->deliveryMode != emailadmin_smtp::FORWARD_ONLY && $this->accountStatus == emailadmin_smtp::MAIL_ENABLED;
}
/**