From c7614649e4312a2f079c5b771316a0fa3a4da821 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 19 Sep 2012 13:20:14 +0200
Subject: [PATCH] Fix date picker format and quick-filter assigments

---
 plugins/tasklist/tasklist.js  | 2 +-
 plugins/tasklist/tasklist.php | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index 1605c49a..49c8b364 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -69,7 +69,7 @@ function rcube_tasklist_ui(settings)
     // general datepicker settings
     var datepicker_settings = {
       // translate from PHP format to datepicker format
-      dateFormat: settings['date_format'].replace(/m/, 'mm').replace(/n/g, 'm').replace(/F/, 'MM').replace(/l/, 'DD').replace(/dd/, 'D').replace(/d/, 'dd').replace(/j/, 'd').replace(/Y/g, 'yy'),
+      dateFormat: settings['date_format'].replace(/M/g, 'm').replace(/mmmmm/, 'MM').replace(/mmm/, 'M').replace(/dddd/, 'DD').replace(/ddd/, 'D').replace(/yy/g, 'y'),
       firstDay : settings['first_day'],
 //      dayNamesMin: settings['days_short'],
 //      monthNames: settings['months'],
diff --git a/plugins/tasklist/tasklist.php b/plugins/tasklist/tasklist.php
index 88eed947..8c584fce 100644
--- a/plugins/tasklist/tasklist.php
+++ b/plugins/tasklist/tasklist.php
@@ -595,6 +595,7 @@ class tasklist extends rcube_plugin
 
         $mask = 0;
         $start = $rec['startdate'] ?: '1900-00-00';
+        $duedate = $rec['date'] ?: '3000-00-00';
 
         if ($rec['flagged'])
             $mask |= self::FILTER_MASK_FLAGGED;
@@ -606,13 +607,13 @@ class tasklist extends rcube_plugin
         else if ($rec['date'] < $today)
             $mask |= self::FILTER_MASK_OVERDUE;
 
-        if ($rec['date'] >= $today && $start <= $today)
+        if ($duedate <= $today || ($rec['startdate'] && $start <= $today))
             $mask |= self::FILTER_MASK_TODAY;
-        if ($rec['date'] >= $tomorrow && $start <= $tomorrow)
+        if ($duedate <= $tomorrow || ($rec['startdate'] && $start <= $tomorrow))
             $mask |= self::FILTER_MASK_TOMORROW;
-        if (($start > $tomorrow || $rec['date'] > $tomorrow) && $rec['date'] <= $weeklimit)
+        if (($start > $tomorrow || $duedate > $tomorrow) && $duedate <= $weeklimit)
             $mask |= self::FILTER_MASK_WEEK;
-        if ($start > $weeklimit || $rec['date'] > $weeklimit)
+        if ($start > $weeklimit || $duedate > $weeklimit)
             $mask |= self::FILTER_MASK_LATER;
 
         return $mask;