harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix timezone issue when importing adjusted events

Browse Source 
(cherry picked from commit 2b452ea3e8)
This commit is contained in:
Mario Vavti 2019-06-03 19:03:43 +00:00 committed by Mario
parent 5b4aa1afc2
commit e64a7b87a8
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/event.php
View File

@ -757,7 +757,6 @@ function parse_vobject($ical, $type) {
function parse_ical_file($f,$uid) {
require_once('vendor/autoload.php');
$s = @file_get_contents($f);
@ -816,12 +815,23 @@ function event_import_ical($ical, $uid) {
// logger('dtstart: ' . var_export($dtstart,true));
$ev['dtstart'] = datetime_convert((($ev['adjust']) ? 'UTC' : date_default_timezone_get()),'UTC',
$ev['timezone'] = 'UTC';
// Try to get an usable olson format timezone
if($ev['adjust']) {
//TODO: we should pass the vcalendar to getTimeZone() to be more accurate
// we do not have it here since parse_ical_file() is passing the vevent only.
$timezone_obj = \Sabre\VObject\TimeZoneUtil::getTimeZone($ical->DTSTART['TZID']);
$timezone = $timezone_obj->getName();
$ev['timezone'] = $timezone;
}
$ev['dtstart'] = datetime_convert((($ev['adjust']) ? 'UTC' : date_default_timezone_get()),$ev['timezone'],
$dtstart->format(\DateTime::W3C));
if(isset($ical->DTEND)) {
$dtend = $ical->DTEND->getDateTime();
$ev['dtend'] = datetime_convert((($ev['adjust']) ? 'UTC' : date_default_timezone_get()),'UTC',
$ev['dtend'] = datetime_convert((($ev['adjust']) ? 'UTC' : date_default_timezone_get()),$ev['timezone'],
$dtend->format(\DateTime::W3C));
}
else {
@ -871,10 +881,6 @@ function event_import_ical($ical, $uid) {
$ev['external_id'] = $evuid;
}
$ev['timezone'] = 'UTC';
if(isset($ical->DTSTART['TZID']))
$ev['timezone'] = $ical->DTSTART['TZID'];
if($ev['summary'] && $ev['dtstart']) {
$ev['event_xchan'] = $channel['channel_hash'];
$ev['uid'] = $channel['channel_id'];