grommunio / grommunio-sync

mapi/class.mapiexception.php

Indentation +1 added lines, -1 removed lines

@@ -60,5 +60,5 @@
 
     // Tell the PHP extension which exception class to instantiate
     if (function_exists('mapi_enable_exceptions')) {
-       //mapi_enable_exceptions("mapiexception");
+        //mapi_enable_exceptions("mapiexception");
     }

Spacing +2 added lines, -2 removed lines

@@ -22,10 +22,10 @@
          */
         public function getDisplayMessage()
         {
-            if(!empty($this->displayMessage))
+            if (!empty($this->displayMessage))
                 return $this->displayMessage;
 
-            switch($this->getCode())
+            switch ($this->getCode())
             {
                 case MAPI_E_NO_ACCESS:
                     return _("You have insufficient privileges to open this object.");

Braces +3 added lines, -2 removed lines

@@ -22,8 +22,9 @@
          */
         public function getDisplayMessage()
         {
-            if(!empty($this->displayMessage))
-                return $this->displayMessage;
+            if(!empty($this->displayMessage)) {
+                            return $this->displayMessage;
+            }
 
             switch($this->getCode())
             {

mapi/class.baseexception.php

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
         // assign display message
         $this->displayMessage = $displayMessage;
 
-        parent::__construct($errorMessage, (int) $code, $previous);
+        parent::__construct($errorMessage, (int)$code, $previous);
     }
 
     /**
@@ -66,7 +66,7 @@ 
      */
     public function getFileLine()
     {
-        return $this->getBaseFile() . ':' . $this->getLine();
+        return $this->getBaseFile().':'.$this->getLine();
     }
 
     /**
@@ -74,7 +74,7 @@ 
      */
     public function getDisplayMessage()
     {
-        if(!is_null($this->displayMessage)) {
+        if (!is_null($this->displayMessage)) {
             return $this->displayMessage;
         }
 
@@ -125,7 +125,7 @@ 
      */
     public function getBaseFile()
     {
-        if(is_null($this->baseFile)) {
+        if (is_null($this->baseFile)) {
             $this->baseFile = basename(parent::getFile());
         }
 

mapi/class.taskrecurrence.php

Spacing +13 added lines, -13 removed lines

@@ -74,12 +74,12 @@ 
         function setRecurrence(&$recur)
         {
             $this->recur = $recur;
-            $this->action =& $recur;
+            $this->action = & $recur;
 
-            if(!isset($this->recur["changed_occurences"]))
+            if (!isset($this->recur["changed_occurences"]))
                 $this->recur["changed_occurences"] = Array();
 
-            if(!isset($this->recur["deleted_occurences"]))
+            if (!isset($this->recur["deleted_occurences"]))
                 $this->recur["deleted_occurences"] = Array();
 
             if (!isset($this->recur['startocc'])) $this->recur['startocc'] = 0;
@@ -91,7 +91,7 @@ 
             // Update $this->recur with proper startrecurrdate and endrecurrdate updated after saving recurrence
             $msgProps = mapi_getprops($this->message, array($this->proptags['recurring_data']));
             $recurring_data = $this->parseRecurrence($msgProps[$this->proptags['recurring_data']]);
-            foreach($recurring_data as $key => $value) {
+            foreach ($recurring_data as $key => $value) {
                 $this->recur[$key] = $value;
             }
 
@@ -107,9 +107,9 @@ 
         function setFirstOccurrence()
         {
             // Check if it is already the first occurrence
-            if($this->action['start'] == $this->recur["start"]){
+            if ($this->action['start'] == $this->recur["start"]) {
                 return;
-            }else{
+            } else {
                 $items = $this->getNextOccurrence();
 
                 $props = array();
@@ -140,7 +140,7 @@ 
              * then we create first two occurrence separately and for first occurrence recurrence has ended.
              */
             if ((empty($this->action['startdate']) && empty($this->action['duedate']))
-                || ($this->action['complete'] == 1) || (isset($this->action['deleteOccurrence']) && $this->action['deleteOccurrence'])){
+                || ($this->action['complete'] == 1) || (isset($this->action['deleteOccurrence']) && $this->action['deleteOccurrence'])) {
 
                 $nextOccurrence = $this->getNextOccurrence();
                 $result = mapi_getprops($this->message, array(PR_ENTRYID, PR_PARENT_ENTRYID, PR_STORE_ENTRYID));
@@ -265,18 +265,18 @@ 
 
             $copy_to_recipientTable = mapi_message_getrecipienttable($newMessage);
             $copy_to_recipientRows = mapi_table_queryallrows($copy_to_recipientTable, array(PR_ROWID));
-            foreach($copy_to_recipientRows as $recipient) {
+            foreach ($copy_to_recipientRows as $recipient) {
                 mapi_message_modifyrecipients($newMessage, MODRECIP_REMOVE, array($recipient));
             }
             mapi_message_modifyrecipients($newMessage, MODRECIP_ADD, $recipients);
 
             // Copy attachments
             $attachmentTable = mapi_message_getattachmenttable($this->message);
-            if($attachmentTable) {
+            if ($attachmentTable) {
                 $attachments = mapi_table_queryallrows($attachmentTable, array(PR_ATTACH_NUM, PR_ATTACH_SIZE, PR_ATTACH_LONG_FILENAME, PR_ATTACHMENT_HIDDEN, PR_DISPLAY_NAME, PR_ATTACH_METHOD));
 
-                foreach($attachments as $attach_props){
-                    $attach_old = mapi_message_openattach($this->message, (int) $attach_props[PR_ATTACH_NUM]);
+                foreach ($attachments as $attach_props) {
+                    $attach_old = mapi_message_openattach($this->message, (int)$attach_props[PR_ATTACH_NUM]);
                     $attach_newResourceMsg = mapi_message_createattach($newMessage);
 
                     mapi_copyto($attach_old, array(), array(), $attach_newResourceMsg, 0);
@@ -293,7 +293,7 @@ 
             $separator = "------------\r\n";
 
             if (!empty($msgbody) && strrpos($msgbody, $separator) === false) {
-                $msgbody = $separator . $msgbody;
+                $msgbody = $separator.$msgbody;
                 $stream = mapi_openproperty($this->message, PR_BODY, IID_IStream, STGM_TRANSACTED, 0);
                 mapi_stream_setsize($stream, strlen($msgbody));
                 mapi_stream_write($stream, $msgbody);
@@ -338,7 +338,7 @@ 
         {
             // Fix timezone object
             $this->tz = false;
-            $this->action =& $recur;
+            $this->action = & $recur;
             $dead_occurrence = isset($this->messageprops[$this->proptags['dead_occurrence']]) ? $this->messageprops[$this->proptags['dead_occurrence']] : false;
 
             if (!$dead_occurrence) {

Braces +25 added lines, -13 removed lines

@@ -76,14 +76,20 @@ 
             $this->recur = $recur;
             $this->action =& $recur;
 
-            if(!isset($this->recur["changed_occurences"]))
-                $this->recur["changed_occurences"] = Array();
+            if(!isset($this->recur["changed_occurences"])) {
+                            $this->recur["changed_occurences"] = Array();
+            }
 
-            if(!isset($this->recur["deleted_occurences"]))
-                $this->recur["deleted_occurences"] = Array();
+            if(!isset($this->recur["deleted_occurences"])) {
+                            $this->recur["deleted_occurences"] = Array();
+            }
 
-            if (!isset($this->recur['startocc'])) $this->recur['startocc'] = 0;
-            if (!isset($this->recur['endocc'])) $this->recur['endocc'] = 0;
+            if (!isset($this->recur['startocc'])) {
+                $this->recur['startocc'] = 0;
+            }
+            if (!isset($this->recur['endocc'])) {
+                $this->recur['endocc'] = 0;
+            }
 
             // Save recurrence because we need proper startrecurrdate and endrecurrdate
             $this->saveRecurrence();
@@ -109,7 +115,7 @@ 
             // Check if it is already the first occurrence
             if($this->action['start'] == $this->recur["start"]){
                 return;
-            }else{
+            } else{
                 $items = $this->getNextOccurrence();
 
                 $props = array();
@@ -171,8 +177,9 @@ 
 
                     $props[$this->proptags["dead_occurrence"]] = false;
                 } else {
-                    if (isset($this->action['deleteOccurrence']) && $this->action['deleteOccurrence'])
-                        return false;
+                    if (isset($this->action['deleteOccurrence']) && $this->action['deleteOccurrence']) {
+                                            return false;
+                    }
 
                     // Didn't get next occurrence, probably this is the last one, so recurrence ends here
                     $props[$this->proptags["dead_occurrence"]] = true;
@@ -224,8 +231,12 @@ 
             // Get all properties
             $taskItemProps = mapi_getprops($this->message);
 
-            if (isset($this->action["subject"])) $taskItemProps[$this->proptags["subject"]] = $this->action["subject"];
-            if (isset($this->action["importance"])) $taskItemProps[$this->proptags["importance"]] = $this->action["importance"];
+            if (isset($this->action["subject"])) {
+                $taskItemProps[$this->proptags["subject"]] = $this->action["subject"];
+            }
+            if (isset($this->action["importance"])) {
+                $taskItemProps[$this->proptags["importance"]] = $this->action["importance"];
+            }
             if (isset($this->action["startdate"])) {
                 $taskItemProps[$this->proptags["startdate"]] = $this->action["startdate"];
                 $taskItemProps[$this->proptags["commonstart"]] = $this->action["startdate"];
@@ -380,8 +391,9 @@ 
                 $props[$this->proptags['reset_reminder']] = false;
             }
 
-            if (!empty($props))
-                mapi_setprops($this->message, $props);
+            if (!empty($props)) {
+                            mapi_setprops($this->message, $props);
+            }
         }
 
         /**

index.php

Spacing +18 added lines, -18 removed lines

@@ -27,13 +27,13 @@ 
         Request::Initialize();
         ZLog::Initialize();
 
-        ZLog::Write(LOGLEVEL_DEBUG,"-------- Start");
+        ZLog::Write(LOGLEVEL_DEBUG, "-------- Start");
         ZLog::Write(LOGLEVEL_DEBUG,
                 sprintf("cmd='%s' devType='%s' devId='%s' getUser='%s' from='%s' version='%s' method='%s'",
-                        Request::GetCommand(), Request::GetDeviceType(), Request::GetDeviceID(), Request::GetGETUser(), Request::GetRemoteAddr(), @constant('GROMMUNIOSYNC_VERSION'), Request::GetMethod() ));
+                        Request::GetCommand(), Request::GetDeviceType(), Request::GetDeviceID(), Request::GetGETUser(), Request::GetRemoteAddr(), @constant('GROMMUNIOSYNC_VERSION'), Request::GetMethod()));
 
         // always request the authorization header
-        if (! Request::HasAuthenticationInfo() || !Request::GetGETUser())
+        if (!Request::HasAuthenticationInfo() || !Request::GetGETUser())
             throw new AuthenticationRequiredException("Access denied. Please send authorisation information");
 
         ZPush::CheckAdvancedConfig();
@@ -48,7 +48,7 @@ 
         }
 
         // Check required GET parameters
-        if(Request::IsMethodPOST() && (Request::GetCommandCode() === false || !Request::GetDeviceID() || !Request::GetDeviceType()))
+        if (Request::IsMethodPOST() && (Request::GetCommandCode() === false || !Request::GetDeviceID() || !Request::GetDeviceType()))
             throw new FatalException("Requested the grommunio-sync URL without the required GET parameters");
 
         // Load the backend
@@ -74,13 +74,13 @@ 
         header(ZPush::GetServerHeader());
 
         if (RequestProcessor::isUserAuthenticated()) {
-            header("X-Grommunio-Sync-Version: ". @constant('GROMMUNIOSYNC_VERSION'));
+            header("X-Grommunio-Sync-Version: ".@constant('GROMMUNIOSYNC_VERSION'));
 
             // announce the supported AS versions (if not already sent to device)
             if (ZPush::GetDeviceManager()->AnnounceASVersion()) {
                 $versions = ZPush::GetSupportedProtocolVersions(true);
                 ZLog::Write(LOGLEVEL_INFO, sprintf("Announcing latest AS version to device: %s", $versions));
-                header("X-MS-RP: ". $versions);
+                header("X-MS-RP: ".$versions);
             }
         }
 
@@ -110,7 +110,7 @@ 
         // data send as a 'normal' packet. If the output packet exceeds 1MB (see ob_start)
         // then it will be sent as a chunked packet anyway because PHP will have to flush
         // the buffer.
-        if(!headers_sent())
+        if (!headers_sent())
             header("Content-Length: $len");
 
         // send vnd.ms-sync.wbxml content type header if there is no content
@@ -143,11 +143,11 @@ 
         // Extract any previous exception message for logging purpose.
         $exclass = get_class($ex);
         $exception_message = $ex->getMessage();
-        if($ex->getPrevious()){
+        if ($ex->getPrevious()) {
             do {
                 $current_exception = $ex->getPrevious();
-                $exception_message .= ' -> ' . $current_exception->getMessage();
-            } while($current_exception->getPrevious());
+                $exception_message .= ' -> '.$current_exception->getMessage();
+            } while ($current_exception->getPrevious());
         }
 
         if (Request::GetUserAgent())
@@ -155,9 +155,9 @@ 
 
         ZLog::Write(LOGLEVEL_FATAL, sprintf('Exception: (%s) - %s', $exclass, $exception_message));
 
-        if(!headers_sent()) {
+        if (!headers_sent()) {
             if ($ex instanceof ZPushException) {
-                header('HTTP/1.1 '. $ex->getHTTPCodeString());
+                header('HTTP/1.1 '.$ex->getHTTPCodeString());
                 foreach ($ex->getHTTPHeaders() as $h)
                     header($h);
             }
@@ -171,12 +171,12 @@ 
             // some devices send unauthorized OPTIONS requests
             // and don't expect anything in the response body
             if (Request::IsMethodGET()) {
-                ZPush::PrintGrommunioSyncLegal($exclass, sprintf('<pre>%s</pre>',$ex->getMessage()));
+                ZPush::PrintGrommunioSyncLegal($exclass, sprintf('<pre>%s</pre>', $ex->getMessage()));
             }
 
             // log the failed login attempt e.g. for fail2ban
             if (defined('LOGAUTHFAIL') && LOGAUTHFAIL != false)
-                ZLog::Write(LOGLEVEL_WARN, sprintf("IP: %s failed to authenticate user '%s'",  Request::GetRemoteAddr(), Request::GetAuthUser()? Request::GetAuthUser(): Request::GetGETUser() ));
+                ZLog::Write(LOGLEVEL_WARN, sprintf("IP: %s failed to authenticate user '%s'", Request::GetRemoteAddr(), Request::GetAuthUser() ? Request::GetAuthUser() : Request::GetGETUser()));
         }
 
         // This could be a WBXML problem.. try to get the complete request
@@ -188,10 +188,10 @@ 
         // the output had not started yet. If it has started already, we can't show the user the error, and
         // the device will give its own (useless) error message.
         else if (!($ex instanceof ZPushException) || $ex->showLegalNotice()) {
-            $cmdinfo = (Request::GetCommand())? sprintf(" processing command <i>%s</i>", Request::GetCommand()): "";
+            $cmdinfo = (Request::GetCommand()) ? sprintf(" processing command <i>%s</i>", Request::GetCommand()) : "";
             $extrace = $ex->getTrace();
-            $trace = (!empty($extrace))? "\n\nTrace:\n". print_r($extrace,1):"";
-            ZPush::PrintGrommunioSyncLegal($exclass . $cmdinfo, sprintf('<pre>%s</pre>',$ex->getMessage() . $trace));
+            $trace = (!empty($extrace)) ? "\n\nTrace:\n".print_r($extrace, 1) : "";
+            ZPush::PrintGrommunioSyncLegal($exclass.$cmdinfo, sprintf('<pre>%s</pre>', $ex->getMessage().$trace));
         }
 
         // Announce exception to process loop detection
@@ -212,7 +212,7 @@ 
                     Request::GetCommand(), Utils::FormatBytes(memory_get_peak_usage(false)), Utils::FormatBytes(memory_get_peak_usage(true)),
                     number_format(microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"], 2),
                     Request::GetDeviceType(), Request::GetDeviceID(), Request::GetGETUser(), Request::GetRemoteAddr(),
-                    RequestProcessor::GetWaitTime(), @constant('GROMMUNIOSYNC_VERSION'), Request::GetMethod(), http_response_code() ));
+                    RequestProcessor::GetWaitTime(), @constant('GROMMUNIOSYNC_VERSION'), Request::GetMethod(), http_response_code()));
 
     ZLog::Write(LOGLEVEL_DEBUG, "-------- End");
 

Braces +51 added lines, -39 removed lines

@@ -14,7 +14,9 @@ 
 
 require_once 'vendor/autoload.php';
 
-if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', 'config.php');
+if (!defined('ZPUSH_CONFIG')) {
+    define('ZPUSH_CONFIG', 'config.php');
+}
 include_once(ZPUSH_CONFIG);
 
     // Attempt to set maximum execution time
@@ -33,8 +35,9 @@ 
                         Request::GetCommand(), Request::GetDeviceType(), Request::GetDeviceID(), Request::GetGETUser(), Request::GetRemoteAddr(), @constant('GROMMUNIOSYNC_VERSION'), Request::GetMethod() ));
 
         // always request the authorization header
-        if (! Request::HasAuthenticationInfo() || !Request::GetGETUser())
-            throw new AuthenticationRequiredException("Access denied. Please send authorisation information");
+        if (! Request::HasAuthenticationInfo() || !Request::GetGETUser()) {
+                    throw new AuthenticationRequiredException("Access denied. Please send authorisation information");
+        }
 
         ZPush::CheckAdvancedConfig();
 
@@ -48,8 +51,9 @@ 
         }
 
         // Check required GET parameters
-        if(Request::IsMethodPOST() && (Request::GetCommandCode() === false || !Request::GetDeviceID() || !Request::GetDeviceType()))
-            throw new FatalException("Requested the grommunio-sync URL without the required GET parameters");
+        if(Request::IsMethodPOST() && (Request::GetCommandCode() === false || !Request::GetDeviceID() || !Request::GetDeviceType())) {
+                    throw new FatalException("Requested the grommunio-sync URL without the required GET parameters");
+        }
 
         // Load the backend
         $backend = ZPush::GetBackend();
@@ -58,17 +62,20 @@ 
         if (PROVISIONING === true && Request::IsMethodPOST() && ZPush::CommandNeedsProvisioning(Request::GetCommandCode()) &&
             ((Request::WasPolicyKeySent() && Request::GetPolicyKey() == 0) || ZPush::GetProvisioningManager()->ProvisioningRequired(Request::GetPolicyKey())) &&
             (LOOSE_PROVISIONING === false ||
-            (LOOSE_PROVISIONING === true && Request::WasPolicyKeySent())))
-            //TODO for AS 14 send a wbxml response
+            (LOOSE_PROVISIONING === true && Request::WasPolicyKeySent()))) {
+                    //TODO for AS 14 send a wbxml response
             throw new ProvisioningRequiredException();
+        }
 
         // most commands require an authenticated user
-        if (ZPush::CommandNeedsAuthentication(Request::GetCommandCode()))
-            RequestProcessor::Authenticate();
+        if (ZPush::CommandNeedsAuthentication(Request::GetCommandCode())) {
+                    RequestProcessor::Authenticate();
+        }
 
         // Do the actual processing of the request
-        if (Request::IsMethodGET())
-            throw new NoPostRequestException("This is the grommunio-sync location and can only be accessed by Microsoft ActiveSync-capable devices", NoPostRequestException::GET_REQUEST);
+        if (Request::IsMethodGET()) {
+                    throw new NoPostRequestException("This is the grommunio-sync location and can only be accessed by Microsoft ActiveSync-capable devices", NoPostRequestException::GET_REQUEST);
+        }
 
         // Do the actual request
         header(ZPush::GetServerHeader());
@@ -110,36 +117,35 @@ 
         // data send as a 'normal' packet. If the output packet exceeds 1MB (see ob_start)
         // then it will be sent as a chunked packet anyway because PHP will have to flush
         // the buffer.
-        if(!headers_sent())
-            header("Content-Length: $len");
+        if(!headers_sent()) {
+                    header("Content-Length: $len");
+        }
 
         // send vnd.ms-sync.wbxml content type header if there is no content
         // otherwise text/html content type is added which might break some devices
-        if (!headers_sent() && $len == 0)
-            header("Content-Type: application/vnd.ms-sync.wbxml");
+        if (!headers_sent() && $len == 0) {
+                    header("Content-Type: application/vnd.ms-sync.wbxml");
+        }
 
         print $data;
 
         // destruct backend after all data is on the stream
         $backend->Logoff();
-    }
-
-    catch (NoPostRequestException $nopostex) {
+    } catch (NoPostRequestException $nopostex) {
         if ($nopostex->getCode() == NoPostRequestException::OPTIONS_REQUEST) {
             header(ZPush::GetServerHeader());
             header(ZPush::GetSupportedProtocolVersions());
             header(ZPush::GetSupportedCommands());
             ZLog::Write(LOGLEVEL_INFO, $nopostex->getMessage());
+        } else if ($nopostex->getCode() == NoPostRequestException::GET_REQUEST) {
+            if (Request::GetUserAgent()) {
+                            ZLog::Write(LOGLEVEL_INFO, sprintf("User-agent: '%s'", Request::GetUserAgent()));
+            }
+            if (!headers_sent() && $nopostex->showLegalNotice()) {
+                            ZPush::PrintGrommunioSyncLegal('GET not supported', $nopostex->getMessage());
+            }
         }
-        else if ($nopostex->getCode() == NoPostRequestException::GET_REQUEST) {
-            if (Request::GetUserAgent())
-                ZLog::Write(LOGLEVEL_INFO, sprintf("User-agent: '%s'", Request::GetUserAgent()));
-            if (!headers_sent() && $nopostex->showLegalNotice())
-                ZPush::PrintGrommunioSyncLegal('GET not supported', $nopostex->getMessage());
-        }
-    }
-
-    catch (Exception $ex) {
+    } catch (Exception $ex) {
         // Extract any previous exception message for logging purpose.
         $exclass = get_class($ex);
         $exception_message = $ex->getMessage();
@@ -150,20 +156,23 @@ 
             } while($current_exception->getPrevious());
         }
 
-        if (Request::GetUserAgent())
-            ZLog::Write(LOGLEVEL_INFO, sprintf("User-agent: '%s'", Request::GetUserAgent()));
+        if (Request::GetUserAgent()) {
+                    ZLog::Write(LOGLEVEL_INFO, sprintf("User-agent: '%s'", Request::GetUserAgent()));
+        }
 
         ZLog::Write(LOGLEVEL_FATAL, sprintf('Exception: (%s) - %s', $exclass, $exception_message));
 
         if(!headers_sent()) {
             if ($ex instanceof ZPushException) {
                 header('HTTP/1.1 '. $ex->getHTTPCodeString());
-                foreach ($ex->getHTTPHeaders() as $h)
-                    header($h);
+                foreach ($ex->getHTTPHeaders() as $h) {
+                                    header($h);
+                }
             }
             // something really unexpected happened!
-            else
-                header('HTTP/1.1 500 Internal Server Error');
+            else {
+                            header('HTTP/1.1 500 Internal Server Error');
+            }
         }
 
         if ($ex instanceof AuthenticationRequiredException) {
@@ -175,8 +184,9 @@ 
             }
 
             // log the failed login attempt e.g. for fail2ban
-            if (defined('LOGAUTHFAIL') && LOGAUTHFAIL != false)
-                ZLog::Write(LOGLEVEL_WARN, sprintf("IP: %s failed to authenticate user '%s'",  Request::GetRemoteAddr(), Request::GetAuthUser()? Request::GetAuthUser(): Request::GetGETUser() ));
+            if (defined('LOGAUTHFAIL') && LOGAUTHFAIL != false) {
+                            ZLog::Write(LOGLEVEL_WARN, sprintf("IP: %s failed to authenticate user '%s'",  Request::GetRemoteAddr(), Request::GetAuthUser()? Request::GetAuthUser(): Request::GetGETUser() ));
+            }
         }
 
         // This could be a WBXML problem.. try to get the complete request
@@ -195,16 +205,18 @@ 
         }
 
         // Announce exception to process loop detection
-        if (ZPush::GetDeviceManager(false))
-            ZPush::GetDeviceManager()->AnnounceProcessException($ex);
+        if (ZPush::GetDeviceManager(false)) {
+                    ZPush::GetDeviceManager()->AnnounceProcessException($ex);
+        }
 
         // Announce exception if the TopCollector if available
         ZPush::GetTopCollector()->AnnounceInformation(get_class($ex), true);
     }
 
     // save device data if the DeviceManager is available
-    if (ZPush::GetDeviceManager(false))
-        ZPush::GetDeviceManager()->Save();
+    if (ZPush::GetDeviceManager(false)) {
+            ZPush::GetDeviceManager()->Save();
+    }
 
     // end gracefully
     ZLog::Write(LOGLEVEL_INFO,