Skip to content

Commit a925478

Browse files
SebastianKrupinskiSebastianKrupinski
committed
fix: add support for Microsoft time zones
Signed-off-by: SebastianKrupinski <[email protected]>
1 parent 1f87fa6 commit a925478

File tree

6 files changed

+327
-25
lines changed

6 files changed

+327
-25
lines changed

‎apps/dav/composer/composer/autoload_classmap.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
'OCA\\DAV\\CalDAV\\Sharing\\Backend' => $baseDir . '/../lib/CalDAV/Sharing/Backend.php',
111111
'OCA\\DAV\\CalDAV\\Sharing\\Service' => $baseDir . '/../lib/CalDAV/Sharing/Service.php',
112112
'OCA\\DAV\\CalDAV\\Status\\StatusService' => $baseDir . '/../lib/CalDAV/Status/StatusService.php',
113+
'OCA\\DAV\\CalDAV\\TimeZoneFactory' => $baseDir . '/../lib/CalDAV/TimeZoneFactory.php',
113114
'OCA\\DAV\\CalDAV\\TimezoneService' => $baseDir . '/../lib/CalDAV/TimezoneService.php',
114115
'OCA\\DAV\\CalDAV\\TipBroker' => $baseDir . '/../lib/CalDAV/TipBroker.php',
115116
'OCA\\DAV\\CalDAV\\Trashbin\\DeletedCalendarObject' => $baseDir . '/../lib/CalDAV/Trashbin/DeletedCalendarObject.php',

‎apps/dav/composer/composer/autoload_static.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ class ComposerStaticInitDAV
125125
'OCA\\DAV\\CalDAV\\Sharing\\Backend' => __DIR__ . '/..' . '/../lib/CalDAV/Sharing/Backend.php',
126126
'OCA\\DAV\\CalDAV\\Sharing\\Service' => __DIR__ . '/..' . '/../lib/CalDAV/Sharing/Service.php',
127127
'OCA\\DAV\\CalDAV\\Status\\StatusService' => __DIR__ . '/..' . '/../lib/CalDAV/Status/StatusService.php',
128+
'OCA\\DAV\\CalDAV\\TimeZoneFactory' => __DIR__ . '/..' . '/../lib/CalDAV/TimeZoneFactory.php',
128129
'OCA\\DAV\\CalDAV\\TimezoneService' => __DIR__ . '/..' . '/../lib/CalDAV/TimezoneService.php',
129130
'OCA\\DAV\\CalDAV\\TipBroker' => __DIR__ . '/..' . '/../lib/CalDAV/TipBroker.php',
130131
'OCA\\DAV\\CalDAV\\Trashbin\\DeletedCalendarObject' => __DIR__ . '/..' . '/../lib/CalDAV/Trashbin/DeletedCalendarObject.php',

‎apps/dav/lib/CalDAV/EventReader.php‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ class EventReader {
7272
*/
7373
public function __construct(VCalendar|VEvent|array|string $input, ?string $uid = null, ?DateTimeZone $timeZone = null) {
7474

75+
$timeZoneFactory = new TimeZoneFactory();
76+
7577
// evaluate if the input is a string and convert it to and vobject if required
7678
if (is_string($input)) {
7779
$input = Reader::read($input);
@@ -94,7 +96,7 @@ public function __construct(VCalendar|VEvent|array|string $input, ?string $uid =
9496
}
9597
// extract calendar timezone
9698
if (isset($input->VTIMEZONE) && isset($input->VTIMEZONE->TZID)) {
97-
$calendarTimeZone = new DateTimeZone($input->VTIMEZONE->TZID->getValue());
99+
$calendarTimeZone = $timeZoneFactory->fromName($input->VTIMEZONE->TZID->getValue());
98100
}
99101
}
100102
// evaluate if input is a collection of event vobjects
@@ -121,15 +123,15 @@ public function __construct(VCalendar|VEvent|array|string $input, ?string $uid =
121123
$this->baseEvent = array_shift($events);
122124
}
123125

124-
// determain the event starting time zone
126+
// determine the event starting time zone
125127
// we require this to align all other dates times
126-
// evaluate if timezone paramater was used (treat this as a override)
128+
// evaluate if timezone parameter was used (treat this as a override)
127129
if ($timeZone !== null) {
128130
$this->baseEventStartTimeZone = $timeZone;
129131
}
130132
// evaluate if event start date has a timezone parameter
131133
elseif (isset($this->baseEvent->DTSTART->parameters['TZID'])) {
132-
$this->baseEventStartTimeZone = new DateTimeZone($this->baseEvent->DTSTART->parameters['TZID']->getValue());
134+
$this->baseEventStartTimeZone = $timeZoneFactory->fromName($this->baseEvent->DTSTART->parameters['TZID']->getValue()) ?? new DateTimeZone('UTC');
133135
}
134136
// evaluate if event parent calendar has a time zone
135137
elseif (isset($calendarTimeZone)) {
@@ -140,15 +142,15 @@ public function __construct(VCalendar|VEvent|array|string $input, ?string $uid =
140142
$this->baseEventStartTimeZone = new DateTimeZone('UTC');
141143
}
142144

143-
// determain the event end time zone
145+
// determine the event end time zone
144146
// we require this to align all other dates and times
145-
// evaluate if timezone paramater was used (treat this as a override)
147+
// evaluate if timezone parameter was used (treat this as a override)
146148
if ($timeZone !== null) {
147149
$this->baseEventEndTimeZone = $timeZone;
148150
}
149151
// evaluate if event end date has a timezone parameter
150152
elseif (isset($this->baseEvent->DTEND->parameters['TZID'])) {
151-
$this->baseEventEndTimeZone = new DateTimeZone($this->baseEvent->DTEND->parameters['TZID']->getValue());
153+
$this->baseEventEndTimeZone = $timeZoneFactory->fromName($this->baseEvent->DTEND->parameters['TZID']->getValue()) ?? new DateTimeZone('UTC');
152154
}
153155
// evaluate if event parent calendar has a time zone
154156
elseif (isset($calendarTimeZone)) {

‎apps/dav/lib/CalDAV/TimeZoneFactory.php‎

Lines changed: 211 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,211 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
/**
6+
* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
7+
* SPDX-License-Identifier: AGPL-3.0-or-later
8+
*/
9+
10+
namespace OCA\DAV\CalDAV;
11+
12+
use DateTimeZone;
13+
14+
/**
15+
* Class to generate DateTimeZone object with automated Microsoft and IANA handling
16+
*
17+
* @since 31.0.0
18+
*/
19+
class TimeZoneFactory {
20+
21+
/**
22+
* conversion table of Microsoft time zones to IANA time zones
23+
*
24+
* @var array<string,string> MS2IANA
25+
*/
26+
private const MS2IANA = [
27+
'AUS Central Standard Time' => 'Australia/Darwin',
28+
'Aus Central W. Standard Time' => 'Australia/Eucla',
29+
'AUS Eastern Standard Time' => 'Australia/Sydney',
30+
'Afghanistan Standard Time' => 'Asia/Kabul',
31+
'Alaskan Standard Time' => 'America/Anchorage',
32+
'Aleutian Standard Time' => 'America/Adak',
33+
'Altai Standard Time' => 'Asia/Barnaul',
34+
'Arab Standard Time' => 'Asia/Riyadh',
35+
'Arabian Standard Time' => 'Asia/Dubai',
36+
'Arabic Standard Time' => 'Asia/Baghdad',
37+
'Argentina Standard Time' => 'America/Buenos_Aires',
38+
'Astrakhan Standard Time' => 'Europe/Astrakhan',
39+
'Atlantic Standard Time' => 'America/Halifax',
40+
'Azerbaijan Standard Time' => 'Asia/Baku',
41+
'Azores Standard Time' => 'Atlantic/Azores',
42+
'Bahia Standard Time' => 'America/Bahia',
43+
'Bangladesh Standard Time' => 'Asia/Dhaka',
44+
'Belarus Standard Time' => 'Europe/Minsk',
45+
'Bougainville Standard Time' => 'Pacific/Bougainville',
46+
'Cape Verde Standard Time' => 'Atlantic/Cape_Verde',
47+
'Canada Central Standard Time' => 'America/Regina',
48+
'Caucasus Standard Time' => 'Asia/Yerevan',
49+
'Cen. Australia Standard Time' => 'Australia/Adelaide',
50+
'Central America Standard Time' => 'America/Guatemala',
51+
'Central Asia Standard Time' => 'Asia/Almaty',
52+
'Central Brazilian Standard Time' => 'America/Cuiaba',
53+
'Central Europe Standard Time' => 'Europe/Budapest',
54+
'Central European Standard Time' => 'Europe/Warsaw',
55+
'Central Pacific Standard Time' => 'Pacific/Guadalcanal',
56+
'Central Standard Time' => 'America/Chicago',
57+
'Central Standard Time (Mexico)' => 'America/Mexico_City',
58+
'Chatham Islands Standard Time' => 'Pacific/Chatham',
59+
'China Standard Time' => 'Asia/Shanghai',
60+
'Coordinated Universal Time' => 'UTC',
61+
'Cuba Standard Time' => 'America/Havana',
62+
'Dateline Standard Time' => 'Etc/GMT+12',
63+
'E. Africa Standard Time' => 'Africa/Nairobi',
64+
'E. Australia Standard Time' => 'Australia/Brisbane',
65+
'E. Europe Standard Time' => 'Europe/Chisinau',
66+
'E. South America Standard Time' => 'America/Sao_Paulo',
67+
'Easter Island Standard Time' => 'Pacific/Easter',
68+
'Eastern Standard Time' => 'America/Toronto',
69+
'Eastern Standard Time (Mexico)' => 'America/Cancun',
70+
'Egypt Standard Time' => 'Africa/Cairo',
71+
'Ekaterinburg Standard Time' => 'Asia/Yekaterinburg',
72+
'FLE Standard Time' => 'Europe/Kiev',
73+
'Fiji Standard Time' => 'Pacific/Fiji',
74+
'GMT Standard Time' => 'Europe/London',
75+
'GTB Standard Time' => 'Europe/Bucharest',
76+
'Georgian Standard Time' => 'Asia/Tbilisi',
77+
'Greenland Standard Time' => 'America/Godthab',
78+
'Greenland (Danmarkshavn)' => 'America/Godthab',
79+
'Greenwich Standard Time' => 'Atlantic/Reykjavik',
80+
'Haiti Standard Time' => 'America/Port-au-Prince',
81+
'Hawaiian Standard Time' => 'Pacific/Honolulu',
82+
'India Standard Time' => 'Asia/Calcutta',
83+
'Iran Standard Time' => 'Asia/Tehran',
84+
'Israel Standard Time' => 'Asia/Jerusalem',
85+
'Jordan Standard Time' => 'Asia/Amman',
86+
'Kaliningrad Standard Time' => 'Europe/Kaliningrad',
87+
'Kamchatka Standard Time' => 'Asia/Kamchatka',
88+
'Korea Standard Time' => 'Asia/Seoul',
89+
'Libya Standard Time' => 'Africa/Tripoli',
90+
'Line Islands Standard Time' => 'Pacific/Kiritimati',
91+
'Lord Howe Standard Time' => 'Australia/Lord_Howe',
92+
'Magadan Standard Time' => 'Asia/Magadan',
93+
'Magallanes Standard Time' => 'America/Punta_Arenas',
94+
'Malaysia Standard Time' => 'Asia/Kuala_Lumpur',
95+
'Marquesas Standard Time' => 'Pacific/Marquesas',
96+
'Mauritius Standard Time' => 'Indian/Mauritius',
97+
'Mid-Atlantic Standard Time' => 'Atlantic/South_Georgia',
98+
'Middle East Standard Time' => 'Asia/Beirut',
99+
'Montevideo Standard Time' => 'America/Montevideo',
100+
'Morocco Standard Time' => 'Africa/Casablanca',
101+
'Mountain Standard Time' => 'America/Denver',
102+
'Mountain Standard Time (Mexico)' => 'America/Chihuahua',
103+
'Myanmar Standard Time' => 'Asia/Rangoon',
104+
'N. Central Asia Standard Time' => 'Asia/Novosibirsk',
105+
'Namibia Standard Time' => 'Africa/Windhoek',
106+
'Nepal Standard Time' => 'Asia/Katmandu',
107+
'New Zealand Standard Time' => 'Pacific/Auckland',
108+
'Newfoundland Standard Time' => 'America/St_Johns',
109+
'Norfolk Standard Time' => 'Pacific/Norfolk',
110+
'North Asia East Standard Time' => 'Asia/Irkutsk',
111+
'North Asia Standard Time' => 'Asia/Krasnoyarsk',
112+
'North Korea Standard Time' => 'Asia/Pyongyang',
113+
'Omsk Standard Time' => 'Asia/Omsk',
114+
'Pacific SA Standard Time' => 'America/Santiago',
115+
'Pacific Standard Time' => 'America/Los_Angeles',
116+
'Pacific Standard Time (Mexico)' => 'America/Tijuana',
117+
'Pakistan Standard Time' => 'Asia/Karachi',
118+
'Paraguay Standard Time' => 'America/Asuncion',
119+
'Qyzylorda Standard Time' => 'Asia/Qyzylorda',
120+
'Romance Standard Time' => 'Europe/Paris',
121+
'Russian Standard Time' => 'Europe/Moscow',
122+
'Russia Time Zone 10' => 'Asia/Srednekolymsk',
123+
'Russia Time Zone 3' => 'Europe/Samara',
124+
'SA Eastern Standard Time' => 'America/Cayenne',
125+
'SA Pacific Standard Time' => 'America/Bogota',
126+
'SA Western Standard Time' => 'America/La_Paz',
127+
'SE Asia Standard Time' => 'Asia/Bangkok',
128+
'Saint Pierre Standard Time' => 'America/Miquelon',
129+
'Sakhalin Standard Time' => 'Asia/Sakhalin',
130+
'Samoa Standard Time' => 'Pacific/Apia',
131+
'Sao Tome Standard Time' => 'Africa/Sao_Tome',
132+
'Saratov Standard Time' => 'Europe/Saratov',
133+
'Singapore Standard Time' => 'Asia/Singapore',
134+
'South Africa Standard Time' => 'Africa/Johannesburg',
135+
'South Sudan Standard Time' => 'Africa/Juba',
136+
'Sri Lanka Standard Time' => 'Asia/Colombo',
137+
'Sudan Standard Time' => 'Africa/Khartoum',
138+
'Syria Standard Time' => 'Asia/Damascus',
139+
'Taipei Standard Time' => 'Asia/Taipei',
140+
'Tasmania Standard Time' => 'Australia/Hobart',
141+
'Tocantins Standard Time' => 'America/Araguaina',
142+
'Tokyo Standard Time' => 'Asia/Tokyo',
143+
'Tomsk Standard Time' => 'Asia/Tomsk',
144+
'Tonga Standard Time' => 'Pacific/Tongatapu',
145+
'Transbaikal Standard Time' => 'Asia/Chita',
146+
'Turkey Standard Time' => 'Europe/Istanbul',
147+
'Turks And Caicos Standard Time' => 'America/Grand_Turk',
148+
'US Eastern Standard Time' => 'America/Indianapolis',
149+
'US Mountain Standard Time' => 'America/Phoenix',
150+
'UTC' => 'Etc/GMT',
151+
'UTC+13' => 'Etc/GMT-13',
152+
'UTC+12' => 'Etc/GMT-12',
153+
'UTC-02' => 'Etc/GMT+2',
154+
'UTC-09' => 'Etc/GMT+9',
155+
'UTC-11' => 'Etc/GMT+11',
156+
'Ulaanbaatar Standard Time' => 'Asia/Ulaanbaatar',
157+
'Venezuela Standard Time' => 'America/Caracas',
158+
'Vladivostok Standard Time' => 'Asia/Vladivostok',
159+
'Volgograd Standard Time' => 'Europe/Volgograd',
160+
'W. Australia Standard Time' => 'Australia/Perth',
161+
'W. Central Africa Standard Time' => 'Africa/Lagos',
162+
'W. Europe Standard Time' => 'Europe/Berlin',
163+
'W. Mongolia Standard Time' => 'Asia/Hovd',
164+
'West Asia Standard Time' => 'Asia/Tashkent',
165+
'West Bank Standard Time' => 'Asia/Hebron',
166+
'West Pacific Standard Time' => 'Pacific/Port_Moresby',
167+
'Yakutsk Standard Time' => 'Asia/Yakutsk',
168+
'Yukon Standard Time' => 'America/Whitehorse',
169+
];
170+
171+
/**
172+
* Determines if given time zone name is a Microsoft time zone
173+
*
174+
* @since 31.0.0
175+
*
176+
* @param string $name time zone name
177+
*
178+
* @return bool
179+
*/
180+
public static function isMS(string $name): bool {
181+
return isset(self::MS2IANA[$name]);
182+
}
183+
184+
/**
185+
* Converts Microsoft time zone name to IANA time zone name
186+
*
187+
* @since 31.0.0
188+
*
189+
* @param string $name microsoft time zone
190+
*
191+
* @return string|null valid IANA time zone name on success, or null on failure
192+
*/
193+
public static function toIANA(string $name): ?string {
194+
return isset(self::MS2IANA[$name]) ? self::MS2IANA[$name] : null;
195+
}
196+
197+
/**
198+
* Generates DateTimeZone object for given time zone name
199+
*
200+
* @since 31.0.0
201+
*
202+
* @param string $name time zone name
203+
*
204+
* @return DateTimeZone|null
205+
*/
206+
public function fromName(string $name): ?DateTimeZone {
207+
// if zone name is MS convert to IANA, otherwise just assume the zone is IANA
208+
$zone = @timezone_open(self::toIANA($name) ?? $name);
209+
return ($zone instanceof DateTimeZone) ? $zone : null;
210+
}
211+
}

0 commit comments

Comments
 (0)