From 272521ba87f0438ee6d4876a91f4ba97e54237f6 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 18 Nov 2014 14:46:44 +0000 Subject: [PATCH] only display "Vacation notice is active" message, if it is active or by a date in future --- mail/inc/class.mail_ui.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index e82832a3b9..2c26bfe847 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -433,7 +433,7 @@ class mail_ui $vacation = false;//$this->gatherVacation(); //error_log(__METHOD__.__LINE__.' Server:'.self::$icServerID.' Sieve Enabled:'.array2string($vacation)); if($vacation) { - if (is_array($vacation) && ($vacation['status'] == 'on' || $vacation['status']=='by_date')) + if (is_array($vacation) && ($vacation['status'] == 'on' || $vacation['status']=='by_date' && $vacation['end_date'] > time())) { $dtfrmt = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat']/*.' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat']!='24'?'h:i a':'H:i')*/; $content[self::$nm_index]['vacationnotice'] = $sel_options[self::$nm_index]['vacationnotice'] = lang('Vacation notice is active');