From fd5e7450f2c6d2ca42388ead80d4be09eb904d7f Mon Sep 17 00:00:00 2001 From: Florian Schlichting Date: Wed, 6 Jan 2016 16:04:00 +0100 Subject: [PATCH] Fix scheduling replies with mixed internal and external (ignored) attendees "new DAVPrincipal" always returns an object, so $attendee_principal will never be false --- inc/caldav-PUT-functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/caldav-PUT-functions.php b/inc/caldav-PUT-functions.php index 43eb56e1..935a9f2d 100644 --- a/inc/caldav-PUT-functions.php +++ b/inc/caldav-PUT-functions.php @@ -223,7 +223,7 @@ function handle_schedule_request( $ical ) { dbg_error_log( "PUT", "Delivering to %s", $attendee_email ); $attendee_principal = new DAVPrincipal ( array ('email'=>$attendee_email, 'options'=> array ( 'allow_by_email' => true ) ) ); - if ( $attendee_principal == false ){ + if ( ! $attendee_principal->Exists() ){ $attendee->SetParameterValue ('SCHEDULE-STATUS','5.3;No scheduling support for user'); continue; } @@ -415,7 +415,7 @@ function do_scheduling_reply( vCalendar $resource, vProperty $organizer ) { // attendees) should remain unmodified. Therefore, we have to make $schedule_original // and $schedule_request be initialized by each attendee's object here. $attendee_principal = new DAVPrincipal ( array ('email'=>$email, 'options'=> array ( 'allow_by_email' => true ) ) ); - if ( $attendee_principal == false ){ + if ( ! $attendee_principal->Exists() ){ dbg_error_log( 'PUT', 'Could not find attendee %s', $email); continue; }