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

Enforce dates to be send as string (fixes #233)

Browse Source 
Prevents AWL/PG from converting them magically.
This commit is contained in:
Andrew Ruthven 2024-03-01 23:42:21 +13:00
parent ce67c2c839
commit 1c7954fc51
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,6 +181,19 @@ function GetTZID( vComponent $comp ) {
return $p->GetParameterValue('TZID');
}
/**
* Quotes a DateTime parameter (e.g. DTSTART) for the database
*
* @var string|null $dt
* @return string|null
*/
function quote_dt_param($dt) {
if (null === $dt || '' === $dt) {
return null;
}
return "'" . $dt . "'";
}
/**
* Deliver scheduling requests to attendees
@ -1086,8 +1099,8 @@ EOSQL;
$dav_data_params[':session_user'] = $session->user_no;
$dtstart = $first->GetPValue('DTSTART');
$calitem_params[':dtstart_orig'] = $dtstart;
$calitem_params[':dtstart'] = $dtstart;
$calitem_params[':dtstart_orig'] = quote_dt_param($dtstart);
$calitem_params[':dtstart'] = quote_dt_param($dtstart);
if ( (!isset($dtstart) || $dtstart == '') && $first->GetPValue('DUE') != '' ) {
$dtstart = $first->GetPValue('DUE');
@ -1129,11 +1142,11 @@ EOSQL;
}
$dtend = $first->GetPValue('DTEND');
$calitem_params[':dtend_orig'] = $dtend;
$calitem_params[':dtend_orig'] = quote_dt_param($dtend);
if ( isset($dtend) && $dtend != '' ) {
dbg_error_log( 'PUT', ' DTEND: "%s", DTSTART: "%s", DURATION: "%s"', $dtend, $dtstart, $first->GetPValue('DURATION') );
$calitem_params[':dtend'] = $dtend;
$calitem_params[':dtend'] = quote_dt_param($dtend);
$dtend = ':dtend';
}
else {
@ -1486,10 +1499,10 @@ function write_resource( DAVResource $resource, $caldav_data, DAVResource $colle
$dtstart = $dtstart . "T000000Z";
$calitem_params[':dtstart_orig'] = $dtstart;
}
$calitem_params[':dtstart'] = $dtstart;
$calitem_params[':dtstart'] = quote_dt_param($dtstart);
$dtend = $first->GetPValue('DTEND');
$calitem_params[':dtend_orig'] = $dtend;
$calitem_params[':dtend_orig'] = quote_dt_param($dtend);
if ( isset($dtend) && $dtend != '' ) {
dbg_error_log( 'PUT', ' DTEND: "%s", DTSTART: "%s", DURATION: "%s"', $dtend, $dtstart, $first->GetPValue('DURATION') );
@ -1497,7 +1510,7 @@ function write_resource( DAVResource $resource, $caldav_data, DAVResource $colle
$dtend = $dtend . "T000000Z";
$calitem_params[':dtend_orig'] = $dtend;
}
$calitem_params[':dtend'] = $dtend;
$calitem_params[':dtend'] = quote_dt_param($dtend);
$dtend = ':dtend';
}
else {