grommunio / grommunio-sync

lib/core/zpush.php

Indentation +5 added lines, -10 removed lines

@@ -109,31 +109,31 @@ 
                                         self::CLASS_OTHERTYPES => array(SYNC_FOLDER_TYPE_OTHER, SYNC_FOLDER_TYPE_DRAFTS, SYNC_FOLDER_TYPE_WASTEBASKET,
                                                                         SYNC_FOLDER_TYPE_SENTMAIL, SYNC_FOLDER_TYPE_OUTBOX, SYNC_FOLDER_TYPE_USER_MAIL,
                                                                         SYNC_FOLDER_TYPE_JOURNAL, SYNC_FOLDER_TYPE_USER_JOURNAL),
-                                   ),
+                                    ),
                     "Contacts"  => array(
                                         self::CLASS_NAME => "SyncContact",
                                         self::CLASS_REQUIRESPROTOCOLVERSION => true,
                                         self::CLASS_DEFAULTTYPE => SYNC_FOLDER_TYPE_CONTACT,
                                         self::CLASS_OTHERTYPES => array(SYNC_FOLDER_TYPE_USER_CONTACT, SYNC_FOLDER_TYPE_UNKNOWN),
-                                   ),
+                                    ),
                     "Calendar"  => array(
                                         self::CLASS_NAME => "SyncAppointment",
                                         self::CLASS_REQUIRESPROTOCOLVERSION => false,
                                         self::CLASS_DEFAULTTYPE => SYNC_FOLDER_TYPE_APPOINTMENT,
                                         self::CLASS_OTHERTYPES => array(SYNC_FOLDER_TYPE_USER_APPOINTMENT),
-                                   ),
+                                    ),
                     "Tasks"     => array(
                                         self::CLASS_NAME => "SyncTask",
                                         self::CLASS_REQUIRESPROTOCOLVERSION => false,
                                         self::CLASS_DEFAULTTYPE => SYNC_FOLDER_TYPE_TASK,
                                         self::CLASS_OTHERTYPES => array(SYNC_FOLDER_TYPE_USER_TASK),
-                                   ),
+                                    ),
                     "Notes" => array(
                                         self::CLASS_NAME => "SyncNote",
                                         self::CLASS_REQUIRESPROTOCOLVERSION => false,
                                         self::CLASS_DEFAULTTYPE => SYNC_FOLDER_TYPE_NOTE,
                                         self::CLASS_OTHERTYPES => array(SYNC_FOLDER_TYPE_USER_NOTE),
-                                   ),
+                                    ),
                 );
 
 
@@ -435,7 +435,6 @@ 
      * Loads a backend file
      *
      * @param string $backendname
-
      * @access public
      * @throws FatalNotImplementedException
      * @return boolean
@@ -636,7 +635,6 @@ 
      *
      * @param string $message               (opt) message to be displayed
      * @param string $additionalMessage     (opt) additional message to be displayed
-
      * @access public
      * @return
      *
@@ -786,7 +784,6 @@ 
      * Indicates if the Provisioning check has to be forced on these commands
      *
      * @param string $commandCode
-
      * @access public
      * @return boolean
      */
@@ -814,7 +811,6 @@ 
      * Indicates if the command to be executed operates on the hierarchy
      *
      * @param int $commandCode
-
      * @access public
      * @return boolean
      */
@@ -829,7 +825,6 @@ 
      *
      * @param string $commandCode   a commandCode
      * @param string $option        e.g. self::UNAUTHENTICATED
-
      * @access private
      * @throws FatalNotImplementedException
      * @return object StateMachine

Spacing +49 added lines, -49 removed lines

@@ -11,7 +11,7 @@ 
     const UNAUTHENTICATED = 1;
     const UNPROVISIONED = 2;
     const NOACTIVESYNCCOMMAND = 3;
-    const WEBSERVICECOMMAND = 4;    // DEPRECATED
+    const WEBSERVICECOMMAND = 4; // DEPRECATED
     const HIERARCHYCOMMAND = 5;
     const PLAININPUT = 6;
     const REQUESTHANDLER = 7;
@@ -73,28 +73,28 @@ 
 
     static private $supportedCommands = array(
                     // COMMAND                             // AS VERSION   // REQUESTHANDLER                        // OTHER SETTINGS
-                    self::COMMAND_SYNC              => array(self::ASV_1,  self::REQUESTHANDLER => "Sync"),
-                    self::COMMAND_SENDMAIL          => array(self::ASV_1,  self::REQUESTHANDLER => "SendMail"),
-                    self::COMMAND_SMARTFORWARD      => array(self::ASV_1,  self::REQUESTHANDLER => "SendMail"),
-                    self::COMMAND_SMARTREPLY        => array(self::ASV_1,  self::REQUESTHANDLER => "SendMail"),
-                    self::COMMAND_GETATTACHMENT     => array(self::ASV_1,  self::REQUESTHANDLER => "GetAttachment"),
-                    self::COMMAND_GETHIERARCHY      => array(self::ASV_1,  self::REQUESTHANDLER => "GetHierarchy",  self::HIERARCHYCOMMAND),            // deprecated but implemented
-                    self::COMMAND_CREATECOLLECTION  => array(self::ASV_1),                                                                              // deprecated & not implemented
-                    self::COMMAND_DELETECOLLECTION  => array(self::ASV_1),                                                                              // deprecated & not implemented
-                    self::COMMAND_MOVECOLLECTION    => array(self::ASV_1),                                                                              // deprecated & not implemented
-                    self::COMMAND_FOLDERSYNC        => array(self::ASV_2,  self::REQUESTHANDLER => "FolderSync",    self::HIERARCHYCOMMAND),
-                    self::COMMAND_FOLDERCREATE      => array(self::ASV_2,  self::REQUESTHANDLER => "FolderChange",  self::HIERARCHYCOMMAND),
-                    self::COMMAND_FOLDERDELETE      => array(self::ASV_2,  self::REQUESTHANDLER => "FolderChange",  self::HIERARCHYCOMMAND),
-                    self::COMMAND_FOLDERUPDATE      => array(self::ASV_2,  self::REQUESTHANDLER => "FolderChange",  self::HIERARCHYCOMMAND),
-                    self::COMMAND_MOVEITEMS         => array(self::ASV_1,  self::REQUESTHANDLER => "MoveItems"),
-                    self::COMMAND_GETITEMESTIMATE   => array(self::ASV_1,  self::REQUESTHANDLER => "GetItemEstimate"),
-                    self::COMMAND_MEETINGRESPONSE   => array(self::ASV_1,  self::REQUESTHANDLER => "MeetingResponse"),
-                    self::COMMAND_RESOLVERECIPIENTS => array(self::ASV_1,  self::REQUESTHANDLER => "ResolveRecipients"),
-                    self::COMMAND_VALIDATECERT      => array(self::ASV_1,  self::REQUESTHANDLER => "ValidateCert"),
-                    self::COMMAND_PROVISION         => array(self::ASV_25, self::REQUESTHANDLER => "Provisioning",  self::UNAUTHENTICATED, self::UNPROVISIONED),
-                    self::COMMAND_SEARCH            => array(self::ASV_1,  self::REQUESTHANDLER => "Search"),
-                    self::COMMAND_PING              => array(self::ASV_2,  self::REQUESTHANDLER => "Ping",          self::UNPROVISIONED),
-                    self::COMMAND_NOTIFY            => array(self::ASV_1,  self::REQUESTHANDLER => "Notify"),                                           // deprecated & not implemented
+                    self::COMMAND_SYNC              => array(self::ASV_1, self::REQUESTHANDLER => "Sync"),
+                    self::COMMAND_SENDMAIL          => array(self::ASV_1, self::REQUESTHANDLER => "SendMail"),
+                    self::COMMAND_SMARTFORWARD      => array(self::ASV_1, self::REQUESTHANDLER => "SendMail"),
+                    self::COMMAND_SMARTREPLY        => array(self::ASV_1, self::REQUESTHANDLER => "SendMail"),
+                    self::COMMAND_GETATTACHMENT     => array(self::ASV_1, self::REQUESTHANDLER => "GetAttachment"),
+                    self::COMMAND_GETHIERARCHY      => array(self::ASV_1, self::REQUESTHANDLER => "GetHierarchy", self::HIERARCHYCOMMAND), // deprecated but implemented
+                    self::COMMAND_CREATECOLLECTION  => array(self::ASV_1), // deprecated & not implemented
+                    self::COMMAND_DELETECOLLECTION  => array(self::ASV_1), // deprecated & not implemented
+                    self::COMMAND_MOVECOLLECTION    => array(self::ASV_1), // deprecated & not implemented
+                    self::COMMAND_FOLDERSYNC        => array(self::ASV_2, self::REQUESTHANDLER => "FolderSync", self::HIERARCHYCOMMAND),
+                    self::COMMAND_FOLDERCREATE      => array(self::ASV_2, self::REQUESTHANDLER => "FolderChange", self::HIERARCHYCOMMAND),
+                    self::COMMAND_FOLDERDELETE      => array(self::ASV_2, self::REQUESTHANDLER => "FolderChange", self::HIERARCHYCOMMAND),
+                    self::COMMAND_FOLDERUPDATE      => array(self::ASV_2, self::REQUESTHANDLER => "FolderChange", self::HIERARCHYCOMMAND),
+                    self::COMMAND_MOVEITEMS         => array(self::ASV_1, self::REQUESTHANDLER => "MoveItems"),
+                    self::COMMAND_GETITEMESTIMATE   => array(self::ASV_1, self::REQUESTHANDLER => "GetItemEstimate"),
+                    self::COMMAND_MEETINGRESPONSE   => array(self::ASV_1, self::REQUESTHANDLER => "MeetingResponse"),
+                    self::COMMAND_RESOLVERECIPIENTS => array(self::ASV_1, self::REQUESTHANDLER => "ResolveRecipients"),
+                    self::COMMAND_VALIDATECERT      => array(self::ASV_1, self::REQUESTHANDLER => "ValidateCert"),
+                    self::COMMAND_PROVISION         => array(self::ASV_25, self::REQUESTHANDLER => "Provisioning", self::UNAUTHENTICATED, self::UNPROVISIONED),
+                    self::COMMAND_SEARCH            => array(self::ASV_1, self::REQUESTHANDLER => "Search"),
+                    self::COMMAND_PING              => array(self::ASV_2, self::REQUESTHANDLER => "Ping", self::UNPROVISIONED),
+                    self::COMMAND_NOTIFY            => array(self::ASV_1, self::REQUESTHANDLER => "Notify"), // deprecated & not implemented
                     self::COMMAND_ITEMOPERATIONS    => array(self::ASV_12, self::REQUESTHANDLER => "ItemOperations"),
                     self::COMMAND_SETTINGS          => array(self::ASV_12, self::REQUESTHANDLER => "Settings"),
             );
@@ -156,7 +156,7 @@ 
      */
     static public function CheckConfig() {
         // check the php version
-        if (version_compare(phpversion(),'5.4.0') < 0) {
+        if (version_compare(phpversion(), '5.4.0') < 0) {
             throw new FatalException("The configured PHP version is too old. Please make sure at least PHP 5.4 is used.");
         }
 
@@ -164,7 +164,7 @@ 
         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) != "/")
+        if (substr(BASE_PATH, -1, 1) != "/")
             throw new FatalMisconfigurationException("The BASE_PATH should terminate with a '/'");
 
         if (!file_exists(BASE_PATH))
@@ -210,7 +210,7 @@ 
             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) != "/")
+            if (substr(LOGFILEDIR, -1, 1) != "/")
                 throw new FatalMisconfigurationException("The LOGFILEDIR should terminate with a '/'");
 
             if (!file_exists(LOGFILEDIR))
@@ -232,11 +232,11 @@ 
 
         // set time zone
         // code contributed by Robert Scheck (rsc)
-        if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
-            if (! @date_default_timezone_set(TIMEZONE))
+        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')) {
+        else if (!ini_get('date.timezone')) {
             date_default_timezone_set('Europe/Vienna');
         }
 
@@ -283,23 +283,23 @@ 
         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){
+        if (PING_HIGHER_BOUND_LIFETIME !== false && PING_LOWER_BOUND_LIFETIME !== false && PING_HIGHER_BOUND_LIFETIME < PING_LOWER_BOUND_LIFETIME) {
             throw new FatalMisconfigurationException("The PING_HIGHER_BOUND_LIFETIME value must be greater or equal to PING_LOWER_BOUND_LIFETIME.");
         }
 
         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.");
         }
 
@@ -445,12 +445,12 @@ 
 
         $backendname = strtolower($backendname);
         if (substr($backendname, 0, 7) !== 'backend')
-            throw new FatalNotImplementedException(sprintf("Backend '%s' is not allowed",$backendname));
+            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";
+        $subdirbackend = REAL_BASE_PATH."backend/".$rbn."/".$rbn.".php";
+        $stdbackend = REAL_BASE_PATH."backend/".$rbn.".php";
 
         if (is_file($subdirbackend))
             $toLoad = $subdirbackend;
@@ -516,7 +516,7 @@ 
      * @return string
      */
     static public function GetAdditionalSyncFolderStore($backendid, $noDebug = false) {
-        if(isset(self::getAddSyncFolders()[$backendid]->Store)) {
+        if (isset(self::getAddSyncFolders()[$backendid]->Store)) {
             $val = self::getAddSyncFolders()[$backendid]->Store;
         }
         else {
@@ -642,10 +642,10 @@ 
      *
      */
     static public function PrintGrommunioSyncLegal($message = "", $additionalMessage = "") {
-        ZLog::Write(LOGLEVEL_DEBUG,"ZPush::PrintGrommunioSyncLegal()");
+        ZLog::Write(LOGLEVEL_DEBUG, "ZPush::PrintGrommunioSyncLegal()");
 
         if ($message)
-            $message = "<h3>". $message . "</h3>";
+            $message = "<h3>".$message."</h3>";
         if ($additionalMessage)
             $additionalMessage .= "<br>";
 
@@ -703,7 +703,7 @@ 
         if (self::GetSupportedASVersion() == self::ASV_25)
             return "MS-Server-ActiveSync: 6.5.7638.1";
         else
-            return "MS-Server-ActiveSync: ". self::GetSupportedASVersion();
+            return "MS-Server-ActiveSync: ".self::GetSupportedASVersion();
     }
 
     /**
@@ -715,13 +715,13 @@ 
      * @return string
      */
     static public function GetSupportedProtocolVersions($valueOnly = false) {
-        $versions = implode(',', array_slice(self::$supportedASVersions, 0, (array_search(self::GetSupportedASVersion(), self::$supportedASVersions)+1)));
-        ZLog::Write(LOGLEVEL_DEBUG, "ZPush::GetSupportedProtocolVersions(): " . $versions);
+        $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;
 
-        return "MS-ASProtocolVersions: " . $versions;
+        return "MS-ASProtocolVersions: ".$versions;
     }
 
     /**
@@ -739,8 +739,8 @@ 
                 $asCommands[] = Utils::GetCommandFromCode($c);
 
         $commands = implode(',', $asCommands);
-        ZLog::Write(LOGLEVEL_DEBUG, "ZPush::GetSupportedCommands(): " . $commands);
-        return "MS-ASProtocolCommands: " . $commands;
+        ZLog::Write(LOGLEVEL_DEBUG, "ZPush::GetSupportedCommands(): ".$commands);
+        return "MS-ASProtocolCommands: ".$commands;
     }
 
     /**
@@ -753,11 +753,11 @@ 
      */
     static public function GetRequestHandlerForCommand($commandCode) {
         if (!array_key_exists($commandCode, self::$supportedCommands) ||
-            !array_key_exists(self::REQUESTHANDLER, self::$supportedCommands[$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";
+        $handlerclass = REAL_BASE_PATH."lib/request/".strtolower($class).".php";
 
         if (is_file($handlerclass))
             include($handlerclass);
@@ -777,7 +777,7 @@ 
      * @return boolean
      */
     static public function CommandNeedsAuthentication($commandCode) {
-        $stat = ! self::checkCommandOptions($commandCode, self::UNAUTHENTICATED);
+        $stat = !self::checkCommandOptions($commandCode, self::UNAUTHENTICATED);
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("ZPush::CommandNeedsAuthentication(%d): %s", $commandCode, Utils::PrintAsString($stat)));
         return $stat;
     }
@@ -791,7 +791,7 @@ 
      * @return boolean
      */
     static public function CommandNeedsProvisioning($commandCode) {
-        $stat = ! self::checkCommandOptions($commandCode, self::UNPROVISIONED);
+        $stat = !self::checkCommandOptions($commandCode, self::UNPROVISIONED);
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("ZPush::CommandNeedsProvisioning(%s): %s", $commandCode, Utils::PrintAsString($stat)));
         return $stat;
     }

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

Indentation +9 added lines, -9 removed lines

@@ -480,15 +480,15 @@
         return true;
     }
 
-     /**
-     * Sets the supported fields transmitted by the device for a certain folder
-     *
-     * @param string    $folderid
-     * @param array     $fieldlist          supported fields
-     *
-     * @access public
-     * @return boolean
-     */
+        /**
+         * Sets the supported fields transmitted by the device for a certain folder
+         *
+         * @param string    $folderid
+         * @param array     $fieldlist          supported fields
+         *
+         * @access public
+         * @return boolean
+         */
     public function SetSupportedFields($folderid, $fieldlist) {
         return $this->device->SetSupportedFields($folderid, $fieldlist);
     }

Spacing +13 added lines, -13 removed lines

@@ -157,18 +157,18 @@ 
                     $this->statemachine->LinkUserDevice($this->device->GetDeviceUser(), self::$devid);
                 }
 
-                if (RequestProcessor::isUserAuthenticated() || $this->device->GetForceSave() ) {
+                if (RequestProcessor::isUserAuthenticated() || $this->device->GetForceSave()) {
                     $this->device->lastupdatetime = time();
                     $this->device->StripData();
                     $this->statemachine->SetState($this->device, self::$devid, IStateMachine::DEVICEDATA);
 
                     // update deviceuser stat in redis as well
-                    $this->setDeviceUserData($this->type, array(self::$user => $this->device), self::$devid, -1, $doCas="merge");
+                    $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) {
-                ZLog::Write(LOGLEVEL_ERROR, "DeviceManager->Save(): Exception: ". $snfex->getMessage());
+                ZLog::Write(LOGLEVEL_ERROR, "DeviceManager->Save(): Exception: ".$snfex->getMessage());
             }
         }
 
@@ -194,7 +194,7 @@ 
      * @return void
      */
     public function DoAutomaticASDeviceSaving($doSave) {
-        ZLog::Write(LOGLEVEL_DEBUG, "DeviceManager->DoAutomaticASDeviceSaving(): save automatically: ". Utils::PrintAsString($doSave));
+        ZLog::Write(LOGLEVEL_DEBUG, "DeviceManager->DoAutomaticASDeviceSaving(): save automatically: ".Utils::PrintAsString($doSave));
         $this->saveDevice = $doSave;
     }
 
@@ -338,7 +338,7 @@ 
             return $folders;
         }
 
-        foreach($this->device->GetAdditionalFolders() as $df) {
+        foreach ($this->device->GetAdditionalFolders() as $df) {
             if (!isset($df['flags'])) {
                 $df['flags'] = 0;
                 ZLog::Write(LOGLEVEL_WARN, sprintf("DeviceManager->GetAdditionalUserSyncFolders(): Additional folder '%s' has no flags.", $df['name']));
@@ -450,7 +450,7 @@ 
         $loop = $this->loopdetection->Detect($folderid, $uuid, $statecounter, $items, $queuedmessages);
         if ($loop !== false) {
             if ($loop === true) {
-                $items = ($items == 0) ? 0: 1+($this->loopdetection->IgnoreNextMessage(false)?1:0) ;
+                $items = ($items == 0) ? 0 : 1 + ($this->loopdetection->IgnoreNextMessage(false) ? 1 : 0);
             }
             else {
                 // we got a new suggested window size
@@ -543,18 +543,18 @@ 
                     // 1. step: check if there is a general limitation for the store
                     if (array_key_exists($store, $specialSyncFilter)) {
                         $spFilter = $specialSyncFilter[$store];
-                        ZLog::Write(LOGLEVEL_DEBUG, sprintf("Limit sync due to configured limitation on the store: '%s': %s",$store, $spFilter));
+                        ZLog::Write(LOGLEVEL_DEBUG, sprintf("Limit sync due to configured limitation on the store: '%s': %s", $store, $spFilter));
                     }
 
                     // 2. step: check if there is a limitation for the hashed ID (for shared/configured stores)
-                    $spKey= $store .'/'. $folderid;
+                    $spKey = $store.'/'.$folderid;
                     if (array_key_exists($spKey, $specialSyncFilter)) {
                         $spFilter = $specialSyncFilter[$spKey];
                         ZLog::Write(LOGLEVEL_DEBUG, sprintf("Limit sync due to configured limitation on the folder: '%s': %s", $spKey, $spFilter));
                     }
 
                     // 3. step: check if there is a limitation for the backendId
-                    $spKey= $store .'/'. $backendFolderId;
+                    $spKey = $store.'/'.$backendFolderId;
                     if (array_key_exists($spKey, $specialSyncFilter)) {
                         $spFilter = $specialSyncFilter[$spKey];
                         ZLog::Write(LOGLEVEL_DEBUG, sprintf("Limit sync due to configured limitation on the folder: '%s': %s", $spKey, $spFilter));
@@ -737,7 +737,7 @@ 
             $uuid = $this->device->GetFolderUUID($folderid);
             if ($uuid) {
                 // has a UUID but is not in the cache?! This is deleted, remove the states.
-                if (! $hc->GetFolder($folderid)) {
+                if (!$hc->GetFolder($folderid)) {
                     ZLog::Write(LOGLEVEL_WARN, sprintf("DeviceManager->CheckFolderData(): Folder '%s' has sync states but is not in the hierarchy cache. Removing states.", $folderid));
                     StateManager::UnLinkState($this->device, $folderid);
                 }
@@ -927,7 +927,7 @@ 
                 // fallback for old grosync like devicedata
                 if (($device instanceof StateObject) && isset($device->devices) && is_array($device->devices)) {
                     ZLog::Write(LOGLEVEL_INFO, "Found old style device, converting...");
-                    list ($_deviceuser, $_domain) =  Utils::SplitDomainUser(Request::GetGETUser());
+                    list ($_deviceuser, $_domain) = Utils::SplitDomainUser(Request::GetGETUser());
                     if (!isset($device->data->devices[$_deviceuser])) {
                         ZLog::Write(LOGLEVEL_INFO, "Using old style device for this request and updating when concluding");
                         $device = $device->devices[$_deviceuser];
@@ -1017,7 +1017,7 @@ 
      */
     private function announceAcceptedMessage($folderid, $id) {
         if ($this->device->RemoveIgnoredMessage($folderid, $id)) {
-            ZLog::Write(LOGLEVEL_INFO, sprintf("DeviceManager->announceAcceptedMessage('%s', '%s'): cleared previously ignored message as message is successfully streamed",$folderid, $id));
+            ZLog::Write(LOGLEVEL_INFO, sprintf("DeviceManager->announceAcceptedMessage('%s', '%s'): cleared previously ignored message as message is successfully streamed", $folderid, $id));
             return true;
         }
         return false;
@@ -1034,7 +1034,7 @@ 
      */
     private function checkBrokenMessages($folderid) {
         // check for correctly synchronized messages of the folder
-        foreach($this->loopdetection->GetSyncedButBeforeIgnoredMessages($folderid) as $okID) {
+        foreach ($this->loopdetection->GetSyncedButBeforeIgnoredMessages($folderid) as $okID) {
             $this->announceAcceptedMessage($folderid, $okID);
         }
         return true;

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

Indentation +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
      */
     public function ImportMessageDeletion($id, $asSoftDelete = false) {
         if ($this->checkForIgnoredMessages) {
-           ZPush::GetDeviceManager()->RemoveBrokenMessage($id);
+            ZPush::GetDeviceManager()->RemoveBrokenMessage($id);
         }
 
         $this->importedMsgs++;

Spacing +6 added lines, -6 removed lines

@@ -26,7 +26,7 @@ 
     public function __construct(&$encoder, $class) {
         $this->encoder = &$encoder;
         $this->objclass = $class;
-        $this->classAsString = (is_object($class))?get_class($class):'';
+        $this->classAsString = (is_object($class)) ?get_class($class) : '';
         $this->seenObjects = array();
         $this->importedMsgs = 0;
         $this->checkForIgnoredMessages = true;
@@ -37,7 +37,7 @@ 
      */
     public function Config($state, $flags = 0) { return true; }
     public function ConfigContentParameters($contentparameters) { return true; }
-    public function GetState() { return false;}
+    public function GetState() { return false; }
     public function LoadConflicts($contentparameters, $state) { return true; }
 
     /**
@@ -51,7 +51,7 @@ 
      */
     public function ImportMessageChange($id, $message) {
         // ignore other SyncObjects
-        if(!($message instanceof $this->classAsString)) {
+        if (!($message instanceof $this->classAsString)) {
             return false;
         }
 
@@ -80,7 +80,7 @@ 
             $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))) {
+            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;
@@ -148,7 +148,7 @@ 
      * @return boolean
      */
     public function ImportMessageReadFlag($id, $flags, $categories = array()) {
-        if(!($this->objclass instanceof SyncMail))
+        if (!($this->objclass instanceof SyncMail))
             return false;
 
         $this->importedMsgs++;
@@ -163,7 +163,7 @@ 
                 $this->encoder->endTag();
                 if (!empty($categories) && is_array($categories)) {
                     $this->encoder->startTag(SYNC_POOMMAIL_CATEGORIES);
-                    foreach($categories as $category) {
+                    foreach ($categories as $category) {
                         $this->encoder->startTag(SYNC_POOMMAIL_CATEGORY);
                         $this->encoder->content($category);
                         $this->encoder->endTag();

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

Spacing +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
      * @return string
      */
     public function GetStat() {
-        return sprintf("HierarchyCache is %s - Cached objects: %d", ((isset($this->data))?"up":"down"), ((isset($this->data))?count($this->data):"0"));
+        return sprintf("HierarchyCache is %s - Cached objects: %d", ((isset($this->data)) ? "up" : "down"), ((isset($this->data)) ?count($this->data) : "0"));
     }
 
     /**

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

Spacing +29 added lines, -29 removed lines

@@ -33,13 +33,13 @@ 
         $this->_out = $output;
 
         // reverse-map the DTD
-        foreach($this->dtd["namespaces"] as $nsid => $nsname) {
+        foreach ($this->dtd["namespaces"] as $nsid => $nsname) {
             $this->_dtd["namespaces"][$nsname] = $nsid;
         }
 
-        foreach($this->dtd["codes"] as $cp => $value) {
+        foreach ($this->dtd["codes"] as $cp => $value) {
             $this->_dtd["codes"][$cp] = array();
-            foreach($this->dtd["codes"][$cp] as $tagid => $tagname) {
+            foreach ($this->dtd["codes"][$cp] as $tagid => $tagname) {
                 $this->_dtd["codes"][$cp][$tagname] = $tagid;
             }
         }
@@ -83,7 +83,7 @@ 
     public function startTag($tag, $attributes = false, $nocontent = false) {
         $stackelem = array();
 
-        if(!$nocontent) {
+        if (!$nocontent) {
             $stackelem['tag'] = $tag;
             $stackelem['nocontent'] = $nocontent;
             $stackelem['sent'] = false;
@@ -108,16 +108,16 @@ 
         $stackelem = array_pop($this->_stack);
 
         // Only output end tags for items that have had a start tag sent
-        if($stackelem['sent']) {
+        if ($stackelem['sent']) {
             $this->_endTag();
 
-            if(count($this->_stack) == 0)
+            if (count($this->_stack) == 0)
                 ZLog::Write(LOGLEVEL_DEBUG, "WBXMLEncoder->endTag() WBXML output completed");
 
-            if(count($this->_stack) == 0 && $this->multipart == true) {
+            if (count($this->_stack) == 0 && $this->multipart == true) {
                 $this->processMultipart();
             }
-            if(count($this->_stack) == 0)
+            if (count($this->_stack) == 0)
                 $this->writeLog();
         }
     }
@@ -133,9 +133,9 @@ 
     public function content($content) {
         // We need to filter out any \0 chars because it's the string terminator in WBXML. We currently
         // cannot send \0 characters within the XML content anywhere.
-        $content = str_replace("\0","",$content);
+        $content = str_replace("\0", "", $content);
 
-        if("x" . $content == "x")
+        if ("x".$content == "x")
             return;
         $this->_outputStack();
         $this->_content($content);
@@ -214,8 +214,8 @@ 
      * @return
      */
     private function _outputStack() {
-        for($i=0;$i<count($this->_stack);$i++) {
-            if(!$this->_stack[$i]['sent']) {
+        for ($i = 0; $i < count($this->_stack); $i++) {
+            if (!$this->_stack[$i]['sent']) {
                 $this->_startTag($this->_stack[$i]['tag'], $this->_stack[$i]['nocontent']);
                 $this->_stack[$i]['sent'] = true;
             }
@@ -234,17 +234,17 @@ 
 
         $mapping = $this->getMapping($tag);
 
-        if(!$mapping)
+        if (!$mapping)
             return false;
 
-        if($this->_tagcp != $mapping["cp"]) {
+        if ($this->_tagcp != $mapping["cp"]) {
             $this->outSwitchPage($mapping["cp"]);
             $this->_tagcp = $mapping["cp"];
         }
 
         $code = $mapping["code"];
 
-        if(!isset($nocontent) || !$nocontent)
+        if (!isset($nocontent) || !$nocontent)
             $code |= 0x40;
 
         $this->outByte($code);
@@ -296,7 +296,7 @@ 
 
         if ($this->log) {
             // data is out, do some logging
-            $this->logContent(sprintf("<<< written %d of %d bytes of %s data >>>", $written, $stat['size'], $asBase64 ? "base64 encoded":"plain"));
+            $this->logContent(sprintf("<<< written %d of %d bytes of %s data >>>", $written, $stat['size'], $asBase64 ? "base64 encoded" : "plain"));
         }
     }
 
@@ -351,10 +351,10 @@ 
             $byte = $uint & 0x7f;
             $uint = $uint >> 7;
             if ($i == 0) {
-                $out = chr($byte) . $out;
+                $out = chr($byte).$out;
             }
             else {
-                $out = chr($byte | 0x80) . $out;
+                $out = chr($byte|0x80).$out;
             }
         }
         fwrite($this->_out, $out);
@@ -399,7 +399,7 @@ 
 
         $split = $this->splitTag($tag);
 
-        if(isset($split["ns"])) {
+        if (isset($split["ns"])) {
             $cp = $this->_dtd["namespaces"][$split["ns"]];
         }
         else {
@@ -426,16 +426,16 @@ 
         $ns = false;
         $pos = strpos($fulltag, chr(58)); // chr(58) == ':'
 
-        if($pos) {
+        if ($pos) {
             $ns = substr($fulltag, 0, $pos);
-            $tag = substr($fulltag, $pos+1);
+            $tag = substr($fulltag, $pos + 1);
         }
         else {
             $tag = $fulltag;
         }
 
         $ret = array();
-        if($ns)
+        if ($ns)
             $ret["ns"] = $ns;
         $ret["tag"] = $tag;
 
@@ -453,11 +453,11 @@ 
      */
     private function logStartTag($tag, $nocontent) {
         $spaces = str_repeat(" ", count($this->logStack));
-        if($nocontent)
-            ZLog::Write(LOGLEVEL_WBXML,"O " . $spaces . " <$tag/>");
+        if ($nocontent)
+            ZLog::Write(LOGLEVEL_WBXML, "O ".$spaces." <$tag/>");
         else {
             array_push($this->logStack, $tag);
-            ZLog::Write(LOGLEVEL_WBXML,"O " . $spaces . " <$tag>");
+            ZLog::Write(LOGLEVEL_WBXML, "O ".$spaces." <$tag>");
         }
     }
 
@@ -470,7 +470,7 @@ 
     private function logEndTag() {
         $spaces = str_repeat(" ", count($this->logStack));
         $tag = array_pop($this->logStack);
-        ZLog::Write(LOGLEVEL_WBXML,"O " . $spaces . "</$tag>");
+        ZLog::Write(LOGLEVEL_WBXML, "O ".$spaces."</$tag>");
     }
 
     /**
@@ -483,7 +483,7 @@ 
      */
     private function logContent($content) {
         $spaces = str_repeat(" ", count($this->logStack));
-        ZLog::Write(LOGLEVEL_WBXML,"O " . $spaces . $content);
+        ZLog::Write(LOGLEVEL_WBXML, "O ".$spaces.$content);
     }
 
     /**
@@ -513,7 +513,7 @@ 
 
         fwrite($this->_out, $buffer);
 
-        foreach($this->bodyparts as $bp) {
+        foreach ($this->bodyparts as $bp) {
             stream_copy_to_stream($bp, $this->_out);
             fclose($bp);
         }
@@ -533,6 +533,6 @@ 
         } else {
             $data = "more than 512K of data";
         }
-        ZLog::Write(LOGLEVEL_WBXML, "WBXML-OUT: ". $data, false);
+        ZLog::Write(LOGLEVEL_WBXML, "WBXML-OUT: ".$data, false);
     }
 }

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

Indentation +6 added lines, -6 removed lines

@@ -457,14 +457,14 @@
         $uint = 0;
 
         while(1) {
-          $byte = $this->getByte();
+            $byte = $this->getByte();
 
-          $uint |= $byte & 0x7f;
+            $uint |= $byte & 0x7f;
 
-          if($byte & 0x80)
-              $uint = $uint << 7;
-          else
-              break;
+            if($byte & 0x80)
+                $uint = $uint << 7;
+            else
+                break;
         }
 
         return $uint;

Spacing +36 added lines, -36 removed lines

@@ -74,14 +74,14 @@ 
         $this->in = $input;
 
         $version = $this->getByte();
-        if($version != self::VERSION) {
+        if ($version != self::VERSION) {
             $this->inputBuffer .= chr($version);
             $this->isWBXML = false;
             return;
         }
 
         $publicid = $this->getMBUInt();
-        if($publicid !== 1)
+        if ($publicid !== 1)
             throw new WBXMLException("Wrong publicid : ".$publicid);
 
         $charsetid = $this->getMBUInt();
@@ -102,18 +102,18 @@ 
     public function getElement() {
         $element = $this->getToken();
 
-        switch($element[EN_TYPE]) {
+        switch ($element[EN_TYPE]) {
             case EN_TYPE_STARTTAG:
                 return $element;
             case EN_TYPE_ENDTAG:
                 return $element;
             case EN_TYPE_CONTENT:
                 WBXMLDecoder::ResetInWhile("decoderGetElement");
-                while(WBXMLDecoder::InWhile("decoderGetElement")) {
+                while (WBXMLDecoder::InWhile("decoderGetElement")) {
                     $next = $this->getToken();
-                    if($next == false)
+                    if ($next == false)
                         return false;
-                    else if($next[EN_TYPE] == EN_CONTENT) {
+                    else if ($next[EN_TYPE] == EN_CONTENT) {
                         $element[EN_CONTENT] .= $next[EN_CONTENT];
                     } else {
                         $this->ungetElement($next);
@@ -152,10 +152,10 @@ 
         if (!$element)
             return false;
 
-        if($element[EN_TYPE] == EN_TYPE_STARTTAG && $element[EN_TAG] == $tag)
+        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]:"")));
+            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,17 +171,17 @@ 
     public function getElementEndTag() {
         $element = $this->getToken();
 
-        if($element[EN_TYPE] == EN_TYPE_ENDTAG)
+        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]:"")));
+            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();
-            ZLog::Write(LOGLEVEL_ERROR, sprintf("WBXMLDecoder->getElementEndTag(): could not read end tag in '%s'. Please enable the LOGLEVEL_WBXML and send the log to the grommunio-sync dev team.", $bt[0]["file"] . ":" . $bt[0]["line"]));
+            ZLog::Write(LOGLEVEL_ERROR, sprintf("WBXMLDecoder->getElementEndTag(): could not read end tag in '%s'. Please enable the LOGLEVEL_WBXML and send the log to the grommunio-sync dev team.", $bt[0]["file"].":".$bt[0]["line"]));
 
             // log the remaining wbxml content
             $this->ungetElement($element);
-            while($el = $this->getElement());
+            while ($el = $this->getElement());
         }
 
         return false;
@@ -196,11 +196,11 @@ 
     public function getElementContent() {
         $element = $this->getToken();
 
-        if($element[EN_TYPE] == EN_TYPE_CONTENT) {
+        if ($element[EN_TYPE] == EN_TYPE_CONTENT) {
             return $element[EN_CONTENT];
         }
         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]:"")));
+            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 +216,8 @@ 
      * @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;
     }
@@ -250,7 +250,7 @@ 
      */
     public function readRemainingData() {
         ZLog::Write(LOGLEVEL_DEBUG, "WBXMLDecoder->readRemainingData() reading remaining data from input stream");
-        while($this->getElement());
+        while ($this->getElement());
     }
 
     /**----------------------------------------------------------------------------------------------------------
@@ -265,14 +265,14 @@ 
      */
     private function getToken() {
         // See if there's something in the ungetBuffer
-        if($this->ungetbuffer) {
+        if ($this->ungetbuffer) {
             $element = $this->ungetbuffer;
             $this->ungetbuffer = false;
             return $element;
         }
 
         $el = $this->_getToken();
-        if($this->log && $el)
+        if ($this->log && $el)
             $this->logToken($el);
 
         return $el;
@@ -289,18 +289,18 @@ 
     private function logToken($el) {
         $spaces = str_repeat(" ", count($this->logStack));
 
-        switch($el[EN_TYPE]) {
+        switch ($el[EN_TYPE]) {
             case EN_TYPE_STARTTAG:
-                if($el[EN_FLAGS] & EN_FLAGS_CONTENT) {
-                    ZLog::Write(LOGLEVEL_WBXML,"I " . $spaces . " <". $el[EN_TAG] . ">");
+                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] . "/>");
+                    ZLog::Write(LOGLEVEL_WBXML, "I ".$spaces." <".$el[EN_TAG]."/>");
 
                 break;
             case EN_TYPE_ENDTAG:
                 $tag = array_pop($this->logStack);
-                ZLog::Write(LOGLEVEL_WBXML,"I " . $spaces . "</" . $tag . ">");
+                ZLog::Write(LOGLEVEL_WBXML, "I ".$spaces."</".$tag.">");
                 break;
             case EN_TYPE_CONTENT:
                 // as we concatenate the string here, the entire content is copied.
@@ -308,13 +308,13 @@ 
                 // requires easily additional 20 MB of RAM. See https://jira.z-hub.io/browse/ZP-1159
                 $messagesize = strlen($el[EN_CONTENT]);
                 if ($messagesize > 10240 && !defined('WBXML_DEBUGGING')) {
-                    $content = substr($el[EN_CONTENT], 0, 10240) . sprintf(" <log message with %d bytes truncated>", $messagesize);
+                    $content = substr($el[EN_CONTENT], 0, 10240).sprintf(" <log message with %d bytes truncated>", $messagesize);
                 }
                 else {
                     $content = $el[EN_CONTENT];
                 }
                 // Log but make sure it's not truncated again (will be slightly bigger than 10KB)
-                ZLog::Write(LOGLEVEL_WBXML,"I " . $spaces . " " . $content, false);
+                ZLog::Write(LOGLEVEL_WBXML, "I ".$spaces." ".$content, false);
                 break;
         }
     }
@@ -330,13 +330,13 @@ 
         $element = array();
 
         WBXMLDecoder::ResetInWhile("decoderGetToken");
-        while(WBXMLDecoder::InWhile("decoderGetToken")) {
+        while (WBXMLDecoder::InWhile("decoderGetToken")) {
             $byte = fread($this->in, 1);
-            if($byte === "" || $byte === false)
+            if ($byte === "" || $byte === false)
                 break;
             $byte = ord($byte);
 
-            switch($byte) {
+            switch ($byte) {
                 case self::WBXML_SWITCH_PAGE:
                     $this->tagcp = $this->getByte();
                     break;
@@ -375,7 +375,7 @@ 
                     throw new WBXMLException("Invalid token :".$byte);
 
                 default:
-                    if($byte & self::WBXML_WITH_ATTRIBUTES)
+                    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);
@@ -441,7 +441,7 @@ 
      */
     private function getByte() {
         $ch = fread($this->in, 1);
-        if(strlen($ch) > 0)
+        if (strlen($ch) > 0)
             return ord($ch);
         else
             return;
@@ -456,12 +456,12 @@ 
     private function getMBUInt() {
         $uint = 0;
 
-        while(1) {
+        while (1) {
           $byte = $this->getByte();
 
           $uint |= $byte & 0x7f;
 
-          if($byte & 0x80)
+          if ($byte & 0x80)
               $uint = $uint << 7;
           else
               break;
@@ -480,11 +480,11 @@ 
      * @return string
      */
     private function getMapping($cp, $id) {
-        if(!isset($this->dtd["codes"][$cp]) || !isset($this->dtd["codes"][$cp][$id]))
+        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];
+            if (isset($this->dtd["namespaces"][$cp])) {
+                return $this->dtd["namespaces"][$cp].":".$this->dtd["codes"][$cp][$id];
             } else
                 return $this->dtd["codes"][$cp][$id];
         }

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/wbxml/wbxmldefs.php

Indentation +29 added lines, -29 removed lines

@@ -704,33 +704,33 @@
                         0x17 => "ContentOwner",
                         0x18 => "RemoveRightsManagementProtection",
                     ),
-              ),
-              "namespaces" => array(
-                  //0 => "AirSync", //
-                  1 => "POOMCONTACTS",
-                  2 => "POOMMAIL",
-                  3 => "AirNotify", //no longer used
-                  4 => "POOMCAL",
-                  5 => "Move",
-                  6 => "GetItemEstimate",
-                  7 => "FolderHierarchy",
-                  8 => "MeetingResponse",
-                  9 => "POOMTASKS",
-                  0xA => "ResolveRecipients",
-                  0xB => "ValidateCert",
-                  0xC => "POOMCONTACTS2",
-                  0xD => "Ping",
-                  0xE => "Provision",//
-                  0xF => "Search",//
-                  0x10 => "GAL",
-                  0x11 => "AirSyncBase", //12.0, 12.1 and 14.0
-                  0x12 => "Settings", //12.0, 12.1 and 14.0.
-                  0x13 => "DocumentLibrary", //12.0, 12.1 and 14.0
-                  0x14 => "ItemOperations", //12.0, 12.1 and 14.0
-                  0x15 => "ComposeMail", //14.0
-                  0x16 => "POOMMAIL2", //14.0
-                  0x17 => "Notes", //14.0
-                  0x18 => "RightsManagement",
-              )
-          );
+                ),
+                "namespaces" => array(
+                    //0 => "AirSync", //
+                    1 => "POOMCONTACTS",
+                    2 => "POOMMAIL",
+                    3 => "AirNotify", //no longer used
+                    4 => "POOMCAL",
+                    5 => "Move",
+                    6 => "GetItemEstimate",
+                    7 => "FolderHierarchy",
+                    8 => "MeetingResponse",
+                    9 => "POOMTASKS",
+                    0xA => "ResolveRecipients",
+                    0xB => "ValidateCert",
+                    0xC => "POOMCONTACTS2",
+                    0xD => "Ping",
+                    0xE => "Provision",//
+                    0xF => "Search",//
+                    0x10 => "GAL",
+                    0x11 => "AirSyncBase", //12.0, 12.1 and 14.0
+                    0x12 => "Settings", //12.0, 12.1 and 14.0.
+                    0x13 => "DocumentLibrary", //12.0, 12.1 and 14.0
+                    0x14 => "ItemOperations", //12.0, 12.1 and 14.0
+                    0x15 => "ComposeMail", //14.0
+                    0x16 => "POOMMAIL2", //14.0
+                    0x17 => "Notes", //14.0
+                    0x18 => "RightsManagement",
+                )
+            );
 }

Spacing +47 added lines, -47 removed lines

@@ -7,41 +7,41 @@ 
  * WBXML definitions
  */
 
-define('EN_TYPE',               1);
-define('EN_TAG',                2);
-define('EN_CONTENT',            3);
-define('EN_FLAGS',              4);
-define('EN_ATTRIBUTES',         5);
+define('EN_TYPE', 1);
+define('EN_TAG', 2);
+define('EN_CONTENT', 3);
+define('EN_FLAGS', 4);
+define('EN_ATTRIBUTES', 5);
 
-define('EN_TYPE_STARTTAG',      1);
-define('EN_TYPE_ENDTAG',        2);
-define('EN_TYPE_CONTENT',       3);
+define('EN_TYPE_STARTTAG', 1);
+define('EN_TYPE_ENDTAG', 2);
+define('EN_TYPE_CONTENT', 3);
 
-define('EN_FLAGS_CONTENT',      1);
-define('EN_FLAGS_ATTRIBUTES',   2);
+define('EN_FLAGS_CONTENT', 1);
+define('EN_FLAGS_ATTRIBUTES', 2);
 
 class WBXMLDefs {
 
     const WBXML_SWITCH_PAGE = 0x00;
-    const WBXML_END =         0x01;
-    const WBXML_ENTITY =      0x02; //not used in ActiveSync
-    const WBXML_STR_I =       0x03;
-    const WBXML_LITERAL =     0x04; //not used in ActiveSync
-    const WBXML_EXT_I_0 =     0x40; //not used in ActiveSync
-    const WBXML_EXT_I_1 =     0x41; //not used in ActiveSync
-    const WBXML_EXT_I_2 =     0x42; //not used in ActiveSync
-    const WBXML_PI =          0x43; //not used in ActiveSync
-    const WBXML_LITERAL_C =   0x44; //not used in ActiveSync
-    const WBXML_EXT_T_0 =     0x80; //not used in ActiveSync
-    const WBXML_EXT_T_1 =     0x81; //not used in ActiveSync
-    const WBXML_EXT_T_2 =     0x82; //not used in ActiveSync
-    const WBXML_STR_T =       0x83; //not used in ActiveSync
-    const WBXML_LITERAL_A =   0x84; //not used in ActiveSync
-    const WBXML_EXT_0 =       0xC0; //not used in ActiveSync
-    const WBXML_EXT_1 =       0xC1; //not used in ActiveSync
-    const WBXML_EXT_2 =       0xC2; //not used in ActiveSync
-    const WBXML_OPAQUE =      0xC3;
-    const WBXML_LITERAL_AC =  0xC4; //not used in ActiveSync
+    const WBXML_END = 0x01;
+    const WBXML_ENTITY = 0x02; //not used in ActiveSync
+    const WBXML_STR_I = 0x03;
+    const WBXML_LITERAL = 0x04; //not used in ActiveSync
+    const WBXML_EXT_I_0 = 0x40; //not used in ActiveSync
+    const WBXML_EXT_I_1 = 0x41; //not used in ActiveSync
+    const WBXML_EXT_I_2 = 0x42; //not used in ActiveSync
+    const WBXML_PI = 0x43; //not used in ActiveSync
+    const WBXML_LITERAL_C = 0x44; //not used in ActiveSync
+    const WBXML_EXT_T_0 = 0x80; //not used in ActiveSync
+    const WBXML_EXT_T_1 = 0x81; //not used in ActiveSync
+    const WBXML_EXT_T_2 = 0x82; //not used in ActiveSync
+    const WBXML_STR_T = 0x83; //not used in ActiveSync
+    const WBXML_LITERAL_A = 0x84; //not used in ActiveSync
+    const WBXML_EXT_0 = 0xC0; //not used in ActiveSync
+    const WBXML_EXT_1 = 0xC1; //not used in ActiveSync
+    const WBXML_EXT_2 = 0xC2; //not used in ActiveSync
+    const WBXML_OPAQUE = 0xC3;
+    const WBXML_LITERAL_AC = 0xC4; //not used in ActiveSync
 
     const WBXML_WITH_ATTRIBUTES = 0x80; //not used in ActiveSync
     const WBXML_WITH_CONTENT = 0x40;
@@ -50,8 +50,8 @@ 
      * The WBXML DTDs
      */
     protected $dtd = array(
-                "codes" => array (
-                    0 => array (
+                "codes" => array(
+                    0 => array(
                         0x05 => "Synchronize",
                         0x06 => "Replies", //Responses
                         0x07 => "Add",
@@ -90,7 +90,7 @@ 
                         0x28 => "MaxItems", // Since 14.0
                         0x29 => "HeartbeatInterval", // Since 14.0 Either this tag or the Wait tag can be present, but not both.
                     ),
-                    1 => array (
+                    1 => array(
                         0x05 => "Anniversary",
                         0x06 => "AssistantName",
                         0x07 => "AssistnamePhoneNumber", //AssistantTelephoneNumber
@@ -150,7 +150,7 @@ 
                         0x3d => "Alias", // Since 14.0
                         0x3e => "WeightedRank" // Since 14.0
                     ),
-                    2 => array (
+                    2 => array(
                         0x05 => "Attachment", // AirSyncBase Attachments is used since 12.0
                         0x06 => "Attachments", // AirSyncBase Attachments is used since 12.0
                         0x07 => "AttName", // AirSyncBase Attachments is used since 12.0
@@ -211,7 +211,7 @@ 
                         0x3e => "CompleteTime", // Since 12.0
                         0x3f => "DisallowNewTimeProposal", // Since 14.0
                     ),
-                    3 => array ( //Code page 3 is no longer in use, however, tokens 05 through 17 have been defined. 20100501
+                    3 => array( //Code page 3 is no longer in use, however, tokens 05 through 17 have been defined. 20100501
                         0x05 => "Notify",
                         0x06 => "Notification",
                         0x07 => "Version",
@@ -232,7 +232,7 @@ 
                         0x15 => "Expiry",
                         0x16 => "NotifyGUID",
                     ),
-                    4 => array (
+                    4 => array(
                         0x05 => "Timezone",
                         0x06 => "AllDayEvent",
                         0x07 => "Attendees",
@@ -289,7 +289,7 @@ 
                         0x3a => "OnlineMeetingConfLink", // Since 14.1
                         0x3b => "OnlineMeetingExternalLink", // Since 14.1
                     ),
-                    5 => array (
+                    5 => array(
                         0x05 => "Moves",
                         0x06 => "Move",
                         0x07 => "SrcMsgId",
@@ -299,7 +299,7 @@ 
                         0x0b => "Status",
                         0x0c => "DstMsgId",
                     ),
-                    6 => array (
+                    6 => array(
                         0x05 => "GetItemEstimate",
                         0x06 => "Version", // deprecated
                         0x07 => "Folders", // Collections
@@ -311,7 +311,7 @@ 
                         0x0d => "Response",
                         0x0e => "Status",
                     ),
-                    7 => array (
+                    7 => array(
                         0x05 => "Folders", // 2.5, 12.0 and 12.1
                         0x06 => "Folder", // 2.5, 12.0 and 12.1
                         0x07 => "DisplayName",
@@ -333,7 +333,7 @@ 
                         0x17 => "Count",
                         0x18 => "Version", // 2.0 - not defined in 20100501
                     ),
-                    8 => array (
+                    8 => array(
                         0x05 => "CalendarId",
                         0x06 => "FolderId", // CollectionId
                         0x07 => "MeetingResponse",
@@ -345,7 +345,7 @@ 
                         0x0d => "Version", // 2.0 - not defined in 20100501
                         0x0e => "InstanceId" // Since AS 14.1
                     ),
-                    9 => array (
+                    9 => array(
                         0x05 => "Body", // AirSyncBase Body is used since 12.0
                         0x06 => "BodySize", // AirSyncBase Body is used since 12.0
                         0x07 => "BodyTruncated", // AirSyncBase Body is used since 12.0
@@ -381,7 +381,7 @@ 
                         0x25 => "IsLeapMonth", // Since 14.0
                         0x26 => "FirstDayOfWeek", // Since 14.1
                     ),
-                    0xa => array (
+                    0xa => array(
                         0x05 => "ResolveRecipients",
                         0x06 => "Response",
                         0x07 => "Status",
@@ -408,7 +408,7 @@ 
                         0x1C => "Data", // Since 14.1
                         0x1D => "MaxPictures", // Since 14.1
                     ),
-                    0xb => array (
+                    0xb => array(
                         0x05 => "ValidateCert",
                         0x06 => "Certificates",
                         0x07 => "Certificate",
@@ -416,7 +416,7 @@ 
                         0x09 => "CheckCRL",
                         0x0a => "Status",
                     ),
-                    0xc => array (
+                    0xc => array(
                         0x05 => "CustomerId",
                         0x06 => "GovernmentId",
                         0x07 => "IMAddress",
@@ -428,7 +428,7 @@ 
                         0x0d => "NickName",
                         0x0e => "MMS",
                     ),
-                    0xd => array (
+                    0xd => array(
                         0x05 => "Ping",
                         0x06 => "AutdState", // (Not used by protocol)
                         0x07 => "Status",
@@ -440,7 +440,7 @@ 
                         0x0d => "MaxFolders",
                         0x0e => "Version" // not defined / deprecated
                     ),
-                    0xe => array (
+                    0xe => array(
                         0x05 => "Provision",
                         0x06 => "Policies",
                         0x07 => "Policy",
@@ -720,8 +720,8 @@ 
                   0xB => "ValidateCert",
                   0xC => "POOMCONTACTS2",
                   0xD => "Ping",
-                  0xE => "Provision",//
-                  0xF => "Search",//
+                  0xE => "Provision", //
+                  0xF => "Search", //
                   0x10 => "GAL",
                   0x11 => "AirSyncBase", //12.0, 12.1 and 14.0
                   0x12 => "Settings", //12.0, 12.1 and 14.0.

lib/interface/isearchprovider.php

Indentation +12 added lines, -12 removed lines

@@ -44,21 +44,21 @@
     public function GetGALSearchResults($searchquery, $searchrange, $searchpicture);
 
     /**
-    * Searches for the emails on the server
-    *
-    * @param ContentParameter $cpo
-    *
-    * @return array
-    */
+     * Searches for the emails on the server
+     *
+     * @param ContentParameter $cpo
+     *
+     * @return array
+     */
     public function GetMailboxSearchResults($cpo);
 
     /**
-    * Terminates a search for a given PID
-    *
-    * @param int $pid
-    *
-    * @return boolean
-    */
+     * Terminates a search for a given PID
+     *
+     * @param int $pid
+     *
+     * @return boolean
+     */
     public function TerminateSearch($pid);
 
 

lib/interface/istatemachine.php

Indentation +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
      */
     public function LinkUserDevice($username, $devid);
 
-   /**
+    /**
      * Unlinks a device from a user
      *
      * @param string    $username