From d78620398c3c39ef38ce625950d4559fd3591a3e Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Thu, 8 Sep 2011 09:40:47 +1200 Subject: [PATCH] Fix METHOD on scheduling request. --- inc/caldav-PUT-functions.php | 10 ++++++++-- .../tests/scheduling/3010-PUT-with-attendees.result | 10 +++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/inc/caldav-PUT-functions.php b/inc/caldav-PUT-functions.php index 24b9e30a..c2fc8a5d 100644 --- a/inc/caldav-PUT-functions.php +++ b/inc/caldav-PUT-functions.php @@ -369,8 +369,10 @@ function create_scheduling_requests( vComponent $resource ) { } dbg_error_log( 'PUT', 'Adding to scheduling inbox %d attendees', count($attendees) ); + $schedule_request = new VCalendar( array('METHOD' => 'REQUEST') ); + $schedule_request->SetComponents( $resource->GetComponents() ); foreach( $attendees AS $attendee ) { - $schedule_status = write_scheduling_request( $resource, $attendee->Value(), true ); + $schedule_status = write_scheduling_request( $schedule_request, $attendee->Value(), true ); dbg_error_log( 'PUT', 'Status for attendee <%s> set to "%s"', $attendee->Value(), $schedule_status ); $attendee->SetParameterValue( 'SCHEDULE-STATUS', $schedule_status ); } @@ -401,8 +403,12 @@ function update_scheduling_requests( vComponent $resource ) { } dbg_error_log( 'PUT', 'Adding to scheduling inbox %d attendees', count($attendees) ); + $schedule_request = new VCalendar( array('METHOD' => 'REQUEST') ); + $schedule_request->SetComponents( $resource->GetComponents() ); foreach( $attendees AS $attendee ) { - $attendee->SetParameterValue( 'SCHEDULE-STATUS', write_scheduling_request( $resource, $attendee->Value(), false ) ); + $schedule_status = write_scheduling_request( $schedule_request, $attendee->Value(), false ); + dbg_error_log( 'PUT', 'Status for attendee <%s> set to "%s"', $attendee->Value(), $schedule_status ); + $attendee->SetParameterValue( 'SCHEDULE-STATUS', $schedule_status ); } } diff --git a/testing/tests/scheduling/3010-PUT-with-attendees.result b/testing/tests/scheduling/3010-PUT-with-attendees.result index 8f34da77..47889a22 100644 --- a/testing/tests/scheduling/3010-PUT-with-attendees.result +++ b/testing/tests/scheduling/3010-PUT-with-attendees.result @@ -1,6 +1,6 @@ HTTP/1.1 100 Continue -HTTP/1.1 204 No Content +HTTP/1.1 201 Created Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule @@ -10,7 +10,7 @@ Content-Type: text/plain; charset="utf-8" caldav_type: >VEVENT< - dav_etag: >e69b6d5b70189b96126c8993bcf1648a< + dav_etag: >29961c088fb4666d00f6894e5dd3cfe8< dtend: >2010-11-23 16:00:00< dtstamp: >2010-11-24 22:19:00< dtstart: >2010-11-23 11:00:00< @@ -22,7 +22,7 @@ Content-Type: text/plain; charset="utf-8" user_no: >10< caldav_type: >VEVENT< - dav_etag: >e69b6d5b70189b96126c8993bcf1648a< + dav_etag: >29961c088fb4666d00f6894e5dd3cfe8< dtend: >2010-11-23 16:00:00< dtstamp: >2010-11-24 22:19:00< dtstart: >2010-11-23 11:00:00< @@ -34,7 +34,7 @@ Content-Type: text/plain; charset="utf-8" user_no: >11< caldav_type: >VEVENT< - dav_etag: >e69b6d5b70189b96126c8993bcf1648a< + dav_etag: >29961c088fb4666d00f6894e5dd3cfe8< dtend: >2010-11-23 16:00:00< dtstamp: >2010-11-24 22:19:00< dtstart: >2010-11-23 11:00:00< @@ -46,7 +46,7 @@ Content-Type: text/plain; charset="utf-8" user_no: >12< caldav_type: >VEVENT< - dav_etag: >e69b6d5b70189b96126c8993bcf1648a< + dav_etag: >29961c088fb4666d00f6894e5dd3cfe8< dtend: >2010-11-23 16:00:00< dtstamp: >2010-11-24 22:19:00< dtstart: >2010-11-23 11:00:00<