grommunio / grommunio-sync

lib/core/statemanager.php

Spacing +4 added lines, -4 removed lines

@@ -419,7 +419,7 @@ 
 			throw new StateInvalidException(sprintf("SyncKey '%s' is invalid", $synckey));
 		}
 
-		return [$matches[1], (int) $matches[2]];
+		return [$matches[1], (int)$matches[2]];
 	}
 
 	/**
@@ -437,7 +437,7 @@ 
 			throw new StateInvalidException(sprintf("UUID '%s' is invalid", $uuid));
 		}
 
-		return "{" . $uuid . "}" . $counter;
+		return "{".$uuid."}".$counter;
 	}
 
 	/*----------------------------------------------------------------------------------------------------------
@@ -520,8 +520,8 @@ 
 			mt_rand(0, 0xFFFF),
 			mt_rand(0, 0xFFFF),
 			mt_rand(0, 0xFFFF),
-			mt_rand(0, 0x0FFF) | 0x4000,
-			mt_rand(0, 0x3FFF) | 0x8000,
+			mt_rand(0, 0x0FFF)|0x4000,
+			mt_rand(0, 0x3FFF)|0x8000,
 			mt_rand(0, 0xFFFF),
 			mt_rand(0, 0xFFFF),
 			mt_rand(0, 0xFFFF)

lib/core/pingtracking.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 	 * Used to remove the current ping data from shared memory.
 	 */
 	public function __destruct() {
-		return $this->setDeviceUserData($this->type, ["pid:" . self::$pid], self::$devid, self::$user, $subkey = -1, $doCas = "deletekeys");
+		return $this->setDeviceUserData($this->type, ["pid:".self::$pid], self::$devid, self::$user, $subkey = -1, $doCas = "deletekeys");
 	}
 
 	/**
@@ -36,7 +36,7 @@ 
 		$this->initializeParams();
 		// need microtime as connections sometimes start at the same second
 		self::$start = microtime(true);
-		$pingtracking = ["pid:" . self::$pid => self::$start];
+		$pingtracking = ["pid:".self::$pid => self::$start];
 
 		return $this->setDeviceUserData($this->type, $pingtracking, self::$devid, self::$user, $subkey = -1, $doCas = "merge");
 	}

lib/core/provisioningmanager.php

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
 		// no policies cached in redis, get policies from admin API
 		else {
 			$policies = false;
-			$api_response = file_get_contents(ADMIN_API_POLICY_ENDPOINT . self::$user);
+			$api_response = file_get_contents(ADMIN_API_POLICY_ENDPOINT.self::$user);
 			if ($api_response) {
 				$data = json_decode($api_response);
 				if (isset($data->data)) {
@@ -176,7 +176,7 @@ 
 		$status = SYNC_PROVISION_RWSTATUS_NA;
 
 		// retrieve the WIPE STATUS from the Admin API
-		$api_response = file_get_contents(ADMIN_API_WIPE_ENDPOINT . self::$user . "?devices=" . self::$devid);
+		$api_response = file_get_contents(ADMIN_API_WIPE_ENDPOINT.self::$user."?devices=".self::$devid);
 		if ($api_response) {
 			$data = json_decode($api_response, true);
 			if (isset($data['data'][self::$devid]["status"])) {
@@ -217,7 +217,7 @@ 
 			),
 		],
 		];
-		$ret = file_get_contents(ADMIN_API_WIPE_ENDPOINT . self::$user . "?devices=" . self::$devid, false, stream_context_create($opts));
+		$ret = file_get_contents(ADMIN_API_WIPE_ENDPOINT.self::$user."?devices=".self::$devid, false, stream_context_create($opts));
 		SLog::Write(LOGLEVEL_DEBUG, sprintf("ProvisioningManager->SetProvisioningWipeStatus() admin API response: %s", trim(Utils::PrintAsString($ret))));
 
 		return strpos($http_response_header[0], "201") !== false;

lib/core/slog.php

Spacing +6 added lines, -6 removed lines

@@ -56,7 +56,7 @@ 
 		// truncate messages longer than 10 KB
 		$messagesize = strlen($message);
 		if ($truncate && $messagesize > 10240) {
-			$message = substr($message, 0, 10240) . sprintf(" <log message with %d bytes truncated>", $messagesize);
+			$message = substr($message, 0, 10240).sprintf(" <log message with %d bytes truncated>", $messagesize);
 		}
 
 		self::$lastLogs[$loglevel] = $message;
@@ -70,7 +70,7 @@ 
 		}
 
 		if ($loglevel & LOGLEVEL_WBXMLSTACK) {
-			self::$wbxmlDebug .= $message . PHP_EOL;
+			self::$wbxmlDebug .= $message.PHP_EOL;
 		}
 	}
 
@@ -117,7 +117,7 @@ 
 
 			$logger = LOGBACKEND_CLASS;
 			if (!class_exists($logger)) {
-				$errmsg = 'The configured logging class `' . $logger . '` does not exist. Check your configuration.';
+				$errmsg = 'The configured logging class `'.$logger.'` does not exist. Check your configuration.';
 				error_log($errmsg);
 
 				throw new \Exception($errmsg);
@@ -178,7 +178,7 @@ 
 
 		default:
 			$bt = debug_backtrace();
-			SLog::Write(LOGLEVEL_ERROR, "trace error: {$errfile}:{$errline} {$errstr} ({$errno}) - backtrace: " . (count($bt) - 1) . " steps");
+			SLog::Write(LOGLEVEL_ERROR, "trace error: {$errfile}:{$errline} {$errstr} ({$errno}) - backtrace: ".(count($bt) - 1)." steps");
 			for ($i = 1, $bt_length = count($bt); $i < $bt_length; ++$i) {
 				$file = $line = "unknown";
 				if (isset($bt[$i]['file'])) {
@@ -187,7 +187,7 @@ 
 				if (isset($bt[$i]['line'])) {
 					$line = $bt[$i]['line'];
 				}
-				SLog::Write(LOGLEVEL_ERROR, "trace: {$i}:" . $file . ":" . $line . " - " . ((isset($bt[$i]['class'])) ? $bt[$i]['class'] . $bt[$i]['type'] : "") . $bt[$i]['function'] . "()");
+				SLog::Write(LOGLEVEL_ERROR, "trace: {$i}:".$file.":".$line." - ".((isset($bt[$i]['class'])) ? $bt[$i]['class'].$bt[$i]['type'] : "").$bt[$i]['function']."()");
 			}
 			// throw new Exception("An error occurred.");
 			break;
@@ -212,7 +212,7 @@ 
 		$errstr = $error["message"];
 
 		// do NOT log PHP Notice, Warning, Deprecated or Strict as FATAL
-		if ($errno & ~(E_NOTICE | E_WARNING | E_DEPRECATED | E_STRICT)) {
+		if ($errno & ~(E_NOTICE|E_WARNING|E_DEPRECATED|E_STRICT)) {
 			SLog::Write(LOGLEVEL_FATAL, sprintf("Fatal error: %s:%d - %s (%s)", $errfile, $errline, $errstr, $errno));
 		}
 	}

lib/wbxml/wbxmldecoder.php

Spacing +14 added lines, -15 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) {
@@ -81,17 +80,17 @@ 
 
 		$publicid = $this->getMBUInt();
 		if ($publicid !== 1) {
-			throw new WBXMLException("Wrong publicid : " . $publicid);
+			throw new WBXMLException("Wrong publicid : ".$publicid);
 		}
 
 		$charsetid = $this->getMBUInt();
 		if ($charsetid !== 106) {
-			throw new WBXMLException("Wrong charset : " . $charsetid);
+			throw new WBXMLException("Wrong charset : ".$charsetid);
 		}
 
 		$stringtablesize = $this->getMBUInt();
 		if ($stringtablesize !== 0) {
-			throw new WBXMLException("Wrong string table size : " . $stringtablesize);
+			throw new WBXMLException("Wrong string table size : ".$stringtablesize);
 		}
 	}
 
@@ -184,7 +183,7 @@ 
 		SLog::Write(LOGLEVEL_WBXMLSTACK, sprintf("WBXMLDecoder->getElementEndTag(): unmatched WBXML tag: '%s' type '%s' flags '%s'", ((isset($element[EN_TAG])) ? $element[EN_TAG] : ""), ((isset($element[EN_TYPE])) ? $element[EN_TYPE] : ""), ((isset($element[EN_FLAGS])) ? $element[EN_FLAGS] : "")));
 
 		$bt = debug_backtrace();
-		SLog::Write(LOGLEVEL_ERROR, sprintf("WBXMLDecoder->getElementEndTag(): could not read end tag in '%s'. Please enable the LOGLEVEL_WBXML and send the log to the grommunio-sync dev team.", $bt[0]["file"] . ":" . $bt[0]["line"]));
+		SLog::Write(LOGLEVEL_ERROR, sprintf("WBXMLDecoder->getElementEndTag(): could not read end tag in '%s'. Please enable the LOGLEVEL_WBXML and send the log to the grommunio-sync dev team.", $bt[0]["file"].":".$bt[0]["line"]));
 
 		// log the remaining wbxml content
 		$this->ungetElement($element);
@@ -232,7 +231,7 @@ 
 	 * @return string
 	 */
 	public function GetPlainInputStream() {
-		return $this->inputBuffer . stream_get_contents($this->in);
+		return $this->inputBuffer.stream_get_contents($this->in);
 	}
 
 	/**
@@ -291,17 +290,17 @@ 
 		switch ($el[EN_TYPE]) {
 			case EN_TYPE_STARTTAG:
 				if ($el[EN_FLAGS] & EN_FLAGS_CONTENT) {
-					SLog::Write(LOGLEVEL_WBXML, "I " . $spaces . " <" . $el[EN_TAG] . ">");
+					SLog::Write(LOGLEVEL_WBXML, "I ".$spaces." <".$el[EN_TAG].">");
 					array_push($this->logStack, $el[EN_TAG]);
 				}
 				else {
-					SLog::Write(LOGLEVEL_WBXML, "I " . $spaces . " <" . $el[EN_TAG] . "/>");
+					SLog::Write(LOGLEVEL_WBXML, "I ".$spaces." <".$el[EN_TAG]."/>");
 				}
 				break;
 
 			case EN_TYPE_ENDTAG:
 				$tag = array_pop($this->logStack);
-				SLog::Write(LOGLEVEL_WBXML, "I " . $spaces . "</" . $tag . ">");
+				SLog::Write(LOGLEVEL_WBXML, "I ".$spaces."</".$tag.">");
 				break;
 
 			case EN_TYPE_CONTENT:
@@ -310,13 +309,13 @@ 
 				// requires easily additional 20 MB of RAM. See https://jira.z-hub.io/browse/ZP-1159
 				$messagesize = strlen($el[EN_CONTENT]);
 				if ($messagesize > 10240 && !defined('WBXML_DEBUGGING')) {
-					$content = substr($el[EN_CONTENT], 0, 10240) . sprintf(" <log message with %d bytes truncated>", $messagesize);
+					$content = substr($el[EN_CONTENT], 0, 10240).sprintf(" <log message with %d bytes truncated>", $messagesize);
 				}
 				else {
 					$content = $el[EN_CONTENT];
 				}
 				// Log but make sure it's not truncated again (will be slightly bigger than 10KB)
-				SLog::Write(LOGLEVEL_WBXML, "I " . $spaces . " " . $content, false);
+				SLog::Write(LOGLEVEL_WBXML, "I ".$spaces." ".$content, false);
 				break;
 		}
 	}
@@ -377,11 +376,11 @@ 
 				case self::WBXML_EXT_1:
 				case self::WBXML_EXT_2:
 				case self::WBXML_LITERAL_AC:
-					throw new WBXMLException("Invalid token :" . $byte);
+					throw new WBXMLException("Invalid token :".$byte);
 
 				default:
 					if ($byte & self::WBXML_WITH_ATTRIBUTES) {
-						throw new WBXMLException("Attributes are not allowed :" . $byte);
+						throw new WBXMLException("Attributes are not allowed :".$byte);
 					}
 					$element[EN_TYPE] = EN_TYPE_STARTTAG;
 					$element[EN_TAG] = $this->getMapping($this->tagcp, $byte & 0x3F);
@@ -490,7 +489,7 @@ 
 		}
 
 		if (isset($this->dtd["namespaces"][$cp])) {
-			return $this->dtd["namespaces"][$cp] . ":" . $this->dtd["codes"][$cp][$id];
+			return $this->dtd["namespaces"][$cp].":".$this->dtd["codes"][$cp][$id];
 		}
 
 		return $this->dtd["codes"][$cp][$id];

lib/wbxml/wbxmldefs.php

Spacing +9 added lines, -9 removed lines

@@ -209,7 +209,7 @@ 
 				0x3E => "CompleteTime", // Since 12.0
 				0x3F => "DisallowNewTimeProposal", // Since 14.0
 			],
-			3 => [ // Code page 3 is no longer in use, however, tokens 05 through 17 have been defined. 20100501
+			3 => [// Code page 3 is no longer in use, however, tokens 05 through 17 have been defined. 20100501
 				0x05 => "Notify",
 				0x06 => "Notification",
 				0x07 => "Version",
@@ -542,7 +542,7 @@ 
 				0x11 => "Status", // Since 14.1
 				0x12 => "Data", // Since 14.1
 			],
-			0x11 => [ // Since 12.0
+			0x11 => [// Since 12.0
 				0x05 => "BodyPreference",
 				0x06 => "Type",
 				0x07 => "TruncationSize",
@@ -566,7 +566,7 @@ 
 				0x1A => "BodyPart", // Since 14.1
 				0x1B => "Status", // Since 14.1
 			],
-			0x12 => [ // Since 12.0
+			0x12 => [// Since 12.0
 				0x05 => "Settings",
 				0x06 => "Status",
 				0x07 => "Get",
@@ -606,7 +606,7 @@ 
 				0x29 => "SendDisabled", // Since 14.1
 				0x2B => "RightsManagementInformation", // Since 14.1
 			],
-			0x13 => [ // Since 12.0
+			0x13 => [// Since 12.0
 				0x05 => "LinkId",
 				0x06 => "DisplayName",
 				0x07 => "IsFolder",
@@ -616,7 +616,7 @@ 
 				0x0B => "ContentLength",
 				0x0C => "ContentType",
 			],
-			0x14 => [ // Since 12.0
+			0x14 => [// Since 12.0
 				0x05 => "ItemOperations",
 				0x06 => "Fetch",
 				0x07 => "Store",
@@ -639,7 +639,7 @@ 
 				0x18 => "ConversationId", // Since 14.0
 				0x19 => "MoveAlways", // Since 14.0
 			],
-			0x15 => [ // Since 14.0
+			0x15 => [// Since 14.0
 				0x05 => "SendMail",
 				0x06 => "SmartForward",
 				0x07 => "SmartReply",
@@ -656,7 +656,7 @@ 
 				0x12 => "Status",
 				0x13 => "AccountId", // Since 14.1
 			],
-			0x16 => [ // Since 14.0
+			0x16 => [// Since 14.0
 				0x05 => "UmCallerId",
 				0x06 => "UmUserNotes",
 				0x07 => "UmAttDuration",
@@ -673,14 +673,14 @@ 
 				0x12 => "FirstDayOfWeek", // Since 14.1
 				0x13 => "MeetingMessageType", // Since 14.1
 			],
-			0x17 => [ // Since 14.0
+			0x17 => [// Since 14.0
 				0x05 => "Subject",
 				0x06 => "MessageClass",
 				0x07 => "LastModifiedDate",
 				0x08 => "Categories",
 				0x09 => "Category",
 			],
-			0x18 => [ // Since 14.1
+			0x18 => [// Since 14.1
 				0x05 => "RightsManagementSupport",
 				0x06 => "RightsManagementTemplates",
 				0x07 => "RightsManagementTemplate",

lib/wbxml/wbxmlencoder.php

Spacing +9 added lines, -9 removed lines

@@ -128,7 +128,7 @@ 
 		// We need to filter out any \0 chars because it's the string terminator in WBXML. We currently
 		// cannot send \0 characters within the XML content anywhere.
 		$content = str_replace("\0", "", $content);
-		if ("x" . $content == "x") {
+		if ("x".$content == "x") {
 			return;
 		}
 		$this->_outputStack();
@@ -177,7 +177,7 @@ 
 	 */
 	public function addBodypartStream($bp) {
 		if (!is_resource($bp)) {
-			throw new WBXMLException("WBXMLEncoder->addBodypartStream(): trying to add a " . gettype($bp) . " instead of a stream");
+			throw new WBXMLException("WBXMLEncoder->addBodypartStream(): trying to add a ".gettype($bp)." instead of a stream");
 		}
 		if ($this->multipart) {
 			$this->bodyparts[] = $bp;
@@ -343,10 +343,10 @@ 
 			$byte = $uint & 0x7F;
 			$uint = $uint >> 7;
 			if ($i == 0) {
-				$out = chr($byte) . $out;
+				$out = chr($byte).$out;
 			}
 			else {
-				$out = chr($byte | 0x80) . $out;
+				$out = chr($byte|0x80).$out;
 			}
 		}
 		fwrite($this->_out, $out);
@@ -442,11 +442,11 @@ 
 	private function logStartTag($tag, $nocontent) {
 		$spaces = str_repeat(" ", count($this->logStack));
 		if ($nocontent) {
-			SLog::Write(LOGLEVEL_WBXML, "O " . $spaces . " <{$tag}/>");
+			SLog::Write(LOGLEVEL_WBXML, "O ".$spaces." <{$tag}/>");
 		}
 		else {
 			array_push($this->logStack, $tag);
-			SLog::Write(LOGLEVEL_WBXML, "O " . $spaces . " <{$tag}>");
+			SLog::Write(LOGLEVEL_WBXML, "O ".$spaces." <{$tag}>");
 		}
 	}
 
@@ -458,7 +458,7 @@ 
 	private function logEndTag() {
 		$spaces = str_repeat(" ", count($this->logStack));
 		$tag = array_pop($this->logStack);
-		SLog::Write(LOGLEVEL_WBXML, "O " . $spaces . "</{$tag}>");
+		SLog::Write(LOGLEVEL_WBXML, "O ".$spaces."</{$tag}>");
 	}
 
 	/**
@@ -470,7 +470,7 @@ 
 	 */
 	private function logContent($content) {
 		$spaces = str_repeat(" ", count($this->logStack));
-		SLog::Write(LOGLEVEL_WBXML, "O " . $spaces . $content);
+		SLog::Write(LOGLEVEL_WBXML, "O ".$spaces.$content);
 	}
 
 	/**
@@ -516,6 +516,6 @@ 
 		else {
 			$data = "more than 512K of data";
 		}
-		SLog::Write(LOGLEVEL_WBXML, "WBXML-OUT: " . $data, false);
+		SLog::Write(LOGLEVEL_WBXML, "WBXML-OUT: ".$data, false);
 	}
 }

lib/utils/compat.php

Spacing +2 added lines, -2 removed lines

@@ -199,12 +199,12 @@
 					break;
 
 				default:
-					exit('Unknown http status code "' . htmlentities($code) . '"');
+					exit('Unknown http status code "'.htmlentities($code).'"');
 					break;
 			}
 
 			$protocol = (isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0');
-			header($protocol . ' ' . $code . ' ' . $text);
+			header($protocol.' '.$code.' '.$text);
 
 			$GLOBALS['http_response_code'] = $code;
 		}

lib/utils/timezoneutil.php

Spacing +160 added lines, -160 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],
 	];
 
 	/**
@@ -1061,7 +1061,7 @@ 
 			$phptimezone = date_default_timezone_get();
 		}
 
-		SLog::Write(LOGLEVEL_DEBUG, "TimezoneUtil::GetFullTZ() for " . $phptimezone);
+		SLog::Write(LOGLEVEL_DEBUG, "TimezoneUtil::GetFullTZ() for ".$phptimezone);
 
 		$servertzname = self::guessTZNameFromPHPName($phptimezone);
 
@@ -1117,7 +1117,7 @@ 
 	 * @return array
 	 */
 	public static function FillTZNames($tz) {
-		SLog::Write(LOGLEVEL_DEBUG, "TimezoneUtil::FillTZNames() filling up bias " . $tz["bias"]);
+		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");
 		}
@@ -1250,7 +1250,7 @@ 
 	public static function TZtest() {
 		foreach (self::$mstzones as $mskey => $msdefs) {
 			if (!array_key_exists($msdefs[0], self::$tzonesoffsets)) {
-				echo "key   '" . $msdefs[0] . "'   not found in tzonesoffsets\n";
+				echo "key   '".$msdefs[0]."'   not found in tzonesoffsets\n";
 			}
 		}
 
@@ -1283,7 +1283,7 @@ 
 		}
 
 		return pack(
-			"la64vvvvvvvv" . "la64vvvvvvvv" . "l",
+			"la64vvvvvvvv"."la64vvvvvvvv"."l",
 			$tz["bias"],
 			$tz["tzname"],
 			0,
@@ -1333,7 +1333,7 @@ 
 		}
 		if (!$date) {
 			// 20110930 (Append T000000Z to the date, so it starts at midnight)
-			$date = date_create_from_format('Ymd\THis\Z', $value . "T000000Z", $tz);
+			$date = date_create_from_format('Ymd\THis\Z', $value."T000000Z", $tz);
 		}
 
 		return date_timestamp_get($date);
@@ -1349,15 +1349,15 @@ 
 	public static function ParseTimezone($timezone) {
 		// (GMT+01.00) Amsterdam / Berlin / Bern / Rome / Stockholm / Vienna
 		if (preg_match('/GMT(\\+|\\-)0(\d)/', $timezone, $matches)) {
-			return "Etc/GMT" . $matches[1] . $matches[2];
+			return "Etc/GMT".$matches[1].$matches[2];
 		}
 		// (GMT+10.00) XXX / XXX / XXX / XXX
 		if (preg_match('/GMT(\\+|\\-)1(\d)/', $timezone, $matches)) {
-			return "Etc/GMT" . $matches[1] . "1" . $matches[2];
+			return "Etc/GMT".$matches[1]."1".$matches[2];
 		}
 		// /inverse.ca/20101018_1/Europe/Amsterdam or /inverse.ca/20101018_1/America/Argentina/Buenos_Aires
 		if (preg_match('/\/[.[:word:]]+\/\w+\/(\w+)\/([\w\/]+)/', $timezone, $matches)) {
-			return $matches[1] . "/" . $matches[2];
+			return $matches[1]."/".$matches[2];
 		}
 
 		return self::getMSTZnameFromTZName(trim($timezone, '"'));