gunnar: server/horde/horde-kronolith HK-GW-Fix_create_new_event.patch, NONE, 1.1 HK-GW-Fix_share_right_editing.patch, NONE, 1.1 HK-UV-Fix_list_events.patch, NONE, 1.1 horde-kronolith-kolab.spec, 1.15, 1.16

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/horde/horde-kronolith
In directory doto:/tmp/cvs-serv11291/horde/horde-kronolith

Modified Files:
	horde-kronolith-kolab.spec 
Added Files:
	HK-GW-Fix_create_new_event.patch 
	HK-GW-Fix_share_right_editing.patch 
	HK-UV-Fix_list_events.patch 
Log Message:
Make horde ready for the beta release.

--- NEW FILE: HK-GW-Fix_create_new_event.patch ---
Fix the return value when creating a new event.

diff -r b92bff17929a kronolith/lib/Driver/kolab.php
--- a/kronolith/lib/Driver/kolab.php	Wed Oct 03 16:28:16 2007 +0200
+++ b/kronolith/lib/Driver/kolab.php	Wed Oct 03 17:15:02 2007 +0200
@@ -1190,7 +1190,7 @@ class Kronolith_Driver_kolab_wrapper_new
             Kolab::triggerFreeBusyUpdate($this->_store->parseFolder($this->_driver->_calendar));
         }
 
-        return $uid;
+        return $event->getUID();
     }
 
     /**

--- NEW FILE: HK-GW-Fix_share_right_editing.patch ---
Fixes share right editing for kronolith.

diff -r 0855b853bf45 kronolith/templates/calendars/calendars.inc
--- a/kronolith/templates/calendars/calendars.inc	Wed Oct 03 19:42:07 2007 +0200
+++ b/kronolith/templates/calendars/calendars.inc	Wed Oct 03 19:43:30 2007 +0200
@@ -113,7 +113,7 @@ function checkSubmit()
    <strong><?php echo _("Permissions") ?></strong>
   </td>
   <td>
-   <input type="button" name="perms" class="button" onclick="if (document.shares.edit_share.value) popup(editURL + document.shares.edit_share.value); else alert('<?php echo addslashes(_("You need to select a calendar first")) ?>')" value="<?php echo _("Edit") ?>" />
+   <input type="button" name="perms" class="button" onclick="if (document.shares.edit_share.value) popup(editURL + encodeURIComponent(document.shares.edit_share.value)); else alert('<?php echo addslashes(_("You need to select a calendar first")) ?>')" value="<?php echo _("Edit") ?>" />
   </td>
  </tr>
  <?php endif; ?>

--- NEW FILE: HK-UV-Fix_list_events.patch ---
Fix event display in kronolith.

diff -r 3bb98854b586 kronolith/lib/Driver/kolab.php
--- a/kronolith/lib/Driver/kolab.php	Thu Oct 04 08:29:40 2007 +0200
+++ b/kronolith/lib/Driver/kolab.php	Thu Oct 04 08:39:10 2007 +0200
@@ -1080,25 +1080,19 @@ class Kronolith_Driver_kolab_wrapper_new
             }
 
             $keep_event = false;
-/*
-            echo "Start: ".$startDate->compareDate($event->start)."<br>\n";
-            echo "End: ".$endDate->compareDate($event->end)."<br>\n";
-*/
-            // check normal event date
-            if ($startDate->compareDate($event->start) <= 0
-                && $endDate->compareDate($event->end) >= -1)
-            {
+            /* check if event period intersects with given period */
+            if (!(($endDate->compareDateTime($event->start) < 0) || 
+                  ($startDate->compareDateTime($event->end) > 0))) {
                 $keep_event = true;
             }
 
-            // do recurrence expansion if not keeping anyway
+            /* do recurrence expansion if not keeping anyway */
             if (!$keep_event && $event->recurs()) {
                 $next = $event->recurrence->nextRecurrence($startDate);
-
-                if ($next !== false && !$event->recurrence->hasException($next->year, $next->month, $next->mday)
-                    && $startDate->compareDate($next) <= 0
-                    && $endDate->compareDate($next) >= 0)
-                {
+                if ($next !== false && 
+                    !$event->recurrence->hasException($next->year, $next->month, $next->mday) &&
+                    (!(($endDate->compareDateTime($event->start) < 0) || 
+                       ($startDate->compareDateTime($event->end) > 0)))) {
                     $keep_event = true;
                 }
             }

Index: horde-kronolith-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/horde-kronolith-kolab.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- horde-kronolith-kolab.spec	1 Oct 2007 15:47:19 -0000	1.15
+++ horde-kronolith-kolab.spec	4 Oct 2007 09:47:55 -0000	1.16
@@ -3,7 +3,7 @@
 %define         V_package horde-%{V_horde_name}-kolab
 %define         V_year  2007
 %define         V_month 10
-%define         V_day   01
+%define         V_day   04
 %define         V_version 2.2_alpha
 %define         V_uver    2.2-alpha
 %define         V_date %{V_year}-%{V_month}-%{V_day}
@@ -26,6 +26,11 @@
 Source1:        horde-kronolith-kolab-conf.template
 Source2:        conf.php
 
+# List of Patches
+Patch0:         HK-GW-Fix_create_new_event.patch
+Patch1:         HK-GW-Fix_share_right_editing.patch
+Patch2:         HK-UV-Fix_list_events.patch
+
 # Build Info
 Prefix:		%{l_prefix}
 BuildRoot:	%{l_buildroot}
@@ -52,6 +57,12 @@
 
 %prep
 	%setup -c -q -n %{V_horde_name}-h3-%{V_uver}
+
+	cd %{V_horde_name}-h3-%{V_uver}
+	%patch -p2 -P 0
+	%patch -p2 -P 1
+	%patch -p2 -P 2
+	cd ..
 
 %build