nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-02-15 03:44:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugs pointed out by PHPStorm.

Browse Source
This commit is contained in:
Andrew McMillan 2016-06-22 22:17:19 +01:00
parent 607afb824c
commit 0f41ade035
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/caldav-DELETE.php
View File

@ -20,6 +20,8 @@ $lock_opener = $request->FailIfLocked();
require_once('schedule-functions.php');
function delete_collection( $id ) {
global $session, $request;
$params = array( ':collection_id' => $id );
$qry = new AwlQuery('SELECT child.collection_id AS child_id FROM collection child JOIN collection parent ON (parent.dav_name = child.parent_container) WHERE parent.collection_id = :collection_id', $params );
if ( $qry->Exec('DELETE',__LINE__,__FILE__) && $qry->rows() > 0 ) {

6
inc/caldav-PUT-functions.php
View File

@ -373,7 +373,7 @@ function do_scheduling_reply( vCalendar $resource, vProperty $organizer ) {
$response = '3.7'; // Organizer was not found on server.
if ( !$organizer_calendar->Exists() ) {
dbg_error_log('ERROR','Default calendar at "%s" does not exist for user "%s"',
$organizer_calendar->dav_name(), $schedule_target->username());
$organizer_calendar->dav_name(), $organizer_principal->username());
$response = '5.2'; // No scheduling support for user
}
else {
@ -384,7 +384,7 @@ function do_scheduling_reply( vCalendar $resource, vProperty $organizer ) {
$response = '1.2'; // Scheduling reply delivered successfully
if ( $organizer_calendar->WriteCalendarMember($schedule_original, false, false, $segment_name) === false ) {
dbg_error_log('ERROR','Could not write updated calendar member to %s',
$attendee_calendar->dav_name(), $attendee_calendar->dav_name(), $schedule_target->username());
$organizer_calendar->dav_name());
trace_bug('Failed to write scheduling resource.');
}
}
@ -1249,7 +1249,7 @@ function write_resource( DAVResource $resource, $caldav_data, DAVResource $colle
}
if ( $qry->rows() != 1 || !($row = $qry->Fetch()) ) {
// No dav_id? => We're toast!
trace_bug( 'No dav_id for "%s" on %s!!!', $path, ($create_resource ? 'create': 'update'));
trace_bug( 'No dav_id for "%s" on %s!!!', $path, ($put_action_type == 'INSERT' ? 'create': 'update'));
rollback_on_error( $caldav_context, $user_no, $path);
return false;
}