plugins/calendar plugins/libcalendaring

[Thomas Brüderli]

 plugins/calendar/README                                  |   11 +++----
 plugins/calendar/lib/Horde_iCalendar_timezone.diff       |   23 ---------------
 plugins/libcalendaring/README                            |   15 +++++++++
 plugins/libcalendaring/lib/Horde_iCalendar_timezone.diff |   23 +++++++++++++++
 4 files changed, 43 insertions(+), 29 deletions(-)

New commits:
commit 2d831d8f8f2706ef48b1c59601c6bc41c5c196de
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Jul 18 12:49:27 2013 +0200

    Also move iCalendar patch; describe dependencies in README files

diff --git a/plugins/calendar/README b/plugins/calendar/README
index c10f389..e73efe9 100644
--- a/plugins/calendar/README
+++ b/plugins/calendar/README
@@ -10,15 +10,14 @@ The client-side calendar UI relies on the "fullcalendar" project by Adam Arshaw
 with extensions made for the use in Roundcube. All changes are published in
 an official fork at https://github.com/roundcube/fullcalendar
 
+For some general calendar-based operations such as alarms handling or iCal
+parsing/exporting this plugins requires the `libcalendaring` plugin which
+is also part of the Kolab Roundcube Plugins repository. Make sure that plugin
+is installed and configured correctly.
+
 For recurring event computation, some utility classes from the Horde project
 are used. They are packaged in a slightly modified version with this plugin.
 
-iCalendar parsing is done with the help of the Horde_iCalendar class. A copy
-of that class with all its dependencies is part of this package. In order
-to update it, execute lib/get_horde_icalendar.sh > lib/Horde_iCalendar.php
-Finally apply the patch lib/Horde_iCalendar_timezone.diff to fix timezone
-handling when parsing iCal files.
-
 IMPORTANT
 ---------
 The calendar module makes heavy use of PHP's DateTime as well as DateInterval
diff --git a/plugins/calendar/lib/Horde_iCalendar_timezone.diff b/plugins/calendar/lib/Horde_iCalendar_timezone.diff
deleted file mode 100644
index edd5587..0000000
--- a/plugins/calendar/lib/Horde_iCalendar_timezone.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/plugins/calendar/lib/Horde_iCalendar.php b/plugins/calendar/lib/Horde_iCalendar.php
-index a3ff79d..6d75d27 100644
---- a/lib/Horde_iCalendar.php
-+++ b/lib/Horde_iCalendar.php
-@@ -1874,7 +1874,17 @@ class Horde_iCalendar {
-     {
-         $vtimezone = $this->_container->findComponentByAttribute('vtimezone', 'TZID', $tzid);
-         if (!$vtimezone) {
--            return false;
-+            // use PHP's standard timezone db to determine tzoffset
-+            try {
-+                $tz = new DateTimeZone($tzid);
-+                $dt = new DateTime('now', $tz);
-+                $dt->setDate($date['year'], $date['month'], $date['mday']);
-+                $dt->setTime($time['hour'], $time['minute'], $date['recond']);
-+                return $tz->getOffset($dt);
-+            }
-+            catch (Exception $e) {
-+                return false;
-+            }
-         }
- 
-         $change_times = array();
diff --git a/plugins/libcalendaring/README b/plugins/libcalendaring/README
new file mode 100644
index 0000000..c49a82f
--- /dev/null
+++ b/plugins/libcalendaring/README
@@ -0,0 +1,15 @@
+Library providing common functions for calendar-based plugins
+-------------------------------------------------------------
+
+Provides utility functions for calendar-related modules such as
+
+* alarms display and dismissal
+* attachment handling
+* iCal parsing and exporting
+
+iCal parsing is done with the help of the Horde_iCalendar class. A copy
+of that class with all its dependencies is part of this package. In order
+to update it, execute lib/get_horde_icalendar.sh > lib/Horde_iCalendar.php
+Finally apply the patch lib/Horde_iCalendar_timezone.diff to fix timezone
+handling when parsing iCal files.
+
diff --git a/plugins/libcalendaring/lib/Horde_iCalendar_timezone.diff b/plugins/libcalendaring/lib/Horde_iCalendar_timezone.diff
new file mode 100644
index 0000000..edd5587
--- /dev/null
+++ b/plugins/libcalendaring/lib/Horde_iCalendar_timezone.diff
@@ -0,0 +1,23 @@
+diff --git a/plugins/calendar/lib/Horde_iCalendar.php b/plugins/calendar/lib/Horde_iCalendar.php
+index a3ff79d..6d75d27 100644
+--- a/lib/Horde_iCalendar.php
++++ b/lib/Horde_iCalendar.php
+@@ -1874,7 +1874,17 @@ class Horde_iCalendar {
+     {
+         $vtimezone = $this->_container->findComponentByAttribute('vtimezone', 'TZID', $tzid);
+         if (!$vtimezone) {
+-            return false;
++            // use PHP's standard timezone db to determine tzoffset
++            try {
++                $tz = new DateTimeZone($tzid);
++                $dt = new DateTime('now', $tz);
++                $dt->setDate($date['year'], $date['month'], $date['mday']);
++                $dt->setTime($time['hour'], $time['minute'], $date['recond']);
++                return $tz->getOffset($dt);
++            }
++            catch (Exception $e) {
++                return false;
++            }
+         }
+ 
+         $change_times = array();