Kolab Groupware OBS

Changes of Revision 22

roundcubemail-plugins-kolab.spec Changed

@@ -24,7 +24,7 @@
 
 Name:       roundcubemail-plugins-kolab
 Version:    3.1.6
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Kolab Groupware plugins for Roundcube Webmail
 
 Group:      Applications/Internet
@@ -36,6 +36,7 @@
 
 Patch1:     roundcubemail-plugins-kolab-3.1.6-task-enhancements.patch
 Patch2:     roundcubemail-plugins-kolab-3.1.6-2353-ics-import-efficiency.patch
+Patch3:     roundcubemail-plugins-kolab-3.1.6-2463-all-day-events-are-off-one-day.patch
 
 BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:  noarch
@@ -54,6 +55,7 @@
 
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 
@@ -214,7 +216,8 @@
 %attr(0770,root,%{httpd_group}) %{roundcube_lib}/plugins/odfviewer
 
 %changelog
-* Thu Oct 31 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.1.6-3
+* Fri Nov  1 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.1.6-3
+- Also apply patch for #2463 - all day events displayed on wrong date
 - Also apply patch for #2353 - ICS import efficiency
 - Also apply patch for task enhancements
 - New upstream version

roundcubemail-plugins-kolab-3.1.6-2463-all-day-events-are-off-one-day.patch Added

@@ -0,0 +1,51 @@
+commit 5924783b18b5c423e58b30730bfdee00ca6c85b0
+Author: Thomas Bruederli <bruederli@kolabsys.com>
+Date:   Fri Nov 1 11:23:42 2013 +0100
+
+    Don't set timezone on allday dates (#2463)
+
+diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
+index e8e5ab2..f08798e 100644
+--- a/plugins/calendar/calendar.php
++++ b/plugins/calendar/calendar.php
+@@ -1217,7 +1217,7 @@ class calendar extends rcube_plugin
+     if ($event['recurrence']) {
+       $event['recurrence_text'] = $this->_recurrence_text($event['recurrence']);
+       if ($event['recurrence']['UNTIL'])
+-        $event['recurrence']['UNTIL'] = $this->lib->adjust_timezone($event['recurrence']['UNTIL'])->format('c');
++        $event['recurrence']['UNTIL'] = $this->lib->adjust_timezone($event['recurrence']['UNTIL'], $event['allday'])->format('c');
+       unset($event['recurrence']['EXCEPTIONS']);
+     }
+ 
+@@ -1248,8 +1248,8 @@ class calendar extends rcube_plugin
+ 
+     return array(
+       '_id'   => $event['calendar'] . ':' . $event['id'],  // unique identifier for fullcalendar
+-      'start' => $this->lib->adjust_timezone($event['start'])->format('c'),
+-      'end'   => $this->lib->adjust_timezone($event['end'])->format('c'),
++      'start' => $this->lib->adjust_timezone($event['start'], $event['allday'])->format('c'),
++      'end'   => $this->lib->adjust_timezone($event['end'], $event['allday'])->format('c'),
+       // 'changed' might be empty for event recurrences (Bug #2185)
+       'changed' => $event['changed'] ? $this->lib->adjust_timezone($event['changed'])->format('c') : null,
+       'title'       => strval($event['title']),
+diff --git a/plugins/libcalendaring/libcalendaring.php b/plugins/libcalendaring/libcalendaring.php
+index 47cf67e..4cd5782 100644
+--- a/plugins/libcalendaring/libcalendaring.php
++++ b/plugins/libcalendaring/libcalendaring.php
+@@ -120,14 +120,14 @@ class libcalendaring extends rcube_plugin
+      * @param mixed Any kind of a date representation (DateTime object, string or unix timestamp)
+      * @return object DateTime object in user's timezone
+      */
+-    public function adjust_timezone($dt)
++    public function adjust_timezone($dt, $dateonly = false)
+     {
+         if (is_numeric($dt))
+             $dt = new DateTime('@'.$dt);
+         else if (is_string($dt))
+             $dt = new DateTime($dt);
+ 
+-        if ($dt instanceof DateTime) {
++        if ($dt instanceof DateTime && !($dt->_dateonly || $dateonly)) {
+             $dt->setTimezone($this->timezone);
+         }
+