gunnar: server/php-kolab/Kolab_Filter issue3558.patch, NONE, 1.1.2.1 ChangeLog, 1.29.2.3, 1.29.2.4 Kolab_Filter.spec, 1.19.2.4, 1.19.2.5 Makefile, 1.8.2.3, 1.8.2.4

cvs at kolab.org cvs at kolab.org
Thu Apr 16 20:55:05 CEST 2009


Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv7339

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Kolab_Filter.spec Makefile 
Added Files:
      Tag: kolab_2_2_branch
	issue3558.patch 
Log Message:
 kolab/issue3558 (whole-day events broken for resources)

--- NEW FILE: issue3558.patch ---
--- a/lib/Horde/Kolab/Resource.php.orig	2009-04-16 20:00:58.000000000 +0200
+++ b/lib/Horde/Kolab/Resource.php	2009-04-16 20:46:05.000000000 +0200
@@ -247,8 +247,17 @@
         $object['summary'] = $itip->getAttributeDefault('SUMMARY', '');
         $object['location'] = $itip->getAttributeDefault('LOCATION', '');
         $object['body'] = $itip->getAttributeDefault('DESCRIPTION', '');
-        $object['start-date'] = $itip->getAttributeDefault('DTSTART', '');
-        $object['end-date'] = $itip->getAttributeDefault('DTEND', '');
+        $dtend = $itip->getAttributeDefault('DTEND', '');
+        if (is_array($dtend)) {
+            $object['_is_all_day'] = true;
+            /**
+             * Substract a day (86400 seconds) using epochs to take number of
+             * days per month into account
+             */
+            $dtend = $this->convert2epoch($dtend) - 86400;
+        }
+        $object['start-date'] = $this->convert2epoch($itip->getAttributeDefault('DTSTART', ''));
+        $object['end-date'] = $this->convert2epoch($dtend);
         if ($itip->getAttributeDefault('TRANSP', 'OPAQUE') == 'TRANSPARENT') {
             $object['show-time-as'] = $itip->getAttributeDefault('DTEND', '');
         }
@@ -997,17 +1006,16 @@
      */
     function cleanArray($ical_date)
     {
-        if (array_key_exists('hour', $ical_date)) {
-            $temp['hour']   = array_key_exists('hour', $ical_date) ? $ical_date['hour'] :  '00';
-            $temp['minute']   = array_key_exists('minute', $ical_date) ? $ical_date['minute'] :  '00';
-            $temp['second']   = array_key_exists('second', $ical_date) ? $ical_date['second'] :  '00';
-            $temp['zone']   = array_key_exists('zone', $ical_date) ? $ical_date['zone'] :  'UTC';
-        } else {
+        if (!array_key_exists('hour', $ical_date)) {
             $temp['DATE'] = '1';
         }
+        $temp['hour']   = array_key_exists('hour', $ical_date) ? $ical_date['hour'] :  '00';
+        $temp['minute']   = array_key_exists('minute', $ical_date) ? $ical_date['minute'] :  '00';
+        $temp['second']   = array_key_exists('second', $ical_date) ? $ical_date['second'] :  '00';
         $temp['year']   = array_key_exists('year', $ical_date) ? $ical_date['year'] :  '0000';
         $temp['month']   = array_key_exists('month', $ical_date) ? $ical_date['month'] :  '00';
         $temp['mday']   = array_key_exists('mday', $ical_date) ? $ical_date['mday'] :  '00';
+        $temp['zone']   = array_key_exists('zone', $ical_date) ? $ical_date['zone'] :  'UTC';
 
         return $temp;
     }

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.29.2.3
retrieving revision 1.29.2.4
diff -u -d -r1.29.2.3 -r1.29.2.4
--- ChangeLog	1 Apr 2009 16:04:38 -0000	1.29.2.3
+++ ChangeLog	16 Apr 2009 18:55:03 -0000	1.29.2.4
@@ -1,3 +1,8 @@
+2009-04-16  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_Filter.spec: kolab/issue3558 (whole-day events broken for
+	resources)
+
 2009-04-01  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Filter.spec: kolab/issue3521 (kolabmailboxfilter does not

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.4
retrieving revision 1.19.2.5
diff -u -d -r1.19.2.4 -r1.19.2.5
--- Kolab_Filter.spec	1 Apr 2009 16:04:38 -0000	1.19.2.4
+++ Kolab_Filter.spec	16 Apr 2009 18:55:03 -0000	1.19.2.5
@@ -25,6 +25,7 @@
 Patch3:    dovecotlda-quoting.patch
 Patch4:    revert_issue2499.patch
 Patch5:    issue3521.patch
+Patch6:    issue3558.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -65,6 +66,7 @@
 	%patch -p1 -P 3
 	%patch -p3 -P 4
 	%patch -p3 -P 5
+	%patch -p1 -P 6
 	cp %{S:1} .
 %build
 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -d -r1.8.2.3 -r1.8.2.4
--- Makefile	1 Apr 2009 16:04:38 -0000	1.8.2.3
+++ Makefile	16 Apr 2009 18:55:03 -0000	1.8.2.4
@@ -21,7 +21,7 @@
 
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog issue3521.patch revert_issue2499.patch issue3435.patch issue3192.patch issue3441.patch dovecotlda-quoting.patch package.xml
+EXTRA=ChangeLog issue3521.patch revert_issue2499.patch issue3435.patch issue3192.patch issue3441.patch issue3558.patch dovecotlda-quoting.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm





More information about the commits mailing list