[Pkg-owncloud-commits] [php-sabre-vobject] 13/38: SUMMARY in scheduling messages. #123

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch upstream
in repository php-sabre-vobject.

commit 15fe6bafd3569501b180d1858f39dc026a5af607
Author: Dominik Tobschall <dominik at fruux.com>
Date:   Tue Sep 16 00:19:01 2014 +0200

    SUMMARY in scheduling messages. #123
---
 lib/ITip/Broker.php                          | 12 +++++++++---
 tests/VObject/ITip/BrokerDeleteEventTest.php | 13 +++++++++----
 tests/VObject/ITip/BrokerUpdateEventTest.php | 13 +++++++++----
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/lib/ITip/Broker.php b/lib/ITip/Broker.php
index 3700b55..edfe97a 100644
--- a/lib/ITip/Broker.php
+++ b/lib/ITip/Broker.php
@@ -504,14 +504,17 @@ class Broker {
                 $icalMsg = new VCalendar();
                 $icalMsg->METHOD = $message->method;
                 $event = $icalMsg->add('VEVENT', array(
+                    'UID' => $message->uid,
                     'SEQUENCE' => $message->sequence,
-                    'UID'      => $message->uid,
                 ));
+                if ($calendar->VEVENT->SUMMARY) {
+                    $event->add('SUMMARY', $calendar->VEVENT->SUMMARY);
+                }
+                $org = $event->add('ORGANIZER', $eventInfo['organizer']);
+                if ($eventInfo['organizerName']) $org['CN'] = $eventInfo['organizerName'];
                 $event->add('ATTENDEE', $attendee['href'], array(
                     'CN' => $attendee['name'],
                 ));
-                $org = $event->add('ORGANIZER', $eventInfo['organizer']);
-                if ($eventInfo['organizerName']) $org['CN'] = $eventInfo['organizerName'];
                 $message->significantChange = true;
 
             } else {
@@ -682,6 +685,9 @@ class Broker {
                 'UID' => $message->uid,
                 'SEQUENCE' => $message->sequence,
             ));
+            if ($calendar->VEVENT->SUMMARY) {
+                $event->add('SUMMARY', $calendar->VEVENT->SUMMARY);
+            }
             if ($instance['id'] !== 'master') {
                 $event->{'RECURRENCE-ID'} = DateTimeParser::parseDateTime($instance['id'], $eventInfo['timezone']);
             }
diff --git a/tests/VObject/ITip/BrokerDeleteEventTest.php b/tests/VObject/ITip/BrokerDeleteEventTest.php
index 00172cc..e58eec3 100644
--- a/tests/VObject/ITip/BrokerDeleteEventTest.php
+++ b/tests/VObject/ITip/BrokerDeleteEventTest.php
@@ -12,6 +12,7 @@ VERSION:2.0
 BEGIN:VEVENT
 UID:foobar
 SEQUENCE:1
+SUMMARY:foo
 ORGANIZER;CN=Strunk:mailto:strunk at example.org
 ATTENDEE;CN=One:mailto:one at example.org
 ATTENDEE;CN=Two:mailto:two at example.org
@@ -41,10 +42,11 @@ PRODID:-//Sabre//Sabre VObject $version//EN
 CALSCALE:GREGORIAN
 METHOD:CANCEL
 BEGIN:VEVENT
-SEQUENCE:2
 UID:foobar
-ATTENDEE;CN=One:mailto:one at example.org
+SEQUENCE:2
+SUMMARY:foo
 ORGANIZER;CN=Strunk:mailto:strunk at example.org
+ATTENDEE;CN=One:mailto:one at example.org
 END:VEVENT
 END:VCALENDAR
 ICS
@@ -65,10 +67,11 @@ PRODID:-//Sabre//Sabre VObject $version//EN
 CALSCALE:GREGORIAN
 METHOD:CANCEL
 BEGIN:VEVENT
-SEQUENCE:2
 UID:foobar
-ATTENDEE;CN=Two:mailto:two at example.org
+SEQUENCE:2
+SUMMARY:foo
 ORGANIZER;CN=Strunk:mailto:strunk at example.org
+ATTENDEE;CN=Two:mailto:two at example.org
 END:VEVENT
 END:VCALENDAR
 ICS
@@ -88,6 +91,7 @@ VERSION:2.0
 BEGIN:VEVENT
 UID:foobar
 SEQUENCE:1
+SUMMARY:foo
 ORGANIZER;CN=Strunk:mailto:strunk at example.org
 ATTENDEE;CN=One:mailto:one at example.org
 ATTENDEE;CN=Two:mailto:two at example.org
@@ -119,6 +123,7 @@ METHOD:REPLY
 BEGIN:VEVENT
 UID:foobar
 SEQUENCE:1
+SUMMARY:foo
 ORGANIZER;CN=Strunk:mailto:strunk at example.org
 ATTENDEE;PARTSTAT=DECLINED;CN=One:mailto:one at example.org
 END:VEVENT
diff --git a/tests/VObject/ITip/BrokerUpdateEventTest.php b/tests/VObject/ITip/BrokerUpdateEventTest.php
index 96d362c..6dd96f6 100644
--- a/tests/VObject/ITip/BrokerUpdateEventTest.php
+++ b/tests/VObject/ITip/BrokerUpdateEventTest.php
@@ -12,6 +12,7 @@ VERSION:2.0
 BEGIN:VEVENT
 UID:foobar
 SEQUENCE:1
+SUMMARY:foo
 ORGANIZER;CN=Strunk:mailto:strunk at example.org
 ATTENDEE;CN=Strunk:mailto:strunk at example.org
 ATTENDEE;CN=One:mailto:one at example.org
@@ -28,6 +29,7 @@ VERSION:2.0
 BEGIN:VEVENT
 UID:foobar
 SEQUENCE:2
+SUMMARY:foo
 ORGANIZER;CN=Strunk:mailto:strunk at example.org
 ATTENDEE;CN=Strunk:mailto:strunk at example.org
 ATTENDEE;CN=Two:mailto:two at example.org
@@ -56,10 +58,11 @@ PRODID:-//Sabre//Sabre VObject $version//EN
 CALSCALE:GREGORIAN
 METHOD:CANCEL
 BEGIN:VEVENT
-SEQUENCE:2
 UID:foobar
-ATTENDEE;CN=One:mailto:one at example.org
+SEQUENCE:2
+SUMMARY:foo
 ORGANIZER;CN=Strunk:mailto:strunk at example.org
+ATTENDEE;CN=One:mailto:one at example.org
 END:VEVENT
 END:VCALENDAR
 ICS
@@ -83,6 +86,7 @@ METHOD:REQUEST
 BEGIN:VEVENT
 UID:foobar
 SEQUENCE:2
+SUMMARY:foo
 ORGANIZER;CN=Strunk:mailto:strunk at example.org
 ATTENDEE;CN=Strunk:mailto:strunk at example.org
 ATTENDEE;CN=Two:mailto:two at example.org
@@ -111,6 +115,7 @@ METHOD:REQUEST
 BEGIN:VEVENT
 UID:foobar
 SEQUENCE:2
+SUMMARY:foo
 ORGANIZER;CN=Strunk:mailto:strunk at example.org
 ATTENDEE;CN=Strunk:mailto:strunk at example.org
 ATTENDEE;CN=Two:mailto:two at example.org
@@ -349,10 +354,10 @@ PRODID:-//Sabre//Sabre VObject $version//EN
 CALSCALE:GREGORIAN
 METHOD:CANCEL
 BEGIN:VEVENT
-SEQUENCE:2
 UID:foobar
-ATTENDEE;CN=One:mailto:one at example.org
+SEQUENCE:2
 ORGANIZER;CN=Strunk:mailto:strunk at example.org
+ATTENDEE;CN=One:mailto:one at example.org
 END:VEVENT
 END:VCALENDAR
 ICS

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git