grommunio / grommunio-sync

lib/wbxml/wbxmlencoder.php

Braces +9 added lines, -18 removed lines

@@ -53,8 +53,7 @@ 
 		if ($this->multipart) {
 			header("Content-Type: application/vnd.ms-sync.multipart");
 			SLog::Write(LOGLEVEL_DEBUG, "WBXMLEncoder->startWBXML() type: vnd.ms-sync.multipart");
-		}
-		else {
+		} else {
 			header("Content-Type: application/vnd.ms-sync.wbxml");
 			SLog::Write(LOGLEVEL_DEBUG, "WBXMLEncoder->startWBXML() type: vnd.ms-sync.wbxml");
 		}
@@ -86,8 +85,7 @@ 
 
 		// If 'nocontent' is specified, then apparently the user wants to force
 			// output of an empty tag, and we therefore output the stack here
-		}
-		else {
+		} else {
 			$this->_outputStack();
 			$this->_startTag($tag, $nocontent);
 		}
@@ -274,8 +272,7 @@ 
 		if ($opaque) {
 			$this->outByte(self::WBXML_OPAQUE);
 			$this->outMBUInt($stat['size']);
-		}
-		else {
+		} else {
 			$this->outByte(self::WBXML_STR_I);
 		}
 
@@ -344,8 +341,7 @@ 
 			$uint = $uint >> 7;
 			if ($i == 0) {
 				$out = chr($byte) . $out;
-			}
-			else {
+			} else {
 				$out = chr($byte | 0x80) . $out;
 			}
 		}
@@ -390,8 +386,7 @@ 
 
 		if (isset($split["ns"])) {
 			$cp = $this->_dtd["namespaces"][$split["ns"]];
-		}
-		else {
+		} else {
 			$cp = 0;
 		}
 
@@ -417,8 +412,7 @@ 
 		if ($pos) {
 			$ns = substr($fulltag, 0, $pos);
 			$tag = substr($fulltag, $pos + 1);
-		}
-		else {
+		} else {
 			$tag = $fulltag;
 		}
 
@@ -443,8 +437,7 @@ 
 		$spaces = str_repeat(" ", count($this->logStack));
 		if ($nocontent) {
 			SLog::Write(LOGLEVEL_WBXML, "O " . $spaces . " <{$tag}/>");
-		}
-		else {
+		} else {
 			array_push($this->logStack, $tag);
 			SLog::Write(LOGLEVEL_WBXML, "O " . $spaces . " <{$tag}>");
 		}
@@ -509,11 +502,9 @@ 
 	private function writeLog() {
 		if (ob_get_length() === false) {
 			$data = "output buffer disabled";
-		}
-		elseif (ob_get_length() < 524288) {
+		} elseif (ob_get_length() < 524288) {
 			$data = base64_encode(ob_get_contents());
-		}
-		else {
+		} else {
 			$data = "more than 512K of data";
 		}
 		SLog::Write(LOGLEVEL_WBXML, "WBXML-OUT: " . $data, false);

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/utils/compat.php

Braces +1 added lines, -2 removed lines

@@ -207,8 +207,7 @@
 			header($protocol . ' ' . $code . ' ' . $text);
 
 			$GLOBALS['http_response_code'] = $code;
-		}
-		else {
+		} else {
 			$code = (isset($GLOBALS['http_response_code']) ? $GLOBALS['http_response_code'] : 200);
 		}
 

lib/utils/timezoneutil.php

Braces +1 added lines, -2 removed lines

@@ -1120,8 +1120,7 @@
 		SLog::Write(LOGLEVEL_DEBUG, "TimezoneUtil::FillTZNames() filling up bias " . $tz["bias"]);
 		if (!isset($tz["bias"])) {
 			SLog::Write(LOGLEVEL_WARN, "TimezoneUtil::FillTZNames() submitted TZ array does not have a bias");
-		}
-		else {
+		} else {
 			$tzname = self::guessTZNameFromOffset($tz);
 			$tz['tzname'] = $tz['tznamedst'] = self::encodeTZName(self::getMSTZnameFromTZName($tzname));
 		}

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],
 	];
 
 	/**

lib/utils/stringstreamwrapper.php

Braces +2 added lines, -4 removed lines

@@ -87,11 +87,9 @@
 	public function stream_seek($offset, $whence = SEEK_SET) {
 		if ($whence == SEEK_CUR) {
 			$this->position += $offset;
-		}
-		elseif ($whence == SEEK_END) {
+		} elseif ($whence == SEEK_END) {
 			$this->position = $this->stringlength + $offset;
-		}
-		else {
+		} else {
 			$this->position = $offset;
 		}
 

lib/utils/g_RFC822.php

Braces +18 added lines, -36 removed lines

@@ -250,8 +250,7 @@ 
 
 			if (!$this->nestGroups) {
 				$this->structure = array_merge($this->structure, $valid);
-			}
-			else {
+			} else {
 				$this->structure[] = $valid;
 			}
 		}
@@ -274,12 +273,10 @@ 
 		if ($this->_isGroup($address) && !isset($this->error)) {
 			$split_char = ';';
 			$is_group = true;
-		}
-		elseif (!isset($this->error)) {
+		} elseif (!isset($this->error)) {
 			$split_char = ',';
 			$is_group = false;
-		}
-		elseif (isset($this->error)) {
+		} elseif (isset($this->error)) {
 			return false;
 		}
 
@@ -377,14 +374,12 @@ 
 				substr($string, -1) == '\\') {
 				if (isset($parts[$i + 1])) {
 					$string = $string . $char . $parts[$i + 1];
-				}
-				else {
+				} else {
 					$this->error = 'Invalid address spec. Unclosed bracket or quotes';
 
 					return false;
 				}
-			}
-			else {
+			} else {
 				$this->index = $i;
 
 				break;
@@ -523,8 +518,7 @@ 
 				$addresses[] = $this->_splitCheck($parts, ',');
 				$address['address'] = trim(substr($address['address'], strlen(end($addresses) . ',')));
 			}
-		}
-		else {
+		} else {
 			$addresses[] = $address['address'];
 		}
 
@@ -550,18 +544,15 @@ 
 		if ($this->nestGroups) {
 			if ($is_group) {
 				$structure->addresses = $addresses;
-			}
-			else {
+			} else {
 				$structure = $addresses[0];
 			}
 
 			// Flat format
-		}
-		else {
+		} else {
 			if ($is_group) {
 				$structure = array_merge($structure, $addresses);
-			}
-			else {
+			} else {
 				$structure = $addresses;
 			}
 		}
@@ -689,8 +680,7 @@ 
 
 				// +2 is for the brackets
 				$_mailbox = substr($_mailbox, strpos($_mailbox, '(' . $comment) + strlen($comment) + 2);
-			}
-			else {
+			} else {
 				break;
 			}
 		}
@@ -719,13 +709,11 @@ 
 			}
 
 			// Only got addr-spec
-		}
-		else {
+		} else {
 			// First snip angle brackets if present.
 			if (substr($mailbox, 0, 1) == '<' && substr($mailbox, -1) == '>') {
 				$addr_spec = substr($mailbox, 1, -1);
-			}
-			else {
+			} else {
 				$addr_spec = $mailbox;
 			}
 
@@ -745,8 +733,7 @@ 
 			$mbox->mailbox = $route_addr['local_part'];
 			$mbox->host = $route_addr['domain'];
 			$route_addr['adl'] !== '' ? $mbox->adl = $route_addr['adl'] : '';
-		}
-		else {
+		} else {
 			$mbox->mailbox = $addr_spec['local_part'];
 			$mbox->host = $addr_spec['domain'];
 		}
@@ -772,8 +759,7 @@ 
 		if (strpos($route_addr, ':') !== false) {
 			$parts = explode(':', $route_addr);
 			$route = $this->_splitCheck($parts, ':');
-		}
-		else {
+		} else {
 			$route = $route_addr;
 		}
 
@@ -785,8 +771,7 @@ 
 			if (($addr_spec = $this->_validateAddrSpec($addr_spec)) === false) {
 				return false;
 			}
-		}
-		else {
+		} else {
 			// Validate route part.
 			if (($route = $this->_validateRoute($route)) === false) {
 				return false;
@@ -802,8 +787,7 @@ 
 
 		if (isset($route)) {
 			$return['adl'] = $route;
-		}
-		else {
+		} else {
 			$return['adl'] = '';
 		}
 
@@ -876,8 +860,7 @@ 
 			if (!$this->_validateDliteral($arr[1])) {
 				return false;
 			}
-		}
-		else {
+		} else {
 			if (!$this->_validateAtom($subdomain)) {
 				return false;
 			}
@@ -918,8 +901,7 @@ 
 			$domain = substr($addr_spec, strlen($local_part . '@'));
 
 		// No @ sign so assume the default domain.
-		}
-		else {
+		} else {
 			$local_part = $addr_spec;
 			$domain = $this->default_domain;
 		}

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/utils.php

Braces +8 added lines, -16 removed lines

@@ -33,8 +33,7 @@ 
 		if ($pos === false) {
 			$user = $domainuser;
 			$domain = '';
-		}
-		else {
+		} else {
 			$domain = substr($domainuser, 0, $pos);
 			$user = substr($domainuser, $pos + 1);
 		}
@@ -105,12 +104,10 @@ 
 				if (strlen($names) > 0) {
 					$lastfirst .= ", {$names}";
 					$firstlast = "{$names} {$lastname}";
-				}
-				else {
+				} else {
 					$firstlast = $lastname;
 				}
-			}
-			elseif (strlen($names) > 0) {
+			} elseif (strlen($names) > 0) {
 				$lastfirst = $firstlast = $names;
 			}
 
@@ -122,8 +119,7 @@ 
 				case SYNC_FILEAS_COMPANYONLY:
 					if (strlen($company) > 0) {
 						$fileas = $company;
-					}
-					elseif (strlen($firstlast) > 0) {
+					} elseif (strlen($firstlast) > 0) {
 						$fileas = $lastfirst;
 					}
 					break;
@@ -134,8 +130,7 @@ 
 						if (strlen($lastfirst) > 0) {
 							$fileas .= "({$lastfirst})";
 						}
-					}
-					elseif (strlen($lastfirst) > 0) {
+					} elseif (strlen($lastfirst) > 0) {
 						$fileas = $lastfirst;
 					}
 					break;
@@ -146,8 +141,7 @@ 
 						if (strlen($firstlast) > 0) {
 							$fileas .= " ({$firstlast})";
 						}
-					}
-					elseif (strlen($firstlast) > 0) {
+					} elseif (strlen($firstlast) > 0) {
 						$fileas = $firstlast;
 					}
 					break;
@@ -158,8 +152,7 @@ 
 						if (strlen($company) > 0) {
 							$fileas .= " ({$company})";
 						}
-					}
-					elseif (strlen($company) > 0) {
+					} elseif (strlen($company) > 0) {
 						$fileas = $company;
 					}
 					break;
@@ -170,8 +163,7 @@ 
 						if (strlen($company) > 0) {
 							$fileas .= " ({$company})";
 						}
-					}
-					elseif (strlen($company) > 0) {
+					} elseif (strlen($company) > 0) {
 						$fileas = $company;
 					}
 					break;

Spacing +2 added lines, -2 removed lines

@@ -409,7 +409,7 @@ 
 	 */
 	public static function Utf8_truncate($string, $length, $htmlsafe = false) {
 		// make sure length is always an integer
-		$length = (int) $length;
+		$length = (int)$length;
 
 		// if the input string is shorter then the trunction, make sure it's valid UTF-8!
 		if (strlen($string) <= $length) {
@@ -479,7 +479,7 @@ 
 	 * @return bool
 	 */
 	public static function IsBase64String($string) {
-		return (bool) preg_match("#^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{2}==|[A-Za-z0-9+\\/]{3}=|[A-Za-z0-9+/]{4})?$#", $string);
+		return (bool)preg_match("#^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{2}==|[A-Za-z0-9+\\/]{3}=|[A-Za-z0-9+/]{4})?$#", $string);
 	}
 
 	/**

lib/exceptions/httpreturncodeexception.php

Spacing +1 added lines, -1 removed lines

@@ -15,6 +15,6 @@
 		if ($code) {
 			$this->httpReturnCode = $code;
 		}
-		parent::__construct($message, (int) $code, $previous, $logLevel);
+		parent::__construct($message, (int)$code, $previous, $logLevel);
 	}
 }

index.php

Braces +3 added lines, -6 removed lines

@@ -150,15 +150,13 @@ 
 
 		// destruct backend after all data is on the stream
 		$backend->Logoff();
-	}
-	catch (NoPostRequestException $nopostex) {
+	} catch (NoPostRequestException $nopostex) {
 		if ($nopostex->getCode() == NoPostRequestException::OPTIONS_REQUEST) {
 			header(GSync::GetServerHeader());
 			header(GSync::GetSupportedProtocolVersions());
 			header(GSync::GetSupportedCommands());
 			SLog::Write(LOGLEVEL_INFO, $nopostex->getMessage());
-		}
-		elseif ($nopostex->getCode() == NoPostRequestException::GET_REQUEST) {
+		} elseif ($nopostex->getCode() == NoPostRequestException::GET_REQUEST) {
 			if (Request::GetUserAgent()) {
 				SLog::Write(LOGLEVEL_INFO, sprintf("User-agent: '%s'", Request::GetUserAgent()));
 			}
@@ -166,8 +164,7 @@ 
 				GSync::PrintGrommunioSyncLegal('GET not supported', $nopostex->getMessage());
 			}
 		}
-	}
-	catch (Exception $ex) {
+	} catch (Exception $ex) {
 		// Extract any previous exception message for logging purpose.
 		$exclass = get_class($ex);
 		$exception_message = $ex->getMessage();

lib/exceptions/gsyncexception.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 			$logLevel = $this->defaultLogLevel;
 		}
 
-		parent::__construct($message, (int) $code);
+		parent::__construct($message, (int)$code);
 		SLog::Write($logLevel, get_class($this) . ': ' . $message . ' - code: ' . $code . ' - file: ' . $this->getFile() . ':' . $this->getLine(), false);
 	}