Dolibarr / dolibarr

htdocs/includes/sabre/sabre/vobject/lib/timezonedata/lotuszones.php

Indentation +90 added lines, -90 removed lines

@@ -8,94 +8,94 @@
  * @license http://sabre.io/license/ Modified BSD License
  */
 return [
-    'Dateline' => 'Etc/GMT-12',
-    'Samoa' => 'Pacific/Apia',
-    'Hawaiian' => 'Pacific/Honolulu',
-    'Alaskan' => 'America/Anchorage',
-    'Pacific' => 'America/Los_Angeles',
-    'Pacific Standard Time' => 'America/Los_Angeles',
-    'Mexico Standard Time 2' => 'America/Chihuahua',
-    'Mountain' => 'America/Denver',
-    // 'Mountain Standard Time' => 'America/Chihuahua', // conflict with windows timezones.
-    'US Mountain' => 'America/Phoenix',
-    'Canada Central' => 'America/Edmonton',
-    'Central America' => 'America/Guatemala',
-    'Central' => 'America/Chicago',
-    // 'Central Standard Time'  => 'America/Mexico_City', // conflict with windows timezones.
-    'Mexico' => 'America/Mexico_City',
-    'Eastern' => 'America/New_York',
-    'SA Pacific' => 'America/Bogota',
-    'US Eastern' => 'America/Indiana/Indianapolis',
-    'Venezuela' => 'America/Caracas',
-    'Atlantic' => 'America/Halifax',
-    'Central Brazilian' => 'America/Manaus',
-    'Pacific SA' => 'America/Santiago',
-    'SA Western' => 'America/La_Paz',
-    'Newfoundland' => 'America/St_Johns',
-    'Argentina' => 'America/Argentina/Buenos_Aires',
-    'E. South America' => 'America/Belem',
-    'Greenland' => 'America/Godthab',
-    'Montevideo' => 'America/Montevideo',
-    'SA Eastern' => 'America/Belem',
-    // 'Mid-Atlantic'           => 'Etc/GMT-2', // conflict with windows timezones.
-    'Azores' => 'Atlantic/Azores',
-    'Cape Verde' => 'Atlantic/Cape_Verde',
-    'Greenwich' => 'Atlantic/Reykjavik', // No I'm serious.. Greenwich is not GMT.
-    'Morocco' => 'Africa/Casablanca',
-    'Central Europe' => 'Europe/Prague',
-    'Central European' => 'Europe/Sarajevo',
-    'Romance' => 'Europe/Paris',
-    'W. Central Africa' => 'Africa/Lagos', // Best guess
-    'W. Europe' => 'Europe/Amsterdam',
-    'E. Europe' => 'Europe/Minsk',
-    'Egypt' => 'Africa/Cairo',
-    'FLE' => 'Europe/Helsinki',
-    'GTB' => 'Europe/Athens',
-    'Israel' => 'Asia/Jerusalem',
-    'Jordan' => 'Asia/Amman',
-    'Middle East' => 'Asia/Beirut',
-    'Namibia' => 'Africa/Windhoek',
-    'South Africa' => 'Africa/Harare',
-    'Arab' => 'Asia/Kuwait',
-    'Arabic' => 'Asia/Baghdad',
-    'E. Africa' => 'Africa/Nairobi',
-    'Georgian' => 'Asia/Tbilisi',
-    'Russian' => 'Europe/Moscow',
-    'Iran' => 'Asia/Tehran',
-    'Arabian' => 'Asia/Muscat',
-    'Armenian' => 'Asia/Yerevan',
-    'Azerbijan' => 'Asia/Baku',
-    'Caucasus' => 'Asia/Yerevan',
-    'Mauritius' => 'Indian/Mauritius',
-    'Afghanistan' => 'Asia/Kabul',
-    'Ekaterinburg' => 'Asia/Yekaterinburg',
-    'Pakistan' => 'Asia/Karachi',
-    'West Asia' => 'Asia/Tashkent',
-    'India' => 'Asia/Calcutta',
-    'Sri Lanka' => 'Asia/Colombo',
-    'Nepal' => 'Asia/Kathmandu',
-    'Central Asia' => 'Asia/Dhaka',
-    'N. Central Asia' => 'Asia/Almaty',
-    'Myanmar' => 'Asia/Rangoon',
-    'North Asia' => 'Asia/Krasnoyarsk',
-    'SE Asia' => 'Asia/Bangkok',
-    'China' => 'Asia/Shanghai',
-    'North Asia East' => 'Asia/Irkutsk',
-    'Singapore' => 'Asia/Singapore',
-    'Taipei' => 'Asia/Taipei',
-    'W. Australia' => 'Australia/Perth',
-    'Korea' => 'Asia/Seoul',
-    'Tokyo' => 'Asia/Tokyo',
-    'Yakutsk' => 'Asia/Yakutsk',
-    'AUS Central' => 'Australia/Darwin',
-    'Cen. Australia' => 'Australia/Adelaide',
-    'AUS Eastern' => 'Australia/Sydney',
-    'E. Australia' => 'Australia/Brisbane',
-    'Tasmania' => 'Australia/Hobart',
-    'Vladivostok' => 'Asia/Vladivostok',
-    'West Pacific' => 'Pacific/Guam',
-    'Central Pacific' => 'Asia/Magadan',
-    'Fiji' => 'Pacific/Fiji',
-    'New Zealand' => 'Pacific/Auckland',
-    'Tonga' => 'Pacific/Tongatapu',
+	'Dateline' => 'Etc/GMT-12',
+	'Samoa' => 'Pacific/Apia',
+	'Hawaiian' => 'Pacific/Honolulu',
+	'Alaskan' => 'America/Anchorage',
+	'Pacific' => 'America/Los_Angeles',
+	'Pacific Standard Time' => 'America/Los_Angeles',
+	'Mexico Standard Time 2' => 'America/Chihuahua',
+	'Mountain' => 'America/Denver',
+	// 'Mountain Standard Time' => 'America/Chihuahua', // conflict with windows timezones.
+	'US Mountain' => 'America/Phoenix',
+	'Canada Central' => 'America/Edmonton',
+	'Central America' => 'America/Guatemala',
+	'Central' => 'America/Chicago',
+	// 'Central Standard Time'  => 'America/Mexico_City', // conflict with windows timezones.
+	'Mexico' => 'America/Mexico_City',
+	'Eastern' => 'America/New_York',
+	'SA Pacific' => 'America/Bogota',
+	'US Eastern' => 'America/Indiana/Indianapolis',
+	'Venezuela' => 'America/Caracas',
+	'Atlantic' => 'America/Halifax',
+	'Central Brazilian' => 'America/Manaus',
+	'Pacific SA' => 'America/Santiago',
+	'SA Western' => 'America/La_Paz',
+	'Newfoundland' => 'America/St_Johns',
+	'Argentina' => 'America/Argentina/Buenos_Aires',
+	'E. South America' => 'America/Belem',
+	'Greenland' => 'America/Godthab',
+	'Montevideo' => 'America/Montevideo',
+	'SA Eastern' => 'America/Belem',
+	// 'Mid-Atlantic'           => 'Etc/GMT-2', // conflict with windows timezones.
+	'Azores' => 'Atlantic/Azores',
+	'Cape Verde' => 'Atlantic/Cape_Verde',
+	'Greenwich' => 'Atlantic/Reykjavik', // No I'm serious.. Greenwich is not GMT.
+	'Morocco' => 'Africa/Casablanca',
+	'Central Europe' => 'Europe/Prague',
+	'Central European' => 'Europe/Sarajevo',
+	'Romance' => 'Europe/Paris',
+	'W. Central Africa' => 'Africa/Lagos', // Best guess
+	'W. Europe' => 'Europe/Amsterdam',
+	'E. Europe' => 'Europe/Minsk',
+	'Egypt' => 'Africa/Cairo',
+	'FLE' => 'Europe/Helsinki',
+	'GTB' => 'Europe/Athens',
+	'Israel' => 'Asia/Jerusalem',
+	'Jordan' => 'Asia/Amman',
+	'Middle East' => 'Asia/Beirut',
+	'Namibia' => 'Africa/Windhoek',
+	'South Africa' => 'Africa/Harare',
+	'Arab' => 'Asia/Kuwait',
+	'Arabic' => 'Asia/Baghdad',
+	'E. Africa' => 'Africa/Nairobi',
+	'Georgian' => 'Asia/Tbilisi',
+	'Russian' => 'Europe/Moscow',
+	'Iran' => 'Asia/Tehran',
+	'Arabian' => 'Asia/Muscat',
+	'Armenian' => 'Asia/Yerevan',
+	'Azerbijan' => 'Asia/Baku',
+	'Caucasus' => 'Asia/Yerevan',
+	'Mauritius' => 'Indian/Mauritius',
+	'Afghanistan' => 'Asia/Kabul',
+	'Ekaterinburg' => 'Asia/Yekaterinburg',
+	'Pakistan' => 'Asia/Karachi',
+	'West Asia' => 'Asia/Tashkent',
+	'India' => 'Asia/Calcutta',
+	'Sri Lanka' => 'Asia/Colombo',
+	'Nepal' => 'Asia/Kathmandu',
+	'Central Asia' => 'Asia/Dhaka',
+	'N. Central Asia' => 'Asia/Almaty',
+	'Myanmar' => 'Asia/Rangoon',
+	'North Asia' => 'Asia/Krasnoyarsk',
+	'SE Asia' => 'Asia/Bangkok',
+	'China' => 'Asia/Shanghai',
+	'North Asia East' => 'Asia/Irkutsk',
+	'Singapore' => 'Asia/Singapore',
+	'Taipei' => 'Asia/Taipei',
+	'W. Australia' => 'Australia/Perth',
+	'Korea' => 'Asia/Seoul',
+	'Tokyo' => 'Asia/Tokyo',
+	'Yakutsk' => 'Asia/Yakutsk',
+	'AUS Central' => 'Australia/Darwin',
+	'Cen. Australia' => 'Australia/Adelaide',
+	'AUS Eastern' => 'Australia/Sydney',
+	'E. Australia' => 'Australia/Brisbane',
+	'Tasmania' => 'Australia/Hobart',
+	'Vladivostok' => 'Asia/Vladivostok',
+	'West Pacific' => 'Pacific/Guam',
+	'Central Pacific' => 'Asia/Magadan',
+	'Fiji' => 'Pacific/Fiji',
+	'New Zealand' => 'Pacific/Auckland',
+	'Tonga' => 'Pacific/Tongatapu',
 ];

htdocs/includes/sabre/sabre/vobject/lib/timezonedata/exchangezones.php

Indentation +79 added lines, -79 removed lines

@@ -12,83 +12,83 @@
  * @license http://sabre.io/license/ Modified BSD License
  */
 return [
-    'Universal Coordinated Time' => 'UTC',
-    'Casablanca, Monrovia' => 'Africa/Casablanca',
-    'Greenwich Mean Time: Dublin, Edinburgh, Lisbon, London' => 'Europe/Lisbon',
-    'Greenwich Mean Time; Dublin, Edinburgh, London' => 'Europe/London',
-    'Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna' => 'Europe/Berlin',
-    'Belgrade, Pozsony, Budapest, Ljubljana, Prague' => 'Europe/Prague',
-    'Brussels, Copenhagen, Madrid, Paris' => 'Europe/Paris',
-    'Paris, Madrid, Brussels, Copenhagen' => 'Europe/Paris',
-    'Prague, Central Europe' => 'Europe/Prague',
-    'Sarajevo, Skopje, Sofija, Vilnius, Warsaw, Zagreb' => 'Europe/Sarajevo',
-    'West Central Africa' => 'Africa/Luanda', // This was a best guess
-    'Athens, Istanbul, Minsk' => 'Europe/Athens',
-    'Bucharest' => 'Europe/Bucharest',
-    'Cairo' => 'Africa/Cairo',
-    'Harare, Pretoria' => 'Africa/Harare',
-    'Helsinki, Riga, Tallinn' => 'Europe/Helsinki',
-    'Israel, Jerusalem Standard Time' => 'Asia/Jerusalem',
-    'Baghdad' => 'Asia/Baghdad',
-    'Arab, Kuwait, Riyadh' => 'Asia/Kuwait',
-    'Moscow, St. Petersburg, Volgograd' => 'Europe/Moscow',
-    'East Africa, Nairobi' => 'Africa/Nairobi',
-    'Tehran' => 'Asia/Tehran',
-    'Abu Dhabi, Muscat' => 'Asia/Muscat', // Best guess
-    'Baku, Tbilisi, Yerevan' => 'Asia/Baku',
-    'Kabul' => 'Asia/Kabul',
-    'Ekaterinburg' => 'Asia/Yekaterinburg',
-    'Islamabad, Karachi, Tashkent' => 'Asia/Karachi',
-    'Kolkata, Chennai, Mumbai, New Delhi, India Standard Time' => 'Asia/Calcutta',
-    'Kathmandu, Nepal' => 'Asia/Kathmandu',
-    'Almaty, Novosibirsk, North Central Asia' => 'Asia/Almaty',
-    'Astana, Dhaka' => 'Asia/Dhaka',
-    'Sri Jayawardenepura, Sri Lanka' => 'Asia/Colombo',
-    'Rangoon' => 'Asia/Rangoon',
-    'Bangkok, Hanoi, Jakarta' => 'Asia/Bangkok',
-    'Krasnoyarsk' => 'Asia/Krasnoyarsk',
-    'Beijing, Chongqing, Hong Kong SAR, Urumqi' => 'Asia/Shanghai',
-    'Irkutsk, Ulaan Bataar' => 'Asia/Irkutsk',
-    'Kuala Lumpur, Singapore' => 'Asia/Singapore',
-    'Perth, Western Australia' => 'Australia/Perth',
-    'Taipei' => 'Asia/Taipei',
-    'Osaka, Sapporo, Tokyo' => 'Asia/Tokyo',
-    'Seoul, Korea Standard time' => 'Asia/Seoul',
-    'Yakutsk' => 'Asia/Yakutsk',
-    'Adelaide, Central Australia' => 'Australia/Adelaide',
-    'Darwin' => 'Australia/Darwin',
-    'Brisbane, East Australia' => 'Australia/Brisbane',
-    'Canberra, Melbourne, Sydney, Hobart (year 2000 only)' => 'Australia/Sydney',
-    'Guam, Port Moresby' => 'Pacific/Guam',
-    'Hobart, Tasmania' => 'Australia/Hobart',
-    'Vladivostok' => 'Asia/Vladivostok',
-    'Magadan, Solomon Is., New Caledonia' => 'Asia/Magadan',
-    'Auckland, Wellington' => 'Pacific/Auckland',
-    'Fiji Islands, Kamchatka, Marshall Is.' => 'Pacific/Fiji',
-    'Nuku\'alofa, Tonga' => 'Pacific/Tongatapu',
-    'Azores' => 'Atlantic/Azores',
-    'Cape Verde Is.' => 'Atlantic/Cape_Verde',
-    'Mid-Atlantic' => 'America/Noronha',
-    'Brasilia' => 'America/Sao_Paulo', // Best guess
-    'Buenos Aires' => 'America/Argentina/Buenos_Aires',
-    'Greenland' => 'America/Godthab',
-    'Newfoundland' => 'America/St_Johns',
-    'Atlantic Time (Canada)' => 'America/Halifax',
-    'Caracas, La Paz' => 'America/Caracas',
-    'Santiago' => 'America/Santiago',
-    'Bogota, Lima, Quito' => 'America/Bogota',
-    'Eastern Time (US & Canada)' => 'America/New_York',
-    'Indiana (East)' => 'America/Indiana/Indianapolis',
-    'Central America' => 'America/Guatemala',
-    'Central Time (US & Canada)' => 'America/Chicago',
-    'Mexico City, Tegucigalpa' => 'America/Mexico_City',
-    'Saskatchewan' => 'America/Edmonton',
-    'Arizona' => 'America/Phoenix',
-    'Mountain Time (US & Canada)' => 'America/Denver', // Best guess
-    'Pacific Time (US & Canada)' => 'America/Los_Angeles', // Best guess
-    'Pacific Time (US & Canada); Tijuana' => 'America/Los_Angeles', // Best guess
-    'Alaska' => 'America/Anchorage',
-    'Hawaii' => 'Pacific/Honolulu',
-    'Midway Island, Samoa' => 'Pacific/Midway',
-    'Eniwetok, Kwajalein, Dateline Time' => 'Pacific/Kwajalein',
+	'Universal Coordinated Time' => 'UTC',
+	'Casablanca, Monrovia' => 'Africa/Casablanca',
+	'Greenwich Mean Time: Dublin, Edinburgh, Lisbon, London' => 'Europe/Lisbon',
+	'Greenwich Mean Time; Dublin, Edinburgh, London' => 'Europe/London',
+	'Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna' => 'Europe/Berlin',
+	'Belgrade, Pozsony, Budapest, Ljubljana, Prague' => 'Europe/Prague',
+	'Brussels, Copenhagen, Madrid, Paris' => 'Europe/Paris',
+	'Paris, Madrid, Brussels, Copenhagen' => 'Europe/Paris',
+	'Prague, Central Europe' => 'Europe/Prague',
+	'Sarajevo, Skopje, Sofija, Vilnius, Warsaw, Zagreb' => 'Europe/Sarajevo',
+	'West Central Africa' => 'Africa/Luanda', // This was a best guess
+	'Athens, Istanbul, Minsk' => 'Europe/Athens',
+	'Bucharest' => 'Europe/Bucharest',
+	'Cairo' => 'Africa/Cairo',
+	'Harare, Pretoria' => 'Africa/Harare',
+	'Helsinki, Riga, Tallinn' => 'Europe/Helsinki',
+	'Israel, Jerusalem Standard Time' => 'Asia/Jerusalem',
+	'Baghdad' => 'Asia/Baghdad',
+	'Arab, Kuwait, Riyadh' => 'Asia/Kuwait',
+	'Moscow, St. Petersburg, Volgograd' => 'Europe/Moscow',
+	'East Africa, Nairobi' => 'Africa/Nairobi',
+	'Tehran' => 'Asia/Tehran',
+	'Abu Dhabi, Muscat' => 'Asia/Muscat', // Best guess
+	'Baku, Tbilisi, Yerevan' => 'Asia/Baku',
+	'Kabul' => 'Asia/Kabul',
+	'Ekaterinburg' => 'Asia/Yekaterinburg',
+	'Islamabad, Karachi, Tashkent' => 'Asia/Karachi',
+	'Kolkata, Chennai, Mumbai, New Delhi, India Standard Time' => 'Asia/Calcutta',
+	'Kathmandu, Nepal' => 'Asia/Kathmandu',
+	'Almaty, Novosibirsk, North Central Asia' => 'Asia/Almaty',
+	'Astana, Dhaka' => 'Asia/Dhaka',
+	'Sri Jayawardenepura, Sri Lanka' => 'Asia/Colombo',
+	'Rangoon' => 'Asia/Rangoon',
+	'Bangkok, Hanoi, Jakarta' => 'Asia/Bangkok',
+	'Krasnoyarsk' => 'Asia/Krasnoyarsk',
+	'Beijing, Chongqing, Hong Kong SAR, Urumqi' => 'Asia/Shanghai',
+	'Irkutsk, Ulaan Bataar' => 'Asia/Irkutsk',
+	'Kuala Lumpur, Singapore' => 'Asia/Singapore',
+	'Perth, Western Australia' => 'Australia/Perth',
+	'Taipei' => 'Asia/Taipei',
+	'Osaka, Sapporo, Tokyo' => 'Asia/Tokyo',
+	'Seoul, Korea Standard time' => 'Asia/Seoul',
+	'Yakutsk' => 'Asia/Yakutsk',
+	'Adelaide, Central Australia' => 'Australia/Adelaide',
+	'Darwin' => 'Australia/Darwin',
+	'Brisbane, East Australia' => 'Australia/Brisbane',
+	'Canberra, Melbourne, Sydney, Hobart (year 2000 only)' => 'Australia/Sydney',
+	'Guam, Port Moresby' => 'Pacific/Guam',
+	'Hobart, Tasmania' => 'Australia/Hobart',
+	'Vladivostok' => 'Asia/Vladivostok',
+	'Magadan, Solomon Is., New Caledonia' => 'Asia/Magadan',
+	'Auckland, Wellington' => 'Pacific/Auckland',
+	'Fiji Islands, Kamchatka, Marshall Is.' => 'Pacific/Fiji',
+	'Nuku\'alofa, Tonga' => 'Pacific/Tongatapu',
+	'Azores' => 'Atlantic/Azores',
+	'Cape Verde Is.' => 'Atlantic/Cape_Verde',
+	'Mid-Atlantic' => 'America/Noronha',
+	'Brasilia' => 'America/Sao_Paulo', // Best guess
+	'Buenos Aires' => 'America/Argentina/Buenos_Aires',
+	'Greenland' => 'America/Godthab',
+	'Newfoundland' => 'America/St_Johns',
+	'Atlantic Time (Canada)' => 'America/Halifax',
+	'Caracas, La Paz' => 'America/Caracas',
+	'Santiago' => 'America/Santiago',
+	'Bogota, Lima, Quito' => 'America/Bogota',
+	'Eastern Time (US & Canada)' => 'America/New_York',
+	'Indiana (East)' => 'America/Indiana/Indianapolis',
+	'Central America' => 'America/Guatemala',
+	'Central Time (US & Canada)' => 'America/Chicago',
+	'Mexico City, Tegucigalpa' => 'America/Mexico_City',
+	'Saskatchewan' => 'America/Edmonton',
+	'Arizona' => 'America/Phoenix',
+	'Mountain Time (US & Canada)' => 'America/Denver', // Best guess
+	'Pacific Time (US & Canada)' => 'America/Los_Angeles', // Best guess
+	'Pacific Time (US & Canada); Tijuana' => 'America/Los_Angeles', // Best guess
+	'Alaska' => 'America/Anchorage',
+	'Hawaii' => 'Pacific/Honolulu',
+	'Midway Island, Samoa' => 'Pacific/Midway',
+	'Eniwetok, Kwajalein, Dateline Time' => 'Pacific/Kwajalein',
 ];

htdocs/includes/sabre/sabre/vobject/lib/timezonedata/php-workaround.php

Indentation +28 added lines, -28 removed lines

@@ -15,32 +15,32 @@
  * @license http://sabre.io/license/ Modified BSD License
  */
 return [
-    'CST6CDT' => 'America/Chicago',
-    'Cuba' => 'America/Havana',
-    'Egypt' => 'Africa/Cairo',
-    'Eire' => 'Europe/Dublin',
-    'EST5EDT' => 'America/New_York',
-    'Factory' => 'UTC',
-    'GB-Eire' => 'Europe/London',
-    'GMT0' => 'UTC',
-    'Greenwich' => 'UTC',
-    'Hongkong' => 'Asia/Hong_Kong',
-    'Iceland' => 'Atlantic/Reykjavik',
-    'Iran' => 'Asia/Tehran',
-    'Israel' => 'Asia/Jerusalem',
-    'Jamaica' => 'America/Jamaica',
-    'Japan' => 'Asia/Tokyo',
-    'Kwajalein' => 'Pacific/Kwajalein',
-    'Libya' => 'Africa/Tripoli',
-    'MST7MDT' => 'America/Denver',
-    'Navajo' => 'America/Denver',
-    'NZ-CHAT' => 'Pacific/Chatham',
-    'Poland' => 'Europe/Warsaw',
-    'Portugal' => 'Europe/Lisbon',
-    'PST8PDT' => 'America/Los_Angeles',
-    'Singapore' => 'Asia/Singapore',
-    'Turkey' => 'Europe/Istanbul',
-    'Universal' => 'UTC',
-    'W-SU' => 'Europe/Moscow',
-    'Zulu' => 'UTC',
+	'CST6CDT' => 'America/Chicago',
+	'Cuba' => 'America/Havana',
+	'Egypt' => 'Africa/Cairo',
+	'Eire' => 'Europe/Dublin',
+	'EST5EDT' => 'America/New_York',
+	'Factory' => 'UTC',
+	'GB-Eire' => 'Europe/London',
+	'GMT0' => 'UTC',
+	'Greenwich' => 'UTC',
+	'Hongkong' => 'Asia/Hong_Kong',
+	'Iceland' => 'Atlantic/Reykjavik',
+	'Iran' => 'Asia/Tehran',
+	'Israel' => 'Asia/Jerusalem',
+	'Jamaica' => 'America/Jamaica',
+	'Japan' => 'Asia/Tokyo',
+	'Kwajalein' => 'Pacific/Kwajalein',
+	'Libya' => 'Africa/Tripoli',
+	'MST7MDT' => 'America/Denver',
+	'Navajo' => 'America/Denver',
+	'NZ-CHAT' => 'Pacific/Chatham',
+	'Poland' => 'Europe/Warsaw',
+	'Portugal' => 'Europe/Lisbon',
+	'PST8PDT' => 'America/Los_Angeles',
+	'Singapore' => 'Asia/Singapore',
+	'Turkey' => 'Europe/Istanbul',
+	'Universal' => 'UTC',
+	'W-SU' => 'Europe/Moscow',
+	'Zulu' => 'UTC',
 ];

htdocs/includes/sabre/sabre/vobject/lib/timezonedata/php-bc.php

Indentation +133 added lines, -133 removed lines

@@ -16,137 +16,137 @@
  * @license http://sabre.io/license/ Modified BSD License
  */
 return [
-    'Africa/Asmera',
-    'Africa/Timbuktu',
-    'America/Argentina/ComodRivadavia',
-    'America/Atka',
-    'America/Buenos_Aires',
-    'America/Catamarca',
-    'America/Coral_Harbour',
-    'America/Cordoba',
-    'America/Ensenada',
-    'America/Fort_Wayne',
-    'America/Indianapolis',
-    'America/Jujuy',
-    'America/Knox_IN',
-    'America/Louisville',
-    'America/Mendoza',
-    'America/Montreal',
-    'America/Porto_Acre',
-    'America/Rosario',
-    'America/Shiprock',
-    'America/Virgin',
-    'Antarctica/South_Pole',
-    'Asia/Ashkhabad',
-    'Asia/Calcutta',
-    'Asia/Chungking',
-    'Asia/Dacca',
-    'Asia/Istanbul',
-    'Asia/Katmandu',
-    'Asia/Macao',
-    'Asia/Saigon',
-    'Asia/Tel_Aviv',
-    'Asia/Thimbu',
-    'Asia/Ujung_Pandang',
-    'Asia/Ulan_Bator',
-    'Atlantic/Faeroe',
-    'Atlantic/Jan_Mayen',
-    'Australia/ACT',
-    'Australia/Canberra',
-    'Australia/LHI',
-    'Australia/North',
-    'Australia/NSW',
-    'Australia/Queensland',
-    'Australia/South',
-    'Australia/Tasmania',
-    'Australia/Victoria',
-    'Australia/West',
-    'Australia/Yancowinna',
-    'Brazil/Acre',
-    'Brazil/DeNoronha',
-    'Brazil/East',
-    'Brazil/West',
-    'Canada/Atlantic',
-    'Canada/Central',
-    'Canada/Eastern',
-    'Canada/Mountain',
-    'Canada/Newfoundland',
-    'Canada/Pacific',
-    'Canada/Saskatchewan',
-    'Canada/Yukon',
-    'CET',
-    'Chile/Continental',
-    'Chile/EasterIsland',
-    'EET',
-    'EST',
-    'Etc/GMT',
-    'Etc/GMT+0',
-    'Etc/GMT+1',
-    'Etc/GMT+10',
-    'Etc/GMT+11',
-    'Etc/GMT+12',
-    'Etc/GMT+2',
-    'Etc/GMT+3',
-    'Etc/GMT+4',
-    'Etc/GMT+5',
-    'Etc/GMT+6',
-    'Etc/GMT+7',
-    'Etc/GMT+8',
-    'Etc/GMT+9',
-    'Etc/GMT-0',
-    'Etc/GMT-1',
-    'Etc/GMT-10',
-    'Etc/GMT-11',
-    'Etc/GMT-12',
-    'Etc/GMT-13',
-    'Etc/GMT-14',
-    'Etc/GMT-2',
-    'Etc/GMT-3',
-    'Etc/GMT-4',
-    'Etc/GMT-5',
-    'Etc/GMT-6',
-    'Etc/GMT-7',
-    'Etc/GMT-8',
-    'Etc/GMT-9',
-    'Etc/GMT0',
-    'Etc/Greenwich',
-    'Etc/UCT',
-    'Etc/Universal',
-    'Etc/UTC',
-    'Etc/Zulu',
-    'Europe/Belfast',
-    'Europe/Nicosia',
-    'Europe/Tiraspol',
-    'GB',
-    'GMT',
-    'GMT+0',
-    'GMT-0',
-    'HST',
-    'MET',
-    'Mexico/BajaNorte',
-    'Mexico/BajaSur',
-    'Mexico/General',
-    'MST',
-    'NZ',
-    'Pacific/Ponape',
-    'Pacific/Samoa',
-    'Pacific/Truk',
-    'Pacific/Yap',
-    'PRC',
-    'ROC',
-    'ROK',
-    'UCT',
-    'US/Alaska',
-    'US/Aleutian',
-    'US/Arizona',
-    'US/Central',
-    'US/East-Indiana',
-    'US/Eastern',
-    'US/Hawaii',
-    'US/Indiana-Starke',
-    'US/Michigan',
-    'US/Mountain',
-    'US/Pacific',
-    'US/Samoa',
-    'WET',
+	'Africa/Asmera',
+	'Africa/Timbuktu',
+	'America/Argentina/ComodRivadavia',
+	'America/Atka',
+	'America/Buenos_Aires',
+	'America/Catamarca',
+	'America/Coral_Harbour',
+	'America/Cordoba',
+	'America/Ensenada',
+	'America/Fort_Wayne',
+	'America/Indianapolis',
+	'America/Jujuy',
+	'America/Knox_IN',
+	'America/Louisville',
+	'America/Mendoza',
+	'America/Montreal',
+	'America/Porto_Acre',
+	'America/Rosario',
+	'America/Shiprock',
+	'America/Virgin',
+	'Antarctica/South_Pole',
+	'Asia/Ashkhabad',
+	'Asia/Calcutta',
+	'Asia/Chungking',
+	'Asia/Dacca',
+	'Asia/Istanbul',
+	'Asia/Katmandu',
+	'Asia/Macao',
+	'Asia/Saigon',
+	'Asia/Tel_Aviv',
+	'Asia/Thimbu',
+	'Asia/Ujung_Pandang',
+	'Asia/Ulan_Bator',
+	'Atlantic/Faeroe',
+	'Atlantic/Jan_Mayen',
+	'Australia/ACT',
+	'Australia/Canberra',
+	'Australia/LHI',
+	'Australia/North',
+	'Australia/NSW',
+	'Australia/Queensland',
+	'Australia/South',
+	'Australia/Tasmania',
+	'Australia/Victoria',
+	'Australia/West',
+	'Australia/Yancowinna',
+	'Brazil/Acre',
+	'Brazil/DeNoronha',
+	'Brazil/East',
+	'Brazil/West',
+	'Canada/Atlantic',
+	'Canada/Central',
+	'Canada/Eastern',
+	'Canada/Mountain',
+	'Canada/Newfoundland',
+	'Canada/Pacific',
+	'Canada/Saskatchewan',
+	'Canada/Yukon',
+	'CET',
+	'Chile/Continental',
+	'Chile/EasterIsland',
+	'EET',
+	'EST',
+	'Etc/GMT',
+	'Etc/GMT+0',
+	'Etc/GMT+1',
+	'Etc/GMT+10',
+	'Etc/GMT+11',
+	'Etc/GMT+12',
+	'Etc/GMT+2',
+	'Etc/GMT+3',
+	'Etc/GMT+4',
+	'Etc/GMT+5',
+	'Etc/GMT+6',
+	'Etc/GMT+7',
+	'Etc/GMT+8',
+	'Etc/GMT+9',
+	'Etc/GMT-0',
+	'Etc/GMT-1',
+	'Etc/GMT-10',
+	'Etc/GMT-11',
+	'Etc/GMT-12',
+	'Etc/GMT-13',
+	'Etc/GMT-14',
+	'Etc/GMT-2',
+	'Etc/GMT-3',
+	'Etc/GMT-4',
+	'Etc/GMT-5',
+	'Etc/GMT-6',
+	'Etc/GMT-7',
+	'Etc/GMT-8',
+	'Etc/GMT-9',
+	'Etc/GMT0',
+	'Etc/Greenwich',
+	'Etc/UCT',
+	'Etc/Universal',
+	'Etc/UTC',
+	'Etc/Zulu',
+	'Europe/Belfast',
+	'Europe/Nicosia',
+	'Europe/Tiraspol',
+	'GB',
+	'GMT',
+	'GMT+0',
+	'GMT-0',
+	'HST',
+	'MET',
+	'Mexico/BajaNorte',
+	'Mexico/BajaSur',
+	'Mexico/General',
+	'MST',
+	'NZ',
+	'Pacific/Ponape',
+	'Pacific/Samoa',
+	'Pacific/Truk',
+	'Pacific/Yap',
+	'PRC',
+	'ROC',
+	'ROK',
+	'UCT',
+	'US/Alaska',
+	'US/Aleutian',
+	'US/Arizona',
+	'US/Central',
+	'US/East-Indiana',
+	'US/Eastern',
+	'US/Hawaii',
+	'US/Indiana-Starke',
+	'US/Michigan',
+	'US/Mountain',
+	'US/Pacific',
+	'US/Samoa',
+	'WET',
 ];

htdocs/includes/sabre/sabre/vobject/lib/PHPUnitAssertions.php

Indentation +53 added lines, -53 removed lines

@@ -14,62 +14,62 @@
  */
 trait PHPUnitAssertions
 {
-    /**
-     * This method tests whether two vcards or icalendar objects are
-     * semantically identical.
-     *
-     * It supports objects being supplied as strings, streams or
-     * Sabre\VObject\Component instances.
-     *
-     * PRODID is removed from both objects as this is often changes and would
-     * just get in the way.
-     *
-     * CALSCALE will automatically get removed if it's set to GREGORIAN.
-     *
-     * Any property that has the value **ANY** will be treated as a wildcard.
-     *
-     * @param resource|string|Component $expected
-     * @param resource|string|Component $actual
-     * @param string                    $message
-     */
-    public function assertVObjectEqualsVObject($expected, $actual, $message = '')
-    {
-        $getObj = function ($input) {
-            if (is_resource($input)) {
-                $input = stream_get_contents($input);
-            }
-            if (is_string($input)) {
-                $input = Reader::read($input);
-            }
-            if (!$input instanceof Component) {
-                $this->fail('Input must be a string, stream or VObject component');
-            }
-            unset($input->PRODID);
-            if ($input instanceof Component\VCalendar && 'GREGORIAN' === (string) $input->CALSCALE) {
-                unset($input->CALSCALE);
-            }
+	/**
+	 * This method tests whether two vcards or icalendar objects are
+	 * semantically identical.
+	 *
+	 * It supports objects being supplied as strings, streams or
+	 * Sabre\VObject\Component instances.
+	 *
+	 * PRODID is removed from both objects as this is often changes and would
+	 * just get in the way.
+	 *
+	 * CALSCALE will automatically get removed if it's set to GREGORIAN.
+	 *
+	 * Any property that has the value **ANY** will be treated as a wildcard.
+	 *
+	 * @param resource|string|Component $expected
+	 * @param resource|string|Component $actual
+	 * @param string                    $message
+	 */
+	public function assertVObjectEqualsVObject($expected, $actual, $message = '')
+	{
+		$getObj = function ($input) {
+			if (is_resource($input)) {
+				$input = stream_get_contents($input);
+			}
+			if (is_string($input)) {
+				$input = Reader::read($input);
+			}
+			if (!$input instanceof Component) {
+				$this->fail('Input must be a string, stream or VObject component');
+			}
+			unset($input->PRODID);
+			if ($input instanceof Component\VCalendar && 'GREGORIAN' === (string) $input->CALSCALE) {
+				unset($input->CALSCALE);
+			}
 
-            return $input;
-        };
+			return $input;
+		};
 
-        $expected = $getObj($expected)->serialize();
-        $actual = $getObj($actual)->serialize();
+		$expected = $getObj($expected)->serialize();
+		$actual = $getObj($actual)->serialize();
 
-        // Finding wildcards in expected.
-        preg_match_all('|^([A-Z]+):\\*\\*ANY\\*\\*\r$|m', $expected, $matches, PREG_SET_ORDER);
+		// Finding wildcards in expected.
+		preg_match_all('|^([A-Z]+):\\*\\*ANY\\*\\*\r$|m', $expected, $matches, PREG_SET_ORDER);
 
-        foreach ($matches as $match) {
-            $actual = preg_replace(
-                '|^'.preg_quote($match[1], '|').':(.*)\r$|m',
-                $match[1].':**ANY**'."\r",
-                $actual
-            );
-        }
+		foreach ($matches as $match) {
+			$actual = preg_replace(
+				'|^'.preg_quote($match[1], '|').':(.*)\r$|m',
+				$match[1].':**ANY**'."\r",
+				$actual
+			);
+		}
 
-        $this->assertEquals(
-            $expected,
-            $actual,
-            $message
-        );
-    }
+		$this->assertEquals(
+			$expected,
+			$actual,
+			$message
+		);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
      */
     public function assertVObjectEqualsVObject($expected, $actual, $message = '')
     {
-        $getObj = function ($input) {
+        $getObj = function($input) {
             if (is_resource($input)) {
                 $input = stream_get_contents($input);
             }

htdocs/includes/sabre/sabre/vobject/lib/Splitter/VCard.php

Indentation +45 added lines, -45 removed lines

@@ -21,54 +21,54 @@
  */
 class VCard implements SplitterInterface
 {
-    /**
-     * File handle.
-     *
-     * @var resource
-     */
-    protected $input;
+	/**
+	 * File handle.
+	 *
+	 * @var resource
+	 */
+	protected $input;
 
-    /**
-     * Persistent parser.
-     *
-     * @var MimeDir
-     */
-    protected $parser;
+	/**
+	 * Persistent parser.
+	 *
+	 * @var MimeDir
+	 */
+	protected $parser;
 
-    /**
-     * Constructor.
-     *
-     * The splitter should receive an readable file stream as its input.
-     *
-     * @param resource $input
-     * @param int      $options parser options, see the OPTIONS constants
-     */
-    public function __construct($input, $options = 0)
-    {
-        $this->input = $input;
-        $this->parser = new MimeDir($input, $options);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * The splitter should receive an readable file stream as its input.
+	 *
+	 * @param resource $input
+	 * @param int      $options parser options, see the OPTIONS constants
+	 */
+	public function __construct($input, $options = 0)
+	{
+		$this->input = $input;
+		$this->parser = new MimeDir($input, $options);
+	}
 
-    /**
-     * Every time getNext() is called, a new object will be parsed, until we
-     * hit the end of the stream.
-     *
-     * When the end is reached, null will be returned.
-     *
-     * @return \Sabre\VObject\Component|null
-     */
-    public function getNext()
-    {
-        try {
-            $object = $this->parser->parse();
+	/**
+	 * Every time getNext() is called, a new object will be parsed, until we
+	 * hit the end of the stream.
+	 *
+	 * When the end is reached, null will be returned.
+	 *
+	 * @return \Sabre\VObject\Component|null
+	 */
+	public function getNext()
+	{
+		try {
+			$object = $this->parser->parse();
 
-            if (!$object instanceof VObject\Component\VCard) {
-                throw new VObject\ParseException('The supplied input contained non-VCARD data.');
-            }
-        } catch (VObject\EofException $e) {
-            return;
-        }
+			if (!$object instanceof VObject\Component\VCard) {
+				throw new VObject\ParseException('The supplied input contained non-VCARD data.');
+			}
+		} catch (VObject\EofException $e) {
+			return;
+		}
 
-        return $object;
-    }
+		return $object;
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Splitter/ICalendar.php

Indentation +71 added lines, -71 removed lines

@@ -21,86 +21,86 @@
  */
 class ICalendar implements SplitterInterface
 {
-    /**
-     * Timezones.
-     *
-     * @var array
-     */
-    protected $vtimezones = [];
+	/**
+	 * Timezones.
+	 *
+	 * @var array
+	 */
+	protected $vtimezones = [];
 
-    /**
-     * iCalendar objects.
-     *
-     * @var array
-     */
-    protected $objects = [];
+	/**
+	 * iCalendar objects.
+	 *
+	 * @var array
+	 */
+	protected $objects = [];
 
-    /**
-     * Constructor.
-     *
-     * The splitter should receive an readable file stream as its input.
-     *
-     * @param resource $input
-     * @param int      $options parser options, see the OPTIONS constants
-     */
-    public function __construct($input, $options = 0)
-    {
-        $data = VObject\Reader::read($input, $options);
+	/**
+	 * Constructor.
+	 *
+	 * The splitter should receive an readable file stream as its input.
+	 *
+	 * @param resource $input
+	 * @param int      $options parser options, see the OPTIONS constants
+	 */
+	public function __construct($input, $options = 0)
+	{
+		$data = VObject\Reader::read($input, $options);
 
-        if (!$data instanceof VObject\Component\VCalendar) {
-            throw new VObject\ParseException('Supplied input could not be parsed as VCALENDAR.');
-        }
+		if (!$data instanceof VObject\Component\VCalendar) {
+			throw new VObject\ParseException('Supplied input could not be parsed as VCALENDAR.');
+		}
 
-        foreach ($data->children() as $component) {
-            if (!$component instanceof VObject\Component) {
-                continue;
-            }
+		foreach ($data->children() as $component) {
+			if (!$component instanceof VObject\Component) {
+				continue;
+			}
 
-            // Get all timezones
-            if ('VTIMEZONE' === $component->name) {
-                $this->vtimezones[(string) $component->TZID] = $component;
-                continue;
-            }
+			// Get all timezones
+			if ('VTIMEZONE' === $component->name) {
+				$this->vtimezones[(string) $component->TZID] = $component;
+				continue;
+			}
 
-            // Get component UID for recurring Events search
-            if (!$component->UID) {
-                $component->UID = sha1(microtime()).'-vobjectimport';
-            }
-            $uid = (string) $component->UID;
+			// Get component UID for recurring Events search
+			if (!$component->UID) {
+				$component->UID = sha1(microtime()).'-vobjectimport';
+			}
+			$uid = (string) $component->UID;
 
-            // Take care of recurring events
-            if (!array_key_exists($uid, $this->objects)) {
-                $this->objects[$uid] = new VCalendar();
-            }
+			// Take care of recurring events
+			if (!array_key_exists($uid, $this->objects)) {
+				$this->objects[$uid] = new VCalendar();
+			}
 
-            $this->objects[$uid]->add(clone $component);
-        }
-    }
+			$this->objects[$uid]->add(clone $component);
+		}
+	}
 
-    /**
-     * Every time getNext() is called, a new object will be parsed, until we
-     * hit the end of the stream.
-     *
-     * When the end is reached, null will be returned.
-     *
-     * @return \Sabre\VObject\Component|null
-     */
-    public function getNext()
-    {
-        if ($object = array_shift($this->objects)) {
-            // create our baseobject
-            $object->version = '2.0';
-            $object->prodid = '-//Sabre//Sabre VObject '.VObject\Version::VERSION.'//EN';
-            $object->calscale = 'GREGORIAN';
+	/**
+	 * Every time getNext() is called, a new object will be parsed, until we
+	 * hit the end of the stream.
+	 *
+	 * When the end is reached, null will be returned.
+	 *
+	 * @return \Sabre\VObject\Component|null
+	 */
+	public function getNext()
+	{
+		if ($object = array_shift($this->objects)) {
+			// create our baseobject
+			$object->version = '2.0';
+			$object->prodid = '-//Sabre//Sabre VObject '.VObject\Version::VERSION.'//EN';
+			$object->calscale = 'GREGORIAN';
 
-            // add vtimezone information to obj (if we have it)
-            foreach ($this->vtimezones as $vtimezone) {
-                $object->add($vtimezone);
-            }
+			// add vtimezone information to obj (if we have it)
+			foreach ($this->vtimezones as $vtimezone) {
+				$object->add($vtimezone);
+			}
 
-            return $object;
-        } else {
-            return;
-        }
-    }
+			return $object;
+		} else {
+			return;
+		}
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Splitter/SplitterInterface.php

Indentation +17 added lines, -17 removed lines

@@ -17,22 +17,22 @@
  */
 interface SplitterInterface
 {
-    /**
-     * Constructor.
-     *
-     * The splitter should receive an readable file stream as its input.
-     *
-     * @param resource $input
-     */
-    public function __construct($input);
+	/**
+	 * Constructor.
+	 *
+	 * The splitter should receive an readable file stream as its input.
+	 *
+	 * @param resource $input
+	 */
+	public function __construct($input);
 
-    /**
-     * Every time getNext() is called, a new object will be parsed, until we
-     * hit the end of the stream.
-     *
-     * When the end is reached, null will be returned.
-     *
-     * @return \Sabre\VObject\Component|null
-     */
-    public function getNext();
+	/**
+	 * Every time getNext() is called, a new object will be parsed, until we
+	 * hit the end of the stream.
+	 *
+	 * When the end is reached, null will be returned.
+	 *
+	 * @return \Sabre\VObject\Component|null
+	 */
+	public function getNext();
 }

htdocs/includes/sabre/sabre/vobject/lib/FreeBusyData.php

Indentation +171 added lines, -171 removed lines

@@ -11,175 +11,175 @@
  */
 class FreeBusyData
 {
-    /**
-     * Start timestamp.
-     *
-     * @var int
-     */
-    protected $start;
-
-    /**
-     * End timestamp.
-     *
-     * @var int
-     */
-    protected $end;
-
-    /**
-     * A list of free-busy times.
-     *
-     * @var array
-     */
-    protected $data;
-
-    public function __construct($start, $end)
-    {
-        $this->start = $start;
-        $this->end = $end;
-        $this->data = [];
-
-        $this->data[] = [
-            'start' => $this->start,
-            'end' => $this->end,
-            'type' => 'FREE',
-        ];
-    }
-
-    /**
-     * Adds free or busytime to the data.
-     *
-     * @param int    $start
-     * @param int    $end
-     * @param string $type  FREE, BUSY, BUSY-UNAVAILABLE or BUSY-TENTATIVE
-     */
-    public function add($start, $end, $type)
-    {
-        if ($start > $this->end || $end < $this->start) {
-            // This new data is outside our timerange.
-            return;
-        }
-
-        if ($start < $this->start) {
-            // The item starts before our requested time range
-            $start = $this->start;
-        }
-        if ($end > $this->end) {
-            // The item ends after our requested time range
-            $end = $this->end;
-        }
-
-        // Finding out where we need to insert the new item.
-        $currentIndex = 0;
-        while ($start > $this->data[$currentIndex]['end']) {
-            ++$currentIndex;
-        }
-
-        // The standard insertion point will be one _after_ the first
-        // overlapping item.
-        $insertStartIndex = $currentIndex + 1;
-
-        $newItem = [
-            'start' => $start,
-            'end' => $end,
-            'type' => $type,
-        ];
-
-        $precedingItem = $this->data[$insertStartIndex - 1];
-        if ($this->data[$insertStartIndex - 1]['start'] === $start) {
-            // The old item starts at the exact same point as the new item.
-            --$insertStartIndex;
-        }
-
-        // Now we know where to insert the item, we need to know where it
-        // starts overlapping with items on the tail end. We need to start
-        // looking one item before the insertStartIndex, because it's possible
-        // that the new item 'sits inside' the previous old item.
-        if ($insertStartIndex > 0) {
-            $currentIndex = $insertStartIndex - 1;
-        } else {
-            $currentIndex = 0;
-        }
-
-        while ($end > $this->data[$currentIndex]['end']) {
-            ++$currentIndex;
-        }
-
-        // What we are about to insert into the array
-        $newItems = [
-            $newItem,
-        ];
-
-        // This is the amount of items that are completely overwritten by the
-        // new item.
-        $itemsToDelete = $currentIndex - $insertStartIndex;
-        if ($this->data[$currentIndex]['end'] <= $end) {
-            ++$itemsToDelete;
-        }
-
-        // If itemsToDelete was -1, it means that the newly inserted item is
-        // actually sitting inside an existing one. This means we need to split
-        // the item at the current position in two and insert the new item in
-        // between.
-        if (-1 === $itemsToDelete) {
-            $itemsToDelete = 0;
-            if ($newItem['end'] < $precedingItem['end']) {
-                $newItems[] = [
-                    'start' => $newItem['end'] + 1,
-                    'end' => $precedingItem['end'],
-                    'type' => $precedingItem['type'],
-                ];
-            }
-        }
-
-        array_splice(
-            $this->data,
-            $insertStartIndex,
-            $itemsToDelete,
-            $newItems
-        );
-
-        $doMerge = false;
-        $mergeOffset = $insertStartIndex;
-        $mergeItem = $newItem;
-        $mergeDelete = 1;
-
-        if (isset($this->data[$insertStartIndex - 1])) {
-            // Updating the start time of the previous item.
-            $this->data[$insertStartIndex - 1]['end'] = $start;
-
-            // If the previous and the current are of the same type, we can
-            // merge them into one item.
-            if ($this->data[$insertStartIndex - 1]['type'] === $this->data[$insertStartIndex]['type']) {
-                $doMerge = true;
-                --$mergeOffset;
-                ++$mergeDelete;
-                $mergeItem['start'] = $this->data[$insertStartIndex - 1]['start'];
-            }
-        }
-        if (isset($this->data[$insertStartIndex + 1])) {
-            // Updating the start time of the next item.
-            $this->data[$insertStartIndex + 1]['start'] = $end;
-
-            // If the next and the current are of the same type, we can
-            // merge them into one item.
-            if ($this->data[$insertStartIndex + 1]['type'] === $this->data[$insertStartIndex]['type']) {
-                $doMerge = true;
-                ++$mergeDelete;
-                $mergeItem['end'] = $this->data[$insertStartIndex + 1]['end'];
-            }
-        }
-        if ($doMerge) {
-            array_splice(
-                $this->data,
-                $mergeOffset,
-                $mergeDelete,
-                [$mergeItem]
-            );
-        }
-    }
-
-    public function getData()
-    {
-        return $this->data;
-    }
+	/**
+	 * Start timestamp.
+	 *
+	 * @var int
+	 */
+	protected $start;
+
+	/**
+	 * End timestamp.
+	 *
+	 * @var int
+	 */
+	protected $end;
+
+	/**
+	 * A list of free-busy times.
+	 *
+	 * @var array
+	 */
+	protected $data;
+
+	public function __construct($start, $end)
+	{
+		$this->start = $start;
+		$this->end = $end;
+		$this->data = [];
+
+		$this->data[] = [
+			'start' => $this->start,
+			'end' => $this->end,
+			'type' => 'FREE',
+		];
+	}
+
+	/**
+	 * Adds free or busytime to the data.
+	 *
+	 * @param int    $start
+	 * @param int    $end
+	 * @param string $type  FREE, BUSY, BUSY-UNAVAILABLE or BUSY-TENTATIVE
+	 */
+	public function add($start, $end, $type)
+	{
+		if ($start > $this->end || $end < $this->start) {
+			// This new data is outside our timerange.
+			return;
+		}
+
+		if ($start < $this->start) {
+			// The item starts before our requested time range
+			$start = $this->start;
+		}
+		if ($end > $this->end) {
+			// The item ends after our requested time range
+			$end = $this->end;
+		}
+
+		// Finding out where we need to insert the new item.
+		$currentIndex = 0;
+		while ($start > $this->data[$currentIndex]['end']) {
+			++$currentIndex;
+		}
+
+		// The standard insertion point will be one _after_ the first
+		// overlapping item.
+		$insertStartIndex = $currentIndex + 1;
+
+		$newItem = [
+			'start' => $start,
+			'end' => $end,
+			'type' => $type,
+		];
+
+		$precedingItem = $this->data[$insertStartIndex - 1];
+		if ($this->data[$insertStartIndex - 1]['start'] === $start) {
+			// The old item starts at the exact same point as the new item.
+			--$insertStartIndex;
+		}
+
+		// Now we know where to insert the item, we need to know where it
+		// starts overlapping with items on the tail end. We need to start
+		// looking one item before the insertStartIndex, because it's possible
+		// that the new item 'sits inside' the previous old item.
+		if ($insertStartIndex > 0) {
+			$currentIndex = $insertStartIndex - 1;
+		} else {
+			$currentIndex = 0;
+		}
+
+		while ($end > $this->data[$currentIndex]['end']) {
+			++$currentIndex;
+		}
+
+		// What we are about to insert into the array
+		$newItems = [
+			$newItem,
+		];
+
+		// This is the amount of items that are completely overwritten by the
+		// new item.
+		$itemsToDelete = $currentIndex - $insertStartIndex;
+		if ($this->data[$currentIndex]['end'] <= $end) {
+			++$itemsToDelete;
+		}
+
+		// If itemsToDelete was -1, it means that the newly inserted item is
+		// actually sitting inside an existing one. This means we need to split
+		// the item at the current position in two and insert the new item in
+		// between.
+		if (-1 === $itemsToDelete) {
+			$itemsToDelete = 0;
+			if ($newItem['end'] < $precedingItem['end']) {
+				$newItems[] = [
+					'start' => $newItem['end'] + 1,
+					'end' => $precedingItem['end'],
+					'type' => $precedingItem['type'],
+				];
+			}
+		}
+
+		array_splice(
+			$this->data,
+			$insertStartIndex,
+			$itemsToDelete,
+			$newItems
+		);
+
+		$doMerge = false;
+		$mergeOffset = $insertStartIndex;
+		$mergeItem = $newItem;
+		$mergeDelete = 1;
+
+		if (isset($this->data[$insertStartIndex - 1])) {
+			// Updating the start time of the previous item.
+			$this->data[$insertStartIndex - 1]['end'] = $start;
+
+			// If the previous and the current are of the same type, we can
+			// merge them into one item.
+			if ($this->data[$insertStartIndex - 1]['type'] === $this->data[$insertStartIndex]['type']) {
+				$doMerge = true;
+				--$mergeOffset;
+				++$mergeDelete;
+				$mergeItem['start'] = $this->data[$insertStartIndex - 1]['start'];
+			}
+		}
+		if (isset($this->data[$insertStartIndex + 1])) {
+			// Updating the start time of the next item.
+			$this->data[$insertStartIndex + 1]['start'] = $end;
+
+			// If the next and the current are of the same type, we can
+			// merge them into one item.
+			if ($this->data[$insertStartIndex + 1]['type'] === $this->data[$insertStartIndex]['type']) {
+				$doMerge = true;
+				++$mergeDelete;
+				$mergeItem['end'] = $this->data[$insertStartIndex + 1]['end'];
+			}
+		}
+		if ($doMerge) {
+			array_splice(
+				$this->data,
+				$mergeOffset,
+				$mergeDelete,
+				[$mergeItem]
+			);
+		}
+	}
+
+	public function getData()
+	{
+		return $this->data;
+	}
 }