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

basic check for sieve capability allows for empty acc_sieve_host -> fallback to acc_imap_host

Browse Source
This commit is contained in:
Klaus Leithoff 2014-04-07 12:52:50 +00:00
parent 0113cd678c
commit acd782c287
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mail/inc/class.mail_ui.inc.php
View File

@ -2439,7 +2439,7 @@ unset($query['actions']);
*/ */
function gatherVacation() function gatherVacation()
{ {
$vacation = $this->mail_bo->icServer->acc_sieve_enabled && $this->mail_bo->icServer->acc_sieve_host; $vacation = $this->mail_bo->icServer->acc_sieve_enabled && ($this->mail_bo->icServer->acc_sieve_host||$this->mail_bo->icServer->acc_imap_host);
//error_log(__METHOD__.__LINE__.' Server:'.self::$icServerID.' Sieve Enabled:'.array2string($vacation)); //error_log(__METHOD__.__LINE__.' Server:'.self::$icServerID.' Sieve Enabled:'.array2string($vacation));
if($vacation) { if($vacation) {
$sieveServerClass = mail_bo::getInstance(false, self::$icServerID, false, $oldIMAPObject=true); $sieveServerClass = mail_bo::getInstance(false, self::$icServerID, false, $oldIMAPObject=true);
@ -2456,6 +2456,7 @@ unset($query['actions']);
$vacation = false; $vacation = false;
} }
} }
//error_log(__METHOD__.__LINE__.' Server:'.self::$icServerID.' Vacation retrieved:'.array2string($vacation));
} }
return $vacation; return $vacation;
} }