[Pkg-owncloud-commits] [php-sabredav] 33/45: SCHEDULE-STATUS must not contain a human-readable reason-phrase.
David Prévot
taffit at moszumanska.debian.org
Sat Jan 10 14:20:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository php-sabredav.
commit b16493cb2e0a61656a97a4fc9063a4576937de40
Author: Evert Pot <evert at rooftopsolutions.nl>
Date: Mon Jan 5 20:53:40 2015 -0500
SCHEDULE-STATUS must not contain a human-readable reason-phrase.
Fixes #586.
---
ChangeLog.md | 6 ++++++
lib/CalDAV/Schedule/Plugin.php | 4 ++--
lib/DAV/Version.php | 2 +-
tests/Sabre/CalDAV/Schedule/DeliverNewEventTest.php | 2 +-
tests/Sabre/CalDAV/Schedule/ScheduleDeliverTest.php | 18 +++++++++---------
5 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index 29c8f43..490cacd 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,6 +1,12 @@
ChangeLog
=========
+2.1.3 (2015-??-??)
+------------------
+
+* #586: SCHEDULE-STATUS should not contain a reason-phrase.
+
+
2.1.2 (2014-12-10)
------------------
diff --git a/lib/CalDAV/Schedule/Plugin.php b/lib/CalDAV/Schedule/Plugin.php
index 789ac5d..0b0407b 100644
--- a/lib/CalDAV/Schedule/Plugin.php
+++ b/lib/CalDAV/Schedule/Plugin.php
@@ -532,7 +532,7 @@ class Plugin extends ServerPlugin {
if (isset($newObject->VEVENT->ORGANIZER) && ($newObject->VEVENT->ORGANIZER->getNormalizedValue() === $message->recipient)) {
if ($message->scheduleStatus) {
- $newObject->VEVENT->ORGANIZER['SCHEDULE-STATUS'] = $message->scheduleStatus;
+ $newObject->VEVENT->ORGANIZER['SCHEDULE-STATUS'] = $message->getScheduleStatus();
}
unset($newObject->VEVENT->ORGANIZER['SCHEDULE-FORCE-SEND']);
@@ -542,7 +542,7 @@ class Plugin extends ServerPlugin {
if ($attendee->getNormalizedValue() === $message->recipient) {
if ($message->scheduleStatus) {
- $attendee['SCHEDULE-STATUS'] = $message->scheduleStatus;
+ $attendee['SCHEDULE-STATUS'] = $message->getScheduleStatus();
}
unset($attendee['SCHEDULE-FORCE-SEND']);
break;
diff --git a/lib/DAV/Version.php b/lib/DAV/Version.php
index 33dd3a3..a26fa99 100644
--- a/lib/DAV/Version.php
+++ b/lib/DAV/Version.php
@@ -14,6 +14,6 @@ class Version {
/**
* Full version number
*/
- const VERSION = '2.1.2';
+ const VERSION = '2.1.3';
}
diff --git a/tests/Sabre/CalDAV/Schedule/DeliverNewEventTest.php b/tests/Sabre/CalDAV/Schedule/DeliverNewEventTest.php
index 3336da2..d240e75 100644
--- a/tests/Sabre/CalDAV/Schedule/DeliverNewEventTest.php
+++ b/tests/Sabre/CalDAV/Schedule/DeliverNewEventTest.php
@@ -72,7 +72,7 @@ ICS
$resultVObj = VObject\Reader::read($result);
$this->assertEquals(
- '1.2;Message delivered locally',
+ '1.2',
$resultVObj->VEVENT->ATTENDEE[1]['SCHEDULE-STATUS']->getValue()
);
diff --git a/tests/Sabre/CalDAV/Schedule/ScheduleDeliverTest.php b/tests/Sabre/CalDAV/Schedule/ScheduleDeliverTest.php
index 292694e..8b23c92 100644
--- a/tests/Sabre/CalDAV/Schedule/ScheduleDeliverTest.php
+++ b/tests/Sabre/CalDAV/Schedule/ScheduleDeliverTest.php
@@ -52,7 +52,7 @@ BEGIN:VEVENT
UID:foo
DTSTART:20140811T230000Z
ORGANIZER:mailto:user1.sabredav at sabredav.org
-ATTENDEE;SCHEDULE-STATUS="1.2;Message delivered locally":mailto:user2.sabredav at sabredav.org
+ATTENDEE;SCHEDULE-STATUS=1.2:mailto:user2.sabredav at sabredav.org
END:VEVENT
END:VCALENDAR
ICS;
@@ -131,7 +131,7 @@ BEGIN:VEVENT
UID:foo
DTSTART:20140811T230000Z
ORGANIZER:mailto:user1.sabredav at sabredav.org
-ATTENDEE;SCHEDULE-STATUS="1.2;Message delivered locally":mailto:user2.sabredav at sabredav.org
+ATTENDEE;SCHEDULE-STATUS=1.2:mailto:user2.sabredav at sabredav.org
END:VEVENT
END:VCALENDAR
ICS;
@@ -326,7 +326,7 @@ BEGIN:VCALENDAR
BEGIN:VEVENT
UID:foo
DTSTART:20140811T230000Z
-ORGANIZER;SCHEDULE-STATUS="1.2;Message delivered locally":mailto:user2.sabredav at sabredav.org
+ORGANIZER;SCHEDULE-STATUS=1.2:mailto:user2.sabredav at sabredav.org
ATTENDEE;PARTSTAT=ACCEPTED:mailto:user2.sabredav at sabredav.org
ATTENDEE;PARTSTAT=ACCEPTED:mailto:user1.sabredav at sabredav.org
ATTENDEE:mailto:user3.sabredav at sabredav.org
@@ -364,7 +364,7 @@ BEGIN:VEVENT
UID:foo
DTSTART:20140811T230000Z
ORGANIZER:mailto:user1.sabredav at sabredav.org
-ATTENDEE;SCHEDULE-STATUS="3.7;Could not find principal.":mailto:user3.sabredav at sabredav.org
+ATTENDEE;SCHEDULE-STATUS=3.7:mailto:user3.sabredav at sabredav.org
END:VEVENT
END:VCALENDAR
ICS;
@@ -400,7 +400,7 @@ BEGIN:VEVENT
UID:foo
DTSTART:20140811T230000Z
ORGANIZER:mailto:user1.sabredav at sabredav.org
-ATTENDEE;SCHEDULE-STATUS="5.2;Could not find local inbox":mailto:user2.sabredav at sabredav.org
+ATTENDEE;SCHEDULE-STATUS=5.2:mailto:user2.sabredav at sabredav.org
END:VEVENT
END:VCALENDAR
ICS;
@@ -436,7 +436,7 @@ BEGIN:VEVENT
UID:foo
DTSTART:20140811T230000Z
ORGANIZER:mailto:user1.sabredav at sabredav.org
-ATTENDEE;SCHEDULE-STATUS="5.2;Could not locate a calendar-home-set":mailto:user2.sabredav at sabredav.org
+ATTENDEE;SCHEDULE-STATUS=5.2:mailto:user2.sabredav at sabredav.org
END:VEVENT
END:VCALENDAR
ICS;
@@ -471,7 +471,7 @@ BEGIN:VEVENT
UID:foo
DTSTART:20140811T230000Z
ORGANIZER:mailto:user1.sabredav at sabredav.org
-ATTENDEE;SCHEDULE-STATUS="5.2;Could not find a schedule-default-calendar-URL property":mailto:user2.sabredav at sabredav.org
+ATTENDEE;SCHEDULE-STATUS=5.2:mailto:user2.sabredav at sabredav.org
END:VEVENT
END:VCALENDAR
ICS;
@@ -504,7 +504,7 @@ BEGIN:VEVENT
UID:foo
DTSTART:20140811T230000Z
ORGANIZER:mailto:user1.sabredav at sabredav.org
-ATTENDEE;SCHEDULE-STATUS="5.2;There was no system capable of delivering the scheduling message":mailto:user2.sabredav at sabredav.org
+ATTENDEE;SCHEDULE-STATUS=5.2:mailto:user2.sabredav at sabredav.org
END:VEVENT
END:VCALENDAR
ICS;
@@ -539,7 +539,7 @@ BEGIN:VEVENT
UID:foo
DTSTART:20140811T230000Z
ORGANIZER:mailto:user1.sabredav at sabredav.org
-ATTENDEE;SCHEDULE-STATUS="5.2;There was no system capable of delivering the scheduling message":mailto:user2.sabredav at sabredav.org
+ATTENDEE;SCHEDULE-STATUS=5.2:mailto:user2.sabredav at sabredav.org
END:VEVENT
END:VCALENDAR
ICS;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git
More information about the Pkg-owncloud-commits
mailing list