grommunio / grommunio-sync

lib/utils/stringstreamwrapper.php

Indentation +8 added lines, -8 removed lines

@@ -104,7 +104,7 @@ 
         return $this->position;
     }
 
-   /**
+    /**
      * Indicates if 'end of file' is reached
      *
      * @access public
@@ -133,11 +133,11 @@ 
     }
 
     /**
-    * Retrieves information about a stream
-    *
-    * @access public
-    * @return array
-    */
+     * Retrieves information about a stream
+     *
+     * @access public
+     * @return array
+     */
     public function stream_stat() {
         return array(
             7               => $this->stringlength,
@@ -145,7 +145,7 @@ 
         );
     }
 
-   /**
+    /**
      * Instantiates a StringStreamWrapper
      *
      * @param string    $string             The string to be wrapped
@@ -154,7 +154,7 @@ 
      * @access public
      * @return StringStreamWrapper
      */
-     static public function Open($string, $truncatehtmlsafe = false) {
+        static public function Open($string, $truncatehtmlsafe = false) {
         $context = stream_context_create(array(self::PROTOCOL => array('string' => &$string, 'truncatehtmlsafe' => $truncatehtmlsafe)));
         return fopen(self::PROTOCOL . "://",'r', false, $context);
     }

Spacing +5 added lines, -5 removed lines

@@ -42,7 +42,7 @@ 
         $this->truncateHtmlSafe = (isset($contextOptions[self::PROTOCOL]['truncatehtmlsafe'])) ? $contextOptions[self::PROTOCOL]['truncatehtmlsafe'] : false;
 
         $this->stringlength = strlen($this->stringstream);
-        ZLog::Write(LOGLEVEL_DEBUG, sprintf("StringStreamWrapper::stream_open(): initialized stream length: %d - HTML-safe-truncate: %s", $this->stringlength,  Utils::PrintAsString($this->truncateHtmlSafe)));
+        ZLog::Write(LOGLEVEL_DEBUG, sprintf("StringStreamWrapper::stream_open(): initialized stream length: %d - HTML-safe-truncate: %s", $this->stringlength, Utils::PrintAsString($this->truncateHtmlSafe)));
 
         return true;
     }
@@ -67,9 +67,9 @@ 
      * @param string $data
      * @return int
      */
-    public function stream_write($data){
+    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;
     }
@@ -120,7 +120,7 @@ 
      * @param int $new_size
      * @return boolean
      */
-    public function stream_truncate ($new_size) {
+    public function stream_truncate($new_size) {
         // cut the string!
         $this->stringstream = Utils::Utf8_truncate($this->stringstream, $new_size, $this->truncateHtmlSafe);
         $this->stringlength = strlen($this->stringstream);
@@ -156,7 +156,7 @@ 
      */
      static public function Open($string, $truncatehtmlsafe = false) {
         $context = stream_context_create(array(self::PROTOCOL => array('string' => &$string, 'truncatehtmlsafe' => $truncatehtmlsafe)));
-        return fopen(self::PROTOCOL . "://",'r', false, $context);
+        return fopen(self::PROTOCOL."://", 'r', false, $context);
     }
 }
 

Braces +5 added lines, -6 removed lines

@@ -32,8 +32,9 @@ 
      */
     public function stream_open($path, $mode, $options, &$opened_path) {
         $contextOptions = stream_context_get_options($this->context);
-        if (!isset($contextOptions[self::PROTOCOL]['string']))
-            return false;
+        if (!isset($contextOptions[self::PROTOCOL]['string'])) {
+                    return false;
+        }
 
         $this->position = 0;
 
@@ -84,11 +85,9 @@ 
     public function stream_seek($offset, $whence = SEEK_SET) {
         if ($whence == SEEK_CUR) {
             $this->position += $offset;
-        }
-        else if ($whence == SEEK_END) {
+        } else if ($whence == SEEK_END) {
             $this->position = $this->stringlength + $offset;
-        }
-        else {
+        } else {
             $this->position = $offset;
         }
         return true;

lib/utils/g_RFC822.php

Indentation +6 added lines, -6 removed lines

@@ -136,9 +136,9 @@ 
     var $mailRFC822 = true;
 
     /**
-    * A limit after which processing stops
-    * @var int $limit
-    */
+     * A limit after which processing stops
+     * @var int $limit
+     */
     var $limit = null;
 
     /**
@@ -272,9 +272,9 @@ 
         // $string now contains the first full address/group.
         // Add to the addresses array.
         $this->addresses[] = array(
-                                   'address' => trim($string),
-                                   'group'   => $is_group
-                                   );
+                                    'address' => trim($string),
+                                    'group'   => $is_group
+                                    );
 
         // Remove the now stored address from the initial line, the +1
         // is to account for the explode character.

Switch Indentation +13 added lines, -13 removed lines

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

Spacing +18 added lines, -18 removed lines

@@ -256,7 +256,7 @@ 
 
             // First check there's a colon at all:
             if (strpos($string, ':') === false) {
-                $this->error = 'Invalid address: ' . $string;
+                $this->error = 'Invalid address: '.$string;
                 return false;
             }
 
@@ -283,7 +283,7 @@ 
         // If the next char is a comma and this was a group, then
         // there are more addresses, otherwise, if there are any more
         // chars, then there is another address.
-        if ($is_group && substr($address, 0, 1) == ','){
+        if ($is_group && substr($address, 0, 1) == ',') {
             $address = trim(substr($address, 1));
             return $address;
 
@@ -339,7 +339,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';
                     return false;
@@ -405,7 +405,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;
         } else {
             return ($num_angle_start > $num_angle_end);
@@ -423,11 +423,11 @@ 
     protected function _hasUnclosedBracketsSub($string, &$num, $char)
     {
         $parts = explode($char, $string);
-        for ($i = 0; $i < count($parts); $i++){
+        for ($i = 0; $i < count($parts); $i++) {
             if (substr($parts[$i], -1) == '\\' || $this->_hasUnclosedQuotes($parts[$i]))
                 $num--;
             if (isset($parts[$i + 1]))
-                $parts[$i + 1] = $parts[$i] . $char . $parts[$i + 1];
+                $parts[$i + 1] = $parts[$i].$char.$parts[$i + 1];
         }
 
         return $num;
@@ -453,7 +453,7 @@ 
             $structure = array();
 
             // And validate the group part of the name.
-            if (!$this->_validatePhrase($groupname)){
+            if (!$this->_validatePhrase($groupname)) {
                 $this->error = 'Group name did not validate.';
                 return false;
             } else {
@@ -465,7 +465,7 @@ 
                 }
             }
 
-            $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.
@@ -474,7 +474,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'];
@@ -491,7 +491,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;
             }
@@ -529,7 +529,7 @@ 
         $parts = preg_split('/[ \\x09]+/', $phrase, -1, PREG_SPLIT_NO_EMPTY);
 
         $phrase_parts = array();
-        while (count($parts) > 0){
+        while (count($parts) > 0) {
             $phrase_parts[] = $this->_splitCheck($parts, ' ');
             for ($i = 0; $i < $this->index + 1; $i++)
                 array_shift($parts);
@@ -632,7 +632,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;
             }
@@ -717,7 +717,7 @@ 
 
         // If $route is same as $route_addr then the colon was in
         // quotes or brackets or, of course, non existent.
-        if ($route === $route_addr){
+        if ($route === $route_addr) {
             unset($route);
             $addr_spec = $route_addr;
             if (($addr_spec = $this->_validateAddrSpec($addr_spec)) === false) {
@@ -729,7 +729,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) {
@@ -805,7 +805,7 @@ 
      */
     protected function _validateSubdomain($subdomain)
     {
-        if (preg_match('|^\[(.*)]$|', $subdomain, $arr)){
+        if (preg_match('|^\[(.*)]$|', $subdomain, $arr)) {
             if (!$this->_validateDliteral($arr[1])) return false;
         } else {
             if (!$this->_validateAtom($subdomain)) return false;
@@ -824,7 +824,7 @@ 
      */
     protected function _validateDliteral($dliteral)
     {
-        return !preg_match('/(.)[][\x0D\\\\]/', $dliteral, $matches) && ((! isset($matches[1])) || $matches[1] != '\\');
+        return !preg_match('/(.)[][\x0D\\\\]/', $dliteral, $matches) && ((!isset($matches[1])) || $matches[1] != '\\');
     }
 
     /**
@@ -843,7 +843,7 @@ 
         if (strpos($addr_spec, '@') !== false) {
             $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 {
@@ -943,7 +943,7 @@ 
      * @access private
      */
     function raiseError($message) {
-        ZLog::Write(LOGLEVEL_ERROR, "z_RFC822 error: ". $message);
+        ZLog::Write(LOGLEVEL_ERROR, "z_RFC822 error: ".$message);
         return false;
     }
 }

Braces +69 added lines, -28 removed lines

@@ -154,11 +154,21 @@ 
      */
     public function __construct($address = null, $default_domain = null, $nest_groups = null, $validate = null, $limit = null)
     {
-        if (isset($address))        $this->address        = $address;
-        if (isset($default_domain)) $this->default_domain = $default_domain;
-        if (isset($nest_groups))    $this->nestGroups     = $nest_groups;
-        if (isset($validate))       $this->validate       = $validate;
-        if (isset($limit))          $this->limit          = $limit;
+        if (isset($address)) {
+            $this->address        = $address;
+        }
+        if (isset($default_domain)) {
+            $this->default_domain = $default_domain;
+        }
+        if (isset($nest_groups)) {
+            $this->nestGroups     = $nest_groups;
+        }
+        if (isset($validate)) {
+            $this->validate       = $validate;
+        }
+        if (isset($limit)) {
+            $this->limit          = $limit;
+        }
     }
 
     /**
@@ -179,13 +189,25 @@ 
             return $obj->parseAddressList();
         }
 
-        if (isset($address))        $this->address        = $address;
+        if (isset($address)) {
+            $this->address        = $address;
+        }
         // grommunio-sync addition
-        if (strlen(trim($this->address)) == 0) return array();
-        if (isset($default_domain)) $this->default_domain = $default_domain;
-        if (isset($nest_groups))    $this->nestGroups     = $nest_groups;
-        if (isset($validate))       $this->validate       = $validate;
-        if (isset($limit))          $this->limit          = $limit;
+        if (strlen(trim($this->address)) == 0) {
+            return array();
+        }
+        if (isset($default_domain)) {
+            $this->default_domain = $default_domain;
+        }
+        if (isset($nest_groups)) {
+            $this->nestGroups     = $nest_groups;
+        }
+        if (isset($validate)) {
+            $this->validate       = $validate;
+        }
+        if (isset($limit)) {
+            $this->limit          = $limit;
+        }
 
         $this->structure  = array();
         $this->addresses  = array();
@@ -424,10 +446,12 @@ 
     {
         $parts = explode($char, $string);
         for ($i = 0; $i < count($parts); $i++){
-            if (substr($parts[$i], -1) == '\\' || $this->_hasUnclosedQuotes($parts[$i]))
-                $num--;
-            if (isset($parts[$i + 1]))
-                $parts[$i + 1] = $parts[$i] . $char . $parts[$i + 1];
+            if (substr($parts[$i], -1) == '\\' || $this->_hasUnclosedQuotes($parts[$i])) {
+                            $num--;
+            }
+            if (isset($parts[$i + 1])) {
+                            $parts[$i + 1] = $parts[$i] . $char . $parts[$i + 1];
+            }
         }
 
         return $num;
@@ -531,8 +555,9 @@ 
         $phrase_parts = array();
         while (count($parts) > 0){
             $phrase_parts[] = $this->_splitCheck($parts, ' ');
-            for ($i = 0; $i < $this->index + 1; $i++)
-                array_shift($parts);
+            for ($i = 0; $i < $this->index + 1; $i++) {
+                            array_shift($parts);
+            }
         }
 
         foreach ($phrase_parts as $part) {
@@ -545,7 +570,9 @@ 
             }
 
             // Otherwise it's an atom:
-            if (!$this->_validateAtom($part)) return false;
+            if (!$this->_validateAtom($part)) {
+                return false;
+            }
         }
 
         return true;
@@ -761,7 +788,9 @@ 
 
         foreach ($domains as $domain) {
             $domain = str_replace('@', '', trim($domain));
-            if (!$this->_validateDomain($domain)) return false;
+            if (!$this->_validateDomain($domain)) {
+                return false;
+            }
         }
 
         return $route;
@@ -783,13 +812,15 @@ 
 
         while (count($subdomains) > 0) {
             $sub_domains[] = $this->_splitCheck($subdomains, '.');
-            for ($i = 0; $i < $this->index + 1; $i++)
-                array_shift($subdomains);
+            for ($i = 0; $i < $this->index + 1; $i++) {
+                            array_shift($subdomains);
+            }
         }
 
         foreach ($sub_domains as $sub_domain) {
-            if (!$this->_validateSubdomain(trim($sub_domain)))
-                return false;
+            if (!$this->_validateSubdomain(trim($sub_domain))) {
+                            return false;
+            }
         }
 
         // Managed to get here, so return input.
@@ -806,9 +837,13 @@ 
     protected function _validateSubdomain($subdomain)
     {
         if (preg_match('|^\[(.*)]$|', $subdomain, $arr)){
-            if (!$this->_validateDliteral($arr[1])) return false;
+            if (!$this->_validateDliteral($arr[1])) {
+                return false;
+            }
         } else {
-            if (!$this->_validateAtom($subdomain)) return false;
+            if (!$this->_validateAtom($subdomain)) {
+                return false;
+            }
         }
 
         // Got here, so return successful.
@@ -851,8 +886,12 @@ 
             $domain     = $this->default_domain;
         }
 
-        if (($local_part = $this->_validateLocalPart($local_part)) === false) return false;
-        if (($domain     = $this->_validateDomain($domain)) === false) return false;
+        if (($local_part = $this->_validateLocalPart($local_part)) === false) {
+            return false;
+        }
+        if (($domain     = $this->_validateDomain($domain)) === false) {
+            return false;
+        }
 
         // Got here so return successful.
         return array('local_part' => $local_part, 'domain' => $domain);
@@ -890,7 +929,9 @@ 
                 return false;
             }
 
-            if ($this->_validatePhrase(trim($word)) === false) return false;
+            if ($this->_validatePhrase(trim($word)) === false) {
+                return false;
+            }
         }
 
         // Managed to get here, so return the input.

lib/utils/compat.php

Indentation +5 added lines, -5 removed lines

@@ -9,11 +9,11 @@
 
 if (!function_exists('apache_request_headers')) {
     /**
-      * When using other webservers or using php as cgi in apache
-      * the function apache_request_headers() is not available.
-      * This function parses the environment variables to extract
-      * the necessary headers for grommunio-sync
-      */
+     * When using other webservers or using php as cgi in apache
+     * the function apache_request_headers() is not available.
+     * This function parses the environment variables to extract
+     * the necessary headers for grommunio-sync
+     */
     function apache_request_headers() {
         $headers = array();
         foreach ($_SERVER as $key => $value)

Spacing +2 added lines, -2 removed lines

@@ -84,12 +84,12 @@
                 case 504: $text = 'Gateway Time-out'; break;
                 case 505: $text = 'HTTP Version not supported'; 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 {

Braces +3 added lines, -2 removed lines

@@ -16,9 +16,10 @@
       */
     function apache_request_headers() {
         $headers = array();
-        foreach ($_SERVER as $key => $value)
-            if (substr($key, 0, 5) == 'HTTP_')
+        foreach ($_SERVER as $key => $value) {
+                    if (substr($key, 0, 5) == 'HTTP_')
                 $headers[strtr(substr($key, 5), '_', '-')] = $value;
+        }
 
         return $headers;
     }

lib/utils/utils.php

Indentation +16 added lines, -16 removed lines

@@ -17,7 +17,7 @@ 
      * @return string
      */
     static public function PrintAsString($var) {
-       return ($var)?(($var===true)?'true':$var):(($var===false)?'false':(($var==='')?'empty':(($var === null) ? 'null':$var)));
+        return ($var)?(($var===true)?'true':$var):(($var===false)?'false':(($var==='')?'empty':(($var === null) ? 'null':$var)));
     }
 
     /**
@@ -239,7 +239,7 @@ 
             return hex2bin("040000008200E00074C5B7101A82E0080000000000000000000000000000000000000000". bin2hex($OLUid). "00");
         }
         else
-           return hex2bin($icalUid);
+            return hex2bin($icalUid);
     }
 
     /**
@@ -546,18 +546,18 @@ 
     }
 
 
-   /**
-    * Get charset name from a codepage
-    *
-    * @see http://msdn.microsoft.com/en-us/library/dd317756(VS.85).aspx
-    *
-    * Table taken from common/codepage.cpp
-    *
-    * @param integer codepage Codepage
-    *
-    * @access public
-    * @return string iconv-compatible charset name
-    */
+    /**
+     * Get charset name from a codepage
+     *
+     * @see http://msdn.microsoft.com/en-us/library/dd317756(VS.85).aspx
+     *
+     * Table taken from common/codepage.cpp
+     *
+     * @param integer codepage Codepage
+     *
+     * @access public
+     * @return string iconv-compatible charset name
+     */
     public static function GetCodepageCharset($codepage) {
         $codepages = array(
             20106 => "DIN_66003",
@@ -696,8 +696,8 @@ 
      */
     public static function FixFileOwner($file) {
         if (!function_exists('posix_getuid')) {
-           ZLog::Write(LOGLEVEL_DEBUG, "Utils::FixeFileOwner(): Posix subsystem not available, skipping.");
-           return false;
+            ZLog::Write(LOGLEVEL_DEBUG, "Utils::FixeFileOwner(): Posix subsystem not available, skipping.");
+            return false;
         }
         if (posix_getuid() == 0 && is_file($file)) {
             $dir = dirname($file);

Spacing +36 added lines, -36 removed lines

@@ -17,7 +17,7 @@ 
      * @return string
      */
     static public function PrintAsString($var) {
-       return ($var)?(($var===true)?'true':$var):(($var===false)?'false':(($var==='')?'empty':(($var === null) ? 'null':$var)));
+       return ($var) ? (($var === true) ? 'true' : $var) : (($var === false) ? 'false' : (($var === '') ? 'empty' : (($var === null) ? 'null' : $var)));
     }
 
     /**
@@ -31,13 +31,13 @@ 
      */
     static public function SplitDomainUser($domainuser) {
         $pos = strrpos($domainuser, '\\');
-        if($pos === false){
+        if ($pos === false) {
             $user = $domainuser;
             $domain = '';
         }
-        else{
-            $domain = substr($domainuser,0,$pos);
-            $user = substr($domainuser,$pos+1);
+        else {
+            $domain = substr($domainuser, 0, $pos);
+            $user = substr($domainuser, $pos + 1);
         }
         return array($user, $domain);
     }
@@ -61,13 +61,13 @@ 
 
         $zcs = "";
         if (isset($zip) && $zip != "") $zcs = $zip;
-        if (isset($city) && $city != "") $zcs .= (($zcs)?" ":"") . $city;
-        if (isset($state) && $state != "") $zcs .= (($zcs)?" ":"") . $state;
-        if ($zcs) $out = $zcs . "\r\n" . $out;
+        if (isset($city) && $city != "") $zcs .= (($zcs) ? " " : "").$city;
+        if (isset($state) && $state != "") $zcs .= (($zcs) ? " " : "").$state;
+        if ($zcs) $out = $zcs."\r\n".$out;
 
-        if (isset($street) && $street != "") $out = $street . (($out)?"\r\n\r\n". $out: "") ;
+        if (isset($street) && $street != "") $out = $street.(($out) ? "\r\n\r\n".$out : "");
 
-        return ($out)?$out:null;
+        return ($out) ? $out : null;
     }
 
     /**
@@ -84,7 +84,7 @@ 
     static public 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);
 
@@ -92,7 +92,7 @@ 
             // firstlast is "firstname middlename lastname"
             if (strlen($lastname) > 0) {
                 $lastfirst = $lastname;
-                if (strlen($names) > 0){
+                if (strlen($names) > 0) {
                     $lastfirst .= ", $names";
                     $firstlast = "$names $lastname";
                 }
@@ -192,7 +192,7 @@ 
             $vs = preg_split('/-/', phpversion("mapi"));
             return ($version <= $vs[1]);
         }
-        if (version_compare(phpversion("mapi"), $version) == -1){
+        if (version_compare(phpversion("mapi"), $version) == -1) {
             return false;
         }
 
@@ -207,7 +207,7 @@ 
      * @access public
      * @return string   the vCal-Uid if available in the olUid, else the original olUid as HEX
      */
-    static public function GetICalUidFromOLUid($olUid){
+    static public function GetICalUidFromOLUid($olUid) {
         //check if "vCal-Uid" is somewhere in outlookid case-insensitive
         $icalUid = stristr($olUid, "vCal-Uid");
         if ($icalUid !== false) {
@@ -236,7 +236,7 @@ 
             $OLUid .= "vCal-Uid";
             $OLUid .= pack("V", 1);
             $OLUid .= $icalUid;
-            return hex2bin("040000008200E00074C5B7101A82E0080000000000000000000000000000000000000000". bin2hex($OLUid). "00");
+            return hex2bin("040000008200E00074C5B7101A82E0080000000000000000000000000000000000000000".bin2hex($OLUid)."00");
         }
         else
            return hex2bin($icalUid);
@@ -296,7 +296,7 @@ 
      */
     static public function GetFiltertypeInterval($filtertype) {
         $back = false;
-        switch($filtertype) {
+        switch ($filtertype) {
             case SYNC_FILTERTYPE_1DAY:
                 $back = 60 * 60 * 24;
                 break;
@@ -332,7 +332,7 @@ 
      * @return long
      */
     static public function GetTruncSize($truncation) {
-        switch($truncation) {
+        switch ($truncation) {
             case SYNC_TRUNCATION_HEADERS:
                 return 0;
             case SYNC_TRUNCATION_512B:
@@ -340,19 +340,19 @@ 
             case SYNC_TRUNCATION_1K:
                 return 1024;
             case SYNC_TRUNCATION_2K:
-                return 2*1024;
+                return 2 * 1024;
             case SYNC_TRUNCATION_5K:
-                return 5*1024;
+                return 5 * 1024;
             case SYNC_TRUNCATION_10K:
-                return 10*1024;
+                return 10 * 1024;
             case SYNC_TRUNCATION_20K:
-                return 20*1024;
+                return 20 * 1024;
             case SYNC_TRUNCATION_50K:
-                return 50*1024;
+                return 50 * 1024;
             case SYNC_TRUNCATION_100K:
-                return 100*1024;
+                return 100 * 1024;
             case SYNC_TRUNCATION_ALL:
-                return 1024*1024; // We'll limit to 1MB anyway
+                return 1024 * 1024; // We'll limit to 1MB anyway
             default:
                 return 1024; // Default to 1Kb
         }
@@ -388,7 +388,7 @@ 
             }
         }
 
-        while($length >= 0) {
+        while ($length >= 0) {
             if ((ord($string[$length]) < 0x80) || (ord($string[$length]) >= 0xC0)) {
                 return substr($string, 0, $length);
             }
@@ -434,7 +434,7 @@ 
      * @return boolean
      */
     static public 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);
     }
 
     /**
@@ -607,7 +607,7 @@ 
             20127 => "us-ascii"
         );
 
-        if(isset($codepages[$codepage])) {
+        if (isset($codepages[$codepage])) {
             return $codepages[$codepage];
         } else {
             // Defaulting to iso-8859-15 since it is more likely for someone to make a mistake in the codepage
@@ -709,7 +709,7 @@ 
                 throw new FatalException("FixFileOwner: $dir must be owned by the nginx/apache/php user instead of root for debian based systems and by root:grosync for RHEL-based systems");
             }
 
-            if($perm_dir['uid'] !== $perm_file['uid'] || $perm_dir['gid'] !== $perm_file['gid']) {
+            if ($perm_dir['uid'] !== $perm_file['uid'] || $perm_dir['gid'] !== $perm_file['gid']) {
                 chown($file, $perm_dir['uid']);
                 chgrp($file, $perm_dir['gid']);
                 chmod($file, 0664);
@@ -764,10 +764,10 @@ 
         if ($bytes <= 0) return '0 B';
 
         $units = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB');
-        $base = log ($bytes, 1024);
+        $base = log($bytes, 1024);
         $fBase = floor($base);
         $pow = pow(1024, $base - $fBase);
-        return sprintf ("%.{$precision}f %s", $pow, $units[$fBase]);
+        return sprintf("%.{$precision}f %s", $pow, $units[$fBase]);
     }
 
     /**
@@ -866,9 +866,9 @@ 
     //if the store supports unicode return the string without converting it
     if (!$force_convert && defined('STORE_SUPPORTS_UNICODE') && STORE_SUPPORTS_UNICODE == true) return $string;
 
-    if (function_exists("iconv")){
-        return @iconv("UTF-8", "Windows-1252" . $option, $string);
-    }else{
+    if (function_exists("iconv")) {
+        return @iconv("UTF-8", "Windows-1252".$option, $string);
+    } else {
         return utf8_decode($string); // no euro support here
     }
 }
@@ -877,9 +877,9 @@ 
     //if the store supports unicode return the string without converting it
     if (!$force_convert && defined('STORE_SUPPORTS_UNICODE') && STORE_SUPPORTS_UNICODE == true) return $string;
 
-    if (function_exists("iconv")){
-        return @iconv("Windows-1252", "UTF-8" . $option, $string);
-    }else{
+    if (function_exists("iconv")) {
+        return @iconv("Windows-1252", "UTF-8".$option, $string);
+    } else {
         return utf8_encode($string); // no euro support here
     }
 }

Braces +70 added lines, -48 removed lines

@@ -34,8 +34,7 @@ 
         if($pos === false){
             $user = $domainuser;
             $domain = '';
-        }
-        else{
+        } else{
             $domain = substr($domainuser,0,$pos);
             $user = substr($domainuser,$pos+1);
         }
@@ -57,15 +56,27 @@ 
     static public function BuildAddressString($street, $zip, $city, $state, $country) {
         $out = "";
 
-        if (isset($country) && $street != "") $out = $country;
+        if (isset($country) && $street != "") {
+            $out = $country;
+        }
 
         $zcs = "";
-        if (isset($zip) && $zip != "") $zcs = $zip;
-        if (isset($city) && $city != "") $zcs .= (($zcs)?" ":"") . $city;
-        if (isset($state) && $state != "") $zcs .= (($zcs)?" ":"") . $state;
-        if ($zcs) $out = $zcs . "\r\n" . $out;
+        if (isset($zip) && $zip != "") {
+            $zcs = $zip;
+        }
+        if (isset($city) && $city != "") {
+            $zcs .= (($zcs)?" ":"") . $city;
+        }
+        if (isset($state) && $state != "") {
+            $zcs .= (($zcs)?" ":"") . $state;
+        }
+        if ($zcs) {
+            $out = $zcs . "\r\n" . $out;
+        }
 
-        if (isset($street) && $street != "") $out = $street . (($out)?"\r\n\r\n". $out: "") ;
+        if (isset($street) && $street != "") {
+            $out = $street . (($out)?"\r\n\r\n". $out: "") ;
+        }
 
         return ($out)?$out:null;
     }
@@ -95,12 +106,10 @@ 
                 if (strlen($names) > 0){
                     $lastfirst .= ", $names";
                     $firstlast = "$names $lastname";
-                }
-                else {
+                } else {
                     $firstlast = $lastname;
                 }
-            }
-            elseif (strlen($names) > 0) {
+            } elseif (strlen($names) > 0) {
                 $lastfirst = $firstlast = $names;
             }
 
@@ -112,18 +121,19 @@ 
                 case SYNC_FILEAS_COMPANYONLY:
                     if (strlen($company) > 0) {
                         $fileas = $company;
+                    } elseif (strlen($firstlast) > 0) {
+                                            $fileas = $lastfirst;
                     }
-                    elseif (strlen($firstlast) > 0)
-                        $fileas = $lastfirst;
                     break;
                 case SYNC_FILEAS_COMPANYLAST:
                     if (strlen($company) > 0) {
                         $fileas = $company;
-                        if (strlen($lastfirst) > 0)
-                            $fileas .= "($lastfirst)";
+                        if (strlen($lastfirst) > 0) {
+                                                    $fileas .= "($lastfirst)";
+                        }
+                    } elseif (strlen($lastfirst) > 0) {
+                                            $fileas = $lastfirst;
                     }
-                    elseif (strlen($lastfirst) > 0)
-                        $fileas = $lastfirst;
                     break;
                 case SYNC_FILEAS_COMPANYFIRST:
                     if (strlen($company) > 0) {
@@ -131,8 +141,7 @@ 
                         if (strlen($firstlast) > 0) {
                             $fileas .= " ($firstlast)";
                         }
-                    }
-                    elseif (strlen($firstlast) > 0) {
+                    } elseif (strlen($firstlast) > 0) {
                         $fileas = $firstlast;
                     }
                     break;
@@ -142,8 +151,7 @@ 
                         if (strlen($company) > 0) {
                             $fileas .= " ($company)";
                         }
-                    }
-                    elseif (strlen($company) > 0) {
+                    } elseif (strlen($company) > 0) {
                         $fileas = $company;
                     }
                     break;
@@ -153,8 +161,7 @@ 
                         if (strlen($company) > 0) {
                             $fileas .= " ($company)";
                         }
-                    }
-                    elseif (strlen($company) > 0) {
+                    } elseif (strlen($company) > 0) {
                         $fileas = $company;
                     }
                     break;
@@ -167,8 +174,9 @@ 
                     $fileas = $firstlast;
                     break;
             }
-            if (strlen($fileas) == 0)
-                ZLog::Write(LOGLEVEL_DEBUG, "Fileas is empty.");
+            if (strlen($fileas) == 0) {
+                            ZLog::Write(LOGLEVEL_DEBUG, "Fileas is empty.");
+            }
             return $fileas;
         }
         ZLog::Write(LOGLEVEL_DEBUG, "FILEAS_ORDER not defined. Add it to your config.php.");
@@ -237,9 +245,9 @@ 
             $OLUid .= pack("V", 1);
             $OLUid .= $icalUid;
             return hex2bin("040000008200E00074C5B7101A82E0080000000000000000000000000000000000000000". bin2hex($OLUid). "00");
+        } else {
+                   return hex2bin($icalUid);
         }
-        else
-           return hex2bin($icalUid);
     }
 
     /**
@@ -263,9 +271,9 @@ 
             $s = $recurStartTime - $h * 4096 - $m * 64;
 
             return gmmktime($h, $m, $s, $month, $day, $year);
+        } else {
+                    return false;
         }
-        else
-            return false;
     }
 
     /**
@@ -539,10 +547,11 @@ 
      * @return string
      */
     public static function GetFormattedTime($timestamp = false) {
-        if (!$timestamp)
-            return @strftime("%d/%m/%Y %H:%M:%S");
-        else
-            return @strftime("%d/%m/%Y %H:%M:%S", $timestamp);
+        if (!$timestamp) {
+                    return @strftime("%d/%m/%Y %H:%M:%S");
+        } else {
+                    return @strftime("%d/%m/%Y %H:%M:%S", $timestamp);
+        }
     }
 
 
@@ -630,9 +639,9 @@ 
         if (function_exists("iconv")) {
             $charset = self::GetCodepageCharset($codepage);
             return iconv($charset, "utf-8", $string);
+        } else {
+                    ZLog::Write(LOGLEVEL_WARN, "Utils::ConvertCodepageStringToUtf8() 'iconv' is not available. Charset conversion skipped.");
         }
-        else
-            ZLog::Write(LOGLEVEL_WARN, "Utils::ConvertCodepageStringToUtf8() 'iconv' is not available. Charset conversion skipped.");
 
         return $string;
     }
@@ -649,16 +658,17 @@ 
      */
     public static function ConvertCodepage($in, $out, $string) {
         // do nothing if both charsets are the same
-        if ($in == $out)
-            return $string;
+        if ($in == $out) {
+                    return $string;
+        }
 
         if (function_exists("iconv")) {
             $inCharset = self::GetCodepageCharset($in);
             $outCharset = self::GetCodepageCharset($out);
             return iconv($inCharset, $outCharset, $string);
+        } else {
+                    ZLog::Write(LOGLEVEL_WARN, "Utils::ConvertCodepage() 'iconv' is not available. Charset conversion skipped.");
         }
-        else
-            ZLog::Write(LOGLEVEL_WARN, "Utils::ConvertCodepage() 'iconv' is not available. Charset conversion skipped.");
 
         return $string;
     }
@@ -677,9 +687,15 @@ 
         }
         // The best choice is RTF, then HTML and then MIME in order to save bandwidth
         // because MIME is a complete message including the headers and attachments
-        if (in_array(SYNC_BODYPREFERENCE_RTF, $bpTypes))  return SYNC_BODYPREFERENCE_RTF;
-        if (in_array(SYNC_BODYPREFERENCE_HTML, $bpTypes)) return SYNC_BODYPREFERENCE_HTML;
-        if (in_array(SYNC_BODYPREFERENCE_MIME, $bpTypes)) return SYNC_BODYPREFERENCE_MIME;
+        if (in_array(SYNC_BODYPREFERENCE_RTF, $bpTypes)) {
+            return SYNC_BODYPREFERENCE_RTF;
+        }
+        if (in_array(SYNC_BODYPREFERENCE_HTML, $bpTypes)) {
+            return SYNC_BODYPREFERENCE_HTML;
+        }
+        if (in_array(SYNC_BODYPREFERENCE_MIME, $bpTypes)) {
+            return SYNC_BODYPREFERENCE_MIME;
+        }
         return SYNC_BODYPREFERENCE_PLAIN;
     }
 
@@ -761,7 +777,9 @@ 
      * @return void|string
      */
     public static function FormatBytes($bytes, $precision = 2) {
-        if ($bytes <= 0) return '0 B';
+        if ($bytes <= 0) {
+            return '0 B';
+        }
 
         $units = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB');
         $base = log ($bytes, 1024);
@@ -864,22 +882,26 @@ 
 //for other backends.
 function utf8_to_windows1252($string, $option = "", $force_convert = false) {
     //if the store supports unicode return the string without converting it
-    if (!$force_convert && defined('STORE_SUPPORTS_UNICODE') && STORE_SUPPORTS_UNICODE == true) return $string;
+    if (!$force_convert && defined('STORE_SUPPORTS_UNICODE') && STORE_SUPPORTS_UNICODE == true) {
+        return $string;
+    }
 
     if (function_exists("iconv")){
         return @iconv("UTF-8", "Windows-1252" . $option, $string);
-    }else{
+    } else{
         return utf8_decode($string); // no euro support here
     }
 }
 
 function windows1252_to_utf8($string, $option = "", $force_convert = false) {
     //if the store supports unicode return the string without converting it
-    if (!$force_convert && defined('STORE_SUPPORTS_UNICODE') && STORE_SUPPORTS_UNICODE == true) return $string;
+    if (!$force_convert && defined('STORE_SUPPORTS_UNICODE') && STORE_SUPPORTS_UNICODE == true) {
+        return $string;
+    }
 
     if (function_exists("iconv")){
         return @iconv("Windows-1252", "UTF-8" . $option, $string);
-    }else{
+    } else{
         return utf8_encode($string); // no euro support here
     }
 }

lib/utils/timezoneutil.php

Indentation +80 added lines, -80 removed lines

@@ -238,7 +238,7 @@ 
             // -720 min
             "Dateline Standard Time" => array(
                         "Etc/GMT+12",
-                 ),
+                    ),
 
             // -660 min
             "Samoa Standard Time" => array(
@@ -248,7 +248,7 @@ 
                         "Pacific/Pago_Pago",
                         "Pacific/Samoa",
                         "US/Samoa",
-                 ),
+                    ),
 
             // -600 min
             "Hawaiian Standard Time" => array(
@@ -262,12 +262,12 @@ 
                         "Pacific/Tahiti",
                         "US/Aleutian",
                         "US/Hawaii",
-                 ),
+                    ),
 
             // -570 min
             "-570" => array(
                         "Pacific/Marquesas",
-                 ),
+                    ),
 
             // -540 min
             "Alaskan Standard Time" => array(
@@ -279,7 +279,7 @@ 
                         "Etc/GMT+9",
                         "Pacific/Gambier",
                         "US/Alaska",
-                 ),
+                    ),
 
             // -480 min
             "Pacific Standard Time" => array(
@@ -299,7 +299,7 @@ 
                         "PST8PDT",
                         "US/Pacific",
                         "US/Pacific-New",
-                 ),
+                    ),
 
             // -420 min
             "US Mountain Standard Time" => array(
@@ -325,7 +325,7 @@ 
                         "Navajo",
                         "US/Arizona",
                         "US/Mountain",
-                 ),
+                    ),
 
             // -360 min
             "Central Standard Time" => array(
@@ -347,17 +347,17 @@ 
                         "US/Indiana-Starke",
                         "CST6CDT",
                         "Etc/GMT+6",
-                 ),
+                    ),
             "Canada Central Standard Time" => array(
                         "Canada/Central",
                         "Canada/East-Saskatchewan",
                         "Canada/Saskatchewan",
-                 ),
+                    ),
             "Mexico Standard Time" => array(
                         "America/Mexico_City",
                         "America/Monterrey",
                         "Mexico/General",
-                 ),
+                    ),
             "Central America Standard Time" => array(
                         "America/Bahia_Banderas",
                         "America/Belize",
@@ -372,7 +372,7 @@ 
                         "Chile/EasterIsland",
                         "Pacific/Easter",
                         "Pacific/Galapagos",
-                 ),
+                    ),
 
             // -300 min
             "US Eastern Standard Time" => array(
@@ -403,7 +403,7 @@ 
                         "US/East-Indiana",
                         "US/Eastern",
                         "US/Michigan",
-                 ),
+                    ),
             "SA Pacific Standard Time" => array(
                         "America/Atikokan",
                         "America/Bogota",
@@ -418,12 +418,12 @@ 
                         "America/Panama",
                         "America/Pangnirtung",
                         "America/Port-au-Prince",
-                 ),
+                    ),
 
             // -270 min
             "Venezuela Standard Time" => array(
                         "America/Caracas",
-                 ),
+                    ),
             // -240 min
             "Atlantic Standard Time" => array(
                         "America/Barbados",
@@ -443,7 +443,7 @@ 
                         "Atlantic/Bermuda",
                         "Canada/Atlantic",
                         "Etc/GMT+4",
-                 ),
+                    ),
             "SA Western Standard Time" => array(
                         "America/Anguilla",
                         "America/Antigua",
@@ -472,19 +472,19 @@ 
                         "America/Rio_Branco",
                         "Brazil/Acre",
                         "Brazil/West",
-                 ),
+                    ),
             "Pacific SA Standard Time" => array(
                         "America/Santiago",
                         "America/Santo_Domingo",
                         "Antarctica/Palmer",
                         "Chile/Continental",
-                 ),
+                    ),
 
             // -210 min
             "Newfoundland and Labrador Standard Time" => array(
                         "America/St_Johns",
                         "Canada/Newfoundland",
-                 ),
+                    ),
 
             // -180 min
             "E South America Standard Time" => array(
@@ -497,7 +497,7 @@ 
                         "America/Sao_Paulo",
                         "Brazil/East",
                         "Etc/GMT+3",
-                 ),
+                    ),
             "SA Eastern Standard Time" => array(
                         "America/Argentina/Buenos_Aires",
                         "America/Argentina/Catamarca",
@@ -524,11 +524,11 @@ 
                         "America/Paramaribo",
                         "America/Rosario",
                         "America/Santarem",
-                 ),
+                    ),
             "Greenland Standard Time" => array(
                         "Antarctica/Rothera",
                         "Atlantic/Stanley",
-                 ),
+                    ),
 
             // -120 min
             "Mid-Atlantic Standard Time" => array(
@@ -536,17 +536,17 @@ 
                         "Atlantic/South_Georgia",
                         "Brazil/DeNoronha",
                         "Etc/GMT+2",
-                 ),
+                    ),
 
             // -60 min
             "Azores Standard Time" => array(
                         "Atlantic/Azores",
                         "Etc/GMT+1",
-                 ),
+                    ),
             "Cape Verde Standard Time" => array(
                         "America/Scoresbysund",
                         "Atlantic/Cape_Verde",
-                 ),
+                    ),
 
             // 0 min
             "GMT Standard Time" => array(
@@ -580,7 +580,7 @@ 
                         "UCT",
                         "Universal",
                         "UTC",
-                 ),
+                    ),
             "Greenwich Standard Time" => array(
                         "Africa/Abidjan",
                         "Africa/Accra",
@@ -606,7 +606,7 @@ 
                         "Atlantic/Reykjavik",
                         "Atlantic/St_Helena",
                         "Zulu",
-                 ),
+                    ),
 
             // +60 min
             "Central Europe Standard Time" => array(
@@ -616,7 +616,7 @@ 
                         "Europe/Ljubljana",
                         "Europe/Prague",
                         "Europe/Vaduz",
-                 ),
+                    ),
             "Central European Standard Time" => array(
                         "Europe/Sarajevo",
                         "Europe/Skopje",
@@ -624,7 +624,7 @@ 
                         "Europe/Zagreb",
                         "MET",
                         "Poland",
-                 ),
+                    ),
             "Romance Standard Time" => array(
                         "Europe/Andorra",
                         "Europe/Brussels",
@@ -637,7 +637,7 @@ 
                         "Europe/Podgorica",
                         "Europe/San_Marino",
                         "Europe/Tirane",
-                 ),
+                    ),
             "W Europe Standard Time" => array(
                         "Europe/Amsterdam",
                         "Europe/Berlin",
@@ -652,7 +652,7 @@ 
                         "WET",
                         "CET",
                         "Etc/GMT-1",
-                 ),
+                    ),
             "W Central Africa Standard Time" => array(
                         "Africa/Algiers",
                         "Africa/Bangui",
@@ -670,7 +670,7 @@ 
                         "Africa/Tunis",
                         "Africa/Windhoek",
                         "Atlantic/Jan_Mayen",
-                 ),
+                    ),
 
             // +120 min
             "E Europe Standard Time" => array(
@@ -684,13 +684,13 @@ 
                         "Europe/Tiraspol",
                         "Europe/Uzhgorod",
                         "Europe/Zaporozhye",
-                 ),
+                    ),
             "Egypt Standard Time" => array(
                         "Africa/Cairo",
                         "Africa/Tripoli",
                         "Egypt",
                         "Libya",
-                 ),
+                    ),
             "FLE Standard Time" => array(
                         "Europe/Helsinki",
                         "Europe/Kiev",
@@ -698,13 +698,13 @@ 
                         "Europe/Sofia",
                         "Europe/Tallinn",
                         "Europe/Vilnius",
-                 ),
+                    ),
             "GTB Standard Time" => array(
                         "Asia/Istanbul",
                         "Europe/Athens",
                         "Europe/Istanbul",
                         "Turkey",
-                 ),
+                    ),
             "Israel Standard Time" => array(
                         "Asia/Amman",
                         "Asia/Beirut",
@@ -715,7 +715,7 @@ 
                         "Asia/Tel_Aviv",
                         "Asia/Jerusalem",
                         "Israel",
-                 ),
+                    ),
             "South Africa Standard Time" => array(
                         "Africa/Blantyre",
                         "Africa/Bujumbura",
@@ -728,7 +728,7 @@ 
                         "Africa/Maputo",
                         "Africa/Maseru",
                         "Africa/Mbabane",
-                 ),
+                    ),
 
             // +180 min
             "Russian Standard Time" => array(
@@ -736,12 +736,12 @@ 
                         "Europe/Kaliningrad",
                         "Europe/Minsk",
                         "Etc/GMT-3",
-                 ),
+                    ),
             "Arab Standard Time" => array(
                         "Asia/Qatar",
                         "Asia/Kuwait",
                         "Asia/Riyadh",
-                 ),
+                    ),
             "E Africa Standard Time" => array(
                         "Africa/Addis_Ababa",
                         "Africa/Asmara",
@@ -753,7 +753,7 @@ 
                         "Africa/Khartoum",
                         "Africa/Mogadishu",
                         "Africa/Nairobi",
-                 ),
+                    ),
             "Arabic Standard Time" => array(
                         "Asia/Aden",
                         "Asia/Baghdad",
@@ -761,13 +761,13 @@ 
                         "Indian/Antananarivo",
                         "Indian/Comoro",
                         "Indian/Mayotte",
-                 ),
+                    ),
 
             // +210 min
             "Iran Standard Time" => array(
                         "Asia/Tehran",
                         "Iran",
-                 ),
+                    ),
 
             // +240 min
             "Arabian Standard Time" => array(
@@ -776,7 +776,7 @@ 
                         "Indian/Mahe",
                         "Indian/Mauritius",
                         "Indian/Reunion",
-                 ),
+                    ),
             "Caucasus Standard Time" => array(
                         "Asia/Baku",
                         "Asia/Tbilisi",
@@ -786,17 +786,17 @@ 
                         "Europe/Samara",
                         "Europe/Volgograd",
                         "W-SU",
-                 ),
+                    ),
 
             // +270 min
             "Transitional Islamic State of Afghanistan Standard Time" => array(
                         "Asia/Kabul",
-                 ),
+                    ),
 
             // +300 min
             "Ekaterinburg Standard Time" => array(
                         "Antarctica/Mawson",
-                 ),
+                    ),
             "West Asia Standard Time" => array(
                         "Asia/Aqtau",
                         "Asia/Aqtobe",
@@ -810,29 +810,29 @@ 
                         "Etc/GMT-5",
                         "Indian/Kerguelen",
                         "Indian/Maldives",
-                 ),
+                    ),
 
             // +330 min
             "India Standard Time" => array(
                         "Asia/Calcutta",
                         "Asia/Colombo",
                         "Asia/Kolkata",
-                 ),
+                    ),
 
             // +345 min
             "Nepal Standard Time" => array(
                         "Asia/Kathmandu",
                         "Asia/Katmandu",
-                 ),
+                    ),
 
             // +360 min
             "Central Asia Standard Time" => array(
                         "Asia/Dacca",
                         "Asia/Dhaka",
-                 ),
+                    ),
             "Sri Lanka Standard Time" => array(
                         "Indian/Chagos",
-                 ),
+                    ),
             "N Central Asia Standard Time" => array(
                         "Antarctica/Vostok",
                         "Asia/Almaty",
@@ -842,13 +842,13 @@ 
                         "Asia/Thimphu",
                         "Asia/Yekaterinburg",
                         "Etc/GMT-6",
-                 ),
+                    ),
 
             // +390 min
             "Myanmar Standard Time" => array(
                         "Asia/Rangoon",
                         "Indian/Cocos",
-                 ),
+                    ),
 
             // +420 min
             "SE Asia Standard Time" => array(
@@ -859,7 +859,7 @@ 
                         "Asia/Phnom_Penh",
                         "Asia/Saigon",
                         "Indian/Christmas",
-                 ),
+                    ),
             "North Asia Standard Time" => array(
                         "Antarctica/Davis",
                         "Asia/Novokuznetsk",
@@ -868,7 +868,7 @@ 
                         "Asia/Pontianak",
                         "Asia/Vientiane",
                         "Etc/GMT-7",
-                 ),
+                    ),
 
             // +480 min
             "China Standard Time" => array(
@@ -884,19 +884,19 @@ 
                         "Hongkong",
                         "PRC",
                         "ROC",
-                 ),
+                    ),
             "Singapore Standard Time" => array(
                         "Singapore",
                         "Asia/Singapore",
                         "Asia/Kuala_Lumpur",
-                 ),
+                    ),
             "Taipei Standard Time" => array(
                         "Asia/Taipei",
-                 ),
+                    ),
             "W Australia Standard Time" => array(
                         "Australia/Perth",
                         "Australia/West",
-                 ),
+                    ),
             "North Asia East Standard Time" => array(
                         "Antarctica/Casey",
                         "Asia/Kashgar",
@@ -909,43 +909,43 @@ 
                         "Etc/GMT-8",
                         "Asia/Ulaanbaatar",
                         "Asia/Ulan_Bator",
-                 ),
+                    ),
 
             // +525 min
             "525" => array(
                         "Australia/Eucla",
-                 ),
+                    ),
 
             // +540 min
             "Korea Standard Time" => array(
                         "Asia/Seoul",
                         "Asia/Pyongyang",
                         "ROK",
-                 ),
+                    ),
             "Tokyo Standard Time" => array(
                         "Asia/Tokyo",
                         "Japan",
                         "Etc/GMT-9",
-                 ),
+                    ),
             "Yakutsk Standard Time" => array(
                         "Asia/Dili",
                         "Asia/Irkutsk",
                         "Asia/Jayapura",
                         "Pacific/Palau",
-                 ),
+                    ),
 
             // +570 min
             "AUS Central Standard Time" => array(
                         "Australia/Darwin",
                         "Australia/North",
-                 ),
-             // DST
+                    ),
+                // DST
             "Cen Australia Standard Time" => array(
                         "Australia/Adelaide",
                         "Australia/Broken_Hill",
                         "Australia/South",
                         "Australia/Yancowinna",
-                 ),
+                    ),
 
             // +600 min
             "AUS Eastern Standard Time" => array(
@@ -956,20 +956,20 @@ 
                         "Australia/ACT",
                         "Australia/NSW",
                         "Australia/Victoria",
-                 ),
+                    ),
             "E Australia Standard Time" => array(
                         "Etc/GMT-10",
                         "Australia/Brisbane",
                         "Australia/Queensland",
                         "Australia/Lindeman",
-                 ),
+                    ),
             "Tasmania Standard Time" => array(
                         "Australia/Hobart",
                         "Australia/Tasmania",
-                 ),
+                    ),
             "Vladivostok Standard Time" => array(
                         "Antarctica/DumontDUrville",
-                 ),
+                    ),
             "West Pacific Standard Time" => array(
                         "Asia/Yakutsk",
                         "Pacific/Chuuk",
@@ -978,13 +978,13 @@ 
                         "Pacific/Saipan",
                         "Pacific/Truk",
                         "Pacific/Yap",
-                 ),
+                    ),
 
             // +630 min
             "630" => array(
                         "Australia/LHI",
                         "Australia/Lord_Howe",
-                 ),
+                    ),
 
             // +660 min
             "Central Pacific Standard Time" => array(
@@ -998,12 +998,12 @@ 
                         "Pacific/Noumea",
                         "Pacific/Pohnpei",
                         "Pacific/Ponape",
-                 ),
+                    ),
 
             // 690 min
             "690" => array(
                         "Pacific/Norfolk",
-                 ),
+                    ),
 
             // +720 min
             "Fiji Islands Standard Time" => array(
@@ -1011,7 +1011,7 @@ 
                         "Asia/Kamchatka",
                         "Asia/Magadan",
                         "Kwajalein",
-                 ),
+                    ),
             "New Zealand Standard Time" => array(
                         "Antarctica/McMurdo",
                         "Antarctica/South_Pole",
@@ -1026,13 +1026,13 @@ 
                         "Pacific/Tarawa",
                         "Pacific/Wake",
                         "Pacific/Wallis",
-                 ),
+                    ),
 
             // +765 min
             "765" => array(
                         "NZ-CHAT",
                         "Pacific/Chatham",
-                 ),
+                    ),
 
             // +780 min
             "Tonga Standard Time" => array(
@@ -1040,14 +1040,14 @@ 
                         "Pacific/Apia",
                         "Pacific/Enderbury",
                         "Pacific/Tongatapu",
-                 ),
+                    ),
 
             // +840 min
             "840" => array(
                         "Etc/GMT-14",
                         "Pacific/Fakaofo",
                         "Pacific/Kiritimati",
-                 ),
+                    ),
             );
 
     /**

Spacing +165 added lines, -165 removed lines

@@ -18,83 +18,83 @@ 
      * Updated at: 01.06.2012
      */
     private static $mstzones = array(
-                        "000" => array("Dateline Standard Time",                    "(GMT-12:00) International Date Line West"),
-                        "001" => array("Samoa Standard Time",                       "(GMT-11:00) Midway Island, Samoa"),
-                        "002" => array("Hawaiian Standard Time",                    "(GMT-10:00) Hawaii"),
-                        "003" => array("Alaskan Standard Time",                     "(GMT-09:00) Alaska"),
-                        "004" => array("Pacific Standard Time",                     "(GMT-08:00) Pacific Time (US and Canada); Tijuana"),
-                        "010" => array("Mountain Standard Time",                    "(GMT-07:00) Mountain Time (US and Canada)"),
-                        "013" => array("Mexico Standard Time 2",                    "(GMT-07:00) Chihuahua, La Paz, Mazatlan"),
-                        "015" => array("US Mountain Standard Time",                 "(GMT-07:00) Arizona"),
-                        "020" => array("Central Standard Time",                     "(GMT-06:00) Central Time (US and Canada"),
-                        "025" => array("Canada Central Standard Time",              "(GMT-06:00) Saskatchewan"),
-                        "030" => array("Mexico Standard Time",                      "(GMT-06:00) Guadalajara, Mexico City, Monterrey"),
-                        "033" => array("Central America Standard Time",             "(GMT-06:00) Central America"),
-                        "035" => array("Eastern Standard Time",                     "(GMT-05:00) Eastern Time (US and Canada)"),
-                        "040" => array("US Eastern Standard Time",                  "(GMT-05:00) Indiana (East)"),
-                        "045" => array("SA Pacific Standard Time",                  "(GMT-05:00) Bogota, Lima, Quito"),
-                        "uk1" => array("Venezuela Standard Time",                   "(GMT-04:30) Caracas"),                     // added
-                        "050" => array("Atlantic Standard Time",                    "(GMT-04:00) Atlantic Time (Canada)"),
-                        "055" => array("SA Western Standard Time",                  "(GMT-04:00) Caracas, La Paz"),
-                        "056" => array("Pacific SA Standard Time",                  "(GMT-04:00) Santiago"),
-                        "060" => array("Newfoundland and Labrador Standard Time",   "(GMT-03:30) Newfoundland and Labrador"),
-                        "065" => array("E South America Standard Time" ,            "(GMT-03:00) Brasilia"),
-                        "070" => array("SA Eastern Standard Time",                  "(GMT-03:00) Buenos Aires, Georgetown"),
-                        "073" => array("Greenland Standard Time",                   "(GMT-03:00) Greenland"),
-                        "075" => array("Mid-Atlantic Standard Time",                "(GMT-02:00) Mid-Atlantic"),
-                        "080" => array("Azores Standard Time",                      "(GMT-01:00) Azores"),
-                        "083" => array("Cape Verde Standard Time",                  "(GMT-01:00) Cape Verde Islands"),
-                        "085" => array("GMT Standard Time",                         "(GMT) Greenwich Mean Time: Dublin, Edinburgh, Lisbon, London"),
-                        "090" => array("Greenwich Standard Time",                   "(GMT) Casablanca, Monrovia"),
-                        "095" => array("Central Europe Standard Time",              "(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague"),
-                        "100" => array("Central European Standard Time",            "(GMT+01:00) Sarajevo, Skopje, Warsaw, Zagreb"),
-                        "105" => array("Romance Standard Time",                     "(GMT+01:00) Brussels, Copenhagen, Madrid, Paris"),
-                        "110" => array("W Europe Standard Time",                    "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna"),
-                        "111" => array("W. Europe Standard Time",                   "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna"),
-                        "113" => array("W Central Africa Standard Time",            "(GMT+01:00) West Central Africa"),
-                        "115" => array("E Europe Standard Time",                    "(GMT+02:00) Bucharest"),
-                        "120" => array("Egypt Standard Time",                       "(GMT+02:00) Cairo"),
-                        "125" => array("FLE Standard Time",                         "(GMT+02:00) Helsinki, Kiev, Riga, Sofia, Tallinn, Vilnius"),
-                        "130" => array("GTB Standard Time",                         "(GMT+02:00) Athens, Istanbul, Minsk"),
-                        "135" => array("Israel Standard Time",                      "(GMT+02:00) Jerusalem"),
-                        "140" => array("South Africa Standard Time",                "(GMT+02:00) Harare, Pretoria"),
-                        "145" => array("Russian Standard Time",                     "(GMT+03:00) Moscow, St. Petersburg, Volgograd"),
-                        "150" => array("Arab Standard Time",                        "(GMT+03:00) Kuwait, Riyadh"),
-                        "155" => array("E Africa Standard Time",                    "(GMT+03:00) Nairobi"),
-                        "158" => array("Arabic Standard Time",                      "(GMT+03:00) Baghdad"),
-                        "160" => array("Iran Standard Time",                        "(GMT+03:30) Tehran"),
-                        "165" => array("Arabian Standard Time",                     "(GMT+04:00) Abu Dhabi, Muscat"),
-                        "170" => array("Caucasus Standard Time",                    "(GMT+04:00) Baku, Tbilisi, Yerevan"),
-                        "175" => array("Transitional Islamic State of Afghanistan Standard Time","(GMT+04:30) Kabul"),
-                        "180" => array("Ekaterinburg Standard Time",                "(GMT+05:00) Ekaterinburg"),
-                        "185" => array("West Asia Standard Time",                   "(GMT+05:00) Islamabad, Karachi, Tashkent"),
-                        "190" => array("India Standard Time",                       "(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi"),
-                        "193" => array("Nepal Standard Time",                       "(GMT+05:45) Kathmandu"),
-                        "195" => array("Central Asia Standard Time",                "(GMT+06:00) Astana, Dhaka"),
-                        "200" => array("Sri Lanka Standard Time",                   "(GMT+06:00) Sri Jayawardenepura"),
-                        "201" => array("N Central Asia Standard Time",              "(GMT+06:00) Almaty, Novosibirsk"),
-                        "203" => array("Myanmar Standard Time",                     "(GMT+06:30) Yangon Rangoon"),
-                        "205" => array("SE Asia Standard Time",                     "(GMT+07:00) Bangkok, Hanoi, Jakarta"),
-                        "207" => array("North Asia Standard Time",                  "(GMT+07:00) Krasnoyarsk"),
-                        "210" => array("China Standard Time",                       "(GMT+08:00) Beijing, Chongqing, Hong Kong SAR, Urumqi"),
-                        "215" => array("Singapore Standard Time",                   "(GMT+08:00) Kuala Lumpur, Singapore"),
-                        "220" => array("Taipei Standard Time",                      "(GMT+08:00) Taipei"),
-                        "225" => array("W Australia Standard Time",                 "(GMT+08:00) Perth"),
-                        "227" => array("North Asia East Standard Time",             "(GMT+08:00) Irkutsk, Ulaanbaatar"),
-                        "230" => array("Korea Standard Time",                       "(GMT+09:00) Seoul"),
-                        "235" => array("Tokyo Standard Time",                       "(GMT+09:00) Osaka, Sapporo, Tokyo"),
-                        "240" => array("Yakutsk Standard Time",                     "(GMT+09:00) Yakutsk"),
-                        "245" => array("AUS Central Standard Time",                 "(GMT+09:30) Darwin"),
-                        "250" => array("Cen Australia Standard Time",               "(GMT+09:30) Adelaide"),
-                        "255" => array("AUS Eastern Standard Time",                 "(GMT+10:00) Canberra, Melbourne, Sydney"),
-                        "260" => array("E Australia Standard Time",                 "(GMT+10:00) Brisbane"),
-                        "265" => array("Tasmania Standard Time",                    "(GMT+10:00) Hobart"),
-                        "270" => array("Vladivostok Standard Time",                 "(GMT+10:00) Vladivostok"),
-                        "275" => array("West Pacific Standard Time",                "(GMT+10:00) Guam, Port Moresby"),
-                        "280" => array("Central Pacific Standard Time",             "(GMT+11:00) Magadan, Solomon Islands, New Caledonia"),
-                        "285" => array("Fiji Islands Standard Time",                "(GMT+12:00) Fiji Islands, Kamchatka, Marshall Islands"),
-                        "290" => array("New Zealand Standard Time",                 "(GMT+12:00) Auckland, Wellington"),
-                        "300" => array("Tonga Standard Time",                       "(GMT+13:00) Nuku'alofa"),
+                        "000" => array("Dateline Standard Time", "(GMT-12:00) International Date Line West"),
+                        "001" => array("Samoa Standard Time", "(GMT-11:00) Midway Island, Samoa"),
+                        "002" => array("Hawaiian Standard Time", "(GMT-10:00) Hawaii"),
+                        "003" => array("Alaskan Standard Time", "(GMT-09:00) Alaska"),
+                        "004" => array("Pacific Standard Time", "(GMT-08:00) Pacific Time (US and Canada); Tijuana"),
+                        "010" => array("Mountain Standard Time", "(GMT-07:00) Mountain Time (US and Canada)"),
+                        "013" => array("Mexico Standard Time 2", "(GMT-07:00) Chihuahua, La Paz, Mazatlan"),
+                        "015" => array("US Mountain Standard Time", "(GMT-07:00) Arizona"),
+                        "020" => array("Central Standard Time", "(GMT-06:00) Central Time (US and Canada"),
+                        "025" => array("Canada Central Standard Time", "(GMT-06:00) Saskatchewan"),
+                        "030" => array("Mexico Standard Time", "(GMT-06:00) Guadalajara, Mexico City, Monterrey"),
+                        "033" => array("Central America Standard Time", "(GMT-06:00) Central America"),
+                        "035" => array("Eastern Standard Time", "(GMT-05:00) Eastern Time (US and Canada)"),
+                        "040" => array("US Eastern Standard Time", "(GMT-05:00) Indiana (East)"),
+                        "045" => array("SA Pacific Standard Time", "(GMT-05:00) Bogota, Lima, Quito"),
+                        "uk1" => array("Venezuela Standard Time", "(GMT-04:30) Caracas"), // added
+                        "050" => array("Atlantic Standard Time", "(GMT-04:00) Atlantic Time (Canada)"),
+                        "055" => array("SA Western Standard Time", "(GMT-04:00) Caracas, La Paz"),
+                        "056" => array("Pacific SA Standard Time", "(GMT-04:00) Santiago"),
+                        "060" => array("Newfoundland and Labrador Standard Time", "(GMT-03:30) Newfoundland and Labrador"),
+                        "065" => array("E South America Standard Time", "(GMT-03:00) Brasilia"),
+                        "070" => array("SA Eastern Standard Time", "(GMT-03:00) Buenos Aires, Georgetown"),
+                        "073" => array("Greenland Standard Time", "(GMT-03:00) Greenland"),
+                        "075" => array("Mid-Atlantic Standard Time", "(GMT-02:00) Mid-Atlantic"),
+                        "080" => array("Azores Standard Time", "(GMT-01:00) Azores"),
+                        "083" => array("Cape Verde Standard Time", "(GMT-01:00) Cape Verde Islands"),
+                        "085" => array("GMT Standard Time", "(GMT) Greenwich Mean Time: Dublin, Edinburgh, Lisbon, London"),
+                        "090" => array("Greenwich Standard Time", "(GMT) Casablanca, Monrovia"),
+                        "095" => array("Central Europe Standard Time", "(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague"),
+                        "100" => array("Central European Standard Time", "(GMT+01:00) Sarajevo, Skopje, Warsaw, Zagreb"),
+                        "105" => array("Romance Standard Time", "(GMT+01:00) Brussels, Copenhagen, Madrid, Paris"),
+                        "110" => array("W Europe Standard Time", "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna"),
+                        "111" => array("W. Europe Standard Time", "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna"),
+                        "113" => array("W Central Africa Standard Time", "(GMT+01:00) West Central Africa"),
+                        "115" => array("E Europe Standard Time", "(GMT+02:00) Bucharest"),
+                        "120" => array("Egypt Standard Time", "(GMT+02:00) Cairo"),
+                        "125" => array("FLE Standard Time", "(GMT+02:00) Helsinki, Kiev, Riga, Sofia, Tallinn, Vilnius"),
+                        "130" => array("GTB Standard Time", "(GMT+02:00) Athens, Istanbul, Minsk"),
+                        "135" => array("Israel Standard Time", "(GMT+02:00) Jerusalem"),
+                        "140" => array("South Africa Standard Time", "(GMT+02:00) Harare, Pretoria"),
+                        "145" => array("Russian Standard Time", "(GMT+03:00) Moscow, St. Petersburg, Volgograd"),
+                        "150" => array("Arab Standard Time", "(GMT+03:00) Kuwait, Riyadh"),
+                        "155" => array("E Africa Standard Time", "(GMT+03:00) Nairobi"),
+                        "158" => array("Arabic Standard Time", "(GMT+03:00) Baghdad"),
+                        "160" => array("Iran Standard Time", "(GMT+03:30) Tehran"),
+                        "165" => array("Arabian Standard Time", "(GMT+04:00) Abu Dhabi, Muscat"),
+                        "170" => array("Caucasus Standard Time", "(GMT+04:00) Baku, Tbilisi, Yerevan"),
+                        "175" => array("Transitional Islamic State of Afghanistan Standard Time", "(GMT+04:30) Kabul"),
+                        "180" => array("Ekaterinburg Standard Time", "(GMT+05:00) Ekaterinburg"),
+                        "185" => array("West Asia Standard Time", "(GMT+05:00) Islamabad, Karachi, Tashkent"),
+                        "190" => array("India Standard Time", "(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi"),
+                        "193" => array("Nepal Standard Time", "(GMT+05:45) Kathmandu"),
+                        "195" => array("Central Asia Standard Time", "(GMT+06:00) Astana, Dhaka"),
+                        "200" => array("Sri Lanka Standard Time", "(GMT+06:00) Sri Jayawardenepura"),
+                        "201" => array("N Central Asia Standard Time", "(GMT+06:00) Almaty, Novosibirsk"),
+                        "203" => array("Myanmar Standard Time", "(GMT+06:30) Yangon Rangoon"),
+                        "205" => array("SE Asia Standard Time", "(GMT+07:00) Bangkok, Hanoi, Jakarta"),
+                        "207" => array("North Asia Standard Time", "(GMT+07:00) Krasnoyarsk"),
+                        "210" => array("China Standard Time", "(GMT+08:00) Beijing, Chongqing, Hong Kong SAR, Urumqi"),
+                        "215" => array("Singapore Standard Time", "(GMT+08:00) Kuala Lumpur, Singapore"),
+                        "220" => array("Taipei Standard Time", "(GMT+08:00) Taipei"),
+                        "225" => array("W Australia Standard Time", "(GMT+08:00) Perth"),
+                        "227" => array("North Asia East Standard Time", "(GMT+08:00) Irkutsk, Ulaanbaatar"),
+                        "230" => array("Korea Standard Time", "(GMT+09:00) Seoul"),
+                        "235" => array("Tokyo Standard Time", "(GMT+09:00) Osaka, Sapporo, Tokyo"),
+                        "240" => array("Yakutsk Standard Time", "(GMT+09:00) Yakutsk"),
+                        "245" => array("AUS Central Standard Time", "(GMT+09:30) Darwin"),
+                        "250" => array("Cen Australia Standard Time", "(GMT+09:30) Adelaide"),
+                        "255" => array("AUS Eastern Standard Time", "(GMT+10:00) Canberra, Melbourne, Sydney"),
+                        "260" => array("E Australia Standard Time", "(GMT+10:00) Brisbane"),
+                        "265" => array("Tasmania Standard Time", "(GMT+10:00) Hobart"),
+                        "270" => array("Vladivostok Standard Time", "(GMT+10:00) Vladivostok"),
+                        "275" => array("West Pacific Standard Time", "(GMT+10:00) Guam, Port Moresby"),
+                        "280" => array("Central Pacific Standard Time", "(GMT+11:00) Magadan, Solomon Islands, New Caledonia"),
+                        "285" => array("Fiji Islands Standard Time", "(GMT+12:00) Fiji Islands, Kamchatka, Marshall Islands"),
+                        "290" => array("New Zealand Standard Time", "(GMT+12:00) Auckland, Wellington"),
+                        "300" => array("Tonga Standard Time", "(GMT+13:00) Nuku'alofa"),
                 );
 
     /**
@@ -129,104 +129,104 @@ 
      */
     private static $tzonesoffsets = array(
                         "Transitional Islamic State of Afghanistan Standard Time"
-                                                                    => array(-270, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "Alaskan Standard Time"                     => array(540, 0, -60,  0, 11, 0, 1, 2, 0, 0, 0,  0, 3, 0, 2, 2, 0, 0, 0),
-                        "Arab Standard Time"                        => array(-180, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "Arabian Standard Time"                     => array(-240, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "Arabic Standard Time"                      => array(-180, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
+                                                                    => array(-270, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "Alaskan Standard Time"                     => array(540, 0, -60, 0, 11, 0, 1, 2, 0, 0, 0, 0, 3, 0, 2, 2, 0, 0, 0),
+                        "Arab Standard Time"                        => array(-180, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "Arabian Standard Time"                     => array(-240, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "Arabic Standard Time"                      => array(-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"                    => array(240, 0, -60,  0, 11, 0, 1, 2, 0, 0, 0,  0, 3, 0, 2, 2, 0, 0, 0),
-                        "AUS Central Standard Time"                 => array(-570, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "AUS Eastern Standard Time"                 => array(-600, 0, -60,  0, 4, 0, 1, 3, 0, 0, 0,  0, 10, 0, 1, 2, 0, 0, 0),
+                        "Atlantic Standard Time"                    => array(240, 0, -60, 0, 11, 0, 1, 2, 0, 0, 0, 0, 3, 0, 2, 2, 0, 0, 0),
+                        "AUS Central Standard Time"                 => array(-570, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "AUS Eastern Standard Time"                 => array(-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"                      => array(60, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0),
+                        "Azores Standard Time"                      => array(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"              => array(360, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "Cape Verde Standard Time"                  => array(60, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "Caucasus Standard Time"                    => array(-240, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0),
-                        "Cen Australia Standard Time"               => array(-570, 0, -60,  0, 4, 0, 1, 3, 0, 0, 0,  0, 10, 0, 1, 2, 0, 0, 0),
-                        "Central America Standard Time"             => array(360, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "Central Asia 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"              => array(360, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "Cape Verde Standard Time"                  => array(60, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "Caucasus Standard Time"                    => array(-240, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0),
+                        "Cen Australia Standard Time"               => array(-570, 0, -60, 0, 4, 0, 1, 3, 0, 0, 0, 0, 10, 0, 1, 2, 0, 0, 0),
+                        "Central America Standard Time"             => array(360, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "Central Asia Standard Time"                => array(-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"              => array(-60, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0),
-                        "Central European Standard Time"            => array(-60, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0),
-                        "Central Pacific Standard Time"             => array(-660, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "Central Standard Time"                     => array(360, 0, -60,  0, 11, 0, 1, 2, 0, 0, 0,  0, 3, 0, 2, 2, 0, 0, 0),
-                        "Mexico Standard Time"                      => array(360, 0, -60,  0, 10, 0, 5, 2, 0, 0, 0,  0, 4, 0, 1, 2, 0, 0, 0),
-                        "China Standard Time"                       => array(-480, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "Dateline Standard Time"                    => array(720, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "E Africa Standard Time"                    => array(-180, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "E Australia Standard Time"                 => array(-600, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "E Europe Standard Time"                    => array(-120, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0),
-                        "E South America Standard Time"             => array(180, 0, -60,  0, 2, 6, 4, 23, 59, 59, 999,  0, 10, 6, 3, 23, 59, 59, 999),
-                        "Eastern Standard Time"                     => array(300, 0, -60,  0, 11, 0, 1, 2, 0, 0, 0,  0, 3, 0, 2, 2, 0, 0, 0),
-                        "Egypt Standard Time"                       => array(-120, 0, -60,  0, 9, 4, 5, 23, 59, 59, 999,  0, 4, 4, 5, 23, 59, 59, 999),
-                        "Ekaterinburg Standard Time"                => array(-300, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0),
-                        "Fiji Islands Standard Time"                => array(-720, 0, -60,  0, 3, 0, 5, 3, 0, 0, 0,  0, 10, 0, 4, 2, 0, 0, 0),
-                        "FLE Standard Time"                         => array(-120, 0, -60,  0, 10, 0, 5, 4, 0, 0, 0,  0, 3, 0, 5, 3, 0, 0, 0),
+                        "Central Europe Standard Time"              => array(-60, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0),
+                        "Central European Standard Time"            => array(-60, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0),
+                        "Central Pacific Standard Time"             => array(-660, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "Central Standard Time"                     => array(360, 0, -60, 0, 11, 0, 1, 2, 0, 0, 0, 0, 3, 0, 2, 2, 0, 0, 0),
+                        "Mexico Standard Time"                      => array(360, 0, -60, 0, 10, 0, 5, 2, 0, 0, 0, 0, 4, 0, 1, 2, 0, 0, 0),
+                        "China Standard Time"                       => array(-480, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "Dateline Standard Time"                    => array(720, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "E Africa Standard Time"                    => array(-180, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "E Australia Standard Time"                 => array(-600, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "E Europe Standard Time"                    => array(-120, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0),
+                        "E South America Standard Time"             => array(180, 0, -60, 0, 2, 6, 4, 23, 59, 59, 999, 0, 10, 6, 3, 23, 59, 59, 999),
+                        "Eastern Standard Time"                     => array(300, 0, -60, 0, 11, 0, 1, 2, 0, 0, 0, 0, 3, 0, 2, 2, 0, 0, 0),
+                        "Egypt Standard Time"                       => array(-120, 0, -60, 0, 9, 4, 5, 23, 59, 59, 999, 0, 4, 4, 5, 23, 59, 59, 999),
+                        "Ekaterinburg Standard Time"                => array(-300, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0),
+                        "Fiji Islands Standard Time"                => array(-720, 0, -60, 0, 3, 0, 5, 3, 0, 0, 0, 0, 10, 0, 4, 2, 0, 0, 0),
+                        "FLE Standard Time"                         => array(-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"                         => array(0, 0, -60,  0, 10, 0, 5, 2, 0, 0, 0,  0, 3, 0, 5, 1, 0, 0, 0),
-                        "Greenland Standard Time"                   => array(180, 0, -60,  0, 10, 6, 5, 23, 0, 0, 0,  0, 3, 6, 4, 22, 0, 0, 0),
-                        "Greenwich Standard Time"                   => array(0, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "GTB Standard Time"                         => array(-120, 0, -60,  0, 10, 0, 5, 4, 0, 0, 0,  0, 3, 0, 5, 3, 0, 0, 0),
-                        "Hawaiian Standard Time"                    => array(600, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "India Standard Time"                       => array(-330, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "Iran Standard Time"                        => array(-210, 0, -60,  0, 9, 1, 3, 23, 59, 59, 999,  0, 3, 6, 3, 23, 59, 59, 999),
-                        "Israel Standard Time"                      => array(-120, 0, -60,  0, 9, 0, 4, 2, 0, 0, 0,  0, 3, 5, 5, 2, 0, 0, 0),
+                        "GMT Standard Time"                         => array(0, 0, -60, 0, 10, 0, 5, 2, 0, 0, 0, 0, 3, 0, 5, 1, 0, 0, 0),
+                        "Greenland Standard Time"                   => array(180, 0, -60, 0, 10, 6, 5, 23, 0, 0, 0, 0, 3, 6, 4, 22, 0, 0, 0),
+                        "Greenwich Standard Time"                   => array(0, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "GTB Standard Time"                         => array(-120, 0, -60, 0, 10, 0, 5, 4, 0, 0, 0, 0, 3, 0, 5, 3, 0, 0, 0),
+                        "Hawaiian Standard Time"                    => array(600, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "India Standard Time"                       => array(-330, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "Iran Standard Time"                        => array(-210, 0, -60, 0, 9, 1, 3, 23, 59, 59, 999, 0, 3, 6, 3, 23, 59, 59, 999),
+                        "Israel Standard Time"                      => array(-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"                       => array(-540, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
+                        "Korea Standard Time"                       => array(-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"                => array(120, 0, -60,  0, 9, 0, 5, 2, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0),
+                        "Mid-Atlantic Standard Time"                => array(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"                    => array(420, 0, -60,  0, 11, 0, 1, 2, 0, 0, 0,  0, 3, 0, 2, 2, 0, 0, 0),
-                        "Mexico Standard Time 2"                    => array(420, 0, -60,  0, 10, 0, 5, 2, 0, 0, 0,  0, 4, 0, 1, 2, 0, 0, 0),
-                        "Myanmar Standard Time"                     => array(-390, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "N Central Asia Standard Time"              => array(-360, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0),
+                        "Mountain Standard Time"                    => array(420, 0, -60, 0, 11, 0, 1, 2, 0, 0, 0, 0, 3, 0, 2, 2, 0, 0, 0),
+                        "Mexico Standard Time 2"                    => array(420, 0, -60, 0, 10, 0, 5, 2, 0, 0, 0, 0, 4, 0, 1, 2, 0, 0, 0),
+                        "Myanmar Standard Time"                     => array(-390, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "N Central Asia Standard Time"              => array(-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"                       => array(-345, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "New Zealand Standard Time"                 => array(-720, 0, -60,  0, 4, 0, 1, 3, 0, 0, 0,  0, 9, 0, 5, 2, 0, 0, 0),
-                        "Newfoundland and Labrador Standard Time"   => array(210, 0, -60,  0, 11, 0, 1, 0, 1, 0, 0,  0, 3, 0, 2, 0, 1, 0, 0),
-                        "North Asia East Standard Time"             => array(-480, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0),
-                        "North Asia Standard Time"                  => array(-420, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0),
-                        "Pacific SA Standard Time"                  => array(240, 0, -60,  0, 3, 6, 2, 23, 59, 59, 999,  0, 10, 6, 2, 23, 59, 59, 999),
-                        "Pacific Standard Time"                     => array(480, 0, -60,  0, 11, 0, 1, 2, 0, 0, 0,  0, 3, 0, 2, 2, 0, 0, 0),
+                        "Nepal Standard Time"                       => array(-345, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "New Zealand Standard Time"                 => array(-720, 0, -60, 0, 4, 0, 1, 3, 0, 0, 0, 0, 9, 0, 5, 2, 0, 0, 0),
+                        "Newfoundland and Labrador Standard Time"   => array(210, 0, -60, 0, 11, 0, 1, 0, 1, 0, 0, 0, 3, 0, 2, 0, 1, 0, 0),
+                        "North Asia East Standard Time"             => array(-480, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0),
+                        "North Asia Standard Time"                  => array(-420, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0),
+                        "Pacific SA Standard Time"                  => array(240, 0, -60, 0, 3, 6, 2, 23, 59, 59, 999, 0, 10, 6, 2, 23, 59, 59, 999),
+                        "Pacific Standard Time"                     => array(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"                     => array(-60, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0),
-                        "Russian Standard Time"                     => array(-180, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0),
-                        "SA Eastern Standard Time"                  => array(180, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "SA Pacific Standard Time"                  => array(300, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "SA Western Standard Time"                  => array(240, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "Samoa Standard Time"                       => array(660, 0, -60,  0, 3, 6, 5, 23, 59, 59, 999,  0, 9, 6, 5, 23, 59, 59, 999),
-                        "SE Asia Standard Time"                     => array(-420, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "Singapore Standard Time"                   => array(-480, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "South Africa Standard Time"                => array(-120, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "Sri Lanka Standard Time"                   => array(-330, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
+                        "Romance Standard Time"                     => array(-60, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0),
+                        "Russian Standard Time"                     => array(-180, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0),
+                        "SA Eastern Standard Time"                  => array(180, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "SA Pacific Standard Time"                  => array(300, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "SA Western Standard Time"                  => array(240, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "Samoa Standard Time"                       => array(660, 0, -60, 0, 3, 6, 5, 23, 59, 59, 999, 0, 9, 6, 5, 23, 59, 59, 999),
+                        "SE Asia Standard Time"                     => array(-420, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "Singapore Standard Time"                   => array(-480, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "South Africa Standard Time"                => array(-120, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "Sri Lanka Standard Time"                   => array(-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"                      => array(-480, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "Tasmania Standard Time"                    => array(-600, 0, -60,  0, 4, 0, 1, 3, 0, 0, 0,  0, 10, 0, 1, 2, 0, 0, 0),
-                        "Tokyo Standard Time"                       => array(-540, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "Tonga Standard Time"                       => array(-780, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
+                        "Taipei Standard Time"                      => array(-480, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "Tasmania Standard Time"                    => array(-600, 0, -60, 0, 4, 0, 1, 3, 0, 0, 0, 0, 10, 0, 1, 2, 0, 0, 0),
+                        "Tokyo Standard Time"                       => array(-540, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "Tonga Standard Time"                       => array(-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"                  => array(300, 0, -60,  0, 11, 0, 1, 2, 0, 0, 0,  0, 3, 0, 2, 2, 0, 0, 0),
-                        "US Mountain Standard Time"                 => array(420, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
+                        "US Eastern Standard Time"                  => array(300, 0, -60, 0, 11, 0, 1, 2, 0, 0, 0, 0, 3, 0, 2, 2, 0, 0, 0),
+                        "US Mountain Standard Time"                 => array(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"                   => array(270, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "Vladivostok Standard Time"                 => array(-600, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0),
-                        "W Australia Standard Time"                 => array(-480, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "W Central Africa Standard Time"            => array(-60, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "W Europe Standard Time"                    => array(-60, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0),
-                        "West Asia Standard Time"                   => array(-300, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "West Pacific Standard Time"                => array(-600, 0, -60,  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0),
-                        "Yakutsk Standard Time"                     => array(-540, 0, -60,  0, 10, 0, 5, 3, 0, 0, 0,  0, 3, 0, 5, 2, 0, 0, 0),
+                        "Venezuela Standard Time"                   => array(270, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "Vladivostok Standard Time"                 => array(-600, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0),
+                        "W Australia Standard Time"                 => array(-480, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "W Central Africa Standard Time"            => array(-60, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "W Europe Standard Time"                    => array(-60, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0),
+                        "West Asia Standard Time"                   => array(-300, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "West Pacific Standard Time"                => array(-600, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+                        "Yakutsk Standard Time"                     => array(-540, 0, -60, 0, 10, 0, 5, 3, 0, 0, 0, 0, 3, 0, 5, 2, 0, 0, 0),
                 );
 
     /**
@@ -1063,7 +1063,7 @@ 
         if ($phptimezone === false)
             $phptimezone = date_default_timezone_get();
 
-        ZLog::Write(LOGLEVEL_DEBUG, "TimezoneUtil::GetFullTZ() for ". $phptimezone);
+        ZLog::Write(LOGLEVEL_DEBUG, "TimezoneUtil::GetFullTZ() for ".$phptimezone);
 
         $servertzname = self::guessTZNameFromPHPName($phptimezone);
         return self::GetFullTZFromTZName($servertzname);
@@ -1121,7 +1121,7 @@ 
      * @return array
      */
     static public function FillTZNames($tz) {
-        ZLog::Write(LOGLEVEL_DEBUG, "TimezoneUtil::FillTZNames() filling up bias ". $tz["bias"]);
+        ZLog::Write(LOGLEVEL_DEBUG, "TimezoneUtil::FillTZNames() filling up bias ".$tz["bias"]);
         if (!isset($tz["bias"]))
             ZLog::Write(LOGLEVEL_WARN, "TimezoneUtil::FillTZNames() submitted TZ array does not have a bias");
         else {
@@ -1143,10 +1143,10 @@ 
         // try to find a quite exact match
         foreach (self::$tzonesoffsets as $tzname => $tzoffset) {
             if ($offset["bias"] == $tzoffset[0] &&
-                isset($offset["dstendmonth"])   && $offset["dstendmonth"] == $tzoffset[4] &&
-                isset($offset["dstendday"])     && $offset["dstendday"] == $tzoffset[6] &&
+                isset($offset["dstendmonth"]) && $offset["dstendmonth"] == $tzoffset[4] &&
+                isset($offset["dstendday"]) && $offset["dstendday"] == $tzoffset[6] &&
                 isset($offset["dststartmonth"]) && $offset["dststartmonth"] == $tzoffset[12] &&
-                isset($offset["dststartday"])   && $offset["dststartday"] == $tzoffset[14])
+                isset($offset["dststartday"]) && $offset["dststartday"] == $tzoffset[14])
                 return $tzname;
         }
 
@@ -1235,7 +1235,7 @@ 
      * @return string
      */
     static private function encodeTZName($name) {
-        return substr(iconv('UTF-8', 'UTF-16', $name),2,-1);
+        return substr(iconv('UTF-8', 'UTF-16', $name), 2, -1);
     }
 
     /**
@@ -1248,7 +1248,7 @@ 
     static public 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";
         }
 
         foreach (self::$tzonesoffsets as $tzname => $offset) {
@@ -1277,7 +1277,7 @@ 
         if (!isset($tz["tzname"]) || !$tz["tzname"] || !isset($tz["tznamedst"]) || !$tz["tznamedst"])
             $tz = TimezoneUtil::FillTZNames($tz);
 
-        $packed = pack("la64vvvvvvvv" . "la64vvvvvvvv" . "l",
+        $packed = pack("la64vvvvvvvv"."la64vvvvvvvv"."l",
                 $tz["bias"], $tz["tzname"], 0, $tz["dstendmonth"], $tz["dstendday"], $tz["dstendweek"], $tz["dstendhour"], $tz["dstendminute"], $tz["dstendsecond"], $tz["dstendmillis"],
                 $tz["stdbias"], $tz["tznamedst"], 0, $tz["dststartmonth"], $tz["dststartday"], $tz["dststartweek"], $tz["dststarthour"], $tz["dststartminute"], $tz["dststartsecond"], $tz["dststartmillis"],
                 $tz["dstbias"]);
@@ -1311,7 +1311,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);
     }
@@ -1328,15 +1328,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, '"'));
     }

Braces +27 added lines, -19 removed lines

@@ -1060,8 +1060,9 @@ 
      * @return array
      */
     static public function GetFullTZ($phptimezone = false) {
-        if ($phptimezone === false)
-            $phptimezone = date_default_timezone_get();
+        if ($phptimezone === false) {
+                    $phptimezone = date_default_timezone_get();
+        }
 
         ZLog::Write(LOGLEVEL_DEBUG, "TimezoneUtil::GetFullTZ() for ". $phptimezone);
 
@@ -1122,9 +1123,9 @@ 
      */
     static public function FillTZNames($tz) {
         ZLog::Write(LOGLEVEL_DEBUG, "TimezoneUtil::FillTZNames() filling up bias ". $tz["bias"]);
-        if (!isset($tz["bias"]))
-            ZLog::Write(LOGLEVEL_WARN, "TimezoneUtil::FillTZNames() submitted TZ array does not have a bias");
-        else {
+        if (!isset($tz["bias"])) {
+                    ZLog::Write(LOGLEVEL_WARN, "TimezoneUtil::FillTZNames() submitted TZ array does not have a bias");
+        } else {
             $tzname = self::guessTZNameFromOffset($tz);
             $tz['tzname'] = $tz['tznamedst'] = self::encodeTZName(self::getMSTZnameFromTZName($tzname));
         }
@@ -1146,14 +1147,16 @@ 
                 isset($offset["dstendmonth"])   && $offset["dstendmonth"] == $tzoffset[4] &&
                 isset($offset["dstendday"])     && $offset["dstendday"] == $tzoffset[6] &&
                 isset($offset["dststartmonth"]) && $offset["dststartmonth"] == $tzoffset[12] &&
-                isset($offset["dststartday"])   && $offset["dststartday"] == $tzoffset[14])
-                return $tzname;
+                isset($offset["dststartday"])   && $offset["dststartday"] == $tzoffset[14]) {
+                            return $tzname;
+            }
         }
 
         // try to find a bias match
         foreach (self::$tzonesoffsets as $tzname => $tzoffset) {
-            if ($offset["bias"] == $tzoffset[0])
-                return $tzname;
+            if ($offset["bias"] == $tzoffset[0]) {
+                            return $tzname;
+            }
         }
 
         // nothing found? return gmt
@@ -1198,8 +1201,9 @@ 
         }
 
         foreach (self::$mstzones as $mskey => $msdefs) {
-            if ($name == $msdefs[0])
-                return $msdefs[1];
+            if ($name == $msdefs[0]) {
+                            return $msdefs[1];
+            }
         }
 
         // Not found? Then retrieve the correct TZName first and try again.
@@ -1217,8 +1221,9 @@ 
         }
         if ($tzName != '') {
             foreach (self::$mstzones as $mskey => $msdefs) {
-                if ($tzName == $msdefs[0])
-                    return $msdefs[1];
+                if ($tzName == $msdefs[0]) {
+                                    return $msdefs[1];
+                }
             }
         }
 
@@ -1247,8 +1252,9 @@ 
      */
     static public 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";
+            if (!array_key_exists($msdefs[0], self::$tzonesoffsets)) {
+                            echo "key   '". $msdefs[0]. "'   not found in tzonesoffsets\n";
+            }
         }
 
         foreach (self::$tzonesoffsets as $tzname => $offset) {
@@ -1259,8 +1265,9 @@ 
                     break;
                 }
             }
-            if (!$found)
-                echo "key    '$tzname' NOT FOUND\n";
+            if (!$found) {
+                            echo "key    '$tzname' NOT FOUND\n";
+            }
         }
     }
 
@@ -1274,8 +1281,9 @@ 
      */
     static public function GetSyncBlobFromTZ($tz) {
         // set the correct TZ name (done using the Bias)
-        if (!isset($tz["tzname"]) || !$tz["tzname"] || !isset($tz["tznamedst"]) || !$tz["tznamedst"])
-            $tz = TimezoneUtil::FillTZNames($tz);
+        if (!isset($tz["tzname"]) || !$tz["tzname"] || !isset($tz["tznamedst"]) || !$tz["tznamedst"]) {
+                    $tz = TimezoneUtil::FillTZNames($tz);
+        }
 
         $packed = pack("la64vvvvvvvv" . "la64vvvvvvvv" . "l",
                 $tz["bias"], $tz["tzname"], 0, $tz["dstendmonth"], $tz["dstendday"], $tz["dstendweek"], $tz["dstendhour"], $tz["dstendminute"], $tz["dstendsecond"], $tz["dstendmillis"],

lib/exceptions/httpreturncodeexception.php

Spacing +1 added lines, -1 removed lines

@@ -14,6 +14,6 @@
     public function __construct($message = "", $code = 0, $previous = NULL, $logLevel = false) {
         if ($code)
             $this->httpReturnCode = $code;
-        parent::__construct($message, (int) $code, $previous, $logLevel);
+        parent::__construct($message, (int)$code, $previous, $logLevel);
     }
 }

Braces +3 added lines, -2 removed lines

@@ -12,8 +12,9 @@
     protected $showLegal = false;
 
     public function __construct($message = "", $code = 0, $previous = NULL, $logLevel = false) {
-        if ($code)
-            $this->httpReturnCode = $code;
+        if ($code) {
+                    $this->httpReturnCode = $code;
+        }
         parent::__construct($message, (int) $code, $previous, $logLevel);
     }
 }

lib/exceptions/zpushexception.php

Spacing +4 added lines, -4 removed lines

@@ -15,18 +15,18 @@
     protected $showLegal = true;
 
     public function __construct($message = "", $code = 0, $previous = NULL, $logLevel = false) {
-        if (! $message)
+        if (!$message)
             $message = $this->httpReturnMessage;
 
         if (!$logLevel)
             $logLevel = $this->defaultLogLevel;
 
-        parent::__construct($message, (int) $code);
-        ZLog::Write($logLevel, get_class($this) .': '. $message . ' - code: '.$code. ' - file: '. $this->getFile().':'.$this->getLine(), false);
+        parent::__construct($message, (int)$code);
+        ZLog::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() {

Braces +6 added lines, -4 removed lines

@@ -15,11 +15,13 @@
     protected $showLegal = true;
 
     public function __construct($message = "", $code = 0, $previous = NULL, $logLevel = false) {
-        if (! $message)
-            $message = $this->httpReturnMessage;
+        if (! $message) {
+                    $message = $this->httpReturnMessage;
+        }
 
-        if (!$logLevel)
-            $logLevel = $this->defaultLogLevel;
+        if (!$logLevel) {
+                    $logLevel = $this->defaultLogLevel;
+        }
 
         parent::__construct($message, (int) $code);
         ZLog::Write($logLevel, get_class($this) .': '. $message . ' - code: '.$code. ' - file: '. $this->getFile().':'.$this->getLine(), false);

lib/exceptions/serviceunavailableexception.php

Indentation +11 added lines, -11 removed lines

@@ -8,16 +8,16 @@
  */
 
 class ServiceUnavailableException extends HTTPReturnCodeException {
-	protected $defaultLogLevel = LOGLEVEL_INFO;
-	protected $httpReturnCode = HTTP_CODE_503;
-	protected $httpReturnMessage = "Service Unavailable";
-	protected $httpHeaders = array();
-	protected $showLegal = false;
+    protected $defaultLogLevel = LOGLEVEL_INFO;
+    protected $httpReturnCode = HTTP_CODE_503;
+    protected $httpReturnMessage = "Service Unavailable";
+    protected $httpHeaders = array();
+    protected $showLegal = false;
 
-	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;
-		}
-	}
+    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;
+        }
+    }
 }

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

grommunio-sync-top.php

Spacing +69 added lines, -69 removed lines

@@ -16,11 +16,11 @@ 
 /************************************************
  * MAIN
  */
-    declare(ticks = 1);
-    define('BASE_PATH_CLI',  dirname(__FILE__) ."/");
-    set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH_CLI);
+    declare(ticks=1);
+    define('BASE_PATH_CLI', dirname(__FILE__)."/");
+    set_include_path(get_include_path().PATH_SEPARATOR.BASE_PATH_CLI);
 
-    if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', BASE_PATH_CLI . 'config.php');
+    if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', BASE_PATH_CLI.'config.php');
     include_once(ZPUSH_CONFIG);
 
     try {
@@ -49,7 +49,7 @@ 
             echo "grommunio-sync interprocess communication (IPC) is not available or TopCollector is disabled.\n";
     }
     catch (ZPushException $zpe) {
-        fwrite(STDERR, get_class($zpe) . ": ". $zpe->getMessage() . "\n");
+        fwrite(STDERR, get_class($zpe).": ".$zpe->getMessage()."\n");
         exit(1);
     }
 
@@ -177,7 +177,7 @@ 
             // wait for user input
             $this->readLineProcess();
         }
-        while($this->terminate != true);
+        while ($this->terminate != true);
     }
 
     /**
@@ -233,20 +233,20 @@ 
                         if ($line['push'] === true) $this->pushConn += 1;
 
                         // ignore push connections
-                        if ($line['push'] === true && ! $this->showPush)
+                        if ($line['push'] === true && !$this->showPush)
                             continue;
 
                         if ($this->filter !== false) {
                             $f = $this->filter;
                             if (!($line["pid"] == $f || $line["ip"] == $f || strtolower($line['command']) == strtolower($f) || preg_match("/.*?$f.*?/i", $line['user']) ||
-                                preg_match("/.*?$f.*?/i", $line['devagent']) || preg_match("/.*?$f.*?/i", $line['devid']) || preg_match("/.*?$f.*?/i", $line['addinfo']) ))
+                                preg_match("/.*?$f.*?/i", $line['devagent']) || preg_match("/.*?$f.*?/i", $line['devid']) || preg_match("/.*?$f.*?/i", $line['addinfo'])))
                                 continue;
                         }
 
                         $lastUpdate = $this->currenttime - $line["update"];
                         if ($this->currenttime - $line["update"] < 2)
                             $this->linesActive[$line["update"].$line["pid"]] = $line;
-                        else if (($line['push'] === true  && $lastUpdate > ($this->pingInterval+2)) || ($line['push'] !== true  && $lastUpdate > 4))
+                        else if (($line['push'] === true && $lastUpdate > ($this->pingInterval + 2)) || ($line['push'] !== true && $lastUpdate > 4))
                             $this->linesUnknown[$line["update"].$line["pid"]] = $line;
                         else
                             $this->linesOpen[$line["update"].$line["pid"]] = $line;
@@ -259,7 +259,7 @@ 
                         if ($this->filter !== false) {
                             $f = $this->filter;
                             if (!($line['pid'] == $f || $line['ip'] == $f || strtolower($line['command']) == strtolower($f) || preg_match("/.*?$f.*?/i", $line['user']) ||
-                                preg_match("/.*?$f.*?/i", $line['devagent']) || preg_match("/.*?$f.*?/i", $line['devid']) || preg_match("/.*?$f.*?/i", $line['addinfo']) ))
+                                preg_match("/.*?$f.*?/i", $line['devagent']) || preg_match("/.*?$f.*?/i", $line['devid']) || preg_match("/.*?$f.*?/i", $line['addinfo'])))
                                 continue;
                         }
 
@@ -286,23 +286,23 @@ 
     private function scrOverview() {
         $linesAvail = $this->scrSize['height'] - 8;
         $lc = 1;
-        $this->scrPrintAt($lc,0, "\033[1mgrommunio-sync-top live statistics\033[0m\t\t\t\t\t". @strftime("%d/%m/%Y %T")."\n"); $lc++;
+        $this->scrPrintAt($lc, 0, "\033[1mgrommunio-sync-top live statistics\033[0m\t\t\t\t\t".@strftime("%d/%m/%Y %T")."\n"); $lc++;
 
-        $this->scrPrintAt($lc,0, sprintf("Open connections: %d\t\t\t\tUsers:\t %d\tgrommunio-sync:   %s ",count($this->activeConn),count($this->activeUsers), $this->getVersion())); $lc++;
-        $this->scrPrintAt($lc,0, sprintf("Push connections: %d\t\t\t\tDevices: %d\tPHP-MAPI: %s", $this->pushConn, count($this->activeDevices),phpversion("mapi"))); $lc++;
-        $this->scrPrintAt($lc,0, sprintf("                                                Hosts:\t %d", count($this->activeHosts))); $lc++;
+        $this->scrPrintAt($lc, 0, sprintf("Open connections: %d\t\t\t\tUsers:\t %d\tgrommunio-sync:   %s ", count($this->activeConn), count($this->activeUsers), $this->getVersion())); $lc++;
+        $this->scrPrintAt($lc, 0, sprintf("Push connections: %d\t\t\t\tDevices: %d\tPHP-MAPI: %s", $this->pushConn, count($this->activeDevices), phpversion("mapi"))); $lc++;
+        $this->scrPrintAt($lc, 0, sprintf("                                                Hosts:\t %d", count($this->activeHosts))); $lc++;
         $lc++;
 
-        $this->scrPrintAt($lc,0, "\033[4m". $this->getLine(array('pid'=>'PID', 'ip'=>'IP', 'user'=>'USER', 'command'=>'COMMAND', 'time'=>'TIME', 'devagent'=>'AGENT', 'devid'=>'DEVID', 'addinfo'=>'Additional Information')). str_repeat(" ",20)."\033[0m"); $lc++;
+        $this->scrPrintAt($lc, 0, "\033[4m".$this->getLine(array('pid'=>'PID', 'ip'=>'IP', 'user'=>'USER', 'command'=>'COMMAND', 'time'=>'TIME', 'devagent'=>'AGENT', 'devid'=>'DEVID', 'addinfo'=>'Additional Information')).str_repeat(" ", 20)."\033[0m"); $lc++;
 
         // print help text if requested
         $hl = 0;
         if ($this->helpexpire > $this->currenttime) {
             $help = $this->scrHelp();
             $linesAvail -= count($help);
-            $hl = $this->scrSize['height'] - count($help) -1;
+            $hl = $this->scrSize['height'] - count($help) - 1;
             foreach ($help as $h) {
-                $this->scrPrintAt($hl,0, $h);
+                $this->scrPrintAt($hl, 0, $h);
                 $hl++;
             }
         }
@@ -316,7 +316,7 @@ 
         if (count($this->linesActive) + count($this->linesOpen) + count($this->linesUnknown) > $linesAvail) {
             $toPrintUnknown = count($this->linesUnknown);
             $toPrintActive = count($this->linesActive);
-            $toPrintOpen = $linesAvail-$toPrintUnknown-$toPrintActive;
+            $toPrintOpen = $linesAvail - $toPrintUnknown - $toPrintActive;
             $toPrintTerm = 0;
         }
 
@@ -339,7 +339,7 @@ 
             if ($linesprinted >= $toPrintActive)
                 break;
 
-            $this->scrPrintAt($lc,0, "\033[01m" . $this->getLine($l)  ."\033[0m");
+            $this->scrPrintAt($lc, 0, "\033[01m".$this->getLine($l)."\033[0m");
             $lc++;
             $linesprinted++;
         }
@@ -349,7 +349,7 @@ 
             if ($linesprinted >= $toPrintOpen)
                 break;
 
-            $this->scrPrintAt($lc,0, $this->getLine($l));
+            $this->scrPrintAt($lc, 0, $this->getLine($l));
             $lc++;
             $linesprinted++;
         }
@@ -362,28 +362,28 @@ 
             $color = "0;31m";
             if ($l['push'] == false && $time - $l["start"] > 30)
                 $color = "1;31m";
-            $this->scrPrintAt($lc,0, "\033[0". $color . $this->getLine($l)  ."\033[0m");
+            $this->scrPrintAt($lc, 0, "\033[0".$color.$this->getLine($l)."\033[0m");
             $lc++;
             $linesprinted++;
         }
 
         if ($toPrintTerm > 0)
-            $toPrintTerm = $linesAvail - $lc +6;
+            $toPrintTerm = $linesAvail - $lc + 6;
 
         $linesprinted = 0;
-        foreach ($this->linesTerm as $time=>$l){
+        foreach ($this->linesTerm as $time=>$l) {
             if ($linesprinted >= $toPrintTerm)
                 break;
 
-            $this->scrPrintAt($lc,0, "\033[01;30m" . $this->getLine($l)  ."\033[0m");
+            $this->scrPrintAt($lc, 0, "\033[01;30m".$this->getLine($l)."\033[0m");
             $lc++;
             $linesprinted++;
         }
 
         // add the lines used when displaying the help text
         $lc += $hl;
-        $this->scrPrintAt($lc,0, "\033[K"); $lc++;
-        $this->scrPrintAt($lc,0, "Colorscheme: \033[01mActive  \033[0mOpen  \033[01;31mUnknown  \033[01;30mTerminated\033[0m");
+        $this->scrPrintAt($lc, 0, "\033[K"); $lc++;
+        $this->scrPrintAt($lc, 0, "Colorscheme: \033[01mActive  \033[0mOpen  \033[01;31mUnknown  \033[01;30mTerminated\033[0m");
 
         // remove old status
         if ($this->statusexpire < $this->currenttime)
@@ -391,13 +391,13 @@ 
 
         // show request information and help command
         if ($this->starttime + 6 > $this->currenttime) {
-            $this->status = sprintf("Requesting information (takes up to %dsecs)", $this->pingInterval). str_repeat(".", ($this->currenttime-$this->starttime)) . "  type \033[01;31mh\033[00;31m or \033[01;31mhelp\033[00;31m for usage instructions";
-            $this->statusexpire = $this->currenttime+1;
+            $this->status = sprintf("Requesting information (takes up to %dsecs)", $this->pingInterval).str_repeat(".", ($this->currenttime - $this->starttime))."  type \033[01;31mh\033[00;31m or \033[01;31mhelp\033[00;31m for usage instructions";
+            $this->statusexpire = $this->currenttime + 1;
         }
 
 
         $str = "";
-        if (! $this->showPush)
+        if (!$this->showPush)
             $str .= "\033[00;32mPush: \033[01;32mNo\033[0m   ";
 
         if ($this->showOption == self::SHOW_ACTIVE_ONLY)
@@ -407,7 +407,7 @@ 
             $str .= "\033[01;32mUnknown only\033[0m   ";
 
         if ($this->showTermSec != self::SHOW_TERM_DEFAULT_TIME)
-            $str .= "\033[01;32mTerminated: ". $this->showTermSec. "s\033[0m   ";
+            $str .= "\033[01;32mTerminated: ".$this->showTermSec."s\033[0m   ";
 
         if ($this->filter !== false || ($this->status !== false && $this->statusexpire > $this->currenttime)) {
             // print filter in green
@@ -417,9 +417,9 @@ 
             if ($this->status !== false)
                 $str .= "\033[00;31m$this->status\033[0m";
         }
-        $this->scrPrintAt(5,0, $str);
+        $this->scrPrintAt(5, 0, $str);
 
-        $this->scrPrintAt(4,0,"Action: \033[01m".$this->action . "\033[0m");
+        $this->scrPrintAt(4, 0, "Action: \033[01m".$this->action."\033[0m");
     }
 
     /**
@@ -433,14 +433,14 @@ 
 
         if ($ans[0] < 128) {
             if (isset($ans[1]) && bin2hex(trim($ans[1])) == "7f") {
-                $this->action = substr($this->action,0,-1);
+                $this->action = substr($this->action, 0, -1);
             }
 
-            if (isset($ans[1]) && $ans[1] != "" ){
-                $this->action .= trim(preg_replace("/[^A-Za-z0-9:]/","",$ans[1]));
+            if (isset($ans[1]) && $ans[1] != "") {
+                $this->action .= trim(preg_replace("/[^A-Za-z0-9:]/", "", $ans[1]));
             }
 
-            if (bin2hex($ans[0]) == "30" && bin2hex($ans[1]) == "0a")  {
+            if (bin2hex($ans[0]) == "30" && bin2hex($ans[1]) == "0a") {
                 $cmds = explode(':', $this->action);
                 if ($cmds[0] == "quit" || $cmds[0] == "q" || (isset($cmds[1]) && $cmds[0] == "" && $cmds[1] == "q")) {
                     $this->topCollector->CollectData(true);
@@ -448,7 +448,7 @@ 
 
                     $this->terminate = true;
                 }
-                else if ($cmds[0] == "clear" ) {
+                else if ($cmds[0] == "clear") {
                     $this->topCollector->ClearLatest(true);
                     $this->topCollector->CollectData(true);
                     $this->topCollector->ReInitIPC();
@@ -457,7 +457,7 @@ 
                     if (!isset($cmds[1]) || $cmds[1] == "") {
                         $this->filter = false;
                         $this->status = "No filter";
-                        $this->statusexpire = $this->currenttime+5;
+                        $this->statusexpire = $this->currenttime + 5;
                     }
                     else {
                         $this->filter = $cmds[1];
@@ -467,7 +467,7 @@ 
                 else if ($cmds[0] == "option" || $cmds[0] == "o") {
                     if (!isset($cmds[1]) || $cmds[1] == "") {
                         $this->status = "Option value needs to be specified. See 'help' or 'h' for instructions";
-                        $this->statusexpire = $this->currenttime+5;
+                        $this->statusexpire = $this->currenttime + 5;
                     }
                     else if ($cmds[1] == "p" || $cmds[1] == "push" || $cmds[1] == "ping")
                         $this->showPush = !$this->showPush;
@@ -484,7 +484,7 @@ 
                         $this->showTermSec = $cmds[1];
                     else {
                         $this->status = sprintf("Option '%s' unknown", $cmds[1]);
-                        $this->statusexpire = $this->currenttime+5;
+                        $this->statusexpire = $this->currenttime + 5;
                     }
                 }
                 else if ($cmds[0] == "reset" || $cmds[0] == "r") {
@@ -492,66 +492,66 @@ 
                     $this->wide = false;
                     $this->helpexpire = 0;
                     $this->status = "reset";
-                    $this->statusexpire = $this->currenttime+2;
+                    $this->statusexpire = $this->currenttime + 2;
                 }
                 // enable/disable wide view
                 else if ($cmds[0] == "wide" || $cmds[0] == "w") {
-                    $this->wide = ! $this->wide;
-                    $this->status = ($this->wide)?"w i d e  view" : "normal view";
-                    $this->statusexpire = $this->currenttime+2;
+                    $this->wide = !$this->wide;
+                    $this->status = ($this->wide) ? "w i d e  view" : "normal view";
+                    $this->statusexpire = $this->currenttime + 2;
                 }
                 else if ($cmds[0] == "help" || $cmds[0] == "h") {
-                    $this->helpexpire = $this->currenttime+20;
+                    $this->helpexpire = $this->currenttime + 20;
                 }
                 // grep the log file
-                else if (($cmds[0] == "log" || $cmds[0] == "l") && isset($cmds[1]) ) {
+                else if (($cmds[0] == "log" || $cmds[0] == "l") && isset($cmds[1])) {
                     if (!file_exists(LOGFILE)) {
-                        $this->status = "Logfile can not be found: ". LOGFILE;
+                        $this->status = "Logfile can not be found: ".LOGFILE;
                     }
                     else {
-                        system('bash -c "fgrep -a '.escapeshellarg($cmds[1]).' '. LOGFILE .' | less +G" > `tty`');
+                        system('bash -c "fgrep -a '.escapeshellarg($cmds[1]).' '.LOGFILE.' | less +G" > `tty`');
                         $this->status = "Returning from log, updating data";
                     }
-                    $this->statusexpire = time()+5; // it might be much "later" now
+                    $this->statusexpire = time() + 5; // it might be much "later" now
                 }
                 // tail the log file
                 else if (($cmds[0] == "tail" || $cmds[0] == "t")) {
                     if (!file_exists(LOGFILE)) {
-                        $this->status = "Logfile can not be found: ". LOGFILE;
+                        $this->status = "Logfile can not be found: ".LOGFILE;
                     }
                     else {
                         $this->doingTail = true;
                         $this->scrClear();
-                        $this->scrPrintAt(1,0,$this->scrAsBold("Press CTRL+C to return to grommunio-sync-top\n\n"));
+                        $this->scrPrintAt(1, 0, $this->scrAsBold("Press CTRL+C to return to grommunio-sync-top\n\n"));
                         $secondary = "";
-                        if (isset($cmds[1])) $secondary =  " -n 200 | grep ".escapeshellarg($cmds[1]);
-                        system('bash -c "tail -f '. LOGFILE . $secondary . '" > `tty`');
+                        if (isset($cmds[1])) $secondary = " -n 200 | grep ".escapeshellarg($cmds[1]);
+                        system('bash -c "tail -f '.LOGFILE.$secondary.'" > `tty`');
                         $this->doingTail = false;
                         $this->status = "Returning from tail, updating data";
                     }
-                    $this->statusexpire = time()+5; // it might be much "later" now
+                    $this->statusexpire = time() + 5; // it might be much "later" now
                 }
                 // tail the error log file
                 else if (($cmds[0] == "error" || $cmds[0] == "e")) {
                     if (!file_exists(LOGERRORFILE)) {
-                        $this->status = "Error logfile can not be found: ". LOGERRORFILE;
+                        $this->status = "Error logfile can not be found: ".LOGERRORFILE;
                     }
                     else {
                         $this->doingTail = true;
                         $this->scrClear();
-                        $this->scrPrintAt(1,0,$this->scrAsBold("Press CTRL+C to return to grommunio-sync-top\n\n"));
+                        $this->scrPrintAt(1, 0, $this->scrAsBold("Press CTRL+C to return to grommunio-sync-top\n\n"));
                         $secondary = "";
-                        if (isset($cmds[1])) $secondary =  " -n 200 | grep ".escapeshellarg($cmds[1]);
-                        system('bash -c "tail -f '. LOGERRORFILE . $secondary . '" > `tty`');
+                        if (isset($cmds[1])) $secondary = " -n 200 | grep ".escapeshellarg($cmds[1]);
+                        system('bash -c "tail -f '.LOGERRORFILE.$secondary.'" > `tty`');
                         $this->doingTail = false;
                         $this->status = "Returning from tail, updating data";
                     }
-                    $this->statusexpire = time()+5; // it might be much "later" now
+                    $this->statusexpire = time() + 5; // it might be much "later" now
                 }
 
                 else if ($cmds[0] != "") {
                     $this->status = sprintf("Command '%s' unknown", $cmds[0]);
-                    $this->statusexpire = $this->currenttime+8;
+                    $this->statusexpire = $this->currenttime + 8;
                 }
                 $this->action = "";
             }
@@ -582,7 +582,7 @@ 
      * @access public
      */
     public function UsageInstructions() {
-        $help = "Usage:\n\tgrommunio-sync-top.php\n\n" .
+        $help = "Usage:\n\tgrommunio-sync-top.php\n\n".
                 "  grommunio-sync-top is a live top-like overview of what grommunio-sync is doing. It does not have specific command line options.\n\n".
                 "  When grommunio-sync-top is running you can specify certain actions and options which can be executed (listed below).\n".
                 "  This help information can also be shown inside grommunio-sync-top by hitting 'help' or 'h'.\n\n";
@@ -634,7 +634,7 @@ 
      * @return string       same text as bold
      */
     private function scrAsBold($text) {
-        return "\033[01m" . $text  ."\033[0m";
+        return "\033[01m".$text."\033[0m";
     }
 
     /**
@@ -647,9 +647,9 @@ 
      */
     private function getLine($l) {
         if ($this->wide === true)
-            return sprintf("%s%s%s%s%s%s%s%s", $this->ptStr($l['pid'],6), $this->ptStr($l['ip'],16), $this->ptStr($l['user'],24), $this->ptStr($l['command'],16), $this->ptStr($this->sec2min($l['time']),8), $this->ptStr($l['devagent'],28), $this->ptStr($l['devid'],33, true), $l['addinfo']);
+            return sprintf("%s%s%s%s%s%s%s%s", $this->ptStr($l['pid'], 6), $this->ptStr($l['ip'], 16), $this->ptStr($l['user'], 24), $this->ptStr($l['command'], 16), $this->ptStr($this->sec2min($l['time']), 8), $this->ptStr($l['devagent'], 28), $this->ptStr($l['devid'], 33, true), $l['addinfo']);
         else
-            return sprintf("%s%s%s%s%s%s%s%s", $this->ptStr($l['pid'],6), $this->ptStr($l['ip'],16), $this->ptStr($l['user'],8), $this->ptStr($l['command'],8), $this->ptStr($this->sec2min($l['time']),6), $this->ptStr($l['devagent'],20), $this->ptStr($l['devid'],12, true), $l['addinfo']);
+            return sprintf("%s%s%s%s%s%s%s%s", $this->ptStr($l['pid'], 6), $this->ptStr($l['ip'], 16), $this->ptStr($l['user'], 8), $this->ptStr($l['command'], 8), $this->ptStr($this->sec2min($l['time']), 6), $this->ptStr($l['devagent'], 20), $this->ptStr($l['devid'], 12, true), $l['addinfo']);
     }
 
     /**
@@ -667,11 +667,11 @@ 
         if (strlen($str) < $size)
             return str_pad($str, $size);
         else if ($cutmiddle == true) {
-            $cut = ($size-2)/2;
-            return $this->ptStr(substr($str,0,$cut) ."..". substr($str,(-1)*($cut-1)), $size);
+            $cut = ($size - 2) / 2;
+            return $this->ptStr(substr($str, 0, $cut)."..".substr($str, (-1) * ($cut - 1)), $size);
         }
         else {
-            return substr($str,0,$size-3).".. ";
+            return substr($str, 0, $size - 3).".. ";
         }
     }
 
@@ -711,7 +711,7 @@ 
     private function sec2min($s) {
         if (!is_int($s))
             return $s;
-        return sprintf("%02.2d:%02.2d", floor($s/60), $s%60);
+        return sprintf("%02.2d:%02.2d", floor($s / 60), $s % 60);
     }
 
     /**
@@ -746,7 +746,7 @@ 
      * @access private
      * @return
      */
-    private function scrPrintAt($row, $col, $text="") {
+    private function scrPrintAt($row, $col, $text = "") {
         echo "\033[".$row.";".$col."H".$text;
     }
 

Braces +132 added lines, -111 removed lines

@@ -10,7 +10,9 @@ 
  */
 
 require_once 'vendor/autoload.php';
-if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', 'config.php');
+if (!defined('ZPUSH_CONFIG')) {
+    define('ZPUSH_CONFIG', 'config.php');
+}
 include_once(ZPUSH_CONFIG);
 
 /************************************************
@@ -20,16 +22,20 @@ 
     define('BASE_PATH_CLI',  dirname(__FILE__) ."/");
     set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH_CLI);
 
-    if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', BASE_PATH_CLI . 'config.php');
+    if (!defined('ZPUSH_CONFIG')) {
+        define('ZPUSH_CONFIG', BASE_PATH_CLI . 'config.php');
+    }
     include_once(ZPUSH_CONFIG);
 
     try {
         ZPush::CheckConfig();
-        if (!function_exists("pcntl_signal"))
-            throw new FatalException("Function pcntl_signal() is not available. Please install package 'php5-pcntl' (or similar) on your system.");
+        if (!function_exists("pcntl_signal")) {
+                    throw new FatalException("Function pcntl_signal() is not available. Please install package 'php5-pcntl' (or similar) on your system.");
+        }
 
-        if (php_sapi_name() != "cli")
-            throw new FatalException("This script can only be called from the CLI.");
+        if (php_sapi_name() != "cli") {
+                    throw new FatalException("This script can only be called from the CLI.");
+        }
 
         $zpt = new ZPushTop();
 
@@ -44,11 +50,10 @@ 
             $zpt->run();
             $zpt->scrClear();
             system("stty sane");
+        } else {
+                    echo "grommunio-sync interprocess communication (IPC) is not available or TopCollector is disabled.\n";
         }
-        else
-            echo "grommunio-sync interprocess communication (IPC) is not available or TopCollector is disabled.\n";
-    }
-    catch (ZPushException $zpe) {
+    } catch (ZPushException $zpe) {
         fwrite(STDERR, get_class($zpe) . ": ". $zpe->getMessage() . "\n");
         exit(1);
     }
@@ -147,8 +152,9 @@ 
             $this->currenttime = time();
 
             // see if shared memory is active
-            if (!$this->IsAvailable())
-                $this->terminate = true;
+            if (!$this->IsAvailable()) {
+                            $this->terminate = true;
+            }
 
             // active processes should continue sending data
             $this->topCollector->CollectData();
@@ -164,10 +170,11 @@ 
             // check if screen size changed
             $s = $this->scrGetSize();
             if ($this->scrSize['width'] != $s['width']) {
-                if ($s['width'] > 180)
-                    $this->wide = true;
-                else
-                    $this->wide = false;
+                if ($s['width'] > 180) {
+                                    $this->wide = true;
+                } else {
+                                    $this->wide = false;
+                }
             }
             $this->scrSize = $s;
 
@@ -212,14 +219,16 @@ 
         $this->activeUsers = array();
         $this->activeDevices = array();
 
-        if (!is_array($data))
-            return;
+        if (!is_array($data)) {
+                    return;
+        }
 
         foreach ($data as $devid=>$users) {
             foreach ($users as $user=>$pids) {
                 foreach ($pids as $pid=>$line) {
-                    if (!is_array($line))
-                        continue;
+                    if (!is_array($line)) {
+                                            continue;
+                    }
 
                     $line['command'] = Utils::GetCommandFromCode($line['command']);
 
@@ -230,37 +239,43 @@ 
                         $this->activeHosts[$line['ip']] = 1;
 
                         $line["time"] = $this->currenttime - $line['start'];
-                        if ($line['push'] === true) $this->pushConn += 1;
+                        if ($line['push'] === true) {
+                            $this->pushConn += 1;
+                        }
 
                         // ignore push connections
-                        if ($line['push'] === true && ! $this->showPush)
-                            continue;
+                        if ($line['push'] === true && ! $this->showPush) {
+                                                    continue;
+                        }
 
                         if ($this->filter !== false) {
                             $f = $this->filter;
                             if (!($line["pid"] == $f || $line["ip"] == $f || strtolower($line['command']) == strtolower($f) || preg_match("/.*?$f.*?/i", $line['user']) ||
-                                preg_match("/.*?$f.*?/i", $line['devagent']) || preg_match("/.*?$f.*?/i", $line['devid']) || preg_match("/.*?$f.*?/i", $line['addinfo']) ))
-                                continue;
+                                preg_match("/.*?$f.*?/i", $line['devagent']) || preg_match("/.*?$f.*?/i", $line['devid']) || preg_match("/.*?$f.*?/i", $line['addinfo']) )) {
+                                                            continue;
+                            }
                         }
 
                         $lastUpdate = $this->currenttime - $line["update"];
-                        if ($this->currenttime - $line["update"] < 2)
-                            $this->linesActive[$line["update"].$line["pid"]] = $line;
-                        else if (($line['push'] === true  && $lastUpdate > ($this->pingInterval+2)) || ($line['push'] !== true  && $lastUpdate > 4))
-                            $this->linesUnknown[$line["update"].$line["pid"]] = $line;
-                        else
-                            $this->linesOpen[$line["update"].$line["pid"]] = $line;
-                    }
-                    else {
+                        if ($this->currenttime - $line["update"] < 2) {
+                                                    $this->linesActive[$line["update"].$line["pid"]] = $line;
+                        } else if (($line['push'] === true  && $lastUpdate > ($this->pingInterval+2)) || ($line['push'] !== true  && $lastUpdate > 4)) {
+                                                    $this->linesUnknown[$line["update"].$line["pid"]] = $line;
+                        } else {
+                                                    $this->linesOpen[$line["update"].$line["pid"]] = $line;
+                        }
+                    } else {
                         // do not show terminated + expired connections
-                        if ($line['ended'] + $this->showTermSec < $this->currenttime)
-                            continue;
+                        if ($line['ended'] + $this->showTermSec < $this->currenttime) {
+                                                    continue;
+                        }
 
                         if ($this->filter !== false) {
                             $f = $this->filter;
                             if (!($line['pid'] == $f || $line['ip'] == $f || strtolower($line['command']) == strtolower($f) || preg_match("/.*?$f.*?/i", $line['user']) ||
-                                preg_match("/.*?$f.*?/i", $line['devagent']) || preg_match("/.*?$f.*?/i", $line['devid']) || preg_match("/.*?$f.*?/i", $line['addinfo']) ))
-                                continue;
+                                preg_match("/.*?$f.*?/i", $line['devagent']) || preg_match("/.*?$f.*?/i", $line['devid']) || preg_match("/.*?$f.*?/i", $line['addinfo']) )) {
+                                                            continue;
+                            }
                         }
 
                         $line['time'] = $line['ended'] - $line['start'];
@@ -336,8 +351,9 @@ 
 
         $linesprinted = 0;
         foreach ($this->linesActive as $time=>$l) {
-            if ($linesprinted >= $toPrintActive)
-                break;
+            if ($linesprinted >= $toPrintActive) {
+                            break;
+            }
 
             $this->scrPrintAt($lc,0, "\033[01m" . $this->getLine($l)  ."\033[0m");
             $lc++;
@@ -346,8 +362,9 @@ 
 
         $linesprinted = 0;
         foreach ($this->linesOpen as $time=>$l) {
-            if ($linesprinted >= $toPrintOpen)
-                break;
+            if ($linesprinted >= $toPrintOpen) {
+                            break;
+            }
 
             $this->scrPrintAt($lc,0, $this->getLine($l));
             $lc++;
@@ -356,24 +373,28 @@ 
 
         $linesprinted = 0;
         foreach ($this->linesUnknown as $time=>$l) {
-            if ($linesprinted >= $toPrintUnknown)
-                break;
+            if ($linesprinted >= $toPrintUnknown) {
+                            break;
+            }
 
             $color = "0;31m";
-            if ($l['push'] == false && $time - $l["start"] > 30)
-                $color = "1;31m";
+            if ($l['push'] == false && $time - $l["start"] > 30) {
+                            $color = "1;31m";
+            }
             $this->scrPrintAt($lc,0, "\033[0". $color . $this->getLine($l)  ."\033[0m");
             $lc++;
             $linesprinted++;
         }
 
-        if ($toPrintTerm > 0)
-            $toPrintTerm = $linesAvail - $lc +6;
+        if ($toPrintTerm > 0) {
+                    $toPrintTerm = $linesAvail - $lc +6;
+        }
 
         $linesprinted = 0;
         foreach ($this->linesTerm as $time=>$l){
-            if ($linesprinted >= $toPrintTerm)
-                break;
+            if ($linesprinted >= $toPrintTerm) {
+                            break;
+            }
 
             $this->scrPrintAt($lc,0, "\033[01;30m" . $this->getLine($l)  ."\033[0m");
             $lc++;
@@ -386,8 +407,9 @@ 
         $this->scrPrintAt($lc,0, "Colorscheme: \033[01mActive  \033[0mOpen  \033[01;31mUnknown  \033[01;30mTerminated\033[0m");
 
         // remove old status
-        if ($this->statusexpire < $this->currenttime)
-            $this->status = false;
+        if ($this->statusexpire < $this->currenttime) {
+                    $this->status = false;
+        }
 
         // show request information and help command
         if ($this->starttime + 6 > $this->currenttime) {
@@ -397,25 +419,31 @@ 
 
 
         $str = "";
-        if (! $this->showPush)
-            $str .= "\033[00;32mPush: \033[01;32mNo\033[0m   ";
+        if (! $this->showPush) {
+                    $str .= "\033[00;32mPush: \033[01;32mNo\033[0m   ";
+        }
 
-        if ($this->showOption == self::SHOW_ACTIVE_ONLY)
-            $str .= "\033[01;32mActive only\033[0m   ";
+        if ($this->showOption == self::SHOW_ACTIVE_ONLY) {
+                    $str .= "\033[01;32mActive only\033[0m   ";
+        }
 
-        if ($this->showOption == self::SHOW_UNKNOWN_ONLY)
-            $str .= "\033[01;32mUnknown only\033[0m   ";
+        if ($this->showOption == self::SHOW_UNKNOWN_ONLY) {
+                    $str .= "\033[01;32mUnknown only\033[0m   ";
+        }
 
-        if ($this->showTermSec != self::SHOW_TERM_DEFAULT_TIME)
-            $str .= "\033[01;32mTerminated: ". $this->showTermSec. "s\033[0m   ";
+        if ($this->showTermSec != self::SHOW_TERM_DEFAULT_TIME) {
+                    $str .= "\033[01;32mTerminated: ". $this->showTermSec. "s\033[0m   ";
+        }
 
         if ($this->filter !== false || ($this->status !== false && $this->statusexpire > $this->currenttime)) {
             // print filter in green
-            if ($this->filter !== false)
-                $str .= "\033[00;32mFilter: \033[01;32m$this->filter\033[0m   ";
+            if ($this->filter !== false) {
+                            $str .= "\033[00;32mFilter: \033[01;32m$this->filter\033[0m   ";
+            }
             // print status in red
-            if ($this->status !== false)
-                $str .= "\033[00;31m$this->status\033[0m";
+            if ($this->status !== false) {
+                            $str .= "\033[00;31m$this->status\033[0m";
+            }
         }
         $this->scrPrintAt(5,0, $str);
 
@@ -447,47 +475,40 @@ 
                     $this->topCollector->ClearLatest(true);
 
                     $this->terminate = true;
-                }
-                else if ($cmds[0] == "clear" ) {
+                } else if ($cmds[0] == "clear" ) {
                     $this->topCollector->ClearLatest(true);
                     $this->topCollector->CollectData(true);
                     $this->topCollector->ReInitIPC();
-                }
-                else if ($cmds[0] == "filter" || $cmds[0] == "f") {
+                } else if ($cmds[0] == "filter" || $cmds[0] == "f") {
                     if (!isset($cmds[1]) || $cmds[1] == "") {
                         $this->filter = false;
                         $this->status = "No filter";
                         $this->statusexpire = $this->currenttime+5;
-                    }
-                    else {
+                    } else {
                         $this->filter = $cmds[1];
                         $this->status = false;
                     }
-                }
-                else if ($cmds[0] == "option" || $cmds[0] == "o") {
+                } else if ($cmds[0] == "option" || $cmds[0] == "o") {
                     if (!isset($cmds[1]) || $cmds[1] == "") {
                         $this->status = "Option value needs to be specified. See 'help' or 'h' for instructions";
                         $this->statusexpire = $this->currenttime+5;
-                    }
-                    else if ($cmds[1] == "p" || $cmds[1] == "push" || $cmds[1] == "ping")
-                        $this->showPush = !$this->showPush;
-                    else if ($cmds[1] == "a" || $cmds[1] == "active")
-                        $this->showOption = self::SHOW_ACTIVE_ONLY;
-                    else if ($cmds[1] == "u" || $cmds[1] == "unknown")
-                        $this->showOption = self::SHOW_UNKNOWN_ONLY;
-                    else if ($cmds[1] == "d" || $cmds[1] == "default") {
+                    } else if ($cmds[1] == "p" || $cmds[1] == "push" || $cmds[1] == "ping") {
+                                            $this->showPush = !$this->showPush;
+                    } else if ($cmds[1] == "a" || $cmds[1] == "active") {
+                                            $this->showOption = self::SHOW_ACTIVE_ONLY;
+                    } else if ($cmds[1] == "u" || $cmds[1] == "unknown") {
+                                            $this->showOption = self::SHOW_UNKNOWN_ONLY;
+                    } else if ($cmds[1] == "d" || $cmds[1] == "default") {
                         $this->showOption = self::SHOW_DEFAULT;
                         $this->showTermSec = self::SHOW_TERM_DEFAULT_TIME;
                         $this->showPush = true;
-                    }
-                    else if (is_numeric($cmds[1]))
-                        $this->showTermSec = $cmds[1];
-                    else {
+                    } else if (is_numeric($cmds[1])) {
+                                            $this->showTermSec = $cmds[1];
+                    } else {
                         $this->status = sprintf("Option '%s' unknown", $cmds[1]);
                         $this->statusexpire = $this->currenttime+5;
                     }
-                }
-                else if ($cmds[0] == "reset" || $cmds[0] == "r") {
+                } else if ($cmds[0] == "reset" || $cmds[0] == "r") {
                     $this->filter = false;
                     $this->wide = false;
                     $this->helpexpire = 0;
@@ -499,16 +520,14 @@ 
                     $this->wide = ! $this->wide;
                     $this->status = ($this->wide)?"w i d e  view" : "normal view";
                     $this->statusexpire = $this->currenttime+2;
-                }
-                else if ($cmds[0] == "help" || $cmds[0] == "h") {
+                } else if ($cmds[0] == "help" || $cmds[0] == "h") {
                     $this->helpexpire = $this->currenttime+20;
                 }
                 // grep the log file
                 else if (($cmds[0] == "log" || $cmds[0] == "l") && isset($cmds[1]) ) {
                     if (!file_exists(LOGFILE)) {
                         $this->status = "Logfile can not be found: ". LOGFILE;
-                    }
-                    else {
+                    } else {
                         system('bash -c "fgrep -a '.escapeshellarg($cmds[1]).' '. LOGFILE .' | less +G" > `tty`');
                         $this->status = "Returning from log, updating data";
                     }
@@ -518,13 +537,14 @@ 
                 else if (($cmds[0] == "tail" || $cmds[0] == "t")) {
                     if (!file_exists(LOGFILE)) {
                         $this->status = "Logfile can not be found: ". LOGFILE;
-                    }
-                    else {
+                    } else {
                         $this->doingTail = true;
                         $this->scrClear();
                         $this->scrPrintAt(1,0,$this->scrAsBold("Press CTRL+C to return to grommunio-sync-top\n\n"));
                         $secondary = "";
-                        if (isset($cmds[1])) $secondary =  " -n 200 | grep ".escapeshellarg($cmds[1]);
+                        if (isset($cmds[1])) {
+                            $secondary =  " -n 200 | grep ".escapeshellarg($cmds[1]);
+                        }
                         system('bash -c "tail -f '. LOGFILE . $secondary . '" > `tty`');
                         $this->doingTail = false;
                         $this->status = "Returning from tail, updating data";
@@ -535,21 +555,20 @@ 
                 else if (($cmds[0] == "error" || $cmds[0] == "e")) {
                     if (!file_exists(LOGERRORFILE)) {
                         $this->status = "Error logfile can not be found: ". LOGERRORFILE;
-                    }
-                    else {
+                    } else {
                         $this->doingTail = true;
                         $this->scrClear();
                         $this->scrPrintAt(1,0,$this->scrAsBold("Press CTRL+C to return to grommunio-sync-top\n\n"));
                         $secondary = "";
-                        if (isset($cmds[1])) $secondary =  " -n 200 | grep ".escapeshellarg($cmds[1]);
+                        if (isset($cmds[1])) {
+                            $secondary =  " -n 200 | grep ".escapeshellarg($cmds[1]);
+                        }
                         system('bash -c "tail -f '. LOGERRORFILE . $secondary . '" > `tty`');
                         $this->doingTail = false;
                         $this->status = "Returning from tail, updating data";
                     }
                     $this->statusexpire = time()+5; // it might be much "later" now
-                }
-
-                else if ($cmds[0] != "") {
+                } else if ($cmds[0] != "") {
                     $this->status = sprintf("Command '%s' unknown", $cmds[0]);
                     $this->statusexpire = $this->currenttime+8;
                 }
@@ -646,10 +665,11 @@ 
      * @return string
      */
     private function getLine($l) {
-        if ($this->wide === true)
-            return sprintf("%s%s%s%s%s%s%s%s", $this->ptStr($l['pid'],6), $this->ptStr($l['ip'],16), $this->ptStr($l['user'],24), $this->ptStr($l['command'],16), $this->ptStr($this->sec2min($l['time']),8), $this->ptStr($l['devagent'],28), $this->ptStr($l['devid'],33, true), $l['addinfo']);
-        else
-            return sprintf("%s%s%s%s%s%s%s%s", $this->ptStr($l['pid'],6), $this->ptStr($l['ip'],16), $this->ptStr($l['user'],8), $this->ptStr($l['command'],8), $this->ptStr($this->sec2min($l['time']),6), $this->ptStr($l['devagent'],20), $this->ptStr($l['devid'],12, true), $l['addinfo']);
+        if ($this->wide === true) {
+                    return sprintf("%s%s%s%s%s%s%s%s", $this->ptStr($l['pid'],6), $this->ptStr($l['ip'],16), $this->ptStr($l['user'],24), $this->ptStr($l['command'],16), $this->ptStr($this->sec2min($l['time']),8), $this->ptStr($l['devagent'],28), $this->ptStr($l['devid'],33, true), $l['addinfo']);
+        } else {
+                    return sprintf("%s%s%s%s%s%s%s%s", $this->ptStr($l['pid'],6), $this->ptStr($l['ip'],16), $this->ptStr($l['user'],8), $this->ptStr($l['command'],8), $this->ptStr($this->sec2min($l['time']),6), $this->ptStr($l['devagent'],20), $this->ptStr($l['devid'],12, true), $l['addinfo']);
+        }
     }
 
     /**
@@ -664,13 +684,12 @@ 
      * @return string
      */
     private function ptStr($str, $size, $cutmiddle = false) {
-        if (strlen($str) < $size)
-            return str_pad($str, $size);
-        else if ($cutmiddle == true) {
+        if (strlen($str) < $size) {
+                    return str_pad($str, $size);
+        } else if ($cutmiddle == true) {
             $cut = ($size-2)/2;
             return $this->ptStr(substr($str,0,$cut) ."..". substr($str,(-1)*($cut-1)), $size);
-        }
-        else {
+        } else {
             return substr($str,0,$size-3).".. ";
         }
     }
@@ -684,8 +703,9 @@ 
     private function scrGetSize() {
         $tty = strtolower(exec('stty -a | fgrep columns'));
         if (preg_match_all("/rows.([0-9]+);.columns.([0-9]+);/", $tty, $output) ||
-            preg_match_all("/([0-9]+).rows;.([0-9]+).columns;/", $tty, $output))
-            return array('width' => $output[2][0], 'height' => $output[1][0]);
+            preg_match_all("/([0-9]+).rows;.([0-9]+).columns;/", $tty, $output)) {
+                    return array('width' => $output[2][0], 'height' => $output[1][0]);
+        }
 
         return array('width' => 80, 'height' => 24);
     }
@@ -709,8 +729,9 @@ 
      * @return string
      */
     private function sec2min($s) {
-        if (!is_int($s))
-            return $s;
+        if (!is_int($s)) {
+                    return $s;
+        }
         return sprintf("%02.2d:%02.2d", floor($s/60), $s%60);
     }