gunnar: server/horde/horde-framework HK-GW-Kolab_extensions.patch, 1.2, 1.3 horde-framework-kolab.spec, 1.29, 1.30

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv17398/horde/horde-framework

Modified Files:
	HK-GW-Kolab_extensions.patch horde-framework-kolab.spec 
Log Message:
Some fixes to the way we expand recurrences in free/busy.

Index: HK-GW-Kolab_extensions.patch
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/HK-GW-Kolab_extensions.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- HK-GW-Kolab_extensions.patch	22 Nov 2007 16:31:00 -0000	1.2
+++ HK-GW-Kolab_extensions.patch	23 Nov 2007 15:03:53 -0000	1.3
@@ -394,10 +394,10 @@
          $this->_storage = &new Kolab_IMAP();
      }
  
-diff -r 2be0e69810d0 framework/Kolab/Kolab/Freebusy.php
+diff -r f536c90a6397 framework/Kolab/Kolab/Freebusy.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/framework/Kolab/Kolab/Freebusy.php	Thu Nov 22 17:29:28 2007 +0100
-@@ -0,0 +1,490 @@
++++ b/framework/Kolab/Kolab/Freebusy.php	Fri Nov 23 15:51:14 2007 +0100
+@@ -0,0 +1,495 @@
 +<?php
 +/**
 + * @package Horde_Kolab
@@ -560,10 +560,17 @@
 +            /* do recurrence expansion if not keeping anyway */
 +            if ($event->recurs()) {
 +                $next = $event->recurrence->nextRecurrence($startDate);
++                while ($next !== false && 
++                       $event->recurrence->hasException($next->year, $next->month, $next->mday)) {
++                    $next->mday++;
++                    $next = $event->recurrence->nextRecurrence($next);
++                }
++                $duration = $next->timestamp() - $event->start->timestamp();
++                $next_end = &new Horde_Date($event->end->timestamp() + $duration);
++
 +                if ($next !== false && 
-+                    !$event->recurrence->hasException($next->year, $next->month, $next->mday) &&
-+                    (!(($endDate->compareDateTime($event->start) < 0) || 
-+                       ($startDate->compareDateTime($event->end) > 0)))) {
++                    (!(($endDate->compareDateTime($next) < 0) || 
++                       ($startDate->compareDateTime($next_end) > 0)))) {
 +                    $result[] = $event;
 +                }
 +            }
@@ -744,18 +751,16 @@
 +            if (!$event->recurs()) {
 +                $vFb->addBusyPeriod('BUSY', $startThisDay, null, $duration, $extra);
 +            } else {
-+                while (true) {
-+                    $next = $event->recurrence->nextRecurrence($startDate);
-+                    if ($next === false) {
++                $next = $event->recurrence->nextRecurrence($startDate);
++                while ($next) {
++                    if ($endDate->compareDateTime($next) < 0) {
 +                        break;
 +                    }
-+                    if ($event->recurrence->hasException($next->year, $next->month, $next->mday)) {
-+                        continue;
-+                    }
-+                    if ($endDate->compareDateTime($next->start) < 0) {
-+                        break;
++                    if (!$event->recurrence->hasException($next->year, $next->month, $next->mday)) {
++                        $vFb->addBusyPeriod('BUSY', $next->timestamp(), null, $duration, $extra);
 +                    }
-+                    $vFb->addBusyPeriod('BUSY', $next->timestamp(), null, $duration, $extra);
++                    $next->mday++;
++                    $next = $event->recurrence->nextRecurrence($next);
 +                }
 +            }
 +        }

Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- horde-framework-kolab.spec	22 Nov 2007 16:24:14 -0000	1.29
+++ horde-framework-kolab.spec	23 Nov 2007 15:03:53 -0000	1.30
@@ -3,7 +3,7 @@
 %define         V_package horde-%{V_horde_name}-kolab
 %define         V_year  2007
 %define         V_month 11
-%define         V_day   22
+%define         V_day   23
 %define         V_version 3.2_ALPHA
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}