From: <lei...@us...> - 2011-12-21 15:18:44
|
Author: leithoff Date: Wed Dec 21 16:19:02 2011 New Revision: 37575 URL: http://svn.stylite.de/viewvc/egroupware?rev=37575&view=rev Log: fix to fetch Vacation part of sieve script when vacation is active (seen when using dovecot) Modified: trunk/felamimail/inc/class.uifelamimail.inc.php Modified: trunk/felamimail/inc/class.uifelamimail.inc.php URL: http://svn.stylite.de/viewvc/egroupware/trunk/felamimail/inc/class.uifelamimail.inc.php?rev=37575&r1=37574&r2=37575&view=diff ============================================================================== --- trunk/felamimail/inc/class.uifelamimail.inc.php (original) +++ trunk/felamimail/inc/class.uifelamimail.inc.php Wed Dec 21 16:19:02 2011 @@ -761,6 +761,8 @@ $this->t->set_var('reloadView',$refreshURL); // display a warning if vacation notice is active if(($imapServer instanceof defaultimap) && $imapServer->enableSieve) { + $scriptName = (!empty($GLOBALS['egw_info']['user']['preferences']['felamimail']['sieveScriptName'])) ? $GLOBALS['egw_info']['user']['preferences']['felamimail']['sieveScriptName'] : 'felamimail'; + $imapServer->getScript($scriptName); $imapServer->retrieveRules($imapServer->scriptName); $vacation = $imapServer->getVacation($imapServer->scriptName); //_debug_array($vacation); |