grommunio / grommunio-sync

lib/wbxml/wbxmldefs.php

Spacing +9 added lines, -9 removed lines

@@ -210,7 +210,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',
@@ -543,7 +543,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',
@@ -567,7 +567,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',
@@ -607,7 +607,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',
@@ -617,7 +617,7 @@ 
                 0x0B => 'ContentLength',
                 0x0C => 'ContentType',
             ],
-            0x14 => [ // Since 12.0
+            0x14 => [// Since 12.0
                 0x05 => 'ItemOperations',
                 0x06 => 'Fetch',
                 0x07 => 'Store',
@@ -640,7 +640,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',
@@ -657,7 +657,7 @@ 
                 0x12 => 'Status',
                 0x13 => 'AccountId', // Since 14.1
             ],
-            0x16 => [ // Since 14.0
+            0x16 => [// Since 14.0
                 0x05 => 'UmCallerId',
                 0x06 => 'UmUserNotes',
                 0x07 => 'UmAttDuration',
@@ -674,14 +674,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/utils/stringstreamwrapper.php

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
      */
     public function stream_write($data) {
         $l = strlen($data);
-        $this->stringstream = substr($this->stringstream, 0, $this->position) . $data . substr($this->stringstream, $this->position += $l);
+        $this->stringstream = substr($this->stringstream, 0, $this->position).$data.substr($this->stringstream, $this->position += $l);
         $this->stringlength = strlen($this->stringstream);
 
         return $l;
@@ -157,7 +157,7 @@ 
     public static function Open($string, $truncatehtmlsafe = false) {
         $context = stream_context_create([self::PROTOCOL => ['string' => &$string, 'truncatehtmlsafe' => $truncatehtmlsafe]]);
 
-        return fopen(self::PROTOCOL . '://', 'r', false, $context);
+        return fopen(self::PROTOCOL.'://', 'r', false, $context);
     }
 }
 

lib/utils/g_RFC822.php

Switch Indentation +12 added lines, -12 removed lines

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

Spacing +13 added lines, -13 removed lines

@@ -286,7 +286,7 @@ 
                 $comments[] = $comment;
 
                 // +2 is for the brackets
-                $_mailbox = substr($_mailbox, strpos($_mailbox, '(' . $comment) + strlen($comment) + 2);
+                $_mailbox = substr($_mailbox, strpos($_mailbox, '('.$comment) + strlen($comment) + 2);
             } else {
                 break;
             }
@@ -304,11 +304,11 @@ 
             $name = $this->_splitCheck($parts, '<');
 
             $phrase = trim($name);
-            $route_addr = trim(substr($mailbox, strlen($name . '<'), -1));
+            $route_addr = trim(substr($mailbox, strlen($name.'<'), -1));
 
             // grommunio-sync fix for umlauts and other special chars
             if ('"' != substr($phrase, 0, 1) && '"' != substr($phrase, -1)) {
-                $phrase = '"' . $phrase . '"';
+                $phrase = '"'.$phrase.'"';
             }
 
             if (false === $this->_validatePhrase($phrase) || ($route_addr = $this->_validateRouteAddr($route_addr)) === false) {
@@ -398,7 +398,7 @@ 
      * @return bool always false as there was an error
      */
     public function raiseError($message) {
-        SLog::Write(LOGLEVEL_ERROR, 'z_RFC822 error: ' . $message);
+        SLog::Write(LOGLEVEL_ERROR, 'z_RFC822 error: '.$message);
 
         return false;
     }
@@ -436,7 +436,7 @@ 
 
             // First check there's a colon at all:
             if (false === strpos($string, ':')) {
-                $this->error = 'Invalid address: ' . $string;
+                $this->error = 'Invalid address: '.$string;
 
                 return false;
             }
@@ -518,7 +518,7 @@ 
                 || $this->_hasUnclosedBrackets($string, '()')
                 || '\\' == substr($string, -1)) {
                 if (isset($parts[$i + 1])) {
-                    $string = $string . $char . $parts[$i + 1];
+                    $string = $string.$char.$parts[$i + 1];
                 } else {
                     $this->error = 'Invalid address spec. Unclosed bracket or quotes';
 
@@ -589,7 +589,7 @@ 
         $this->_hasUnclosedBracketsSub($string, $num_angle_end, $chars[1]);
 
         if ($num_angle_start < $num_angle_end) {
-            $this->error = 'Invalid address spec. Unmatched quote or bracket (' . $chars . ')';
+            $this->error = 'Invalid address spec. Unmatched quote or bracket ('.$chars.')';
 
             return false;
         }
@@ -613,7 +613,7 @@ 
                 --$num;
             }
             if (isset($parts[$i + 1])) {
-                $parts[$i + 1] = $parts[$i] . $char . $parts[$i + 1];
+                $parts[$i + 1] = $parts[$i].$char.$parts[$i + 1];
             }
         }
 
@@ -652,7 +652,7 @@ 
                 $structure->groupname = $groupname;
             }
 
-            $address['address'] = ltrim(substr($address['address'], strlen($groupname . ':')));
+            $address['address'] = ltrim(substr($address['address'], strlen($groupname.':')));
         }
 
         // If a group then split on comma and put into an array.
@@ -661,7 +661,7 @@ 
             while (strlen($address['address']) > 0) {
                 $parts = explode(',', $address['address']);
                 $addresses[] = $this->_splitCheck($parts, ',');
-                $address['address'] = trim(substr($address['address'], strlen(end($addresses) . ',')));
+                $address['address'] = trim(substr($address['address'], strlen(end($addresses).',')));
             }
         } else {
             $addresses[] = $address['address'];
@@ -678,7 +678,7 @@ 
         for ($i = 0; $i < count($addresses); ++$i) {
             if (!$this->validateMailbox($addresses[$i])) {
                 if (empty($this->error)) {
-                    $this->error = 'Validation failed for: ' . $addresses[$i];
+                    $this->error = 'Validation failed for: '.$addresses[$i];
                 }
 
                 return false;
@@ -830,7 +830,7 @@ 
                 return false;
             }
 
-            $addr_spec = substr($route_addr, strlen($route . ':'));
+            $addr_spec = substr($route_addr, strlen($route.':'));
 
             // Validate addr-spec part.
             if (($addr_spec = $this->_validateAddrSpec($addr_spec)) === false) {
@@ -951,7 +951,7 @@ 
         if (false !== strpos($addr_spec, '@')) {
             $parts = explode('@', $addr_spec);
             $local_part = $this->_splitCheck($parts, '@');
-            $domain = substr($addr_spec, strlen($local_part . '@'));
+            $domain = substr($addr_spec, strlen($local_part.'@'));
 
         // No @ sign so assume the default domain.
         } else {

lib/utils/compat.php

Spacing +2 added lines, -2 removed lines

@@ -199,13 +199,13 @@
 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;
         } else {

lib/utils/utils.php

Spacing +10 added lines, -10 removed lines

@@ -64,17 +64,17 @@ 
             $zcs = $zip;
         }
         if (isset($city) && '' != $city) {
-            $zcs .= (($zcs) ? ' ' : '') . $city;
+            $zcs .= (($zcs) ? ' ' : '').$city;
         }
         if (isset($state) && '' != $state) {
-            $zcs .= (($zcs) ? ' ' : '') . $state;
+            $zcs .= (($zcs) ? ' ' : '').$state;
         }
         if ($zcs) {
-            $out = $zcs . "\r\n" . $out;
+            $out = $zcs."\r\n".$out;
         }
 
         if (isset($street) && '' != $street) {
-            $out = $street . (($out) ? "\r\n\r\n" . $out : '');
+            $out = $street.(($out) ? "\r\n\r\n".$out : '');
         }
 
         return ($out) ? $out : null;
@@ -93,7 +93,7 @@ 
     public static function BuildFileAs($lastname = '', $firstname = '', $middlename = '', $company = '') {
         if (defined('FILEAS_ORDER')) {
             $fileas = $lastfirst = $firstlast = '';
-            $names = trim($firstname . ' ' . $middlename);
+            $names = trim($firstname.' '.$middlename);
             $lastname = trim($lastname);
             $company = trim($company);
 
@@ -256,7 +256,7 @@ 
             $OLUid .= pack('V', 1);
             $OLUid .= $icalUid;
 
-            return hex2bin('040000008200E00074C5B7101A82E0080000000000000000000000000000000000000000' . bin2hex($OLUid) . '00');
+            return hex2bin('040000008200E00074C5B7101A82E0080000000000000000000000000000000000000000'.bin2hex($OLUid).'00');
         }
 
         return hex2bin($icalUid);
@@ -415,7 +415,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) {
@@ -476,7 +476,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);
     }
 
     /**
@@ -972,7 +972,7 @@ 
     }
 
     if (function_exists('iconv')) {
-        return @iconv('UTF-8', 'Windows-1252' . $option, $string);
+        return @iconv('UTF-8', 'Windows-1252'.$option, $string);
     }
 
     return utf8_decode($string); // no euro support here
@@ -985,7 +985,7 @@ 
     }
 
     if (function_exists('iconv')) {
-        return @iconv('Windows-1252', 'UTF-8' . $option, $string);
+        return @iconv('Windows-1252', 'UTF-8'.$option, $string);
     }
 
     return utf8_encode($string); // no euro support here

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');
         } else {
@@ -1137,7 +1137,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";
             }
         }
 
@@ -1170,7 +1170,7 @@ 
         }
 
         return pack(
-            'la64vvvvvvvv' . 'la64vvvvvvvv' . 'l',
+            'la64vvvvvvvv'.'la64vvvvvvvv'.'l',
             $tz['bias'],
             $tz['tzname'],
             0,
@@ -1220,7 +1220,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);
@@ -1236,15 +1236,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, '"'));

lib/exceptions/gsyncexception.php

Spacing +3 added lines, -3 removed lines

@@ -23,12 +23,12 @@
             $logLevel = $this->defaultLogLevel;
         }
 
-        parent::__construct($message, (int) $code);
-        SLog::Write($logLevel, get_class($this) . ': ' . $message . ' - code: ' . $code . ' - file: ' . $this->getFile() . ':' . $this->getLine(), false);
+        parent::__construct($message, (int)$code);
+        SLog::Write($logLevel, get_class($this).': '.$message.' - code: '.$code.' - file: '.$this->getFile().':'.$this->getLine(), false);
     }
 
     public function getHTTPCodeString() {
-        return $this->httpReturnCode . ' ' . $this->httpReturnMessage;
+        return $this->httpReturnCode.' '.$this->httpReturnMessage;
     }
 
     public function getHTTPHeaders() {

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);
     }
 }

lib/exceptions/serviceunavailableexception.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     public function __construct($message = '', $code = 0, $previous = null, $logLevel = false) {
         parent::__construct($message, $code, $previous, $logLevel);
         if (RETRY_AFTER_DELAY !== false) {
-            $this->httpHeaders[] = 'Retry-After: ' . RETRY_AFTER_DELAY;
+            $this->httpHeaders[] = 'Retry-After: '.RETRY_AFTER_DELAY;
         }
     }
 }