grommunio / grommunio-sync

lib/core/zpush.php

Braces +121 added lines, -94 removed lines

@@ -161,19 +161,23 @@ 
         }
 
         // some basic checks
-        if (!defined('BASE_PATH'))
-            throw new FatalMisconfigurationException("The BASE_PATH is not configured. Check if the config.php file is in place.");
+        if (!defined('BASE_PATH')) {
+                    throw new FatalMisconfigurationException("The BASE_PATH is not configured. Check if the config.php file is in place.");
+        }
 
-        if (substr(BASE_PATH, -1,1) != "/")
-            throw new FatalMisconfigurationException("The BASE_PATH should terminate with a '/'");
+        if (substr(BASE_PATH, -1,1) != "/") {
+                    throw new FatalMisconfigurationException("The BASE_PATH should terminate with a '/'");
+        }
 
-        if (!file_exists(BASE_PATH))
-            throw new FatalMisconfigurationException("The configured BASE_PATH does not exist or can not be accessed.");
+        if (!file_exists(BASE_PATH)) {
+                    throw new FatalMisconfigurationException("The configured BASE_PATH does not exist or can not be accessed.");
+        }
 
-        if (defined('BASE_PATH_CLI') && file_exists(BASE_PATH_CLI))
-            define('REAL_BASE_PATH', BASE_PATH_CLI);
-        else
-            define('REAL_BASE_PATH', BASE_PATH);
+        if (defined('BASE_PATH_CLI') && file_exists(BASE_PATH_CLI)) {
+                    define('REAL_BASE_PATH', BASE_PATH_CLI);
+        } else {
+                    define('REAL_BASE_PATH', BASE_PATH);
+        }
 
         if (!defined('LOGBACKEND')) {
             define('LOGBACKEND', 'filelog');
@@ -204,39 +208,42 @@ 
             if (LOG_SYSLOG_HOST && LOG_SYSLOG_PORT <= 0) {
                 throw new FatalMisconfigurationException("LOG_SYSLOG_HOST is defined but the LOG_SYSLOG_PORT does not seem to be valid.");
             }
-        }
-        elseif (strtolower(LOGBACKEND) == 'filelog') {
+        } elseif (strtolower(LOGBACKEND) == 'filelog') {
             define('LOGBACKEND_CLASS', 'FileLog');
-            if (!defined('LOGFILEDIR'))
-                throw new FatalMisconfigurationException("The LOGFILEDIR is not configured. Check if the config.php file is in place.");
+            if (!defined('LOGFILEDIR')) {
+                            throw new FatalMisconfigurationException("The LOGFILEDIR is not configured. Check if the config.php file is in place.");
+            }
 
-            if (substr(LOGFILEDIR, -1,1) != "/")
-                throw new FatalMisconfigurationException("The LOGFILEDIR should terminate with a '/'");
+            if (substr(LOGFILEDIR, -1,1) != "/") {
+                            throw new FatalMisconfigurationException("The LOGFILEDIR should terminate with a '/'");
+            }
 
-            if (!file_exists(LOGFILEDIR))
-                throw new FatalMisconfigurationException("The configured LOGFILEDIR does not exist or can not be accessed.");
+            if (!file_exists(LOGFILEDIR)) {
+                            throw new FatalMisconfigurationException("The configured LOGFILEDIR does not exist or can not be accessed.");
+            }
 
-            if ((!file_exists(LOGFILE) && !touch(LOGFILE)) || !is_writable(LOGFILE))
-                throw new FatalMisconfigurationException("The configured LOGFILE can not be modified.");
+            if ((!file_exists(LOGFILE) && !touch(LOGFILE)) || !is_writable(LOGFILE)) {
+                            throw new FatalMisconfigurationException("The configured LOGFILE can not be modified.");
+            }
 
-            if ((!file_exists(LOGERRORFILE) && !touch(LOGERRORFILE)) || !is_writable(LOGERRORFILE))
-                throw new FatalMisconfigurationException("The configured LOGERRORFILE can not be modified.");
+            if ((!file_exists(LOGERRORFILE) && !touch(LOGERRORFILE)) || !is_writable(LOGERRORFILE)) {
+                            throw new FatalMisconfigurationException("The configured LOGERRORFILE can not be modified.");
+            }
 
             // check ownership on the (eventually) just created files
             Utils::FixFileOwner(LOGFILE);
             Utils::FixFileOwner(LOGERRORFILE);
-        }
-        else {
+        } else {
             define('LOGBACKEND_CLASS', LOGBACKEND);
         }
 
         // set time zone
         // code contributed by Robert Scheck (rsc)
         if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
-            if (! @date_default_timezone_set(TIMEZONE))
-                throw new FatalMisconfigurationException(sprintf("The configured TIMEZONE '%s' is not valid. Please check supported timezones at http://www.php.net/manual/en/timezones.php", constant('TIMEZONE')));
-        }
-        else if(!ini_get('date.timezone')) {
+            if (! @date_default_timezone_set(TIMEZONE)) {
+                            throw new FatalMisconfigurationException(sprintf("The configured TIMEZONE '%s' is not valid. Please check supported timezones at http://www.php.net/manual/en/timezones.php", constant('TIMEZONE')));
+            }
+        } else if(!ini_get('date.timezone')) {
             date_default_timezone_set('Europe/Vienna');
         }
 
@@ -267,14 +274,15 @@ 
     static public function CheckAdvancedConfig() {
         global $specialLogUsers, $additionalFolders;
 
-        if (!is_array($specialLogUsers))
-            throw new FatalMisconfigurationException("The WBXML log users is not an array.");
+        if (!is_array($specialLogUsers)) {
+                    throw new FatalMisconfigurationException("The WBXML log users is not an array.");
+        }
 
         if (!defined('SYNC_CONTACTS_MAXPICTURESIZE')) {
             define('SYNC_CONTACTS_MAXPICTURESIZE', 49152);
+        } else if ((!is_int(SYNC_CONTACTS_MAXPICTURESIZE) || SYNC_CONTACTS_MAXPICTURESIZE < 1)) {
+                    throw new FatalMisconfigurationException("The SYNC_CONTACTS_MAXPICTURESIZE value must be a number higher than 0.");
         }
-        else if ((!is_int(SYNC_CONTACTS_MAXPICTURESIZE) || SYNC_CONTACTS_MAXPICTURESIZE < 1))
-            throw new FatalMisconfigurationException("The SYNC_CONTACTS_MAXPICTURESIZE value must be a number higher than 0.");
 
         if (!defined('USE_PARTIAL_FOLDERSYNC')) {
             define('USE_PARTIAL_FOLDERSYNC', false);
@@ -282,14 +290,12 @@ 
 
         if (!defined('PING_LOWER_BOUND_LIFETIME')) {
             define('PING_LOWER_BOUND_LIFETIME', false);
-        }
-        elseif(PING_LOWER_BOUND_LIFETIME !== false && (!is_int(PING_LOWER_BOUND_LIFETIME) || PING_LOWER_BOUND_LIFETIME < 1 || PING_LOWER_BOUND_LIFETIME > 3540)){
+        } elseif(PING_LOWER_BOUND_LIFETIME !== false && (!is_int(PING_LOWER_BOUND_LIFETIME) || PING_LOWER_BOUND_LIFETIME < 1 || PING_LOWER_BOUND_LIFETIME > 3540)){
             throw new FatalMisconfigurationException("The PING_LOWER_BOUND_LIFETIME value must be 'false' or a number between 1 and 3540 inclusively.");
         }
         if (!defined('PING_HIGHER_BOUND_LIFETIME')) {
             define('PING_HIGHER_BOUND_LIFETIME', false);
-        }
-        elseif(PING_HIGHER_BOUND_LIFETIME !== false && (!is_int(PING_HIGHER_BOUND_LIFETIME) || PING_HIGHER_BOUND_LIFETIME < 1 || PING_HIGHER_BOUND_LIFETIME > 3540)){
+        } elseif(PING_HIGHER_BOUND_LIFETIME !== false && (!is_int(PING_HIGHER_BOUND_LIFETIME) || PING_HIGHER_BOUND_LIFETIME < 1 || PING_HIGHER_BOUND_LIFETIME > 3540)){
             throw new FatalMisconfigurationException("The PING_HIGHER_BOUND_LIFETIME value must be 'false' or a number between 1 and 3540 inclusively.");
         }
         if(PING_HIGHER_BOUND_LIFETIME !== false && PING_LOWER_BOUND_LIFETIME !== false && PING_HIGHER_BOUND_LIFETIME < PING_LOWER_BOUND_LIFETIME){
@@ -298,8 +304,7 @@ 
 
         if (!defined('RETRY_AFTER_DELAY')) {
             define('RETRY_AFTER_DELAY', 300);
-        }
-        elseif (RETRY_AFTER_DELAY !== false && (!is_int(RETRY_AFTER_DELAY) || RETRY_AFTER_DELAY < 1))  {
+        } elseif (RETRY_AFTER_DELAY !== false && (!is_int(RETRY_AFTER_DELAY) || RETRY_AFTER_DELAY < 1))  {
             throw new FatalMisconfigurationException("The RETRY_AFTER_DELAY value must be 'false' or a number greater than 0.");
         }
 
@@ -312,9 +317,9 @@ 
         }
 
         // the check on additional folders will not throw hard errors, as this is probably changed on live systems
-        if (isset($additionalFolders) && !is_array($additionalFolders))
-            ZLog::Write(LOGLEVEL_ERROR, "ZPush::CheckConfig() : The additional folders synchronization not available as array.");
-        else {
+        if (isset($additionalFolders) && !is_array($additionalFolders)) {
+                    ZLog::Write(LOGLEVEL_ERROR, "ZPush::CheckConfig() : The additional folders synchronization not available as array.");
+        } else {
             // check configured data
             foreach ($additionalFolders as $af) {
 
@@ -358,7 +363,9 @@ 
             ZPush::$stateMachine = self::GetBackend()->GetStateMachine();
 
             if (ZPush::$stateMachine->GetStateVersion() !== ZPush::GetLatestStateVersion()) {
-                if (class_exists("TopCollector")) self::GetTopCollector()->AnnounceInformation("Run migration script!", true);
+                if (class_exists("TopCollector")) {
+                    self::GetTopCollector()->AnnounceInformation("Run migration script!", true);
+                }
                 throw new ServiceUnavailableException(sprintf("The state version available to the %s is not the latest version - please run the state upgrade script. See release notes for more information.", get_class(ZPush::$stateMachine)));
             }
         }
@@ -373,8 +380,9 @@ 
      * @return object Redis
      */
     static public function GetRedis() {
-        if (!isset(ZPush::$redis))
-            ZPush::$redis = new RedisConnection();
+        if (!isset(ZPush::$redis)) {
+                    ZPush::$redis = new RedisConnection();
+        }
 
         return ZPush::$redis;
     }
@@ -412,8 +420,9 @@ 
      * @return object DeviceManager
      */
     static public function GetDeviceManager($initialize = true) {
-        if (!isset(ZPush::$deviceManager) && $initialize)
-            ZPush::$deviceManager = new DeviceManager();
+        if (!isset(ZPush::$deviceManager) && $initialize) {
+                    ZPush::$deviceManager = new DeviceManager();
+        }
 
         return ZPush::$deviceManager;
     }
@@ -425,8 +434,9 @@ 
      * @return object TopCollector
      */
     static public function GetTopCollector() {
-        if (!isset(ZPush::$topCollector))
-            ZPush::$topCollector = new TopCollector();
+        if (!isset(ZPush::$topCollector)) {
+                    ZPush::$topCollector = new TopCollector();
+        }
 
         return ZPush::$topCollector;
     }
@@ -441,23 +451,27 @@ 
      * @return boolean
      */
     static public function IncludeBackend($backendname) {
-        if ($backendname == false) return false;
+        if ($backendname == false) {
+            return false;
+        }
 
         $backendname = strtolower($backendname);
-        if (substr($backendname, 0, 7) !== 'backend')
-            throw new FatalNotImplementedException(sprintf("Backend '%s' is not allowed",$backendname));
+        if (substr($backendname, 0, 7) !== 'backend') {
+                    throw new FatalNotImplementedException(sprintf("Backend '%s' is not allowed",$backendname));
+        }
 
         $rbn = substr($backendname, 7);
 
         $subdirbackend = REAL_BASE_PATH . "backend/" . $rbn . "/" . $rbn . ".php";
         $stdbackend = REAL_BASE_PATH . "backend/" . $rbn . ".php";
 
-        if (is_file($subdirbackend))
-            $toLoad = $subdirbackend;
-        else if (is_file($stdbackend))
-            $toLoad = $stdbackend;
-        else
-            return false;
+        if (is_file($subdirbackend)) {
+                    $toLoad = $subdirbackend;
+        } else if (is_file($stdbackend)) {
+                    $toLoad = $stdbackend;
+        } else {
+                    return false;
+        }
 
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("Including backend file: '%s'", $toLoad));
         return include_once($toLoad);
@@ -518,16 +532,16 @@ 
     static public function GetAdditionalSyncFolderStore($backendid, $noDebug = false) {
         if(isset(self::getAddSyncFolders()[$backendid]->Store)) {
             $val = self::getAddSyncFolders()[$backendid]->Store;
-        }
-        else {
+        } else {
             $val = self::GetDeviceManager()->GetAdditionalUserSyncFolder($backendid);
             if (isset($val['store'])) {
                 $val = $val['store'];
             }
         }
 
-        if (!$noDebug)
-            ZLog::Write(LOGLEVEL_DEBUG, sprintf("ZPush::GetAdditionalSyncFolderStore('%s'): '%s'", $backendid, Utils::PrintAsString($val)));
+        if (!$noDebug) {
+                    ZLog::Write(LOGLEVEL_DEBUG, sprintf("ZPush::GetAdditionalSyncFolderStore('%s'): '%s'", $backendid, Utils::PrintAsString($val)));
+        }
         return $val;
     }
 
@@ -541,14 +555,16 @@ 
      * @throws FatalNotImplementedException
      */
     static public function getSyncObjectFromFolderClass($folderclass) {
-        if (!isset(self::$classes[$folderclass]))
-            throw new FatalNotImplementedException("Class '$folderclass' is not supported");
+        if (!isset(self::$classes[$folderclass])) {
+                    throw new FatalNotImplementedException("Class '$folderclass' is not supported");
+        }
 
         $class = self::$classes[$folderclass][self::CLASS_NAME];
-        if (self::$classes[$folderclass][self::CLASS_REQUIRESPROTOCOLVERSION])
-            return new $class(Request::GetProtocolVersion());
-        else
-            return new $class();
+        if (self::$classes[$folderclass][self::CLASS_REQUIRESPROTOCOLVERSION]) {
+                    return new $class(Request::GetProtocolVersion());
+        } else {
+                    return new $class();
+        }
     }
 
     /**
@@ -565,8 +581,7 @@ 
 
             if (isset($additionalFolders) && !is_array($additionalFolders)) {
                 ZLog::Write(LOGLEVEL_ERROR, "ZPush::getAddSyncFolders() : The additional folders synchronization not available as array.");
-            }
-            else {
+            } else {
                 foreach ($additionalFolders as $af) {
                     if (!is_array($af) || !isset($af['store']) || !isset($af['folderid']) || !isset($af['name']) || !isset($af['type'])) {
                         ZLog::Write(LOGLEVEL_ERROR, "ZPush::getAddSyncFolders() : the additional folder synchronization is not configured correctly. Missing parameters. Entry will be ignored.");
@@ -644,10 +659,12 @@ 
     static public function PrintGrommunioSyncLegal($message = "", $additionalMessage = "") {
         ZLog::Write(LOGLEVEL_DEBUG,"ZPush::PrintGrommunioSyncLegal()");
 
-        if ($message)
-            $message = "<h3>". $message . "</h3>";
-        if ($additionalMessage)
-            $additionalMessage .= "<br>";
+        if ($message) {
+                    $message = "<h3>". $message . "</h3>";
+        }
+        if ($additionalMessage) {
+                    $additionalMessage .= "<br>";
+        }
 
         header("Content-type: text/html");
         print <<<END
@@ -687,8 +704,9 @@ 
      */
     static public function GetSupportedASVersion() {
         $version = self::GetBackend()->GetSupportedASVersion();
-        if (!in_array($version, self::$supportedASVersions))
-            throw new FatalNotImplementedException(sprintf("AS version '%s' reported by the backend is not supported", $version));
+        if (!in_array($version, self::$supportedASVersions)) {
+                    throw new FatalNotImplementedException(sprintf("AS version '%s' reported by the backend is not supported", $version));
+        }
 
         return $version;
     }
@@ -700,10 +718,11 @@ 
      * @return string
      */
     static public function GetServerHeader() {
-        if (self::GetSupportedASVersion() == self::ASV_25)
-            return "MS-Server-ActiveSync: 6.5.7638.1";
-        else
-            return "MS-Server-ActiveSync: ". self::GetSupportedASVersion();
+        if (self::GetSupportedASVersion() == self::ASV_25) {
+                    return "MS-Server-ActiveSync: 6.5.7638.1";
+        } else {
+                    return "MS-Server-ActiveSync: ". self::GetSupportedASVersion();
+        }
     }
 
     /**
@@ -718,8 +737,9 @@ 
         $versions = implode(',', array_slice(self::$supportedASVersions, 0, (array_search(self::GetSupportedASVersion(), self::$supportedASVersions)+1)));
         ZLog::Write(LOGLEVEL_DEBUG, "ZPush::GetSupportedProtocolVersions(): " . $versions);
 
-        if ($valueOnly === true)
-            return $versions;
+        if ($valueOnly === true) {
+                    return $versions;
+        }
 
         return "MS-ASProtocolVersions: " . $versions;
     }
@@ -733,10 +753,11 @@ 
     static public function GetSupportedCommands() {
         $asCommands = array();
         // filter all non-activesync commands
-        foreach (self::$supportedCommands as $c=>$v)
-            if (!self::checkCommandOptions($c, self::NOACTIVESYNCCOMMAND) &&
+        foreach (self::$supportedCommands as $c=>$v) {
+                    if (!self::checkCommandOptions($c, self::NOACTIVESYNCCOMMAND) &&
                 self::checkCommandOptions($c, self::GetSupportedASVersion()))
                 $asCommands[] = Utils::GetCommandFromCode($c);
+        }
 
         $commands = implode(',', $asCommands);
         ZLog::Write(LOGLEVEL_DEBUG, "ZPush::GetSupportedCommands(): " . $commands);
@@ -753,19 +774,22 @@ 
      */
     static public function GetRequestHandlerForCommand($commandCode) {
         if (!array_key_exists($commandCode, self::$supportedCommands) ||
-            !array_key_exists(self::REQUESTHANDLER, self::$supportedCommands[$commandCode]) )
-            throw new FatalNotImplementedException(sprintf("Command '%s' has no request handler or class", Utils::GetCommandFromCode($commandCode)));
+            !array_key_exists(self::REQUESTHANDLER, self::$supportedCommands[$commandCode]) ) {
+                    throw new FatalNotImplementedException(sprintf("Command '%s' has no request handler or class", Utils::GetCommandFromCode($commandCode)));
+        }
 
         $class = self::$supportedCommands[$commandCode][self::REQUESTHANDLER];
         $handlerclass = REAL_BASE_PATH . "lib/request/" . strtolower($class) . ".php";
 
-        if (is_file($handlerclass))
-            include($handlerclass);
+        if (is_file($handlerclass)) {
+                    include($handlerclass);
+        }
 
-        if (class_exists($class))
-            return new $class();
-        else
-            throw new FatalNotImplementedException(sprintf("Request handler '%s' can not be loaded", $class));
+        if (class_exists($class)) {
+                    return new $class();
+        } else {
+                    throw new FatalNotImplementedException(sprintf("Request handler '%s' can not be loaded", $class));
+        }
     }
 
     /**
@@ -835,10 +859,13 @@ 
      * @return object StateMachine
      */
     static private function checkCommandOptions($commandCode, $option) {
-        if ($commandCode === false) return false;
+        if ($commandCode === false) {
+            return false;
+        }
 
-        if (!array_key_exists($commandCode, self::$supportedCommands))
-            throw new FatalNotImplementedException(sprintf("Command '%s' is not supported", Utils::GetCommandFromCode($commandCode)));
+        if (!array_key_exists($commandCode, self::$supportedCommands)) {
+                    throw new FatalNotImplementedException(sprintf("Command '%s' is not supported", Utils::GetCommandFromCode($commandCode)));
+        }
 
         $capa = self::$supportedCommands[$commandCode];
         $defcapa = in_array($option, $capa, true);

lib/core/devicemanager.php

Braces +69 added lines, -56 removed lines

@@ -76,9 +76,9 @@ 
             $this->loadDeviceData();
 
             ZPush::GetTopCollector()->SetUserAgent($this->device->GetDeviceUserAgent());
+        } else {
+                    throw new FatalNotImplementedException("Can not proceed without a device id.");
         }
-        else
-            throw new FatalNotImplementedException("Can not proceed without a device id.");
 
         $this->loopdetection = new LoopDetection();
         $this->loopdetection->ProcessLoopDetectionInit();
@@ -139,8 +139,9 @@ 
 
         // check if previousily ignored messages were synchronized for the current folder
         // on multifolder operations of AS14 this is done by setLatestFolder()
-        if ($this->latestFolder !== false)
-            $this->checkBrokenMessages($this->latestFolder);
+        if ($this->latestFolder !== false) {
+                    $this->checkBrokenMessages($this->latestFolder);
+        }
 
         // update the user agent and AS version on the device
         $this->device->SetUserAgent(Request::GetUserAgent());
@@ -166,8 +167,7 @@ 
                     $this->setDeviceUserData($this->type, array(self::$user => $this->device), self::$devid, -1, $doCas="merge");
                     ZLog::Write(LOGLEVEL_DEBUG, "DeviceManager->Save(): Device data saved");
                 }
-            }
-            catch (StateNotFoundException $snfex) {
+            } catch (StateNotFoundException $snfex) {
                 ZLog::Write(LOGLEVEL_ERROR, "DeviceManager->Save(): Exception: ". $snfex->getMessage());
             }
         }
@@ -179,8 +179,9 @@ 
         }
 
         // we terminated this process
-        if ($this->loopdetection)
-            $this->loopdetection->ProcessLoopDetectionTerminate();
+        if ($this->loopdetection) {
+                    $this->loopdetection->ProcessLoopDetectionTerminate();
+        }
 
         return true;
     }
@@ -211,8 +212,9 @@ 
         ZLog::Write(LOGLEVEL_DEBUG, "Saving submitted device information");
 
         // set the user agent
-        if (isset($deviceinformation->useragent))
-            $this->device->SetUserAgent($deviceinformation->useragent);
+        if (isset($deviceinformation->useragent)) {
+                    $this->device->SetUserAgent($deviceinformation->useragent);
+        }
 
         // save other information
         foreach (array("model", "imei", "friendlyname", "os", "oslanguage", "phonenumber", "mobileoperator", "enableoutboundsms") as $info) {
@@ -294,8 +296,9 @@ 
             // Old Palm Treos always do initial sync for calendar and contacts, even if they are not made available by the backend.
             // We need to fake these folderids, allowing a fake sync/ping, even if they are not supported by the backend
             // if the folderid would be available, they would already be returned in the above statement
-            if ($folderidforClass == false && ($type == SYNC_FOLDER_TYPE_APPOINTMENT || $type == SYNC_FOLDER_TYPE_CONTACT))
-                $folderidforClass = SYNC_FOLDER_TYPE_DUMMY;
+            if ($folderidforClass == false && ($type == SYNC_FOLDER_TYPE_APPOINTMENT || $type == SYNC_FOLDER_TYPE_CONTACT)) {
+                            $folderidforClass = SYNC_FOLDER_TYPE_DUMMY;
+            }
         }
 
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("DeviceManager->GetFolderIdFromCacheByClass('%s'): '%s' => '%s'", $class, $type, $folderidforClass));
@@ -314,12 +317,14 @@ 
     public function GetFolderClassFromCacheByID($folderid) {
         //TODO check if the parent folder exists and is also being synchronized
         $typeFromCache = $this->device->GetFolderType($folderid);
-        if ($typeFromCache === false)
-            throw new NoHierarchyCacheAvailableException(sprintf("Folderid '%s' is not fully synchronized on the device", $folderid));
+        if ($typeFromCache === false) {
+                    throw new NoHierarchyCacheAvailableException(sprintf("Folderid '%s' is not fully synchronized on the device", $folderid));
+        }
 
         $class = ZPush::GetFolderClassFromFolderType($typeFromCache);
-        if ($class === false)
-            throw new NotImplementedException(sprintf("Folderid '%s' is saved to be of type '%d' but this type is not implemented", $folderid, $typeFromCache));
+        if ($class === false) {
+                    throw new NotImplementedException(sprintf("Folderid '%s' is saved to be of type '%d' but this type is not implemented", $folderid, $typeFromCache));
+        }
 
         return $class;
     }
@@ -386,8 +391,9 @@ 
     public function DoNotStreamMessage($id, &$message) {
         $folderid = $this->getLatestFolder();
 
-        if (isset($message->parentid))
-            $folder = $message->parentid;
+        if (isset($message->parentid)) {
+                    $folder = $message->parentid;
+        }
 
         // message was identified to be causing a loop
         if ($this->loopdetection->IgnoreNextMessage(true, $id, $folderid)) {
@@ -439,10 +445,12 @@ 
      * @return int
      */
     public function GetWindowSize($folderid, $uuid, $statecounter, $queuedmessages) {
-        if (isset($this->windowSize[$folderid]))
-            $items = $this->windowSize[$folderid];
-        else
-            $items = WINDOW_SIZE_MAX; // 512 by default
+        if (isset($this->windowSize[$folderid])) {
+                    $items = $this->windowSize[$folderid];
+        } else {
+                    $items = WINDOW_SIZE_MAX;
+        }
+        // 512 by default
 
         $this->setLatestFolder($folderid);
 
@@ -451,16 +459,16 @@ 
         if ($loop !== false) {
             if ($loop === true) {
                 $items = ($items == 0) ? 0: 1+($this->loopdetection->IgnoreNextMessage(false)?1:0) ;
-            }
-            else {
+            } else {
                 // we got a new suggested window size
                 $items = $loop;
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("Mobile loop pre stage detected! Forcing smaller window size of %d before entering loop detection mode", $items));
             }
         }
 
-        if ($items >= 0 && $items <= 2)
-            ZLog::Write(LOGLEVEL_WARN, sprintf("Mobile loop detected! Messages sent to the mobile will be restricted to %d items in order to identify the conflict", $items));
+        if ($items >= 0 && $items <= 2) {
+                    ZLog::Write(LOGLEVEL_WARN, sprintf("Mobile loop detected! Messages sent to the mobile will be restricted to %d items in order to identify the conflict", $items));
+        }
 
         return $items;
     }
@@ -536,8 +544,7 @@ 
                 // do not limit when the owner or impersonated user is syncing!
                 if ($origin == DeviceManager::FLD_ORIGIN_USER || $origin == DeviceManager::FLD_ORIGIN_IMPERSONATED) {
                     ZLog::Write(LOGLEVEL_DEBUG, "Not checking for specific sync limit as this is the owner/impersonated user.");
-                }
-                else {
+                } else {
                     $spKey = false;
                     $spFilter = false;
                     // 1. step: check if there is a general limitation for the store
@@ -598,8 +605,9 @@ 
         ZLog::Write(LOGLEVEL_INFO, "Full device resync requested");
 
         // delete all other uuids
-        foreach ($this->device->GetAllFolderIds() as $folderid)
-            $uuid = StateManager::UnLinkState($this->device, $folderid);
+        foreach ($this->device->GetAllFolderIds() as $folderid) {
+                    $uuid = StateManager::UnLinkState($this->device, $folderid);
+        }
 
         // delete hierarchy states
         StateManager::UnLinkState($this->device, false);
@@ -627,8 +635,9 @@ 
         }
 
         // check if a hierarchy sync might be necessary
-        if ($this->device->GetFolderUUID(false) === false)
-            $this->hierarchySyncRequired = true;
+        if ($this->device->GetFolderUUID(false) === false) {
+                    $this->hierarchySyncRequired = true;
+        }
 
         return $this->hierarchySyncRequired;
     }
@@ -915,13 +924,15 @@ 
      * @return boolean
      */
     private function loadDeviceData() {
-        if (!Request::IsValidDeviceID())
-            return false;
+        if (!Request::IsValidDeviceID()) {
+                    return false;
+        }
         try {
             $deviceHash = $this->statemachine->GetStateHash(self::$devid, IStateMachine::DEVICEDATA);
             if ($deviceHash != $this->deviceHash) {
-                if ($this->deviceHash)
-                    ZLog::Write(LOGLEVEL_DEBUG, "DeviceManager->loadDeviceData(): Device data was changed, reloading");
+                if ($this->deviceHash) {
+                                    ZLog::Write(LOGLEVEL_DEBUG, "DeviceManager->loadDeviceData(): Device data was changed, reloading");
+                }
                 $device = $this->statemachine->GetState(self::$devid, IStateMachine::DEVICEDATA);
                 // TODO: case should be removed when removing ASDevice backwards compatibility
                 // fallback for old grosync like devicedata
@@ -932,8 +943,7 @@ 
                         ZLog::Write(LOGLEVEL_INFO, "Using old style device for this request and updating when concluding");
                         $device = $device->devices[$_deviceuser];
                         $device->lastupdatetime = time();
-                    }
-                    else {
+                    } else {
                         ZLog::Write(LOGLEVEL_WARN, sprintf("Could not find '%s' in device state. Dropping previous device state!", $_deviceuser));
                     }
                 }
@@ -941,17 +951,14 @@ 
                     $this->device = $device;
                     $this->device->LoadedDevice();
                     $this->deviceHash = $deviceHash;
-                }
-                else {
+                } else {
                     ZLog::Write(LOGLEVEL_WARN, "Loaded device is not a device object. Dropping new loaded state and keeping initialized object!");
                 }
                 $this->stateManager->SetDevice($this->device);
             }
-        }
-        catch (StateNotFoundException $snfex) {
+        } catch (StateNotFoundException $snfex) {
             $this->hierarchySyncRequired = true;
-        }
-        catch (UnavailableException $uaex) {
+        } catch (UnavailableException $uaex) {
             // This is temporary and can be ignored e.g. in PING - see https://jira.z-hub.io/browse/ZP-1054
             // If the hash was not available before we treat it like a StateNotFoundException.
             if ($this->deviceHash === false) {
@@ -974,8 +981,9 @@ 
      * @return boolean
      */
     public function AnnounceIgnoredMessage($folderid, $id, SyncObject $message, $reason = self::MSG_BROKEN_UNKNOWN) {
-        if ($folderid === false)
-            $folderid = $this->getLatestFolder();
+        if ($folderid === false) {
+                    $folderid = $this->getLatestFolder();
+        }
 
         $class = get_class($message);
 
@@ -988,14 +996,18 @@ 
         $brokenMessage->reasonString = 'unknown cause';
         $brokenMessage->timestamp = time();
         $info = "";
-        if (isset($message->subject))
-            $info .= sprintf("Subject: '%s'", $message->subject);
-        if (isset($message->fileas))
-            $info .= sprintf("FileAs: '%s'", $message->fileas);
-        if (isset($message->from))
-            $info .= sprintf(" - From: '%s'", $message->from);
-        if (isset($message->starttime))
-            $info .= sprintf(" - On: '%s'", strftime("%Y-%m-%d %H:%M", $message->starttime));
+        if (isset($message->subject)) {
+                    $info .= sprintf("Subject: '%s'", $message->subject);
+        }
+        if (isset($message->fileas)) {
+                    $info .= sprintf("FileAs: '%s'", $message->fileas);
+        }
+        if (isset($message->from)) {
+                    $info .= sprintf(" - From: '%s'", $message->from);
+        }
+        if (isset($message->starttime)) {
+                    $info .= sprintf(" - On: '%s'", strftime("%Y-%m-%d %H:%M", $message->starttime));
+        }
         $brokenMessage->info = $info;
         $brokenMessage->reasonString = ZLog::GetLastMessage(LOGLEVEL_WARN);
 
@@ -1052,8 +1064,9 @@ 
     private function setLatestFolder($folderid) {
         // this is a multi folder operation
         // check on ignoredmessages before discaring the folderid
-        if ($this->latestFolder !== false)
-            $this->checkBrokenMessages($this->latestFolder);
+        if ($this->latestFolder !== false) {
+                    $this->checkBrokenMessages($this->latestFolder);
+        }
 
         $this->latestFolder = $folderid;
 

lib/core/streamimporter.php

Braces +24 added lines, -15 removed lines

@@ -76,17 +76,25 @@ 
             return $stat;
         }
 
-        if ($message->flags === false || $message->flags === SYNC_NEWMESSAGE)
-            $this->encoder->startTag(SYNC_ADD);
-        else {
+        if ($message->flags === false || $message->flags === SYNC_NEWMESSAGE) {
+                    $this->encoder->startTag(SYNC_ADD);
+        } else {
             // on update of an SyncEmail we only export the flags and categories
             if($message instanceof SyncMail && ((isset($message->flag) && $message->flag instanceof SyncMailFlags) || isset($message->categories))) {
                 $newmessage = new SyncMail();
                 $newmessage->read = $message->read;
-                if (isset($message->flag))              $newmessage->flag = $message->flag;
-                if (isset($message->lastverbexectime))  $newmessage->lastverbexectime = $message->lastverbexectime;
-                if (isset($message->lastverbexecuted))  $newmessage->lastverbexecuted = $message->lastverbexecuted;
-                if (isset($message->categories))        $newmessage->categories = $message->categories;
+                if (isset($message->flag)) {
+                    $newmessage->flag = $message->flag;
+                }
+                if (isset($message->lastverbexectime)) {
+                    $newmessage->lastverbexectime = $message->lastverbexectime;
+                }
+                if (isset($message->lastverbexecuted)) {
+                    $newmessage->lastverbexecuted = $message->lastverbexecuted;
+                }
+                if (isset($message->categories)) {
+                    $newmessage->categories = $message->categories;
+                }
                 $message = $newmessage;
                 unset($newmessage);
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesStream->ImportMessageChange('%s'): SyncMail message updated. Message content is striped, only flags/categories are streamed.", $id));
@@ -124,8 +132,7 @@ 
         $this->importedMsgs++;
         if ($asSoftDelete) {
             $this->encoder->startTag(SYNC_SOFTDELETE);
-        }
-        else {
+        } else {
             $this->encoder->startTag(SYNC_REMOVE);
         }
             $this->encoder->startTag(SYNC_SERVERENTRYID);
@@ -148,8 +155,9 @@ 
      * @return boolean
      */
     public function ImportMessageReadFlag($id, $flags, $categories = array()) {
-        if(!($this->objclass instanceof SyncMail))
-            return false;
+        if(!($this->objclass instanceof SyncMail)) {
+                    return false;
+        }
 
         $this->importedMsgs++;
 
@@ -205,10 +213,11 @@ 
         }
 
         // send a modify flag if the folder is already known on the device
-        if (isset($folder->flags) && $folder->flags === SYNC_NEWMESSAGE)
-            $this->encoder->startTag(SYNC_FOLDERHIERARCHY_ADD);
-        else
-            $this->encoder->startTag(SYNC_FOLDERHIERARCHY_UPDATE);
+        if (isset($folder->flags) && $folder->flags === SYNC_NEWMESSAGE) {
+                    $this->encoder->startTag(SYNC_FOLDERHIERARCHY_ADD);
+        } else {
+                    $this->encoder->startTag(SYNC_FOLDERHIERARCHY_UPDATE);
+        }
 
         $folder->Encode($this->encoder);
         $this->encoder->endTag();

lib/core/hierarchycache.php

Braces +12 added lines, -10 removed lines

@@ -59,8 +59,7 @@ 
     public function GetFolder($serverid, $oldState = false) {
         if (!$oldState && array_key_exists($serverid, $this->data)) {
             return $this->data[$serverid];
-        }
-        else if ($oldState && array_key_exists($serverid, $this->dataOld)) {
+        } else if ($oldState && array_key_exists($serverid, $this->dataOld)) {
             return $this->dataOld[$serverid];
         }
         return false;
@@ -117,14 +116,16 @@ 
      * @return boolean
      */
     public function ImportFolders($folders) {
-        if (!is_array($folders))
-            return false;
+        if (!is_array($folders)) {
+                    return false;
+        }
 
         $this->data = array();
 
         foreach ($folders as $folder) {
-            if (!isset($folder->type))
-                continue;
+            if (!isset($folder->type)) {
+                            continue;
+            }
             $this->AddFolder($folder);
         }
         return true;
@@ -139,10 +140,11 @@ 
      * @return array
      */
     public function ExportFolders($oldstate = false) {
-        if ($oldstate === false)
-            return $this->data;
-        else
-            return $this->dataOld;
+        if ($oldstate === false) {
+                    return $this->data;
+        } else {
+                    return $this->dataOld;
+        }
     }
 
     /**

lib/wbxml/wbxmlencoder.php

Braces +41 added lines, -35 removed lines

@@ -58,8 +58,7 @@ 
         if ($this->multipart) {
             header("Content-Type: application/vnd.ms-sync.multipart");
             ZLog::Write(LOGLEVEL_DEBUG, "WBXMLEncoder->startWBXML() type: vnd.ms-sync.multipart");
-        }
-        else {
+        } else {
             header("Content-Type: application/vnd.ms-sync.wbxml");
             ZLog::Write(LOGLEVEL_DEBUG, "WBXMLEncoder->startWBXML() type: vnd.ms-sync.wbxml");
         }
@@ -111,14 +110,16 @@ 
         if($stackelem['sent']) {
             $this->_endTag();
 
-            if(count($this->_stack) == 0)
-                ZLog::Write(LOGLEVEL_DEBUG, "WBXMLEncoder->endTag() WBXML output completed");
+            if(count($this->_stack) == 0) {
+                            ZLog::Write(LOGLEVEL_DEBUG, "WBXMLEncoder->endTag() WBXML output completed");
+            }
 
             if(count($this->_stack) == 0 && $this->multipart == true) {
                 $this->processMultipart();
             }
-            if(count($this->_stack) == 0)
-                $this->writeLog();
+            if(count($this->_stack) == 0) {
+                            $this->writeLog();
+            }
         }
     }
 
@@ -135,8 +136,9 @@ 
         // cannot send \0 characters within the XML content anywhere.
         $content = str_replace("\0","",$content);
 
-        if("x" . $content == "x")
-            return;
+        if("x" . $content == "x") {
+                    return;
+        }
         $this->_outputStack();
         $this->_content($content);
     }
@@ -187,10 +189,12 @@ 
      * @return void
      */
     public function addBodypartStream($bp) {
-        if (!is_resource($bp))
-            throw new WBXMLException("WBXMLEncoder->addBodypartStream(): trying to add a ".gettype($bp)." instead of a stream");
-        if ($this->multipart)
-            $this->bodyparts[] = $bp;
+        if (!is_resource($bp)) {
+                    throw new WBXMLException("WBXMLEncoder->addBodypartStream(): trying to add a ".gettype($bp)." instead of a stream");
+        }
+        if ($this->multipart) {
+                    $this->bodyparts[] = $bp;
+        }
     }
 
     /**
@@ -229,13 +233,15 @@ 
      * @return
      */
     private function _startTag($tag, $nocontent = false) {
-        if ($this->log)
-            $this->logStartTag($tag, $nocontent);
+        if ($this->log) {
+                    $this->logStartTag($tag, $nocontent);
+        }
 
         $mapping = $this->getMapping($tag);
 
-        if(!$mapping)
-            return false;
+        if(!$mapping) {
+                    return false;
+        }
 
         if($this->_tagcp != $mapping["cp"]) {
             $this->outSwitchPage($mapping["cp"]);
@@ -244,8 +250,9 @@ 
 
         $code = $mapping["code"];
 
-        if(!isset($nocontent) || !$nocontent)
-            $code |= 0x40;
+        if(!isset($nocontent) || !$nocontent) {
+                    $code |= 0x40;
+        }
 
         $this->outByte($code);
     }
@@ -258,8 +265,9 @@ 
      * @return
      */
     private function _content($content) {
-        if ($this->log)
-            $this->logContent($content);
+        if ($this->log) {
+                    $this->logContent($content);
+        }
         $this->outByte(self::WBXML_STR_I);
         $this->outTermStr($content);
     }
@@ -278,8 +286,7 @@ 
         if ($opaque) {
             $this->outByte(self::WBXML_OPAQUE);
             $this->outMBUInt($stat['size']);
-        }
-        else {
+        } else {
             $this->outByte(self::WBXML_STR_I);
         }
 
@@ -307,8 +314,9 @@ 
      * @return
      */
     private function _endTag() {
-        if ($this->log)
-            $this->logEndTag();
+        if ($this->log) {
+                    $this->logEndTag();
+        }
         $this->outByte(self::WBXML_END);
     }
 
@@ -352,8 +360,7 @@ 
             $uint = $uint >> 7;
             if ($i == 0) {
                 $out = chr($byte) . $out;
-            }
-            else {
+            } else {
                 $out = chr($byte | 0x80) . $out;
             }
         }
@@ -401,8 +408,7 @@ 
 
         if(isset($split["ns"])) {
             $cp = $this->_dtd["namespaces"][$split["ns"]];
-        }
-        else {
+        } else {
             $cp = 0;
         }
 
@@ -429,14 +435,14 @@ 
         if($pos) {
             $ns = substr($fulltag, 0, $pos);
             $tag = substr($fulltag, $pos+1);
-        }
-        else {
+        } else {
             $tag = $fulltag;
         }
 
         $ret = array();
-        if($ns)
-            $ret["ns"] = $ns;
+        if($ns) {
+                    $ret["ns"] = $ns;
+        }
         $ret["tag"] = $tag;
 
         return $ret;
@@ -453,9 +459,9 @@ 
      */
     private function logStartTag($tag, $nocontent) {
         $spaces = str_repeat(" ", count($this->logStack));
-        if($nocontent)
-            ZLog::Write(LOGLEVEL_WBXML,"O " . $spaces . " <$tag/>");
-        else {
+        if($nocontent) {
+                    ZLog::Write(LOGLEVEL_WBXML,"O " . $spaces . " <$tag/>");
+        } else {
             array_push($this->logStack, $tag);
             ZLog::Write(LOGLEVEL_WBXML,"O " . $spaces . " <$tag>");
         }

lib/wbxml/wbxmldecoder.php

Braces +62 added lines, -52 removed lines

@@ -36,8 +36,7 @@ 
     static public function InWhile($name) {
         if (!isset(self::$loopCounter[$name])) {
             self::$loopCounter[$name] = 0;
-        }
-        else {
+        } else {
             self::$loopCounter[$name]++;
         }
 
@@ -81,16 +80,19 @@ 
         }
 
         $publicid = $this->getMBUInt();
-        if($publicid !== 1)
-            throw new WBXMLException("Wrong publicid : ".$publicid);
+        if($publicid !== 1) {
+                    throw new WBXMLException("Wrong publicid : ".$publicid);
+        }
 
         $charsetid = $this->getMBUInt();
-        if ($charsetid !== 106)
-            throw new WBXMLException("Wrong charset : ".$charsetid);
+        if ($charsetid !== 106) {
+                    throw new WBXMLException("Wrong charset : ".$charsetid);
+        }
 
         $stringtablesize = $this->getMBUInt();
-        if ($stringtablesize !== 0)
-            throw new WBXMLException("Wrong string table size : ".$stringtablesize);
+        if ($stringtablesize !== 0) {
+                    throw new WBXMLException("Wrong string table size : ".$stringtablesize);
+        }
     }
 
     /**
@@ -111,9 +113,9 @@ 
                 WBXMLDecoder::ResetInWhile("decoderGetElement");
                 while(WBXMLDecoder::InWhile("decoderGetElement")) {
                     $next = $this->getToken();
-                    if($next == false)
-                        return false;
-                    else if($next[EN_TYPE] == EN_CONTENT) {
+                    if($next == false) {
+                                            return false;
+                    } else if($next[EN_TYPE] == EN_CONTENT) {
                         $element[EN_CONTENT] .= $next[EN_CONTENT];
                     } else {
                         $this->ungetElement($next);
@@ -149,12 +151,13 @@ 
     public function getElementStartTag($tag) {
         $element = $this->getToken();
 
-        if (!$element)
-            return false;
+        if (!$element) {
+                    return false;
+        }
 
-        if($element[EN_TYPE] == EN_TYPE_STARTTAG && $element[EN_TAG] == $tag)
-            return $element;
-        else {
+        if($element[EN_TYPE] == EN_TYPE_STARTTAG && $element[EN_TAG] == $tag) {
+                    return $element;
+        } else {
             ZLog::Write(LOGLEVEL_WBXMLSTACK, sprintf("WBXMLDecoder->getElementStartTag(): unmatched WBXML tag: '%s' matching '%s' type '%s' flags '%s'", $tag, ((isset($element[EN_TAG]))?$element[EN_TAG]:""), ((isset($element[EN_TYPE]))?$element[EN_TYPE]:""), ((isset($element[EN_FLAGS]))?$element[EN_FLAGS]:"")));
             $this->ungetElement($element);
         }
@@ -171,9 +174,9 @@ 
     public function getElementEndTag() {
         $element = $this->getToken();
 
-        if($element[EN_TYPE] == EN_TYPE_ENDTAG)
-            return $element;
-        else {
+        if($element[EN_TYPE] == EN_TYPE_ENDTAG) {
+                    return $element;
+        } else {
             ZLog::Write(LOGLEVEL_WBXMLSTACK, sprintf("WBXMLDecoder->getElementEndTag(): unmatched WBXML tag: '%s' type '%s' flags '%s'", ((isset($element[EN_TAG]))?$element[EN_TAG]:""), ((isset($element[EN_TYPE]))?$element[EN_TYPE]:""), ((isset($element[EN_FLAGS]))?$element[EN_FLAGS]:"")));
 
             $bt = debug_backtrace();
@@ -198,8 +201,7 @@ 
 
         if($element[EN_TYPE] == EN_TYPE_CONTENT) {
             return $element[EN_CONTENT];
-        }
-        else {
+        } else {
             ZLog::Write(LOGLEVEL_WBXMLSTACK, sprintf("WBXMLDecoder->getElementContent(): unmatched WBXML content: '%s' type '%s' flags '%s'", ((isset($element[EN_TAG]))?$element[EN_TAG]:""), ((isset($element[EN_TYPE]))?$element[EN_TYPE]:""), ((isset($element[EN_FLAGS]))?$element[EN_FLAGS]:"")));
             $this->ungetElement($element);
         }
@@ -216,8 +218,9 @@ 
      * @return
      */
     public function ungetElement($element) {
-        if($this->ungetbuffer)
-            ZLog::Write(LOGLEVEL_ERROR,sprintf("WBXMLDecoder->ungetElement(): WBXML double unget on tag: '%s' type '%s' flags '%s'", ((isset($element[EN_TAG]))?$element[EN_TAG]:""), ((isset($element[EN_TYPE]))?$element[EN_TYPE]:""), ((isset($element[EN_FLAGS]))?$element[EN_FLAGS]:"")));
+        if($this->ungetbuffer) {
+                    ZLog::Write(LOGLEVEL_ERROR,sprintf("WBXMLDecoder->ungetElement(): WBXML double unget on tag: '%s' type '%s' flags '%s'", ((isset($element[EN_TAG]))?$element[EN_TAG]:""), ((isset($element[EN_TYPE]))?$element[EN_TYPE]:""), ((isset($element[EN_FLAGS]))?$element[EN_FLAGS]:"")));
+        }
 
         $this->ungetbuffer = $element;
     }
@@ -272,8 +275,9 @@ 
         }
 
         $el = $this->_getToken();
-        if($this->log && $el)
-            $this->logToken($el);
+        if($this->log && $el) {
+                    $this->logToken($el);
+        }
 
         return $el;
     }
@@ -294,8 +298,9 @@ 
                 if($el[EN_FLAGS] & EN_FLAGS_CONTENT) {
                     ZLog::Write(LOGLEVEL_WBXML,"I " . $spaces . " <". $el[EN_TAG] . ">");
                     array_push($this->logStack, $el[EN_TAG]);
-                } else
-                    ZLog::Write(LOGLEVEL_WBXML,"I " . $spaces . " <" . $el[EN_TAG] . "/>");
+                } else {
+                                    ZLog::Write(LOGLEVEL_WBXML,"I " . $spaces . " <" . $el[EN_TAG] . "/>");
+                }
 
                 break;
             case EN_TYPE_ENDTAG:
@@ -309,8 +314,7 @@ 
                 $messagesize = strlen($el[EN_CONTENT]);
                 if ($messagesize > 10240 && !defined('WBXML_DEBUGGING')) {
                     $content = substr($el[EN_CONTENT], 0, 10240) . sprintf(" <log message with %d bytes truncated>", $messagesize);
-                }
-                else {
+                } else {
                     $content = $el[EN_CONTENT];
                 }
                 // Log but make sure it's not truncated again (will be slightly bigger than 10KB)
@@ -332,8 +336,9 @@ 
         WBXMLDecoder::ResetInWhile("decoderGetToken");
         while(WBXMLDecoder::InWhile("decoderGetToken")) {
             $byte = fread($this->in, 1);
-            if($byte === "" || $byte === false)
-                break;
+            if($byte === "" || $byte === false) {
+                            break;
+            }
             $byte = ord($byte);
 
             switch($byte) {
@@ -375,8 +380,9 @@ 
                     throw new WBXMLException("Invalid token :".$byte);
 
                 default:
-                    if($byte & self::WBXML_WITH_ATTRIBUTES)
-                        throw new WBXMLException("Attributes are not allowed :".$byte);
+                    if($byte & self::WBXML_WITH_ATTRIBUTES) {
+                                            throw new WBXMLException("Attributes are not allowed :".$byte);
+                    }
                     $element[EN_TYPE] = EN_TYPE_STARTTAG;
                     $element[EN_TAG] = $this->getMapping($this->tagcp, $byte & 0x3f);
                     $element[EN_FLAGS] = ($byte & self::WBXML_WITH_CONTENT ? EN_FLAGS_CONTENT : 0);
@@ -398,8 +404,7 @@ 
                 $in = $this->getByte();
                 if ($in == 0) {
                     break;
-                }
-                else {
+                } else {
                     $str .= chr($in);
                 }
             }
@@ -425,11 +430,13 @@ 
      */
     private function getOpaque($len) {
         $d = stream_get_contents($this->in, $len);
-        if ($d === false)
-            throw new HTTPReturnCodeException("WBXMLDecoder->getOpaque(): stream_get_contents === false", HTTP_CODE_500, null, LOGLEVEL_WARN);
+        if ($d === false) {
+                    throw new HTTPReturnCodeException("WBXMLDecoder->getOpaque(): stream_get_contents === false", HTTP_CODE_500, null, LOGLEVEL_WARN);
+        }
         $l = strlen($d);
-        if ($l !== $len)
-            throw new HTTPReturnCodeException("WBXMLDecoder->getOpaque(): only $l byte read instead of $len", HTTP_CODE_500, null, LOGLEVEL_WARN);
+        if ($l !== $len) {
+                    throw new HTTPReturnCodeException("WBXMLDecoder->getOpaque(): only $l byte read instead of $len", HTTP_CODE_500, null, LOGLEVEL_WARN);
+        }
         return $d;
     }
 
@@ -441,10 +448,11 @@ 
      */
     private function getByte() {
         $ch = fread($this->in, 1);
-        if(strlen($ch) > 0)
-            return ord($ch);
-        else
-            return;
+        if(strlen($ch) > 0) {
+                    return ord($ch);
+        } else {
+                    return;
+        }
     }
 
     /**
@@ -461,10 +469,11 @@ 
 
           $uint |= $byte & 0x7f;
 
-          if($byte & 0x80)
-              $uint = $uint << 7;
-          else
-              break;
+          if($byte & 0x80) {
+                        $uint = $uint << 7;
+          } else {
+                        break;
+          }
         }
 
         return $uint;
@@ -480,13 +489,14 @@ 
      * @return string
      */
     private function getMapping($cp, $id) {
-        if(!isset($this->dtd["codes"][$cp]) || !isset($this->dtd["codes"][$cp][$id]))
-            return false;
-        else {
+        if(!isset($this->dtd["codes"][$cp]) || !isset($this->dtd["codes"][$cp][$id])) {
+                    return false;
+        } else {
             if(isset($this->dtd["namespaces"][$cp])) {
                 return $this->dtd["namespaces"][$cp] . ":" . $this->dtd["codes"][$cp][$id];
-            } else
-                return $this->dtd["codes"][$cp][$id];
+            } else {
+                            return $this->dtd["codes"][$cp][$id];
+            }
         }
     }
 }

lib/utils/stringstreamwrapper.php

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

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

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