mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-28 10:53:39 +01:00
* Mail/Sieve: fix vacation notice activated by date does not work if the start date is set in future
This commit is contained in:
parent
f6d6a6a065
commit
7e89783c9f
@ -427,8 +427,7 @@ class Script
|
|||||||
$defaultaddr = $sieve->user . '@' . $sieve->maildomain;
|
$defaultaddr = $sieve->user . '@' . $sieve->maildomain;
|
||||||
array_push($vacation['addresses'],$defaultaddr);
|
array_push($vacation['addresses'],$defaultaddr);
|
||||||
}
|
}
|
||||||
if (($vacation['status'] == 'on' && strlen(trim($vacation['text']))>0)|| $vacation['status'] == 'by_date' &&
|
if (($vacation['status'] == 'on' && strlen(trim($vacation['text']))>0)|| $vacation['status'] == 'by_date') // +24*3600 to include the end_date day
|
||||||
$vacation['start_date'] <= time() && time() < $vacation['end_date']+24*3600) // +24*3600 to include the end_date day
|
|
||||||
{
|
{
|
||||||
$vacation_active = true;
|
$vacation_active = true;
|
||||||
if ($vacation['text'])
|
if ($vacation['text'])
|
||||||
|
Loading…
Reference in New Issue
Block a user