Changes of Revision 41
kolab-freebusy.spec
Changed
x
1
2
3
Name: kolab-freebusy4
Version: 1.0.75
-Release: 1%{?dist}6
+Release: 2%{?dist}7
Summary: Kolab Free/Busy Web Presentation Layer8
9
Group: Applications/Internet10
11
Source0: http://mirror.kolabsys.com/pub/releases/%{name}-%{version}+dep.tar.gz12
Source1: kolab-freebusy.logrotate13
14
+Patch0001: 0001-Consider-recurrence-exceptions-when-computing-busy-t.patch15
+16
BuildArch: noarch17
18
%if 0%{?suse_version}19
20
%prep21
%setup -q22
23
+%patch0001 -p124
+25
%build26
27
%install28
29
%attr(0770,root,%{httpd_group}) %{_localstatedir}/log/%{name}30
31
%changelog32
+* Sun Feb 22 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.0.7-233
+- Correctly render Free/Busy for recurring events with exceptions (#4665)34
+35
* Sun Feb 15 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.0.7-136
- Release of version 1.0.737
38
0001-Consider-recurrence-exceptions-when-computing-busy-t.patch
Added
179
1
2
+From 64f2b531c46cd1aeeb894acfdfae375d1f4cb190 Mon Sep 17 00:00:00 20013
+From: Thomas Bruederli <bruederli@kolabsys.com>4
+Date: Fri, 20 Feb 2015 16:28:50 +01005
+Subject: [PATCH] Consider recurrence exceptions when computing busy times6
+ (#4665)7
+8
+---9
+ composer-dist.json | 14 ++++++10
+ composer.json | 2 +-11
+ lib/Kolab/FreeBusy/SourceIMAP.php | 91 ++++++++++++++++++++++++++++-----------12
+ 3 files changed, 81 insertions(+), 26 deletions(-)13
+ create mode 100644 composer-dist.json14
+15
+diff --git a/composer-dist.json b/composer-dist.json16
+new file mode 10064417
+index 0000000..e0423c918
+--- /dev/null19
++++ b/composer-dist.json20
+@@ -0,0 +1,14 @@21
++{22
++ "name": "kolab/free-busy",23
++ "description": "Kolab Free/Busy Service",24
++ "license": "AGPL-3.0",25
++ "version": "1.0.5",26
++ "autoload": {27
++ "psr-0": {28
++ "": "/usr/share/pear/"29
++ },30
++ "psr-4": {31
++ "": "/usr/share/php/"32
++ }33
++ }34
++}35
+diff --git a/composer.json b/composer.json36
+index 461c052..1efbef6 10064437
+--- a/composer.json38
++++ b/composer.json39
+@@ -2,7 +2,7 @@40
+ "name": "kolab/free-busy",41
+ "description": "Kolab Free/Busy Service",42
+ "license": "AGPL-3.0",43
+- "version": "1.0.6",44
++ "version": "1.0.7",45
+ "repositories": [46
+ {47
+ "type": "pear",48
+diff --git a/lib/Kolab/FreeBusy/SourceIMAP.php b/lib/Kolab/FreeBusy/SourceIMAP.php49
+index 6f116b7..e0de62b 10064450
+--- a/lib/Kolab/FreeBusy/SourceIMAP.php51
++++ b/lib/Kolab/FreeBusy/SourceIMAP.php52
+@@ -5,7 +5,7 @@53
+ *54
+ * @author Thomas Bruederli <bruederli@kolabsys.com>55
+ *56
+- * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>57
++ * Copyright (C) 2013-2015, Kolab Systems AG <contact@kolabsys.com>58
+ *59
+ * This program is free software: you can redistribute it and/or modify60
+ * it under the terms of the GNU Affero General Public License as61
+@@ -171,15 +171,9 @@ class SourceIMAP extends Source62
+ }63
+ }64
+ // skip declined events65
+- else if (is_array($event['attendees'])) {66
+- foreach ($event['attendees'] as $attendee) {67
+- if (in_array($attendee['email'], $user_email)) {68
+- if ($attendee['status'] == 'DECLINED') {69
+- $log->debug('Skip declined event', array($event['uid'], $event['title']));70
+- continue 2;71
+- }72
+- }73
+- }74
++ else if (is_array($event['attendees']) && !$this->check_participation($event, $user_email)) {75
++ $log->debug('Skip declined event', array($event['uid'], $event['title']));76
++ continue;77
+ }78
+ 79
+ // translate all-day dates into absolute UTC times80
+@@ -204,21 +198,7 @@ class SourceIMAP extends Source81
+ }82
+ 83
+ // copied from libvcalendar::_to_ical()84
+- $ve = VObject\Component::create('VEVENT');85
+- $ve->UID = $event['uid'];86
+-87
+- if (!empty($event['start']))88
+- $ve->add(\libvcalendar::datetime_prop('DTSTART', $event['start'], false, false));89
+- if (!empty($event['end']))90
+- $ve->add(\libvcalendar::datetime_prop('DTEND', $event['end'], false, false));91
+-92
+- if (!empty($event['free_busy']))93
+- $ve->add('TRANSP', $event['free_busy'] == 'free' ? 'TRANSPARENT' : 'OPAQUE');94
+-95
+- if ($event['free_busy'] == 'tentative')96
+- $ve->add('STATUS', 'TENTATIVE');97
+- else if (!empty($event['status']))98
+- $ve->add('STATUS', $event['status']);99
++ $ve = $this->to_vevent($event);100
+ 101
+ if ($event['recurrence']) {102
+ if ($exdates = $event['recurrence']['EXDATE'])103
+@@ -229,6 +209,23 @@ class SourceIMAP extends Source104
+ if ($event['recurrence']['FREQ'])105
+ $ve->add('RRULE', \libcalendaring::to_rrule($event['recurrence']));106
+ 107
++ // consider recurrence exceptions108
++ if (is_array($event['recurrence']['EXCEPTIONS'])) {109
++ foreach ($event['recurrence']['EXCEPTIONS'] as $i => $exception) {110
++ // register exdate for this occurrence111
++ if ($exception['recurrence_date'] instanceof \DateTime) {112
++ $exdates[] = $exception['recurrence_date'];113
++ }114
++ // add exception to vcalendar container115
++ if (!$exception['cancelled'] && $this->check_participation($exception, $user_email)) {116
++ $vex = $this->to_vevent($exception);117
++ $vex->UID = $event['uid'] . '-' . $i;118
++ $calendar->add($vex);119
++ $log->debug("Adding event exception for processing:\n" . $vex->serialize());120
++ }121
++ }122
++ }123
++124
+ // add EXDATEs each one per line (for Thunderbird Lightning)125
+ if ($exdates) {126
+ foreach ($exdates as $ex) {127
+@@ -333,4 +330,48 @@ class SourceIMAP extends Source128
+ 129
+ $imap->close();130
+ }131
++132
++ /**133
++ * Helper method to build a Sabre/VObject from the gieven event data134
++ */135
++ private function to_vevent($event)136
++ {137
++ // copied from libvcalendar::_to_ical()138
++ $ve = VObject\Component::create('VEVENT');139
++ $ve->UID = $event['uid'];140
++141
++ if (!empty($event['start']))142
++ $ve->add(\libvcalendar::datetime_prop('DTSTART', $event['start'], false, false));143
++ if (!empty($event['end']))144
++ $ve->add(\libvcalendar::datetime_prop('DTEND', $event['end'], false, false));145
++146
++ if (!empty($event['free_busy']))147
++ $ve->add('TRANSP', $event['free_busy'] == 'free' ? 'TRANSPARENT' : 'OPAQUE');148
++149
++ if ($event['free_busy'] == 'tentative')150
++ $ve->add('STATUS', 'TENTATIVE');151
++ else if (!empty($event['status']))152
++ $ve->add('STATUS', $event['status']);153
++154
++ return $ve;155
++ }156
++157
++ /**158
++ * Helper method to check the participation status of the requested user159
++ */160
++ private function check_participation($event, $user_email)161
++ {162
++ $result = true;163
++164
++ if (is_array($event['attendees'])) {165
++ foreach ($event['attendees'] as $attendee) {166
++ if (in_array($attendee['email'], $user_email) && $attendee['status'] == 'DECLINED') {167
++ $result = false;168
++ break;169
++ }170
++ }171
++ }172
++173
++ return $result;174
++ }175
+ }176
+-- 177
+2.1.0178
+179
debian.changelog
Changed
11
1
2
+kolab-freebusy (1.0.7-0~kolab2) unstable; urgency=low3
+4
+ * Correctly render Free/Busy for recurring events with exceptions (#4665)5
+ 6
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Sun, 22 Feb 2015 12:00:22 +02007
+8
kolab-freebusy (1.0.7-0~kolab1) unstable; urgency=low9
10
* Release of version 1.0.711
debian.series
Changed
3
1
2
+0001-Consider-recurrence-exceptions-when-computing-busy-t.patch -p13
kolab-freebusy.dsc
Changed
10
1
2
Source: kolab-freebusy3
Binary: kolab-freebusy4
Architecture: all5
-Version: 1.0.7-0~kolab16
+Version: 1.0.7-0~kolab27
Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>8
Homepage: http://www.kolab.org9
Standards-Version: 3.9.310