extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-29 03:13:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix diff to master

Browse Source
This commit is contained in:
ralf 2024-11-06 16:29:34 +01:00
parent 0905d8f4aa
commit 70dbebae41
1 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
api/src/CalDAV/JsCalendar.php
View File

@ -556,20 +556,6 @@ class JsCalendar extends JsBase
return $duration; return $duration;
} }
/**
* Parse a DateTime value
*
* @param string $value
* @param string|null $timezone
* @param bool $showWithoutTime true: return H:i set to 00:00
* @return Api\DateTime
* @throws Api\Exception
*/
protected static function parseDateTime(string $value, ?string $timezone=null, bool $showWithoutTime=false)
{
return new Api\DateTime($value, !empty($timezone) ? new \DateTimeZone($timezone) : null);
}
protected static function parseStartDuration(array $data) protected static function parseStartDuration(array $data)
{ {
$parsed = []; $parsed = [];
@ -999,17 +985,14 @@ class JsCalendar extends JsBase
{ {
foreach ($event['recur_exception'] as $timestamp) foreach ($event['recur_exception'] as $timestamp)
{ {
foreach ($event['recur_exception'] as $timestamp) $ex_date = new Api\DateTime($timestamp, Api\DateTime::$server_timezone);
if (!empty($event['whole_day']))
{ {
$ex_date = new Api\DateTime($timestamp, Api\DateTime::$server_timezone); $ex_date->setTime(0, 0, 0);
if (!empty($event['whole_day']))
{
$ex_date->setTime(0, 0, 0);
}
$overrides[self::DateTime($ex_date, $event['tzid'])] = [
'excluded' => true,
];
} }
$overrides[self::DateTime($ex_date, $event['tzid'])] = [
'excluded' => true,
];
} }
} }