nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-18 01:31:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

properly check if $row has been unset (fixes #141)

Browse Source 
Also fix deprecation warnings introduced with PHP 7.3 about the use of
continue inside switch statements, see
https://wiki.php.net/rfc/continue_on_switch_deprecation
This commit is contained in:
Florian Schlichting 2018-12-22 01:03:38 +01:00
parent 55586c784e
commit a51caa38f1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -640,7 +640,7 @@ function do_scheduling_requests( vCalendar $resource, $create, $old_data = null
$response = '5.2'; // No scheduling support for user $response = '5.2'; // No scheduling support for user
} }
else { else {
if ($attendee_is_new || !$row) { if ($attendee_is_new || !isset($row)) {
$this_schedule_request = clone($schedule_request); $this_schedule_request = clone($schedule_request);
$this_resource = clone($resource); $this_resource = clone($resource);
} else { } else {

8
inc/caldav-REPORT-calquery.php
View File

@ -183,7 +183,7 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
$subfilter = $v->GetContent(); $subfilter = $v->GetContent();
if ( is_array( $subfilter ) ) { if ( is_array( $subfilter ) ) {
$success = SqlFilterFragment( $subfilter, $components, $property, $parameter ); $success = SqlFilterFragment( $subfilter, $components, $property, $parameter );
if ( $success === false ) continue; else { if ( $success === false ) continue 2; else {
$sql .= $success['sql']; $sql .= $success['sql'];
$params = array_merge( $params, $success['params'] ); $params = array_merge( $params, $success['params'] );
} }
@ -220,12 +220,12 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
$need_post_filter = true; $need_post_filter = true;
unset($subproperty); unset($subproperty);
dbg_error_log("calquery", "Could not handle 'prop-filter' on %s in SQL", $propertyname ); dbg_error_log("calquery", "Could not handle 'prop-filter' on %s in SQL", $propertyname );
continue; continue 3;
} }
if ( isset($subproperty) ) { if ( isset($subproperty) ) {
$subfilter = $v->GetContent(); $subfilter = $v->GetContent();
$success = SqlFilterFragment( $subfilter, $components, $subproperty, $parameter ); $success = SqlFilterFragment( $subfilter, $components, $subproperty, $parameter );
if ( $success === false ) continue; else { if ( $success === false ) continue 2; else {
$sql .= $success['sql']; $sql .= $success['sql'];
$params = array_merge( $params, $success['params'] ); $params = array_merge( $params, $success['params'] );
} }
@ -238,7 +238,7 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
$parameter = $v->GetAttribute("name"); $parameter = $v->GetAttribute("name");
$subfilter = $v->GetContent(); $subfilter = $v->GetContent();
$success = SqlFilterFragment( $subfilter, $components, $property, $parameter ); $success = SqlFilterFragment( $subfilter, $components, $property, $parameter );
if ( $success === false ) continue; else { if ( $success === false ) continue 2; else {
$sql .= $success['sql']; $sql .= $success['sql'];
$params = array_merge( $params, $success['params'] ); $params = array_merge( $params, $success['params'] );
} }