grommunio / grommunio-sync

lib/utils/timezoneutil.php

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

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

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

grommunio-sync-top.php

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

mapi/class.taskrequest.php

Braces +21 added lines, -9 removed lines

@@ -758,13 +758,19 @@ 
                 $store = $this->store;
             } else {
                 $ab = mapi_openaddressbook($this->session);
-                if(!$ab) return false;
+                if(!$ab) {
+                    return false;
+                }
 
                 $mailuser = mapi_ab_openentry($ab, $ownerentryid);
-                if(!$mailuser) return false;
+                if(!$mailuser) {
+                    return false;
+                }
 
                 $mailuserprops = mapi_getprops($mailuser, array(PR_EMAIL_ADDRESS));
-                if(!isset($mailuserprops[PR_EMAIL_ADDRESS])) return false;
+                if(!isset($mailuserprops[PR_EMAIL_ADDRESS])) {
+                    return false;
+                }
 
                 $storeid = mapi_msgstore_createentryid($this->store, $mailuserprops[PR_EMAIL_ADDRESS]);
 
@@ -783,8 +789,9 @@ 
 
             $inbox = mapi_msgstore_getreceivefolder($store);
             $inboxprops = mapi_getprops($inbox, Array(PR_IPM_TASK_ENTRYID));
-            if(!isset($inboxprops[PR_IPM_TASK_ENTRYID]))
-                return false;
+            if(!isset($inboxprops[PR_IPM_TASK_ENTRYID])) {
+                            return false;
+            }
 
             return mapi_msgstore_openentry($store, $inboxprops[PR_IPM_TASK_ENTRYID]);
         }
@@ -827,10 +834,14 @@ 
             $storeprops = mapi_getprops($store, array(PR_IPM_OUTBOX_ENTRYID, PR_IPM_SENTMAIL_ENTRYID));
 
             $outbox = mapi_msgstore_openentry($store, $storeprops[PR_IPM_OUTBOX_ENTRYID]);
-            if(!$outbox) return false;
+            if(!$outbox) {
+                return false;
+            }
 
             $outgoing = mapi_folder_createmessage($outbox);
-            if(!$outgoing) return false;
+            if(!$outgoing) {
+                return false;
+            }
 
             // Set SENT_REPRESENTING in case we're sending as a delegate
             $ownerstore = $this->getTaskFolderStore();
@@ -920,8 +931,9 @@ 
             $rows = mapi_table_queryallrows($table, array(PR_DEFAULT_STORE, PR_ENTRYID));
 
             foreach($rows as $row) {
-                if($row[PR_DEFAULT_STORE])
-                    return mapi_openmsgstore($this->session, $row[PR_ENTRYID]);
+                if($row[PR_DEFAULT_STORE]) {
+                                    return mapi_openmsgstore($this->session, $row[PR_ENTRYID]);
+                }
             }
 
             return false;

mapi/class.recurrence.php

Braces +65 added lines, -45 removed lines

@@ -124,8 +124,9 @@ 
                 }
                 // Properties in the attachment are the properties of the base object, plus $exception_props plus the base date
                 foreach (array("subject", "location", "label", "reminder", "reminder_minutes", "alldayevent", "busystatus") as $propname) {
-                    if(isset($this->messageprops[$this->proptags[$propname]]))
-                        $props[$this->proptags[$propname]] = $this->messageprops[$this->proptags[$propname]];
+                    if(isset($this->messageprops[$this->proptags[$propname]])) {
+                                            $props[$this->proptags[$propname]] = $this->messageprops[$this->proptags[$propname]];
+                    }
                 }
 
                 $props[PR_MESSAGE_CLASS] = "IPM.OLE.CLASS.{00061055-0000-0000-C000-000000000046}";
@@ -220,12 +221,14 @@ 
             $extomodify = false;
 
             for($i = 0, $len = count($this->recur["changed_occurences"]); $i < $len; $i++) {
-                if($this->isSameDay($this->recur["changed_occurences"][$i]["basedate"], $baseday))
-                    $extomodify = &$this->recur["changed_occurences"][$i];
+                if($this->isSameDay($this->recur["changed_occurences"][$i]["basedate"], $baseday)) {
+                                    $extomodify = &$this->recur["changed_occurences"][$i];
+                }
             }
 
-            if(!$extomodify)
-                return false;
+            if(!$extomodify) {
+                            return false;
+            }
 
             // remove basedate property as we want to preserve the old value
             // client will send basedate with time part as zero, so discard that value
@@ -339,10 +342,11 @@ 
             $startday = $this->dayStartOf($start);
 
             // Get all the occurrences on the days between the basedate (may be reversed)
-            if($prevday < $startday)
-                $items = $this->getItems($this->toGMT($this->tz, $prevday), $this->toGMT($this->tz, $startday + 24 * 60 * 60));
-            else
-                $items = $this->getItems($this->toGMT($this->tz, $startday), $this->toGMT($this->tz, $prevday + 24 * 60 * 60));
+            if($prevday < $startday) {
+                            $items = $this->getItems($this->toGMT($this->tz, $prevday), $this->toGMT($this->tz, $startday + 24 * 60 * 60));
+            } else {
+                            $items = $this->getItems($this->toGMT($this->tz, $startday), $this->toGMT($this->tz, $prevday + 24 * 60 * 60));
+            }
 
             // There should now be exactly one item, namely the item that we are modifying. If there are any other items in the range,
             // then we abort the change, since one of the rules has been violated.
@@ -371,8 +375,9 @@ 
                 $previousitem_startdate = $occitems[count($occitems) - 1][$this->proptags["startdate"]];
 
                 // if our reminder is set before or equal to the beginning of the previous occurrence, then that's not allowed
-                if($startdate - ($reminderminutes*60) <= $previousitem_startdate)
-                    return false;
+                if($startdate - ($reminderminutes*60) <= $previousitem_startdate) {
+                                    return false;
+                }
             }
 
             // Get the endtime of the current occurrence and find the next two occurrences (including the current occurrence)
@@ -385,8 +390,9 @@ 
                 // Get reminder time of the next occurrence.
                 $nextOccReminderTime = $next[$this->proptags["startdate"]] - ($next[$this->proptags["reminder_minutes"]] * 60);
                 // If the reminder time of the next item is before the start of this item, then that's not allowed
-                if($nextOccReminderTime <= $startdate)
-                    return false;
+                if($nextOccReminderTime <= $startdate) {
+                                    return false;
+                }
             }
 
             // All was ok
@@ -396,16 +402,19 @@ 
         function setRecurrence($tz, $recur)
         {
             // only reset timezone if specified
-            if($tz)
-                $this->tz = $tz;
+            if($tz) {
+                            $this->tz = $tz;
+            }
 
             $this->recur = $recur;
 
-            if(!isset($this->recur["changed_occurences"]))
-                $this->recur["changed_occurences"] = Array();
+            if(!isset($this->recur["changed_occurences"])) {
+                            $this->recur["changed_occurences"] = Array();
+            }
 
-            if(!isset($this->recur["deleted_occurences"]))
-                $this->recur["deleted_occurences"] = Array();
+            if(!isset($this->recur["deleted_occurences"])) {
+                            $this->recur["deleted_occurences"] = Array();
+            }
 
             $this->deleteAttachments();
             $this->saveRecurrence();
@@ -657,18 +666,20 @@ 
             $new = Array();
 
             foreach($this->recur["deleted_occurences"] as $entry) {
-                if($entry != $base_date)
-                    $new[] = $entry;
+                if($entry != $base_date) {
+                                    $new[] = $entry;
+                }
             }
             $this->recur["deleted_occurences"] = $new;
 
             $new = Array();
 
             foreach($this->recur["changed_occurences"] as $entry) {
-                if(!$this->isSameDay($entry["basedate"], $base_date))
-                    $new[] = $entry;
-                else
-                    $this->deleteExceptionAttachment($this->toGMT($this->tz, $base_date + $this->recur["startocc"] * 60));
+                if(!$this->isSameDay($entry["basedate"], $base_date)) {
+                                    $new[] = $entry;
+                } else {
+                                    $this->deleteExceptionAttachment($this->toGMT($this->tz, $base_date + $this->recur["startocc"] * 60));
+                }
             }
 
             $this->recur["changed_occurences"] = $new;
@@ -833,7 +844,7 @@ 
             $exception = $this->isException($basedate);
             if($exception){
                 return false;
-            }else{
+            } else{
                 $occstart = $basedate + $startocc * 60;
                 $occend = $basedate + $endocc * 60;
 
@@ -849,8 +860,9 @@ 
                  * starts at 00:00 and ends on 00:00. if it is so, then process
                  * the occurrence and send it in response.
                  */
-                if(($occstart  >= $end || $occend <=  $start) && !($occstart == $occend && $occstart == $start))
-                    return;
+                if(($occstart  >= $end || $occend <=  $start) && !($occstart == $occend && $occstart == $start)) {
+                                    return;
+                }
 
                 // Properties for this occurrence are the same as the main object,
                 // With these properties overridden
@@ -863,8 +875,9 @@ 
             }
 
             // If reminderonly is set, only add reminders
-            if($reminderonly && (!isset($newitem[$this->proptags["reminder"]]) || $newitem[$this->proptags["reminder"]] == false))
-                return;
+            if($reminderonly && (!isset($newitem[$this->proptags["reminder"]]) || $newitem[$this->proptags["reminder"]] == false)) {
+                            return;
+            }
 
             $items[] = $newitem;
         }
@@ -886,12 +899,14 @@ 
 
                 // Check range criterium. Exact matches (eg when $occstart == $end), do NOT match since you cannot
                 // see any part of the appointment. Partial overlaps DO match.
-                if($occstart >= $end || $occend <= $start)
-                    continue;
+                if($occstart >= $end || $occend <= $start) {
+                                    continue;
+                }
 
                 array_push($items, $this->getExceptionProperties($exception));
-                if((count($items) == $limit))
-                    break;
+                if((count($items) == $limit)) {
+                                    break;
+                }
                 }
         }
 
@@ -902,11 +917,13 @@ 
          */
         function isException($basedate)
         {
-            if($this->isDeleteException($basedate))
-                return true;
+            if($this->isDeleteException($basedate)) {
+                            return true;
+            }
 
-            if($this->getChangeException($basedate) != false)
-                return true;
+            if($this->getChangeException($basedate) != false) {
+                            return true;
+            }
 
             return false;
         }
@@ -919,8 +936,9 @@ 
             // Check if the occurrence is deleted on the specified date
             foreach($this->recur["deleted_occurences"] as $deleted)
             {
-                if($this->isSameDay($deleted, $basedate))
-                    return true;
+                if($this->isSameDay($deleted, $basedate)) {
+                                    return true;
+                }
             }
 
             return false;
@@ -934,8 +952,9 @@ 
             // Check if the occurrence is modified on the specified date
             foreach($this->recur["changed_occurences"] as $changed)
             {
-                if($this->isSameDay($changed["basedate"], $basedate))
-                    return $changed;
+                if($this->isSameDay($changed["basedate"], $basedate)) {
+                                    return $changed;
+                }
             }
 
             return false;
@@ -1120,8 +1139,9 @@ 
                 foreach($recipientRows as $key => $recipient) {
                     $found = false;
                     foreach($exception_recips as $excep_recip) {
-                        if (isset($recipient[PR_SEARCH_KEY], $excep_recip[PR_SEARCH_KEY]) && $recipient[PR_SEARCH_KEY] == $excep_recip[PR_SEARCH_KEY])
-                            $found = true;
+                        if (isset($recipient[PR_SEARCH_KEY], $excep_recip[PR_SEARCH_KEY]) && $recipient[PR_SEARCH_KEY] == $excep_recip[PR_SEARCH_KEY]) {
+                                                    $found = true;
+                        }
                     }
 
                     if (!$found) {

mapi/mapitags.php

Braces +2 added lines, -1 removed lines

@@ -5,8 +5,9 @@
  * SPDX-FileCopyrightText: Copyright 2020-2022 grommunio GmbH
  */
 
-if (!function_exists("mapi_prop_tag"))
+if (!function_exists("mapi_prop_tag")) {
     throw new FatalMisconfigurationException("PHP-MAPI extension is not available");
+}
 
 define('PR_ACKNOWLEDGEMENT_MODE'                      ,mapi_prop_tag(PT_LONG,        0x0001));
 define('PR_ALTERNATE_RECIPIENT_ALLOWED'               ,mapi_prop_tag(PT_BOOLEAN,     0x0002));

mapi/class.freebusypublish.php

Braces +20 added lines, -14 removed lines

@@ -200,11 +200,13 @@ 
         while(1) {
             $rows = mapi_table_queryrows($contents, array_values($this->proptags), 0, 50);
 
-            if(!is_array($rows))
-                break;
+            if(!is_array($rows)) {
+                            break;
+            }
 
-            if(empty($rows))
-                break;
+            if(empty($rows)) {
+                            break;
+            }
 
             foreach ($rows as $row) {
                 $occurrences = Array();
@@ -260,9 +262,9 @@ 
 
             // We're finished
             mapi_freebusysupport_close($fbsupport);
+        } else {
+                    ZLog::Write(LOGLEVEL_WARN, "FreeBusyPublish is not available");
         }
-        else
-            ZLog::Write(LOGLEVEL_WARN, "FreeBusyPublish is not available");
     }
 
     /**
@@ -271,10 +273,12 @@ 
     function cmp($a, $b)
     {
         if ($a["time"] == $b["time"]) {
-            if($a["type"] < $b["type"])
-                return 1;
-            if($a["type"] > $b["type"])
-                return -1;
+            if($a["type"] < $b["type"]) {
+                            return 1;
+            }
+            if($a["type"] > $b["type"]) {
+                            return -1;
+            }
             return 0;
         }
         return ($a["time"] > $b["time"] ? 1 : -1);
@@ -322,8 +326,9 @@ 
                         $newitem["end"] = $ts["time"];
                         $newitem["subject"] = join(",", $csubj);
                         $newitem["status"] = !empty($cbusy) ? max($cbusy) : 0;
-                        if($newitem["status"] > 0)
-                            $merged[] = $newitem;
+                        if($newitem["status"] > 0) {
+                                                    $merged[] = $newitem;
+                        }
                     }
 
                     $level++;
@@ -340,8 +345,9 @@ 
                         $newitem["end"] = $ts["time"];
                         $newitem["subject"] = join(",", $csubj);
                         $newitem["status"] = !empty($cbusy) ? max($cbusy) : 0;
-                        if($newitem["status"] > 0)
-                            $merged[] = $newitem;
+                        if($newitem["status"] > 0) {
+                                                    $merged[] = $newitem;
+                        }
                     }
 
                     $level--;

mapi/mapi.util.php

Braces +2 added lines, -2 removed lines

@@ -103,7 +103,7 @@ 
                     $guids[$split[1]] = makeguid($split[1]);
                 }
                 $guid = $guids[$split[1]];
-            }else{
+            } else{
                 $guid = constant($split[1]);
             }
 
@@ -113,7 +113,7 @@ 
             $ids["guid"][$num] = $guid;
             $ids["type"][$num] = $split[0];
             $num++;
-        }else{
+        } else{
             // not a named property
             $props[$name] = $val;
         }