From 6edb31493140164fa29a8b948bc6a3ea38fdf9b1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 23 Feb 2011 10:59:12 +0000
Subject: [PATCH] * correctly parsing of "time-range" REPORT filter, giving a
 SQL error before because it requires comparing as unix timestamp not strings

---
 infolog/inc/class.infolog_groupdav.inc.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/infolog/inc/class.infolog_groupdav.inc.php b/infolog/inc/class.infolog_groupdav.inc.php
index 51509c4356..5e92564171 100644
--- a/infolog/inc/class.infolog_groupdav.inc.php
+++ b/infolog/inc/class.infolog_groupdav.inc.php
@@ -11,6 +11,8 @@
  * @version $Id$
  */
 
+require_once EGW_SERVER_ROOT.'/phpgwapi/inc/horde/lib/core.php';
+
 /**
  * eGroupWare: GroupDAV access: infolog handler
  */
@@ -23,6 +25,13 @@ class infolog_groupdav extends groupdav_handler
 	 */
 	var $bo;
 
+	/**
+	 * vCalendar Instance for parsing
+	 *
+	 * @var array
+	 */
+	var $vCalendar;
+
 	var $filter_prop2infolog = array(
 		'SUMMARY'	=> 'info_subject',
 		'UID'		=> 'info_uid',
@@ -47,6 +56,7 @@ class infolog_groupdav extends groupdav_handler
 		parent::__construct($app,$debug,$base_uri,$principalURL);
 
 		$this->bo = new infolog_bo();
+		$this->vCalendar = new Horde_iCalendar;
 	}
 
 	const PATH_ATTRIBUTE = 'info_id';
@@ -264,8 +274,14 @@ class infolog_groupdav extends groupdav_handler
 						break;
 					case 'time-range':
 				 		if ($this->debug > 1) error_log(__FILE__ . __METHOD__."($options[path],...) time-range={$filter['attrs']['start']}-{$filter['attrs']['end']}");
-						$cal_filters[] = 'info_startdate >= ' . $filter['attrs']['start'];
-						$cal_filters[] = 'info_startdate <= ' . $filter['attrs']['end'];
+				 		if (!empty($filter['attrs']['start']))
+				 		{
+					 		$cal_filters[] = 'info_startdate >= ' . (int)$this->vCalendar->_parseDateTime($filter['attrs']['start']);
+				 		}
+				 		if (!empty($filter['attrs']['end']))
+				 		{
+					 		$cal_filters[]   = 'info_startdate <= ' . (int)$this->vCalendar->_parseDateTime($filter['attrs']['end']);
+				 		}
 						break;
 					default:
 						if ($this->debug) error_log(__METHOD__."($options[path],".array2string($options).",...) unknown filter --> ignored");