From bb90ff3099bd25bf51ce740c509d9f211aa153ae Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 27 Sep 2022 19:43:03 +0530 Subject: [PATCH 1/6] time fix --- lib/BackgroundJob/SendInviteResponseMailJob.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/BackgroundJob/SendInviteResponseMailJob.php b/lib/BackgroundJob/SendInviteResponseMailJob.php index 81df9c980..f72fdc5ed 100644 --- a/lib/BackgroundJob/SendInviteResponseMailJob.php +++ b/lib/BackgroundJob/SendInviteResponseMailJob.php @@ -199,7 +199,7 @@ class SendInviteResponseMailJob extends QueuedJob { $SUMMARY = $vObject->VEVENT->SUMMARY; $datestart = (string) $vObject->VEVENT->DTSTART; if (str_contains($datestart, "T")) { - $eventdate = date("F d, Y h:i", strtotime($datestart)); + $eventdate = date("F d, Y G:i", strtotime($datestart)); } else { $eventdate = date("F d, Y", strtotime($datestart)); } -- GitLab From 3709418c992694d56a7916d7515def010836d293 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 27 Sep 2022 20:13:27 +0530 Subject: [PATCH 2/6] time fix --- lib/BackgroundJob/SendInviteResponseMailJob.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/BackgroundJob/SendInviteResponseMailJob.php b/lib/BackgroundJob/SendInviteResponseMailJob.php index f72fdc5ed..f9b57ac7c 100644 --- a/lib/BackgroundJob/SendInviteResponseMailJob.php +++ b/lib/BackgroundJob/SendInviteResponseMailJob.php @@ -199,7 +199,7 @@ class SendInviteResponseMailJob extends QueuedJob { $SUMMARY = $vObject->VEVENT->SUMMARY; $datestart = (string) $vObject->VEVENT->DTSTART; if (str_contains($datestart, "T")) { - $eventdate = date("F d, Y G:i", strtotime($datestart)); + $eventdate = date("F d, Y h:i A", strtotime($datestart)); } else { $eventdate = date("F d, Y", strtotime($datestart)); } -- GitLab From b70a7c873ac24a31ea15d5d73dfc5933d0c9c555 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 28 Sep 2022 15:35:24 +0530 Subject: [PATCH 3/6] timezone added --- lib/BackgroundJob/SendInviteResponseMailJob.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/BackgroundJob/SendInviteResponseMailJob.php b/lib/BackgroundJob/SendInviteResponseMailJob.php index f9b57ac7c..fd903d987 100644 --- a/lib/BackgroundJob/SendInviteResponseMailJob.php +++ b/lib/BackgroundJob/SendInviteResponseMailJob.php @@ -198,11 +198,15 @@ class SendInviteResponseMailJob extends QueuedJob { $SUMMARY = $vObject->VEVENT->SUMMARY; $datestart = (string) $vObject->VEVENT->DTSTART; + $timezone = (string) $vObject->VEVENT->TZID; if (str_contains($datestart, "T")) { - $eventdate = date("F d, Y h:i A", strtotime($datestart)); + $eventdate = date("F d, Y h:i", strtotime($datestart)); } else { $eventdate = date("F d, Y", strtotime($datestart)); } + if($timezone!=''){ + $eventdate=$eventdate.' ('.$timezone.')'; + } $translationData = [ "summary" => $SUMMARY, "attendee_name" => $attendeeName, -- GitLab From 4b5f76e5cda98b31b93c5e38768547c0fdfcf865 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 28 Sep 2022 16:02:11 +0530 Subject: [PATCH 4/6] timezone added --- lib/BackgroundJob/SendInviteResponseMailJob.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/BackgroundJob/SendInviteResponseMailJob.php b/lib/BackgroundJob/SendInviteResponseMailJob.php index fd903d987..ceff075c1 100644 --- a/lib/BackgroundJob/SendInviteResponseMailJob.php +++ b/lib/BackgroundJob/SendInviteResponseMailJob.php @@ -198,7 +198,7 @@ class SendInviteResponseMailJob extends QueuedJob { $SUMMARY = $vObject->VEVENT->SUMMARY; $datestart = (string) $vObject->VEVENT->DTSTART; - $timezone = (string) $vObject->VEVENT->TZID; + $timezone = $vObject->VEVENT->TZID; if (str_contains($datestart, "T")) { $eventdate = date("F d, Y h:i", strtotime($datestart)); } else { -- GitLab From 903b3c913dabacd8704a5990b62bd7c40e41f49b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 28 Sep 2022 22:37:57 +0530 Subject: [PATCH 5/6] timezone fix --- lib/BackgroundJob/SendInviteResponseMailJob.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/BackgroundJob/SendInviteResponseMailJob.php b/lib/BackgroundJob/SendInviteResponseMailJob.php index ceff075c1..2374bdb51 100644 --- a/lib/BackgroundJob/SendInviteResponseMailJob.php +++ b/lib/BackgroundJob/SendInviteResponseMailJob.php @@ -198,14 +198,21 @@ class SendInviteResponseMailJob extends QueuedJob { $SUMMARY = $vObject->VEVENT->SUMMARY; $datestart = (string) $vObject->VEVENT->DTSTART; - $timezone = $vObject->VEVENT->TZID; if (str_contains($datestart, "T")) { $eventdate = date("F d, Y h:i", strtotime($datestart)); } else { $eventdate = date("F d, Y", strtotime($datestart)); } - if($timezone!=''){ - $eventdate=$eventdate.' ('.$timezone.')'; + $isAllDay = $vObject->VEVENT->DTSTART instanceof Property\ICalendar\Date; + if(!$isAllDay){ + $isFloating = $vObject->VEVENT->DTSTART->isFloating(); + if (!$isFloating) { + $prop = $vObject->VEVENT->DTSTART->offsetGet('TZID'); + if ($prop instanceof Parameter) { + $timezone = $vObject->VEVENT->DTSTART->offsetGet('TZID')->getValue(); + $eventdate=$eventdate.' ('.$timezone.')'; + } + } } $translationData = [ "summary" => $SUMMARY, -- GitLab From 166a95aff7ebfb1341797fb516528e8575a58f1d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 28 Sep 2022 23:34:34 +0530 Subject: [PATCH 6/6] time with timezone --- lib/BackgroundJob/SendInviteResponseMailJob.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/BackgroundJob/SendInviteResponseMailJob.php b/lib/BackgroundJob/SendInviteResponseMailJob.php index 2374bdb51..c2e025bfb 100644 --- a/lib/BackgroundJob/SendInviteResponseMailJob.php +++ b/lib/BackgroundJob/SendInviteResponseMailJob.php @@ -37,6 +37,7 @@ use OCP\IL10N; use OCP\IUserManager; use OCP\Calendar\IManager; use Sabre\VObject\Reader; +use Sabre\VObject\Parameter; use OCP\Util; class SendInviteResponseMailJob extends QueuedJob { @@ -199,7 +200,7 @@ class SendInviteResponseMailJob extends QueuedJob { $SUMMARY = $vObject->VEVENT->SUMMARY; $datestart = (string) $vObject->VEVENT->DTSTART; if (str_contains($datestart, "T")) { - $eventdate = date("F d, Y h:i", strtotime($datestart)); + $eventdate = date("F d, Y h:i A", strtotime($datestart)); } else { $eventdate = date("F d, Y", strtotime($datestart)); } -- GitLab