grommunio / grommunio-sync

lib/core/loopdetection.php

Spacing +2 added lines, -2 removed lines

@@ -758,7 +758,7 @@ 
 							$current['loopcount'] = 1;
 							// the MaxCount is the max number of messages exported before
 							$current['maxCount'] = $counter + (($maxItems < $queuedMessages) ? $maxItems : $queuedMessages);
-							$loop = true;   // loop mode!!
+							$loop = true; // loop mode!!
 						}
 					}
 					elseif ($queuedMessages == 0) {
@@ -778,7 +778,7 @@ 
 							$this->ignore_messageid = $current['potential'];
 						}
 						$current['maxCount'] = $counter + (($maxItems < $queuedMessages) ? $maxItems : $queuedMessages);
-						$loop = true;   // loop mode!!
+						$loop = true; // loop mode!!
 					}
 				}
 			}

lib/core/gsync.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 	public const UNAUTHENTICATED = 1;
 	public const UNPROVISIONED = 2;
 	public const NOACTIVESYNCCOMMAND = 3;
-	public const WEBSERVICECOMMAND = 4;    // DEPRECATED
+	public const WEBSERVICECOMMAND = 4; // DEPRECATED
 	public const HIERARCHYCOMMAND = 5;
 	public const PLAININPUT = 6;
 	public const REQUESTHANDLER = 7;

lib/wbxml/wbxmlencoder.php

Spacing +1 added lines, -1 removed lines

@@ -346,7 +346,7 @@
 				$out = chr($byte) . $out;
 			}
 			else {
-				$out = chr($byte | 0x80) . $out;
+				$out = chr($byte|0x80) . $out;
 			}
 		}
 		fwrite($this->_out, $out);

lib/wbxml/wbxmldecoder.php

Spacing +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
 		if (!isset(self::$loopCounter[$name])) {
 			self::$loopCounter[$name] = 0;
 		}
-		else {
-			++self::$loopCounter[$name];
+		else {++self::$loopCounter[$name];
 		}
 
 		if (self::$loopCounter[$name] > self::MAXLOOP) {

lib/utils/g_RFC822.php

Switch Indentation +12 added lines, -12 removed lines

@@ -410,22 +410,22 @@
 
 		for (; $i < $iMax; ++$i) {
 			switch ($string[$i]) {
-			case '\\':
-				++$slashes;
+				case '\\':
+					++$slashes;
 
-				break;
+					break;
 
-			case '"':
-				if ($slashes % 2 == 0) {
-					$in_quote = !$in_quote;
-				}
-				// Fall through to default action below.
+				case '"':
+					if ($slashes % 2 == 0) {
+						$in_quote = !$in_quote;
+					}
+					// Fall through to default action below.
 
-				// no break
-			default:
-				$slashes = 0;
+					// no break
+				default:
+					$slashes = 0;
 
-				break;
+					break;
 			}
 		}
 

lib/utils/timezoneutil.php

Spacing +152 added lines, -152 removed lines

@@ -17,83 +17,83 @@ 
 	 * Updated at: 01.06.2012
 	 */
 	private static $mstzones = [
-		"000" => ["Dateline Standard Time",                    "(GMT-12:00) International Date Line West"],
-		"001" => ["Samoa Standard Time",                       "(GMT-11:00) Midway Island, Samoa"],
-		"002" => ["Hawaiian Standard Time",                    "(GMT-10:00) Hawaii"],
-		"003" => ["Alaskan Standard Time",                     "(GMT-09:00) Alaska"],
-		"004" => ["Pacific Standard Time",                     "(GMT-08:00) Pacific Time (US and Canada); Tijuana"],
-		"010" => ["Mountain Standard Time",                    "(GMT-07:00) Mountain Time (US and Canada)"],
-		"013" => ["Mexico Standard Time 2",                    "(GMT-07:00) Chihuahua, La Paz, Mazatlan"],
-		"015" => ["US Mountain Standard Time",                 "(GMT-07:00) Arizona"],
-		"020" => ["Central Standard Time",                     "(GMT-06:00) Central Time (US and Canada"],
-		"025" => ["Canada Central Standard Time",              "(GMT-06:00) Saskatchewan"],
-		"030" => ["Mexico Standard Time",                      "(GMT-06:00) Guadalajara, Mexico City, Monterrey"],
-		"033" => ["Central America Standard Time",             "(GMT-06:00) Central America"],
-		"035" => ["Eastern Standard Time",                     "(GMT-05:00) Eastern Time (US and Canada)"],
-		"040" => ["US Eastern Standard Time",                  "(GMT-05:00) Indiana (East)"],
-		"045" => ["SA Pacific Standard Time",                  "(GMT-05:00) Bogota, Lima, Quito"],
-		"uk1" => ["Venezuela Standard Time",                   "(GMT-04:30) Caracas"],                     // added
-		"050" => ["Atlantic Standard Time",                    "(GMT-04:00) Atlantic Time (Canada)"],
-		"055" => ["SA Western Standard Time",                  "(GMT-04:00) Caracas, La Paz"],
-		"056" => ["Pacific SA Standard Time",                  "(GMT-04:00) Santiago"],
-		"060" => ["Newfoundland and Labrador Standard Time",   "(GMT-03:30) Newfoundland and Labrador"],
-		"065" => ["E South America Standard Time",             "(GMT-03:00) Brasilia"],
-		"070" => ["SA Eastern Standard Time",                  "(GMT-03:00) Buenos Aires, Georgetown"],
-		"073" => ["Greenland Standard Time",                   "(GMT-03:00) Greenland"],
-		"075" => ["Mid-Atlantic Standard Time",                "(GMT-02:00) Mid-Atlantic"],
-		"080" => ["Azores Standard Time",                      "(GMT-01:00) Azores"],
-		"083" => ["Cape Verde Standard Time",                  "(GMT-01:00) Cape Verde Islands"],
-		"085" => ["GMT Standard Time",                         "(GMT) Greenwich Mean Time: Dublin, Edinburgh, Lisbon, London"],
-		"090" => ["Greenwich Standard Time",                   "(GMT) Casablanca, Monrovia"],
-		"095" => ["Central Europe Standard Time",              "(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague"],
-		"100" => ["Central European Standard Time",            "(GMT+01:00) Sarajevo, Skopje, Warsaw, Zagreb"],
-		"105" => ["Romance Standard Time",                     "(GMT+01:00) Brussels, Copenhagen, Madrid, Paris"],
-		"110" => ["W Europe Standard Time",                    "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna"],
-		"111" => ["W. Europe Standard Time",                   "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna"],
-		"113" => ["W Central Africa Standard Time",            "(GMT+01:00) West Central Africa"],
-		"115" => ["E Europe Standard Time",                    "(GMT+02:00) Bucharest"],
-		"120" => ["Egypt Standard Time",                       "(GMT+02:00) Cairo"],
-		"125" => ["FLE Standard Time",                         "(GMT+02:00) Helsinki, Kiev, Riga, Sofia, Tallinn, Vilnius"],
-		"130" => ["GTB Standard Time",                         "(GMT+02:00) Athens, Istanbul, Minsk"],
-		"135" => ["Israel Standard Time",                      "(GMT+02:00) Jerusalem"],
-		"140" => ["South Africa Standard Time",                "(GMT+02:00) Harare, Pretoria"],
-		"145" => ["Russian Standard Time",                     "(GMT+03:00) Moscow, St. Petersburg, Volgograd"],
-		"150" => ["Arab Standard Time",                        "(GMT+03:00) Kuwait, Riyadh"],
-		"155" => ["E Africa Standard Time",                    "(GMT+03:00) Nairobi"],
-		"158" => ["Arabic Standard Time",                      "(GMT+03:00) Baghdad"],
-		"160" => ["Iran Standard Time",                        "(GMT+03:30) Tehran"],
-		"165" => ["Arabian Standard Time",                     "(GMT+04:00) Abu Dhabi, Muscat"],
-		"170" => ["Caucasus Standard Time",                    "(GMT+04:00) Baku, Tbilisi, Yerevan"],
+		"000" => ["Dateline Standard Time", "(GMT-12:00) International Date Line West"],
+		"001" => ["Samoa Standard Time", "(GMT-11:00) Midway Island, Samoa"],
+		"002" => ["Hawaiian Standard Time", "(GMT-10:00) Hawaii"],
+		"003" => ["Alaskan Standard Time", "(GMT-09:00) Alaska"],
+		"004" => ["Pacific Standard Time", "(GMT-08:00) Pacific Time (US and Canada); Tijuana"],
+		"010" => ["Mountain Standard Time", "(GMT-07:00) Mountain Time (US and Canada)"],
+		"013" => ["Mexico Standard Time 2", "(GMT-07:00) Chihuahua, La Paz, Mazatlan"],
+		"015" => ["US Mountain Standard Time", "(GMT-07:00) Arizona"],
+		"020" => ["Central Standard Time", "(GMT-06:00) Central Time (US and Canada"],
+		"025" => ["Canada Central Standard Time", "(GMT-06:00) Saskatchewan"],
+		"030" => ["Mexico Standard Time", "(GMT-06:00) Guadalajara, Mexico City, Monterrey"],
+		"033" => ["Central America Standard Time", "(GMT-06:00) Central America"],
+		"035" => ["Eastern Standard Time", "(GMT-05:00) Eastern Time (US and Canada)"],
+		"040" => ["US Eastern Standard Time", "(GMT-05:00) Indiana (East)"],
+		"045" => ["SA Pacific Standard Time", "(GMT-05:00) Bogota, Lima, Quito"],
+		"uk1" => ["Venezuela Standard Time", "(GMT-04:30) Caracas"], // added
+		"050" => ["Atlantic Standard Time", "(GMT-04:00) Atlantic Time (Canada)"],
+		"055" => ["SA Western Standard Time", "(GMT-04:00) Caracas, La Paz"],
+		"056" => ["Pacific SA Standard Time", "(GMT-04:00) Santiago"],
+		"060" => ["Newfoundland and Labrador Standard Time", "(GMT-03:30) Newfoundland and Labrador"],
+		"065" => ["E South America Standard Time", "(GMT-03:00) Brasilia"],
+		"070" => ["SA Eastern Standard Time", "(GMT-03:00) Buenos Aires, Georgetown"],
+		"073" => ["Greenland Standard Time", "(GMT-03:00) Greenland"],
+		"075" => ["Mid-Atlantic Standard Time", "(GMT-02:00) Mid-Atlantic"],
+		"080" => ["Azores Standard Time", "(GMT-01:00) Azores"],
+		"083" => ["Cape Verde Standard Time", "(GMT-01:00) Cape Verde Islands"],
+		"085" => ["GMT Standard Time", "(GMT) Greenwich Mean Time: Dublin, Edinburgh, Lisbon, London"],
+		"090" => ["Greenwich Standard Time", "(GMT) Casablanca, Monrovia"],
+		"095" => ["Central Europe Standard Time", "(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague"],
+		"100" => ["Central European Standard Time", "(GMT+01:00) Sarajevo, Skopje, Warsaw, Zagreb"],
+		"105" => ["Romance Standard Time", "(GMT+01:00) Brussels, Copenhagen, Madrid, Paris"],
+		"110" => ["W Europe Standard Time", "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna"],
+		"111" => ["W. Europe Standard Time", "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna"],
+		"113" => ["W Central Africa Standard Time", "(GMT+01:00) West Central Africa"],
+		"115" => ["E Europe Standard Time", "(GMT+02:00) Bucharest"],
+		"120" => ["Egypt Standard Time", "(GMT+02:00) Cairo"],
+		"125" => ["FLE Standard Time", "(GMT+02:00) Helsinki, Kiev, Riga, Sofia, Tallinn, Vilnius"],
+		"130" => ["GTB Standard Time", "(GMT+02:00) Athens, Istanbul, Minsk"],
+		"135" => ["Israel Standard Time", "(GMT+02:00) Jerusalem"],
+		"140" => ["South Africa Standard Time", "(GMT+02:00) Harare, Pretoria"],
+		"145" => ["Russian Standard Time", "(GMT+03:00) Moscow, St. Petersburg, Volgograd"],
+		"150" => ["Arab Standard Time", "(GMT+03:00) Kuwait, Riyadh"],
+		"155" => ["E Africa Standard Time", "(GMT+03:00) Nairobi"],
+		"158" => ["Arabic Standard Time", "(GMT+03:00) Baghdad"],
+		"160" => ["Iran Standard Time", "(GMT+03:30) Tehran"],
+		"165" => ["Arabian Standard Time", "(GMT+04:00) Abu Dhabi, Muscat"],
+		"170" => ["Caucasus Standard Time", "(GMT+04:00) Baku, Tbilisi, Yerevan"],
 		"175" => ["Transitional Islamic State of Afghanistan Standard Time", "(GMT+04:30) Kabul"],
-		"180" => ["Ekaterinburg Standard Time",                "(GMT+05:00) Ekaterinburg"],
-		"185" => ["West Asia Standard Time",                   "(GMT+05:00) Islamabad, Karachi, Tashkent"],
-		"190" => ["India Standard Time",                       "(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi"],
-		"193" => ["Nepal Standard Time",                       "(GMT+05:45) Kathmandu"],
-		"195" => ["Central Asia Standard Time",                "(GMT+06:00) Astana, Dhaka"],
-		"200" => ["Sri Lanka Standard Time",                   "(GMT+06:00) Sri Jayawardenepura"],
-		"201" => ["N Central Asia Standard Time",              "(GMT+06:00) Almaty, Novosibirsk"],
-		"203" => ["Myanmar Standard Time",                     "(GMT+06:30) Yangon Rangoon"],
-		"205" => ["SE Asia Standard Time",                     "(GMT+07:00) Bangkok, Hanoi, Jakarta"],
-		"207" => ["North Asia Standard Time",                  "(GMT+07:00) Krasnoyarsk"],
-		"210" => ["China Standard Time",                       "(GMT+08:00) Beijing, Chongqing, Hong Kong SAR, Urumqi"],
-		"215" => ["Singapore Standard Time",                   "(GMT+08:00) Kuala Lumpur, Singapore"],
-		"220" => ["Taipei Standard Time",                      "(GMT+08:00) Taipei"],
-		"225" => ["W Australia Standard Time",                 "(GMT+08:00) Perth"],
-		"227" => ["North Asia East Standard Time",             "(GMT+08:00) Irkutsk, Ulaanbaatar"],
-		"230" => ["Korea Standard Time",                       "(GMT+09:00) Seoul"],
-		"235" => ["Tokyo Standard Time",                       "(GMT+09:00) Osaka, Sapporo, Tokyo"],
-		"240" => ["Yakutsk Standard Time",                     "(GMT+09:00) Yakutsk"],
-		"245" => ["AUS Central Standard Time",                 "(GMT+09:30) Darwin"],
-		"250" => ["Cen Australia Standard Time",               "(GMT+09:30) Adelaide"],
-		"255" => ["AUS Eastern Standard Time",                 "(GMT+10:00) Canberra, Melbourne, Sydney"],
-		"260" => ["E Australia Standard Time",                 "(GMT+10:00) Brisbane"],
-		"265" => ["Tasmania Standard Time",                    "(GMT+10:00) Hobart"],
-		"270" => ["Vladivostok Standard Time",                 "(GMT+10:00) Vladivostok"],
-		"275" => ["West Pacific Standard Time",                "(GMT+10:00) Guam, Port Moresby"],
-		"280" => ["Central Pacific Standard Time",             "(GMT+11:00) Magadan, Solomon Islands, New Caledonia"],
-		"285" => ["Fiji Islands Standard Time",                "(GMT+12:00) Fiji Islands, Kamchatka, Marshall Islands"],
-		"290" => ["New Zealand Standard Time",                 "(GMT+12:00) Auckland, Wellington"],
-		"300" => ["Tonga Standard Time",                       "(GMT+13:00) Nuku'alofa"],
+		"180" => ["Ekaterinburg Standard Time", "(GMT+05:00) Ekaterinburg"],
+		"185" => ["West Asia Standard Time", "(GMT+05:00) Islamabad, Karachi, Tashkent"],
+		"190" => ["India Standard Time", "(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi"],
+		"193" => ["Nepal Standard Time", "(GMT+05:45) Kathmandu"],
+		"195" => ["Central Asia Standard Time", "(GMT+06:00) Astana, Dhaka"],
+		"200" => ["Sri Lanka Standard Time", "(GMT+06:00) Sri Jayawardenepura"],
+		"201" => ["N Central Asia Standard Time", "(GMT+06:00) Almaty, Novosibirsk"],
+		"203" => ["Myanmar Standard Time", "(GMT+06:30) Yangon Rangoon"],
+		"205" => ["SE Asia Standard Time", "(GMT+07:00) Bangkok, Hanoi, Jakarta"],
+		"207" => ["North Asia Standard Time", "(GMT+07:00) Krasnoyarsk"],
+		"210" => ["China Standard Time", "(GMT+08:00) Beijing, Chongqing, Hong Kong SAR, Urumqi"],
+		"215" => ["Singapore Standard Time", "(GMT+08:00) Kuala Lumpur, Singapore"],
+		"220" => ["Taipei Standard Time", "(GMT+08:00) Taipei"],
+		"225" => ["W Australia Standard Time", "(GMT+08:00) Perth"],
+		"227" => ["North Asia East Standard Time", "(GMT+08:00) Irkutsk, Ulaanbaatar"],
+		"230" => ["Korea Standard Time", "(GMT+09:00) Seoul"],
+		"235" => ["Tokyo Standard Time", "(GMT+09:00) Osaka, Sapporo, Tokyo"],
+		"240" => ["Yakutsk Standard Time", "(GMT+09:00) Yakutsk"],
+		"245" => ["AUS Central Standard Time", "(GMT+09:30) Darwin"],
+		"250" => ["Cen Australia Standard Time", "(GMT+09:30) Adelaide"],
+		"255" => ["AUS Eastern Standard Time", "(GMT+10:00) Canberra, Melbourne, Sydney"],
+		"260" => ["E Australia Standard Time", "(GMT+10:00) Brisbane"],
+		"265" => ["Tasmania Standard Time", "(GMT+10:00) Hobart"],
+		"270" => ["Vladivostok Standard Time", "(GMT+10:00) Vladivostok"],
+		"275" => ["West Pacific Standard Time", "(GMT+10:00) Guam, Port Moresby"],
+		"280" => ["Central Pacific Standard Time", "(GMT+11:00) Magadan, Solomon Islands, New Caledonia"],
+		"285" => ["Fiji Islands Standard Time", "(GMT+12:00) Fiji Islands, Kamchatka, Marshall Islands"],
+		"290" => ["New Zealand Standard Time", "(GMT+12:00) Auckland, Wellington"],
+		"300" => ["Tonga Standard Time", "(GMT+13:00) Nuku'alofa"],
 	];
 
 	/**
@@ -127,104 +127,104 @@ 
 	 * Created at: 01.06.2012
 	 */
 	private static $tzonesoffsets = [
-		"Transitional Islamic State of Afghanistan Standard Time" => [-270, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"Alaskan Standard Time" => [540, 0, -60,  0, 11, 0, 1, 2, 0, 0, 0,  0, 3, 0, 2, 2, 0, 0, 0],
-		"Arab Standard Time" => [-180, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"Arabian Standard Time" => [-240, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"Arabic Standard Time" => [-180, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
+		"Transitional Islamic State of Afghanistan Standard Time" => [-270, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"Alaskan Standard Time" => [540, 0, -60, 0, 11, 0, 1, 2, 0, 0, 0, 0, 3, 0, 2, 2, 0, 0, 0],
+		"Arab Standard Time" => [-180, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"Arabian Standard Time" => [-240, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"Arabic Standard Time" => [-180, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
 		// "Argentina Standard Time"                   => array(180, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-		"Atlantic Standard Time" => [240, 0, -60,  0, 11, 0, 1, 2, 0, 0, 0,  0, 3, 0, 2, 2, 0, 0, 0],
-		"AUS Central Standard Time" => [-570, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"AUS Eastern Standard Time" => [-600, 0, -60,  0, 4, 0, 1, 3, 0, 0, 0,  0, 10, 0, 1, 2, 0, 0, 0],
+		"Atlantic Standard Time" => [240, 0, -60, 0, 11, 0, 1, 2, 0, 0, 0, 0, 3, 0, 2, 2, 0, 0, 0],
+		"AUS Central Standard Time" => [-570, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"AUS Eastern Standard Time" => [-600, 0, -60, 0, 4, 0, 1, 3, 0, 0, 0, 0, 10, 0, 1, 2, 0, 0, 0],
 		// "Azerbaijan Standard Time"                  => array(-240, 0, -60,  0, 10, 0, 5, 5, 0, 0, 0,  0, 3, 0, 5, 4, 0, 0, 0),
-		"Azores Standard Time" => [60, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0],
+		"Azores Standard Time" => [60, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0],
 		// "Bangladesh Standard Time"                  => array(-360, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-		"Canada Central Standard Time" => [360, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"Cape Verde Standard Time" => [60, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"Caucasus Standard Time" => [-240, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0],
-		"Cen Australia Standard Time" => [-570, 0, -60,  0, 4, 0, 1, 3, 0, 0, 0,  0, 10, 0, 1, 2, 0, 0, 0],
-		"Central America Standard Time" => [360, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"Central Asia Standard Time" => [-360, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
+		"Canada Central Standard Time" => [360, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"Cape Verde Standard Time" => [60, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"Caucasus Standard Time" => [-240, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0],
+		"Cen Australia Standard Time" => [-570, 0, -60, 0, 4, 0, 1, 3, 0, 0, 0, 0, 10, 0, 1, 2, 0, 0, 0],
+		"Central America Standard Time" => [360, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"Central Asia Standard Time" => [-360, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
 		// "Central Brazilian Standard Time"           => array(240, 0, -60,  0, 2, 6, 4, 23, 59, 59, 999,  0, 10, 6, 3, 23, 59, 59, 999),
-		"Central Europe Standard Time" => [-60, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0],
-		"Central European Standard Time" => [-60, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0],
-		"Central Pacific Standard Time" => [-660, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"Central Standard Time" => [360, 0, -60,  0, 11, 0, 1, 2, 0, 0, 0,  0, 3, 0, 2, 2, 0, 0, 0],
-		"Mexico Standard Time" => [360, 0, -60,  0, 10, 0, 5, 2, 0, 0, 0,  0, 4, 0, 1, 2, 0, 0, 0],
-		"China Standard Time" => [-480, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"Dateline Standard Time" => [720, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"E Africa Standard Time" => [-180, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"E Australia Standard Time" => [-600, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"E Europe Standard Time" => [-120, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0],
-		"E South America Standard Time" => [180, 0, -60,  0, 2, 6, 4, 23, 59, 59, 999,  0, 10, 6, 3, 23, 59, 59, 999],
-		"Eastern Standard Time" => [300, 0, -60,  0, 11, 0, 1, 2, 0, 0, 0,  0, 3, 0, 2, 2, 0, 0, 0],
-		"Egypt Standard Time" => [-120, 0, -60,  0, 9, 4, 5, 23, 59, 59, 999,  0, 4, 4, 5, 23, 59, 59, 999],
-		"Ekaterinburg Standard Time" => [-300, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0],
-		"Fiji Islands Standard Time" => [-720, 0, -60,  0, 3, 0, 5, 3, 0, 0, 0,  0, 10, 0, 4, 2, 0, 0, 0],
-		"FLE Standard Time" => [-120, 0, -60,  0, 10, 0, 5, 4, 0, 0, 0,  0, 3, 0, 5, 3, 0, 0, 0],
+		"Central Europe Standard Time" => [-60, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0],
+		"Central European Standard Time" => [-60, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0],
+		"Central Pacific Standard Time" => [-660, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"Central Standard Time" => [360, 0, -60, 0, 11, 0, 1, 2, 0, 0, 0, 0, 3, 0, 2, 2, 0, 0, 0],
+		"Mexico Standard Time" => [360, 0, -60, 0, 10, 0, 5, 2, 0, 0, 0, 0, 4, 0, 1, 2, 0, 0, 0],
+		"China Standard Time" => [-480, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"Dateline Standard Time" => [720, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"E Africa Standard Time" => [-180, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"E Australia Standard Time" => [-600, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"E Europe Standard Time" => [-120, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0],
+		"E South America Standard Time" => [180, 0, -60, 0, 2, 6, 4, 23, 59, 59, 999, 0, 10, 6, 3, 23, 59, 59, 999],
+		"Eastern Standard Time" => [300, 0, -60, 0, 11, 0, 1, 2, 0, 0, 0, 0, 3, 0, 2, 2, 0, 0, 0],
+		"Egypt Standard Time" => [-120, 0, -60, 0, 9, 4, 5, 23, 59, 59, 999, 0, 4, 4, 5, 23, 59, 59, 999],
+		"Ekaterinburg Standard Time" => [-300, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0],
+		"Fiji Islands Standard Time" => [-720, 0, -60, 0, 3, 0, 5, 3, 0, 0, 0, 0, 10, 0, 4, 2, 0, 0, 0],
+		"FLE Standard Time" => [-120, 0, -60, 0, 10, 0, 5, 4, 0, 0, 0, 0, 3, 0, 5, 3, 0, 0, 0],
 		// "Georgian Standard Time"                    => array(-240, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-		"GMT Standard Time" => [0, 0, -60,  0, 10, 0, 5, 2, 0, 0, 0,  0, 3, 0, 5, 1, 0, 0, 0],
-		"Greenland Standard Time" => [180, 0, -60,  0, 10, 6, 5, 23, 0, 0, 0,  0, 3, 6, 4, 22, 0, 0, 0],
-		"Greenwich Standard Time" => [0, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"GTB Standard Time" => [-120, 0, -60,  0, 10, 0, 5, 4, 0, 0, 0,  0, 3, 0, 5, 3, 0, 0, 0],
-		"Hawaiian Standard Time" => [600, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"India Standard Time" => [-330, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"Iran Standard Time" => [-210, 0, -60,  0, 9, 1, 3, 23, 59, 59, 999,  0, 3, 6, 3, 23, 59, 59, 999],
-		"Israel Standard Time" => [-120, 0, -60,  0, 9, 0, 4, 2, 0, 0, 0,  0, 3, 5, 5, 2, 0, 0, 0],
+		"GMT Standard Time" => [0, 0, -60, 0, 10, 0, 5, 2, 0, 0, 0, 0, 3, 0, 5, 1, 0, 0, 0],
+		"Greenland Standard Time" => [180, 0, -60, 0, 10, 6, 5, 23, 0, 0, 0, 0, 3, 6, 4, 22, 0, 0, 0],
+		"Greenwich Standard Time" => [0, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"GTB Standard Time" => [-120, 0, -60, 0, 10, 0, 5, 4, 0, 0, 0, 0, 3, 0, 5, 3, 0, 0, 0],
+		"Hawaiian Standard Time" => [600, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"India Standard Time" => [-330, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"Iran Standard Time" => [-210, 0, -60, 0, 9, 1, 3, 23, 59, 59, 999, 0, 3, 6, 3, 23, 59, 59, 999],
+		"Israel Standard Time" => [-120, 0, -60, 0, 9, 0, 4, 2, 0, 0, 0, 0, 3, 5, 5, 2, 0, 0, 0],
 		// "Jordan Standard Time"                      => array(-120, 0, -60,  0, 10, 5, 5, 1, 0, 0, 0,  0, 3, 4, 5, 23, 59, 59, 999),
 		// "Kamchatka Standard Time"                   => array(-720, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0),
-		"Korea Standard Time" => [-540, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
+		"Korea Standard Time" => [-540, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
 		// "Magadan Standard Time"                     => array(-660, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0),
 		// "Mauritius Standard Time"                   => array(-240, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-		"Mid-Atlantic Standard Time" => [120, 0, -60,  0, 9, 0, 5, 2, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0],
+		"Mid-Atlantic Standard Time" => [120, 0, -60, 0, 9, 0, 5, 2, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0],
 		// "Middle East Standard Time"                 => array(-120, 0, -60,  0, 10, 6, 5, 23, 59, 59, 999,  0, 3, 6, 4, 23, 59, 59, 999),
 		// "Montevideo Standard Time"                  => array(180, 0, -60,  0, 3, 0, 2, 2, 0, 0, 0,  0, 10, 0, 1, 2, 0, 0, 0),
 		// "Morocco Standard Time"                     => array(0, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-		"Mountain Standard Time" => [420, 0, -60,  0, 11, 0, 1, 2, 0, 0, 0,  0, 3, 0, 2, 2, 0, 0, 0],
-		"Mexico Standard Time 2" => [420, 0, -60,  0, 10, 0, 5, 2, 0, 0, 0,  0, 4, 0, 1, 2, 0, 0, 0],
-		"Myanmar Standard Time" => [-390, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"N Central Asia Standard Time" => [-360, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0],
+		"Mountain Standard Time" => [420, 0, -60, 0, 11, 0, 1, 2, 0, 0, 0, 0, 3, 0, 2, 2, 0, 0, 0],
+		"Mexico Standard Time 2" => [420, 0, -60, 0, 10, 0, 5, 2, 0, 0, 0, 0, 4, 0, 1, 2, 0, 0, 0],
+		"Myanmar Standard Time" => [-390, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"N Central Asia Standard Time" => [-360, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0],
 		// "Namibia Standard Time"                     => array(-60, 0, -60,  0, 4, 0, 1, 2, 0, 0, 0,  0, 9, 0, 1, 2, 0, 0, 0),
-		"Nepal Standard Time" => [-345, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"New Zealand Standard Time" => [-720, 0, -60,  0, 4, 0, 1, 3, 0, 0, 0,  0, 9, 0, 5, 2, 0, 0, 0],
-		"Newfoundland and Labrador Standard Time" => [210, 0, -60,  0, 11, 0, 1, 0, 1, 0, 0,  0, 3, 0, 2, 0, 1, 0, 0],
-		"North Asia East Standard Time" => [-480, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0],
-		"North Asia Standard Time" => [-420, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0],
-		"Pacific SA Standard Time" => [240, 0, -60,  0, 3, 6, 2, 23, 59, 59, 999,  0, 10, 6, 2, 23, 59, 59, 999],
-		"Pacific Standard Time" => [480, 0, -60,  0, 11, 0, 1, 2, 0, 0, 0,  0, 3, 0, 2, 2, 0, 0, 0],
+		"Nepal Standard Time" => [-345, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"New Zealand Standard Time" => [-720, 0, -60, 0, 4, 0, 1, 3, 0, 0, 0, 0, 9, 0, 5, 2, 0, 0, 0],
+		"Newfoundland and Labrador Standard Time" => [210, 0, -60, 0, 11, 0, 1, 0, 1, 0, 0, 0, 3, 0, 2, 0, 1, 0, 0],
+		"North Asia East Standard Time" => [-480, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0],
+		"North Asia Standard Time" => [-420, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0],
+		"Pacific SA Standard Time" => [240, 0, -60, 0, 3, 6, 2, 23, 59, 59, 999, 0, 10, 6, 2, 23, 59, 59, 999],
+		"Pacific Standard Time" => [480, 0, -60, 0, 11, 0, 1, 2, 0, 0, 0, 0, 3, 0, 2, 2, 0, 0, 0],
 		// "Pacific Standard Time (Mexico)"            => array(480, 0, -60,  0, 10, 0, 5, 2, 0, 0, 0,  0, 4, 0, 1, 2, 0, 0, 0),
 		// "Pakistan Standard Time"                    => array(-300, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
 		// "Paraguay Standard Time"                    => array(240, 0, -60,  0, 4, 6, 1, 23, 59, 59, 999,  0, 10, 6, 1, 23, 59, 59, 999),
-		"Romance Standard Time" => [-60, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0],
-		"Russian Standard Time" => [-180, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0],
-		"SA Eastern Standard Time" => [180, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"SA Pacific Standard Time" => [300, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"SA Western Standard Time" => [240, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"Samoa Standard Time" => [660, 0, -60,  0, 3, 6, 5, 23, 59, 59, 999,  0, 9, 6, 5, 23, 59, 59, 999],
-		"SE Asia Standard Time" => [-420, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"Singapore Standard Time" => [-480, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"South Africa Standard Time" => [-120, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"Sri Lanka Standard Time" => [-330, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
+		"Romance Standard Time" => [-60, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0],
+		"Russian Standard Time" => [-180, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0],
+		"SA Eastern Standard Time" => [180, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"SA Pacific Standard Time" => [300, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"SA Western Standard Time" => [240, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"Samoa Standard Time" => [660, 0, -60, 0, 3, 6, 5, 23, 59, 59, 999, 0, 9, 6, 5, 23, 59, 59, 999],
+		"SE Asia Standard Time" => [-420, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"Singapore Standard Time" => [-480, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"South Africa Standard Time" => [-120, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"Sri Lanka Standard Time" => [-330, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
 		// "Syria Standard Time"                       => array(-120, 0, -60,  0, 10, 4, 5, 23, 59, 59, 999,  0, 4, 4, 1, 23, 59, 59, 999),
-		"Taipei Standard Time" => [-480, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"Tasmania Standard Time" => [-600, 0, -60,  0, 4, 0, 1, 3, 0, 0, 0,  0, 10, 0, 1, 2, 0, 0, 0],
-		"Tokyo Standard Time" => [-540, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"Tonga Standard Time" => [-780, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
+		"Taipei Standard Time" => [-480, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"Tasmania Standard Time" => [-600, 0, -60, 0, 4, 0, 1, 3, 0, 0, 0, 0, 10, 0, 1, 2, 0, 0, 0],
+		"Tokyo Standard Time" => [-540, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"Tonga Standard Time" => [-780, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
 		// "Ulaanbaatar Standard Time"                 => array(-480, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-		"US Eastern Standard Time" => [300, 0, -60,  0, 11, 0, 1, 2, 0, 0, 0,  0, 3, 0, 2, 2, 0, 0, 0],
-		"US Mountain Standard Time" => [420, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
+		"US Eastern Standard Time" => [300, 0, -60, 0, 11, 0, 1, 2, 0, 0, 0, 0, 3, 0, 2, 2, 0, 0, 0],
+		"US Mountain Standard Time" => [420, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
 		// "UTC"                                       => array(0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
 		// "UTC+12"                                    => array(-720, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
 		// "UTC-02"                                    => array(120, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
 		// "UTC-11"                                    => array(660, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-		"Venezuela Standard Time" => [270, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"Vladivostok Standard Time" => [-600, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0],
-		"W Australia Standard Time" => [-480, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"W Central Africa Standard Time" => [-60, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"W Europe Standard Time" => [-60, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0],
-		"West Asia Standard Time" => [-300, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"West Pacific Standard Time" => [-600, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0],
-		"Yakutsk Standard Time" => [-540, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0],
+		"Venezuela Standard Time" => [270, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"Vladivostok Standard Time" => [-600, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0],
+		"W Australia Standard Time" => [-480, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"W Central Africa Standard Time" => [-60, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"W Europe Standard Time" => [-60, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0],
+		"West Asia Standard Time" => [-300, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"West Pacific Standard Time" => [-600, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+		"Yakutsk Standard Time" => [-540, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0],
 	];
 
 	/**

mapi/class.taskrequest.php

Spacing +33 added lines, -33 removed lines

@@ -23,12 +23,12 @@ 
 	 * carried in the IPM.TaskRequest item (although this information seems
 	 * redundant due to that information already being available in PR_MESSAGE_CLASS).
 	 */
-	define('tdmtNothing', 0);            // Value in IPM.Task items
-	define('tdmtTaskReq', 1);            // Assigner -> Assignee
-	define('tdmtTaskAcc', 2);            // Assignee -> Assigner
-	define('tdmtTaskDec', 3);            // Assignee -> Assigner
-	define('tdmtTaskUpd', 4);            // Assignee -> Assigner
-	define('tdmtTaskSELF', 5);            // Assigner -> Assigner (?)
+	define('tdmtNothing', 0); // Value in IPM.Task items
+	define('tdmtTaskReq', 1); // Assigner -> Assignee
+	define('tdmtTaskAcc', 2); // Assignee -> Assigner
+	define('tdmtTaskDec', 3); // Assignee -> Assigner
+	define('tdmtTaskUpd', 4); // Assignee -> Assigner
+	define('tdmtTaskSELF', 5); // Assigner -> Assigner (?)
 
 	/* The TaskHistory is used to show the last action on the task
 	 * on both the assigner and the assignee's side.
@@ -38,22 +38,22 @@ 
 	 * the format 'Accepted by <user> on 01-01-2010 11:00'.
 	 */
 	define('thNone', 0);
-	define('thAccepted', 1);            // Set by assignee
-	define('thDeclined', 2);            // Set by assignee
-	define('thUpdated', 3);                // Set by assignee
+	define('thAccepted', 1); // Set by assignee
+	define('thDeclined', 2); // Set by assignee
+	define('thUpdated', 3); // Set by assignee
 	define('thDueDateChanged', 4);
-	define('thAssigned', 5);            // Set by assigner
+	define('thAssigned', 5); // Set by assigner
 
 	/* The TaskState value is used to differentiate the version of a task
 	 * in the assigner's folder and the version in the
 	 * assignee's folder. The buttons shown depend on this and
 	 * the 'taskaccepted' boolean (for the assignee)
 	 */
-	define('tdsNOM', 0);        // Got a response to a deleted task, and re-created the task for the assigner
-	define('tdsOWNNEW', 1);        // Not assigned
-	define('tdsOWN', 2);        // Assignee version
-	define('tdsACC', 3);        // Assigner version
-	define('tdsDEC', 4);        // Assigner version, but assignee declined
+	define('tdsNOM', 0); // Got a response to a deleted task, and re-created the task for the assigner
+	define('tdsOWNNEW', 1); // Not assigned
+	define('tdsOWN', 2); // Assignee version
+	define('tdsACC', 3); // Assigner version
+	define('tdsDEC', 4); // Assigner version, but assignee declined
 
 	/* The TaskAcceptanceState is used for the assigner to indicate state */
 	define('olTaskNotDelegated', 0);
@@ -63,13 +63,13 @@ 
 
 	/* The task ownership indicates the role of the current user relative to the task. */
 	define('olNewTask', 0);
-	define('olDelegatedTask', 1);    // Task has been assigned
-	define('olOwnTask', 2);            // Task owned
+	define('olDelegatedTask', 1); // Task has been assigned
+	define('olOwnTask', 2); // Task owned
 
 	/* taskmultrecips indicates whether the task request sent or received has multiple assignees or not. */
 	define('tmrNone', 0);
-	define('tmrSent', 1);        // Task has been sent to multiple assignee
-	define('tmrReceived', 2);    // Task Request received has multiple assignee
+	define('tmrSent', 1); // Task has been sent to multiple assignee
+	define('tmrReceived', 2); // Task Request received has multiple assignee
 
 	// Task icon index.
 	define('ICON_TASK_ASSIGNEE', 0x00000502);
@@ -307,7 +307,7 @@ 
 					VALUE => $goid, ],
 				];
 
-				$table = mapi_folder_getcontentstable($folder, MAPI_DEFERRED_ERRORS | SHOW_SOFT_DELETES);
+				$table = mapi_folder_getcontentstable($folder, MAPI_DEFERRED_ERRORS|SHOW_SOFT_DELETES);
 				$softDeletedItems = mapi_table_queryallrows($table, [PR_ENTRYID], $restriction);
 				if (!empty($softDeletedItems)) {
 					return true;
@@ -515,14 +515,14 @@ 
 			// Set properties on Task Request
 			mapi_setprops($this->message, [
 				$this->props['task_goid'] => $taskid, /* our new task_goid */
-				$this->props['taskstate'] => tdsACC,         /* state for our outgoing request */
-				$this->props['taskmode'] => tdmtNothing,     /* we're not sending a change */
-				$this->props['updatecount'] => 2,            /* version 2 (no idea) */
+				$this->props['taskstate'] => tdsACC, /* state for our outgoing request */
+				$this->props['taskmode'] => tdmtNothing, /* we're not sending a change */
+				$this->props['updatecount'] => 2, /* version 2 (no idea) */
 				$this->props['task_acceptance_state'] => olTaskDelegationUnknown, /* no reply yet */
 				$this->props['ownership'] => olDelegatedTask, /* Task has been assigned */
-				$this->props['taskhistory'] => thAssigned,    /* Task has been assigned */
+				$this->props['taskhistory'] => thAssigned, /* Task has been assigned */
 				PR_CONVERSATION_TOPIC => $messageprops[PR_SUBJECT],
-				PR_ICON_INDEX => ICON_TASK_ASSIGNER,         /* Task request icon */
+				PR_ICON_INDEX => ICON_TASK_ASSIGNER, /* Task request icon */
 			]);
 			$this->setLastUser();
 			$this->setOwnerForAssignor();
@@ -537,10 +537,10 @@ 
 
 			// Make it a task request, and put it in sent items after it is sent
 			mapi_setprops($outgoing, [
-				PR_MESSAGE_CLASS => "IPM.TaskRequest",         /* class is task request */
-				$this->props['taskstate'] => tdsOWN,         /* for the recipient he is the task owner */
-				$this->props['taskmode'] => tdmtTaskReq,    /* for the recipient it's a request */
-				$this->props['updatecount'] => 1,            /* version 2 is in the attachment */
+				PR_MESSAGE_CLASS => "IPM.TaskRequest", /* class is task request */
+				$this->props['taskstate'] => tdsOWN, /* for the recipient he is the task owner */
+				$this->props['taskmode'] => tdmtTaskReq, /* for the recipient it's a request */
+				$this->props['updatecount'] => 1, /* version 2 is in the attachment */
 				PR_SUBJECT_PREFIX => $prefix,
 				PR_SUBJECT => $prefix . $messageprops[PR_SUBJECT],
 			]);
@@ -551,7 +551,7 @@ 
 				PR_ATTACHMENT_HIDDEN => true,
 				PR_DISPLAY_NAME => $messageprops[PR_SUBJECT], ]);
 
-			$sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_MODIFY | MAPI_CREATE);
+			$sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_MODIFY|MAPI_CREATE);
 
 			mapi_copyto($this->message, [], [], $sub);
 			mapi_savechanges($sub);
@@ -890,7 +890,7 @@ 
 
 			$attach = mapi_message_createattach($outgoing);
 			mapi_setprops($attach, [PR_ATTACH_METHOD => ATTACH_EMBEDDED_MSG, PR_DISPLAY_NAME => $messageprops[PR_CONVERSATION_TOPIC], PR_ATTACHMENT_HIDDEN => true]);
-			$sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_CREATE | MAPI_MODIFY);
+			$sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_CREATE|MAPI_MODIFY);
 
 			$message = !$this->isTaskRequest() ? $this->message : $this->getAssociatedTask(false);
 
@@ -943,7 +943,7 @@ 
 			// edit response before sending task response.
 			if ($this->taskCommentsInfo) {
 				$comments = $this->getTaskCommentsInfo();
-				$stream = mapi_openproperty($outgoing, PR_BODY, IID_IStream, STGM_TRANSACTED, MAPI_CREATE | MAPI_MODIFY);
+				$stream = mapi_openproperty($outgoing, PR_BODY, IID_IStream, STGM_TRANSACTED, MAPI_CREATE|MAPI_MODIFY);
 				mapi_stream_setsize($stream, strlen($comments));
 				mapi_stream_write($stream, $comments);
 				mapi_stream_commit($stream);
@@ -1206,7 +1206,7 @@ 
 				}
 
 				foreach ($recips as $recip) {
-					$recip[PR_RECIPIENT_TYPE] = MAPI_TO;    // Change recipient type to MAPI_TO
+					$recip[PR_RECIPIENT_TYPE] = MAPI_TO; // Change recipient type to MAPI_TO
 					mapi_message_modifyrecipients($outgoing, MODRECIP_ADD, [$recip]);
 				}
 

mapi/class.baserecurrence.php

Switch Indentation +143 added lines, -143 removed lines

@@ -1739,193 +1739,193 @@
 				// Loop through the entire recurrence range of dates, and check for each occurrence whether it is in the view range.
 
 				switch ($this->recur["type"]) {
-				case 10:
-					// Daily
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 1440;
-					}
-
-					if ($this->recur["subtype"] == 0) {
-						// Every Nth day
-						for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * $this->recur["everyn"]) {
-							$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+					case 10:
+						// Daily
+						if ($this->recur["everyn"] <= 0) {
+							$this->recur["everyn"] = 1440;
 						}
-					}
-					else {
-						// Every workday
-						for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * 1440) {
-							$nowtime = $this->gmtime($now);
-							if ($nowtime["tm_wday"] > 0 && $nowtime["tm_wday"] < 6) { // only add items in the given timespace
+
+						if ($this->recur["subtype"] == 0) {
+							// Every Nth day
+							for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * $this->recur["everyn"]) {
 								$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
 							}
 						}
-					}
-
-					break;
+						else {
+							// Every workday
+							for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * 1440) {
+								$nowtime = $this->gmtime($now);
+								if ($nowtime["tm_wday"] > 0 && $nowtime["tm_wday"] < 6) { // only add items in the given timespace
+									$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								}
+							}
+						}
 
-				case 11:
-					// Weekly
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 1;
-					}
+						break;
 
-					// If sliding flag is set then move to 'n' weeks
-					if ($this->recur['regen']) {
-						$daystart += (60 * 60 * 24 * 7 * $this->recur["everyn"]);
-					}
+					case 11:
+						// Weekly
+						if ($this->recur["everyn"] <= 0) {
+							$this->recur["everyn"] = 1;
+						}
 
-					for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += (60 * 60 * 24 * 7 * $this->recur["everyn"])) {
+						// If sliding flag is set then move to 'n' weeks
 						if ($this->recur['regen']) {
-							$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							$daystart += (60 * 60 * 24 * 7 * $this->recur["everyn"]);
 						}
-						else {
-							// Loop through the whole following week to the first occurrence of the week, add each day that is specified
-							for ($wday = 0; $wday < 7; ++$wday) {
-								$daynow = $now + $wday * 60 * 60 * 24;
-								// checks weather the next coming day in recurring pattern is less than or equal to end day of the recurring item
-								if ($daynow <= $dayend) {
-									$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
-									if (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"]))) { // Selected ?
-										$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+
+						for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += (60 * 60 * 24 * 7 * $this->recur["everyn"])) {
+							if ($this->recur['regen']) {
+								$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							}
+							else {
+								// Loop through the whole following week to the first occurrence of the week, add each day that is specified
+								for ($wday = 0; $wday < 7; ++$wday) {
+									$daynow = $now + $wday * 60 * 60 * 24;
+									// checks weather the next coming day in recurring pattern is less than or equal to end day of the recurring item
+									if ($daynow <= $dayend) {
+										$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+										if (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"]))) { // Selected ?
+											$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+										}
 									}
 								}
 							}
 						}
-					}
 
-					break;
-
-				case 12:
-					// Monthly
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 1;
-					}
+						break;
 
-					// Loop through all months from start to end of occurrence, starting at beginning of first month
-					for ($now = $this->monthStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
-						if (isset($this->recur["monthday"]) && ($this->recur['monthday'] != "undefined") && !$this->recur['regen']) { // Day M of every N months
-							$difference = 1;
-							if ($this->daysInMonth($now, $this->recur["everyn"]) < $this->recur["monthday"]) {
-								$difference = $this->recur["monthday"] - $this->daysInMonth($now, $this->recur["everyn"]) + 1;
-							}
-							$daynow = $now + (($this->recur["monthday"] - $difference) * 24 * 60 * 60);
-							// checks weather the next coming day in recurrence pattern is less than or equal to end day of the recurring item
-							if ($daynow <= $dayend) {
-								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-							}
+					case 12:
+						// Monthly
+						if ($this->recur["everyn"] <= 0) {
+							$this->recur["everyn"] = 1;
 						}
-						elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] of every N months
-							// Sanitize input
-							if ($this->recur["weekdays"] == 0) {
-								$this->recur["weekdays"] = 1;
-							}
 
-							// If nday is not set to the last day in the month
-							if ($this->recur["nday"] < 5) {
-								// keep the track of no. of time correct selection pattern(like 2nd weekday, 4th fiday, etc.)is matched
-								$ndaycounter = 0;
-								// Find matching weekday in this month
-								for ($day = 0, $total = $this->daysInMonth($now, 1); $day < $total; ++$day) {
-									$daynow = $now + $day * 60 * 60 * 24;
-									$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+						// Loop through all months from start to end of occurrence, starting at beginning of first month
+						for ($now = $this->monthStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
+							if (isset($this->recur["monthday"]) && ($this->recur['monthday'] != "undefined") && !$this->recur['regen']) { // Day M of every N months
+								$difference = 1;
+								if ($this->daysInMonth($now, $this->recur["everyn"]) < $this->recur["monthday"]) {
+									$difference = $this->recur["monthday"] - $this->daysInMonth($now, $this->recur["everyn"]) + 1;
+								}
+								$daynow = $now + (($this->recur["monthday"] - $difference) * 24 * 60 * 60);
+								// checks weather the next coming day in recurrence pattern is less than or equal to end day of the recurring item
+								if ($daynow <= $dayend) {
+									$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								}
+							}
+							elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] of every N months
+								// Sanitize input
+								if ($this->recur["weekdays"] == 0) {
+									$this->recur["weekdays"] = 1;
+								}
 
-									if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
-										++$ndaycounter;
-									}
-									// check the selected pattern is same as asked Nth weekday,If so set the firstday
-									if ($this->recur["nday"] == $ndaycounter) {
-										$firstday = $day;
+								// If nday is not set to the last day in the month
+								if ($this->recur["nday"] < 5) {
+									// keep the track of no. of time correct selection pattern(like 2nd weekday, 4th fiday, etc.)is matched
+									$ndaycounter = 0;
+									// Find matching weekday in this month
+									for ($day = 0, $total = $this->daysInMonth($now, 1); $day < $total; ++$day) {
+										$daynow = $now + $day * 60 * 60 * 24;
+										$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+
+										if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
+											++$ndaycounter;
+										}
+										// check the selected pattern is same as asked Nth weekday,If so set the firstday
+										if ($this->recur["nday"] == $ndaycounter) {
+											$firstday = $day;
 
-										break;
+											break;
+										}
 									}
+									// $firstday is the day of the month on which the asked pattern of nth weekday matches
+									$daynow = $now + $firstday * 60 * 60 * 24;
 								}
-								// $firstday is the day of the month on which the asked pattern of nth weekday matches
-								$daynow = $now + $firstday * 60 * 60 * 24;
-							}
-							else {
-								// Find last day in the month ($now is the firstday of the month)
-								$NumDaysInMonth = $this->daysInMonth($now, 1);
-								$daynow = $now + (($NumDaysInMonth - 1) * 24 * 60 * 60);
+								else {
+									// Find last day in the month ($now is the firstday of the month)
+									$NumDaysInMonth = $this->daysInMonth($now, 1);
+									$daynow = $now + (($NumDaysInMonth - 1) * 24 * 60 * 60);
 
-								$nowtime = $this->gmtime($daynow);
-								while (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) == 0) {
-									$daynow -= 86400;
 									$nowtime = $this->gmtime($daynow);
+									while (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) == 0) {
+										$daynow -= 86400;
+										$nowtime = $this->gmtime($daynow);
+									}
 								}
-							}
 
-							/*
+								/*
 							 * checks weather the next coming day in recurrence pattern is less than or equal to end day of the            * recurring item.Also check weather the coming day in recurrence pattern is greater than or equal to start * of recurring pattern, so that appointment that fall under the recurrence range are only displayed.
 							 */
-							if ($daynow <= $dayend && $daynow >= $daystart) {
-								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								if ($daynow <= $dayend && $daynow >= $daystart) {
+									$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								}
 							}
-						}
-						elseif ($this->recur['regen']) {
-							$next_month_start = $now + ($this->daysInMonth($now, 1) * 24 * 60 * 60);
-							$now = $daystart + ($this->daysInMonth($next_month_start, $this->recur['everyn']) * 24 * 60 * 60);
+							elseif ($this->recur['regen']) {
+								$next_month_start = $now + ($this->daysInMonth($now, 1) * 24 * 60 * 60);
+								$now = $daystart + ($this->daysInMonth($next_month_start, $this->recur['everyn']) * 24 * 60 * 60);
 
-							if ($now <= $dayend) {
-								$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								if ($now <= $dayend) {
+									$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								}
 							}
 						}
-					}
-
-					break;
 
-				case 13:
-					// Yearly
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 12;
-					}
+						break;
 
-					for ($now = $this->yearStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
-						if (isset($this->recur["monthday"]) && !$this->recur['regen']) { // same as monthly, but in a specific month
-							// recur["month"] is in minutes since the beginning of the year
-							$month = $this->monthOfYear($this->recur["month"]); // $month is now month of year [0..11]
-							$monthday = $this->recur["monthday"]; // $monthday is day of the month [1..31]
-							$monthstart = $now + $this->daysInMonth($now, $month) * 24 * 60 * 60; // $monthstart is the timestamp of the beginning of the month
-							if ($monthday > $this->daysInMonth($monthstart, 1)) {
-								$monthday = $this->daysInMonth($monthstart, 1);
-							}    // Cap $monthday on month length (eg 28 feb instead of 29 feb)
-							$daynow = $monthstart + ($monthday - 1) * 24 * 60 * 60;
-							$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+					case 13:
+						// Yearly
+						if ($this->recur["everyn"] <= 0) {
+							$this->recur["everyn"] = 12;
 						}
-						elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
-							// Go the correct month
-							$monthnow = $now + $this->daysInMonth($now, $this->monthOfYear($this->recur["month"])) * 24 * 60 * 60;
 
-							// Find first matching weekday in this month
-							for ($wday = 0; $wday < 7; ++$wday) {
-								$daynow = $monthnow + $wday * 60 * 60 * 24;
-								$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+						for ($now = $this->yearStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
+							if (isset($this->recur["monthday"]) && !$this->recur['regen']) { // same as monthly, but in a specific month
+								// recur["month"] is in minutes since the beginning of the year
+								$month = $this->monthOfYear($this->recur["month"]); // $month is now month of year [0..11]
+								$monthday = $this->recur["monthday"]; // $monthday is day of the month [1..31]
+								$monthstart = $now + $this->daysInMonth($now, $month) * 24 * 60 * 60; // $monthstart is the timestamp of the beginning of the month
+								if ($monthday > $this->daysInMonth($monthstart, 1)) {
+									$monthday = $this->daysInMonth($monthstart, 1);
+								}    // Cap $monthday on month length (eg 28 feb instead of 29 feb)
+								$daynow = $monthstart + ($monthday - 1) * 24 * 60 * 60;
+								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							}
+							elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
+								// Go the correct month
+								$monthnow = $now + $this->daysInMonth($now, $this->monthOfYear($this->recur["month"])) * 24 * 60 * 60;
+
+								// Find first matching weekday in this month
+								for ($wday = 0; $wday < 7; ++$wday) {
+									$daynow = $monthnow + $wday * 60 * 60 * 24;
+									$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
 
-								if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
-									$firstday = $wday;
+									if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
+										$firstday = $wday;
 
-									break;
+										break;
+									}
 								}
-							}
 
-							// Same as above (monthly)
-							$daynow = $monthnow + ($firstday + ($this->recur["nday"] - 1) * 7) * 60 * 60 * 24;
+								// Same as above (monthly)
+								$daynow = $monthnow + ($firstday + ($this->recur["nday"] - 1) * 7) * 60 * 60 * 24;
 
-							while ($this->monthStartOf($daynow) != $this->monthStartOf($monthnow)) {
-								$daynow -= 7 * 60 * 60 * 24;
-							}
+								while ($this->monthStartOf($daynow) != $this->monthStartOf($monthnow)) {
+									$daynow -= 7 * 60 * 60 * 24;
+								}
 
-							$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						}
-						elseif ($this->recur['regen']) {
-							$year_starttime = $this->gmtime($now);
-							$is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1);    // +1 next year
-							$now = $daystart + ($is_next_leapyear ? 31622400 /* Leap year in seconds */ : 31536000 /* year in seconds */);
+								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							}
+							elseif ($this->recur['regen']) {
+								$year_starttime = $this->gmtime($now);
+								$is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1);    // +1 next year
+								$now = $daystart + ($is_next_leapyear ? 31622400 /* Leap year in seconds */ : 31536000 /* year in seconds */);
 
-							if ($now <= $dayend) {
-								$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								if ($now <= $dayend) {
+									$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+								}
 							}
 						}
-					}
 				}
 				// to get all exception items
 				if (!empty($this->recur['changed_occurrences'])) {

Spacing +7 added lines, -7 removed lines

@@ -842,12 +842,12 @@ 
 
 								$dayofweek = gmdate("w", $monthbegindow);
 								for ($i = 0; $i < 7; ++$i) {
-									if ($nday == 5 && (($dayofweek - $i) % 7 >= 0) && (1 << (($dayofweek - $i) % 7)) & $weekdays) {
+									if ($nday == 5 && (($dayofweek - $i) % 7 >= 0) && (1 << (($dayofweek - $i) % 7))&$weekdays) {
 										$day = gmdate("j", $monthbegindow) - $i;
 
 										break;
 									}
-									if ($nday != 5 && (1 << (($dayofweek + $i) % 7)) & $weekdays) {
+									if ($nday != 5 && (1 << (($dayofweek + $i) % 7))&$weekdays) {
 										$day = (($nday - 1) * 7) + ($i + 1);
 
 										break;
@@ -887,12 +887,12 @@ 
 							// Set start on the right day
 							$dayofweek = gmdate("w", $monthbegindow);
 							for ($i = 0; $i < 7; ++$i) {
-								if ($nday == 5 && (($dayofweek - $i) % 7) >= 0 && (1 << (($dayofweek - $i) % 7)) & $weekdays) {
+								if ($nday == 5 && (($dayofweek - $i) % 7) >= 0 && (1 << (($dayofweek - $i) % 7))&$weekdays) {
 									$day = $i;
 
 									break;
 								}
-								if ($nday != 5 && (1 << (($dayofweek + $i) % 7)) & $weekdays) {
+								if ($nday != 5 && (1 << (($dayofweek + $i) % 7))&$weekdays) {
 									$day = ($nday - 1) * 7 + ($i + 1);
 
 									break;
@@ -1144,12 +1144,12 @@ 
 
 									$dayofweek = gmdate("w", $occenddate);
 									for ($i = 0; $i < 7; ++$i) {
-										if ($nday == 5 && (($dayofweek - $i) % 7) >= 0 && (1 << (($dayofweek - $i) % 7)) & $weekdays) {
+										if ($nday == 5 && (($dayofweek - $i) % 7) >= 0 && (1 << (($dayofweek - $i) % 7))&$weekdays) {
 											$occenddate -= $i * 24 * 60 * 60;
 
 											break;
 										}
-										if ($nday != 5 && (1 << (($dayofweek + $i) % 7)) & $weekdays) {
+										if ($nday != 5 && (1 << (($dayofweek + $i) % 7))&$weekdays) {
 											$occenddate += ($i + (($nday - 1) * 7)) * 24 * 60 * 60;
 
 											break;
@@ -1918,7 +1918,7 @@ 
 						}
 						elseif ($this->recur['regen']) {
 							$year_starttime = $this->gmtime($now);
-							$is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1);    // +1 next year
+							$is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1); // +1 next year
 							$now = $daystart + ($is_next_leapyear ? 31622400 /* Leap year in seconds */ : 31536000 /* year in seconds */);
 
 							if ($now <= $dayend) {

lib/grommunio/mapiprovider.php

Spacing +3 added lines, -4 removed lines

@@ -1540,8 +1540,7 @@ 
 						if (isset($exception->asbody)) {
 							$this->setASbody($exception->asbody, $exceptionprops, $appointmentprops);
 							$mapiexception["body"] = $exceptionprops[$appointmentprops["body"]] =
-								(isset($exceptionprops[$appointmentprops["body"]])) ? $exceptionprops[$appointmentprops["body"]] :
-								((isset($exceptionprops[$appointmentprops["html"]])) ? $exceptionprops[$appointmentprops["html"]] : "");
+								(isset($exceptionprops[$appointmentprops["body"]])) ? $exceptionprops[$appointmentprops["body"]] : ((isset($exceptionprops[$appointmentprops["html"]])) ? $exceptionprops[$appointmentprops["html"]] : "");
 						}
 
 						array_push($recur["changed_occurrences"], $mapiexception);
@@ -1616,7 +1615,7 @@ 
 			$org[PR_ADDRTYPE] = isset($representingprops[$appointmentprops["sentrepresentingaddt"]]) ? $representingprops[$appointmentprops["sentrepresentingaddt"]] : $props[$appointmentprops["sentrepresentingaddt"]];
 			$org[PR_SMTP_ADDRESS] = $org[PR_EMAIL_ADDRESS] = isset($representingprops[$appointmentprops["sentrepresentingemail"]]) ? $representingprops[$appointmentprops["sentrepresentingemail"]] : $props[$appointmentprops["sentrepresentingemail"]];
 			$org[PR_SEARCH_KEY] = isset($representingprops[$appointmentprops["sentrepresentinsrchk"]]) ? $representingprops[$appointmentprops["sentrepresentinsrchk"]] : $props[$appointmentprops["sentrepresentinsrchk"]];
-			$org[PR_RECIPIENT_FLAGS] = recipOrganizer | recipSendable;
+			$org[PR_RECIPIENT_FLAGS] = recipOrganizer|recipSendable;
 			$org[PR_RECIPIENT_TYPE] = MAPI_ORIG;
 
 			array_push($recips, $org);
@@ -2494,7 +2493,7 @@ 
 			$props[$properties["emailaddresstype{$cnt}"]] = "SMTP";
 			$props[$properties["emailaddressentryid{$cnt}"]] = mapi_createoneoff($name, "SMTP", $emailAddress);
 			$nremails[] = $cnt - 1;
-			$abprovidertype |= 2 ^ ($cnt - 1);
+			$abprovidertype |= 2^($cnt - 1);
 		}
 	}