From 9db4aeaf7e5a715af2261363b2694b62e4a671e4 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Thu, 17 Apr 2014 18:40:35 +0200
Subject: [PATCH] Fix 'next 7 days' filter (#3000)

---
 plugins/tasklist/tasklist.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/tasklist/tasklist.php b/plugins/tasklist/tasklist.php
index aae960ab..9532c619 100644
--- a/plugins/tasklist/tasklist.php
+++ b/plugins/tasklist/tasklist.php
@@ -756,9 +756,9 @@ class tasklist extends rcube_plugin
             $mask |= self::FILTER_MASK_TODAY;
         if ($duedate <= $tomorrow || ($rec['startdate'] && $start <= $tomorrow))
             $mask |= self::FILTER_MASK_TOMORROW;
-        if ($start > $tomorrow || ($duedate > $tomorrow && $duedate <= $weeklimit))
+        if (($start > $tomorrow && $start <= $weeklimit) || ($duedate > $tomorrow && $duedate <= $weeklimit))
             $mask |= self::FILTER_MASK_WEEK;
-        if ($start > $weeklimit || ($rec['date'] && $duedate > $weeklimit))
+        else if ($start > $weeklimit || ($rec['date'] && $duedate > $weeklimit))
             $mask |= self::FILTER_MASK_LATER;
 
         return $mask;