"Tomorrow" filter should not show tasks that are displayed in "Today".

This commit is contained in:
Aleksander Machniak 2016-11-17 12:23:11 +01:00
parent d1daed31b4
commit 755b4fe2dc

View file

@ -1330,9 +1330,9 @@ class tasklist extends rcube_plugin
if (empty($rec['recurrence']) || $duedate < $today || $start > $weeklimit) {
if ($duedate <= $today || ($rec['startdate'] && $start <= $today))
$mask |= self::FILTER_MASK_TODAY;
if ($duedate <= $tomorrow || ($rec['startdate'] && $start <= $tomorrow))
else if (($start > $today && $start <= $tomorrow) || ($duedate > $today && $duedate <= $tomorrow))
$mask |= self::FILTER_MASK_TOMORROW;
if (($start > $tomorrow && $start <= $weeklimit) || ($duedate > $tomorrow && $duedate <= $weeklimit))
else if (($start > $tomorrow && $start <= $weeklimit) || ($duedate > $tomorrow && $duedate <= $weeklimit))
$mask |= self::FILTER_MASK_WEEK;
else if ($start > $weeklimit || $duedate > $weeklimit)
$mask |= self::FILTER_MASK_LATER;