grommunio / grommunio-sync

version.php

Braces +1 added lines, -2 removed lines

@@ -11,8 +11,7 @@
     $version = exec("hash git 2>/dev/null && cd $path >/dev/null 2>&1 && git describe  --always 2>/dev/null");
     if ($branch && $version) {
         define("GROMMUNIOSYNC_VERSION", $branch .'-'. $version);
-    }
-    else {
+    } else {
         define("GROMMUNIOSYNC_VERSION", "GIT");
     }
 }

lib/log/filelog.php

Braces +2 added lines, -4 removed lines

@@ -30,8 +30,7 @@ 
         if ($this->log_to_user_file === false) {
             if (in_array(strtolower($this->GetDevid()), ['','validate'])) {
                 $this->setLogToUserFile(preg_replace('/[^a-z0-9]/', '_', strtolower($this->GetAuthUser())) . '.log');
-            }
-            else {
+            } else {
                 $this->setLogToUserFile(
                         preg_replace('/[^a-z0-9]/', '_', strtolower($this->GetAuthUser())) .'-'.
                         (($this->GetAuthUser() != $this->GetUser()) ? preg_replace('/[^a-z0-9]/', '_', strtolower($this->GetUser())) .'-' : '') .
@@ -72,8 +71,7 @@ 
             // when the users differ, we need to log both
             if (strcasecmp($this->GetAuthUser(), $this->GetUser()) == 0) {
                 $log .= ' ['. $this->GetUser() .']';
-            }
-            else {
+            } else {
                 $log .= ' ['. $this->GetAuthUser() . Request::IMPERSONATE_DELIM . $this->GetUser() .']';
             }
         }

lib/log/log.php

Braces +6 added lines, -6 removed lines

@@ -259,8 +259,7 @@ 
                     $this->unauthMessageCache = array();
                 }
                 $this->WriteForUser($loglevel, $message);
-            }
-            else {
+            } else {
                 $this->unauthMessageCache[] = array($loglevel, $message);
             }
         }
@@ -299,10 +298,11 @@ 
      * @return string
      */
     protected function GetLogLevelString($loglevel, $pad = false) {
-        if ($pad)
-            $s = " ";
-        else
-            $s = "";
+        if ($pad) {
+                    $s = " ";
+        } else {
+                    $s = "";
+        }
         switch($loglevel) {
             case LOGLEVEL_OFF:          return ""; break;
             case LOGLEVEL_FATAL:        return "[FATAL]"; break;

lib/log/syslog.php

Braces +10 added lines, -5 removed lines

@@ -79,9 +79,15 @@ 
     public function __construct($program_name = null, $host = null, $port = null) {
         parent::__construct();
 
-        if (is_null($program_name)) $program_name = LOG_SYSLOG_PROGRAM;
-        if (is_null($host)) $host = LOG_SYSLOG_HOST;
-        if (is_null($port)) $port = LOG_SYSLOG_PORT;
+        if (is_null($program_name)) {
+            $program_name = LOG_SYSLOG_PROGRAM;
+        }
+        if (is_null($host)) {
+            $host = LOG_SYSLOG_HOST;
+        }
+        if (is_null($port)) {
+            $port = LOG_SYSLOG_PORT;
+        }
 
         $this->SetProgramName($program_name);
         $this->SetHost($host);
@@ -153,8 +159,7 @@ 
         // when the users differ, we need to log both
         if (strcasecmp($this->GetAuthUser(), $this->GetUser()) == 0) {
             $log .= ' ['. $this->GetUser() .']';
-        }
-        else {
+        } else {
             $log .= ' ['. $this->GetAuthUser() . Request::IMPERSONATE_DELIM . $this->GetUser() .']';
         }
         if ($loglevel >= LOGLEVEL_DEVICEID) {

lib/grommunio/exporter.php

Braces +46 added lines, -40 removed lines

@@ -47,13 +47,11 @@ 
         try {
             if($folderid) {
                 $entryid = mapi_msgstore_entryidfromsourcekey($store, $folderid);
-            }
-            else {
+            } else {
                 $storeprops = mapi_getprops($this->store, array(PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID));
                 if (ZPush::GetBackend()->GetImpersonatedUser() == 'system') {
                     $entryid = $storeprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
-                }
-                else {
+                } else {
                     $entryid = $storeprops[PR_IPM_SUBTREE_ENTRYID];
                 }
             }
@@ -70,16 +68,13 @@ 
             if ($folder) {
                 if ($folderid) {
                     $this->exporter = mapi_openproperty($folder, PR_CONTENTS_SYNCHRONIZER, IID_IExchangeExportChanges, 0 , 0);
-                }
-                else {
+                } else {
                     $this->exporter = mapi_openproperty($folder, PR_HIERARCHY_SYNCHRONIZER, IID_IExchangeExportChanges, 0 , 0);
                 }
-            }
-            else {
+            } else {
                 $this->exporter = false;
             }
-        }
-        catch (MAPIException $me) {
+        } catch (MAPIException $me) {
             $this->exporter = false;
             // We return the general error SYNC_FSSTATUS_CODEUNKNOWN (12) which is also SYNC_STATUS_FOLDERHIERARCHYCHANGED (12)
             // if this happened while doing content sync, the mobile will try to resync the folderhierarchy
@@ -102,8 +97,9 @@ 
         $this->flags = $flags;
 
         // this should never happen
-        if ($this->exporter === false || is_array($state))
-            throw new StatusException("ExportChangesICS->Config(): Error, exporter not available", SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_ERROR);
+        if ($this->exporter === false || is_array($state)) {
+                    throw new StatusException("ExportChangesICS->Config(): Error, exporter not available", SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_ERROR);
+        }
 
         // change exporterflags if we are doing a ContentExport
         if($this->folderid) {
@@ -113,8 +109,9 @@ 
             // we check the change ID of the syncstate (0 at initial sync)
             // On subsequent syncs, we do want to receive delete events.
             if(strlen($state) == 0 || bin2hex(substr($state,4,4)) == "00000000") {
-                if (!($this->flags & BACKEND_DISCARD_DATA))
-                    ZLog::Write(LOGLEVEL_DEBUG, "ExportChangesICS->Config(): syncing initial data");
+                if (!($this->flags & BACKEND_DISCARD_DATA)) {
+                                    ZLog::Write(LOGLEVEL_DEBUG, "ExportChangesICS->Config(): syncing initial data");
+                }
                 $this->exporterflags |= SYNC_NO_SOFT_DELETIONS | SYNC_NO_DELETIONS;
             }
         }
@@ -126,11 +123,13 @@ 
 
         // Put the state information in a stream that can be used by ICS
         $stream = mapi_stream_create();
-        if(strlen($state) == 0)
-            $state = hex2bin("0000000000000000");
+        if(strlen($state) == 0) {
+                    $state = hex2bin("0000000000000000");
+        }
 
-        if (!($this->flags & BACKEND_DISCARD_DATA))
-            ZLog::Write(LOGLEVEL_DEBUG, sprintf("ExportChangesICS->Config() initialized with state: 0x%s", bin2hex($state)));
+        if (!($this->flags & BACKEND_DISCARD_DATA)) {
+                    ZLog::Write(LOGLEVEL_DEBUG, sprintf("ExportChangesICS->Config() initialized with state: 0x%s", bin2hex($state)));
+        }
 
         mapi_stream_write($stream, $state);
         $this->statestream = $stream;
@@ -183,8 +182,9 @@ 
 
         // this should never happen!
         if($this->exporter === false || !isset($this->statestream) || !isset($this->flags) || !isset($this->exporterflags) ||
-            ($this->folderid && !isset($this->contentParameters)) )
-            throw new StatusException("ExportChangesICS->InitializeExporter(): Error, exporter or essential data not available", SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_ERROR);
+            ($this->folderid && !isset($this->contentParameters)) ) {
+                    throw new StatusException("ExportChangesICS->InitializeExporter(): Error, exporter or essential data not available", SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_ERROR);
+        }
 
         // PHP wrapper
         $phpwrapper = new PHPWrapper($this->session, $this->store, $importer, $this->folderid);
@@ -196,22 +196,24 @@ 
             // ICS c++ wrapper
             $mapiimporter = mapi_wrap_importcontentschanges($phpwrapper);
             $includeprops = false;
-        }
-        else {
+        } else {
             $mapiimporter = mapi_wrap_importhierarchychanges($phpwrapper);
             $includeprops = array(PR_SOURCE_KEY, PR_DISPLAY_NAME);
         }
 
-        if (!$mapiimporter)
-            throw new StatusException(sprintf("ExportChangesICS->InitializeExporter(): Error, mapi_wrap_import_*_changes() failed: 0x%X", mapi_last_hresult()), SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_WARN);
+        if (!$mapiimporter) {
+                    throw new StatusException(sprintf("ExportChangesICS->InitializeExporter(): Error, mapi_wrap_import_*_changes() failed: 0x%X", mapi_last_hresult()), SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_WARN);
+        }
 
         $ret = mapi_exportchanges_config($this->exporter, $this->statestream, $this->exporterflags, $mapiimporter, $this->restriction, $includeprops, false, 1);
-        if(!$ret)
-            throw new StatusException(sprintf("ExportChangesICS->InitializeExporter(): Error, mapi_exportchanges_config() failed: 0x%X", mapi_last_hresult()), SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_WARN);
+        if(!$ret) {
+                    throw new StatusException(sprintf("ExportChangesICS->InitializeExporter(): Error, mapi_exportchanges_config() failed: 0x%X", mapi_last_hresult()), SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_WARN);
+        }
 
         $changes = mapi_exportchanges_getchangecount($this->exporter);
-        if($changes || !($this->flags & BACKEND_DISCARD_DATA))
-            ZLog::Write(LOGLEVEL_DEBUG, sprintf("ExportChangesICS->InitializeExporter() successfully. %d changes ready to sync for '%s'.", $changes, ($this->folderid)?bin2hex($this->folderid) : 'hierarchy'));
+        if($changes || !($this->flags & BACKEND_DISCARD_DATA)) {
+                    ZLog::Write(LOGLEVEL_DEBUG, sprintf("ExportChangesICS->InitializeExporter() successfully. %d changes ready to sync for '%s'.", $changes, ($this->folderid)?bin2hex($this->folderid) : 'hierarchy'));
+        }
 
         return $ret;
     }
@@ -238,21 +240,24 @@ 
      */
     public function GetState() {
         $error = false;
-        if(!isset($this->statestream) || $this->exporter === false)
-            $error = true;
+        if(!isset($this->statestream) || $this->exporter === false) {
+                    $error = true;
+        }
 
-        if($error === true || mapi_exportchanges_updatestate($this->exporter, $this->statestream) != true )
-            throw new StatusException(sprintf("ExportChangesICS->GetState(): Error, state not available or unable to update: 0x%X", mapi_last_hresult()), (($this->folderid)?SYNC_STATUS_FOLDERHIERARCHYCHANGED:SYNC_FSSTATUS_CODEUNKNOWN), null, LOGLEVEL_WARN);
+        if($error === true || mapi_exportchanges_updatestate($this->exporter, $this->statestream) != true ) {
+                    throw new StatusException(sprintf("ExportChangesICS->GetState(): Error, state not available or unable to update: 0x%X", mapi_last_hresult()), (($this->folderid)?SYNC_STATUS_FOLDERHIERARCHYCHANGED:SYNC_FSSTATUS_CODEUNKNOWN), null, LOGLEVEL_WARN);
+        }
 
         mapi_stream_seek($this->statestream, 0, STREAM_SEEK_SET);
 
         $state = "";
         while(true) {
             $data = mapi_stream_read($this->statestream, 4096);
-            if(strlen($data))
-                $state .= $data;
-            else
-                break;
+            if(strlen($data)) {
+                            $state .= $data;
+            } else {
+                            break;
+            }
         }
 
         return $state;
@@ -265,10 +270,11 @@ 
      * @return int
      */
      public function GetChangeCount() {
-        if ($this->exporter)
-            return mapi_exportchanges_getchangecount($this->exporter);
-        else
-            return 0;
+        if ($this->exporter) {
+                    return mapi_exportchanges_getchangecount($this->exporter);
+        } else {
+                    return 0;
+        }
     }
 
     /**

lib/grommunio/grommunio.php

Braces +199 added lines, -189 removed lines

@@ -134,8 +134,7 @@ 
         if ($this->impersonateUser !== false) {
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Logon(): Impersonation active - authenticating: '%s' - impersonating '%s'", $this->mainUser, $this->impersonateUser));
             $defaultUser = $this->impersonateUser;
-        }
-        else {
+        } else {
             $defaultUser = $this->mainUser;
         }
 
@@ -149,8 +148,7 @@ 
                     $zpush_version = 'Grommunio-Sync_' . @constant('GROMMUNIOSYNC_VERSION');
                     $user_agent = ($deviceId) ? ZPush::GetDeviceManager()->GetUserAgent() : "unknown";
                     $this->session = @mapi_logon_zarafa($this->mainUser, $pass, MAPI_SERVER, null, null, 0, $zpush_version, $user_agent);
-                }
-                else {
+                } else {
                     $this->session = @mapi_logon_zarafa($this->mainUser, $pass, MAPI_SERVER, null, null, 0);
                 }
                 $this->notifications = true;
@@ -163,11 +161,11 @@ 
 
             if (mapi_last_hresult()) {
                 ZLog::Write(LOGLEVEL_ERROR, sprintf("Grommunio->Logon(): login failed with error code: 0x%X", mapi_last_hresult()));
-                if (mapi_last_hresult() == MAPI_E_NETWORK_ERROR)
-                    throw new ServiceUnavailableException("Error connecting to KC (login)");
+                if (mapi_last_hresult() == MAPI_E_NETWORK_ERROR) {
+                                    throw new ServiceUnavailableException("Error connecting to KC (login)");
+                }
             }
-        }
-        catch (MAPIException $ex) {
+        } catch (MAPIException $ex) {
             throw new AuthenticationRequiredException($ex->getDisplayMessage());
         }
 
@@ -186,11 +184,13 @@ 
             $this->defaultstore = $this->openMessageStore($defaultUser);
         }
 
-        if (mapi_last_hresult() == MAPI_E_FAILONEPROVIDER)
-            throw new ServiceUnavailableException("Error connecting to KC (open store)");
+        if (mapi_last_hresult() == MAPI_E_FAILONEPROVIDER) {
+                    throw new ServiceUnavailableException("Error connecting to KC (open store)");
+        }
 
-        if($this->defaultstore === false)
-            throw new AuthenticationRequiredException(sprintf("Grommunio->Logon(): User '%s' has no default store", $defaultUser));
+        if($this->defaultstore === false) {
+                    throw new AuthenticationRequiredException(sprintf("Grommunio->Logon(): User '%s' has no default store", $defaultUser));
+        }
 
         $this->store = $this->defaultstore;
         $this->storeName = $defaultUser;
@@ -229,8 +229,9 @@ 
     public function Setup($store, $checkACLonly = false, $folderid = false) {
         list($user, $domain) = Utils::SplitDomainUser($store);
 
-        if (!isset($this->mainUser))
-            return false;
+        if (!isset($this->mainUser)) {
+                    return false;
+        }
 
         $mainUser = $this->mainUser;
         // when impersonating we need to check against the impersonated user
@@ -238,8 +239,9 @@ 
             $mainUser = $this->impersonateUser;
         }
 
-        if ($user === false)
-            $user = $mainUser;
+        if ($user === false) {
+                    $user = $mainUser;
+        }
 
         // This is a special case. A user will get his entire folder structure by the foldersync by default.
         // The ACL check is executed when an additional folder is going to be sent to the mobile.
@@ -263,8 +265,7 @@ 
                             $storeProps = mapi_getprops($userstore, array(PR_IPM_SUBTREE_ENTRYID));
                             $rights = $this->HasSecretaryACLs($userstore, '', $storeProps[PR_IPM_SUBTREE_ENTRYID]);
                             ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Setup(): Checking for secretary ACLs on root folder of impersonated store '%s': '%s'", $user, Utils::PrintAsString($rights)));
-                        }
-                        else {
+                        } else {
                             $zarafauserinfo = @nsp_getuserinfo($this->mainUser);
                             $rights = (isset($zarafauserinfo['admin']) && $zarafauserinfo['admin'])?true:false;
                             ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Setup(): Checking for admin ACLs on store '%s': '%s'", $user, Utils::PrintAsString($rights)));
@@ -329,8 +330,7 @@ 
         // for SYSTEM user open the public folders
         if (strtoupper($this->storeName) == "SYSTEM") {
             $rootfolder = mapi_msgstore_openentry($this->store, $storeProps[PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
-        }
-        else {
+        } else {
             $rootfolder = mapi_msgstore_openentry($this->store);
         }
 
@@ -352,8 +352,7 @@ 
             $folder = $mapiprovider->GetFolder($row);
             if ($folder) {
                 $folders[] = $folder;
-            }
-            else {
+            } else {
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetHierarchy(): ignoring folder '%s' as MAPIProvider->GetFolder() did not return a SyncFolder object", (isset($row[PR_DISPLAY_NAME]) ? $row[PR_DISPLAY_NAME] : "unknown")));
             }
         }
@@ -389,9 +388,9 @@ 
                 return false;
             }
             return new ImportChangesICS($this->session, $this->store, hex2bin($folderid));
+        } else {
+                    return new ImportChangesICS($this->session, $this->store);
         }
-        else
-            return new ImportChangesICS($this->session, $this->store);
     }
 
     /**
@@ -412,9 +411,9 @@ 
                 return false;
             }
             return new ExportChangesICS($this->session, $this->store, hex2bin($folderid));
+        } else {
+                    return new ExportChangesICS($this->session, $this->store);
         }
-        else
-            return new ExportChangesICS($this->session, $this->store);
     }
 
     /**
@@ -449,11 +448,13 @@ 
 
         // Open the outbox and create the message there
         $storeprops = mapi_getprops($this->defaultstore, array($sendMailProps["outboxentryid"], $sendMailProps["ipmsentmailentryid"]));
-        if(isset($storeprops[$sendMailProps["outboxentryid"]]))
-            $outbox = mapi_msgstore_openentry($this->defaultstore, $storeprops[$sendMailProps["outboxentryid"]]);
+        if(isset($storeprops[$sendMailProps["outboxentryid"]])) {
+                    $outbox = mapi_msgstore_openentry($this->defaultstore, $storeprops[$sendMailProps["outboxentryid"]]);
+        }
 
-        if(!$outbox)
-            throw new StatusException(sprintf("Grommunio->SendMail(): No Outbox found or unable to create message: 0x%X", mapi_last_hresult()), SYNC_COMMONSTATUS_SERVERERROR);
+        if(!$outbox) {
+                    throw new StatusException(sprintf("Grommunio->SendMail(): No Outbox found or unable to create message: 0x%X", mapi_last_hresult()), SYNC_COMMONSTATUS_SERVERERROR);
+        }
 
         $mapimessage = mapi_folder_createmessage($outbox);
 
@@ -510,12 +511,14 @@ 
         if(isset($sm->source->itemid) && $sm->source->itemid) {
             // answering an email in a public/shared folder
             // TODO as the store is setup, we should actually user $this->store instead of $this->defaultstore - nevertheless we need to make sure this store is able to send mail (has an outbox)
-            if (!$this->Setup(ZPush::GetAdditionalSyncFolderStore($sm->source->folderid)))
-                throw new StatusException(sprintf("Grommunio->SendMail() could not Setup() the backend for folder id '%s'", $sm->source->folderid), SYNC_COMMONSTATUS_SERVERERROR);
+            if (!$this->Setup(ZPush::GetAdditionalSyncFolderStore($sm->source->folderid))) {
+                            throw new StatusException(sprintf("Grommunio->SendMail() could not Setup() the backend for folder id '%s'", $sm->source->folderid), SYNC_COMMONSTATUS_SERVERERROR);
+            }
 
             $entryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($sm->source->folderid), hex2bin($sm->source->itemid));
-            if ($entryid)
-                $fwmessage = mapi_msgstore_openentry($this->store, $entryid);
+            if ($entryid) {
+                            $fwmessage = mapi_msgstore_openentry($this->store, $entryid);
+            }
 
             if (isset($fwmessage) && $fwmessage) {
                 // update icon and last_verb when forwarding or replying message
@@ -525,8 +528,7 @@ 
                             PR_ICON_INDEX           => 262,
                             PR_LAST_VERB_EXECUTED   => 104,
                     );
-                }
-                elseif ($sm->replyflag) {
+                } elseif ($sm->replyflag) {
                     $updateProps = array(
                             PR_ICON_INDEX           => 261,
                             PR_LAST_VERB_EXECUTED   => 102,
@@ -586,8 +588,7 @@ 
                         $mapiprops[$sendMailProps["html"]] = $bodyHtml."<br><br>".$fwbodyHtml;
                     }
                 }
-            }
-            else {
+            } else {
                 // no fwmessage could be opened and we need it because we do not replace mime
                 if (!isset($sm->replacemime) || $sm->replacemime == false) {
                     throw new StatusException(sprintf("Grommunio->SendMail(): Could not open message id '%s' in folder id '%s' to be replied/forwarded: 0x%X", $sm->source->itemid, $sm->source->folderid, mapi_last_hresult()), SYNC_COMMONSTATUS_ITEMNOTFOUND);
@@ -631,21 +632,22 @@ 
         if (! $folderid) {
             $entryid = hex2bin($id);
             $sk = $id;
-        }
-        else {
+        } else {
             // id might be in the new longid format, so we have to split it here
             list($fsk, $sk) = Utils::SplitMessageId($id);
             // get the entry id of the message
             $entryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($folderid), hex2bin($sk));
 
         }
-        if(!$entryid)
-            throw new StatusException(sprintf("Grommunio->Fetch('%s','%s'): Error getting entryid: 0x%X", $folderid, $sk, mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
+        if(!$entryid) {
+                    throw new StatusException(sprintf("Grommunio->Fetch('%s','%s'): Error getting entryid: 0x%X", $folderid, $sk, mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
+        }
 
         // open the message
         $message = mapi_msgstore_openentry($this->store, $entryid);
-        if(!$message)
-            throw new StatusException(sprintf("Grommunio->Fetch('%s','%s'): Error, unable to open message: 0x%X", $folderid, $sk, mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
+        if(!$message) {
+                    throw new StatusException(sprintf("Grommunio->Fetch('%s','%s'): Error, unable to open message: 0x%X", $folderid, $sk, mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
+        }
 
         // convert the mapi message into a SyncObject and return it
         $mapiprovider = new MAPIProvider($this->session, $this->store);
@@ -691,8 +693,9 @@ 
     public function GetAttachmentData($attname) {
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetAttachmentData('%s')", $attname));
 
-        if(!strpos($attname, ":"))
-            throw new StatusException(sprintf("Grommunio->GetAttachmentData('%s'): Error, attachment requested for non-existing item", $attname), SYNC_ITEMOPERATIONSSTATUS_INVALIDATT);
+        if(!strpos($attname, ":")) {
+                    throw new StatusException(sprintf("Grommunio->GetAttachmentData('%s'): Error, attachment requested for non-existing item", $attname), SYNC_ITEMOPERATIONSSTATUS_INVALIDATT);
+        }
 
         list($id, $attachnum, $parentEntryid) = explode(":", $attname);
         if (isset($parentEntryid)) {
@@ -701,13 +704,15 @@ 
 
         $entryid = hex2bin($id);
         $message = mapi_msgstore_openentry($this->store, $entryid);
-        if(!$message)
-            throw new StatusException(sprintf("Grommunio->GetAttachmentData('%s'): Error, unable to open item for attachment data for id '%s' with: 0x%X", $attname, $id, mapi_last_hresult()), SYNC_ITEMOPERATIONSSTATUS_INVALIDATT);
+        if(!$message) {
+                    throw new StatusException(sprintf("Grommunio->GetAttachmentData('%s'): Error, unable to open item for attachment data for id '%s' with: 0x%X", $attname, $id, mapi_last_hresult()), SYNC_ITEMOPERATIONSSTATUS_INVALIDATT);
+        }
 
         MAPIUtils::ParseSmime($this->session, $this->defaultstore, $this->getAddressbook(), $message);
         $attach = mapi_message_openattach($message, $attachnum);
-        if(!$attach)
-            throw new StatusException(sprintf("Grommunio->GetAttachmentData('%s'): Error, unable to open attachment number '%s' with: 0x%X", $attname, $attachnum, mapi_last_hresult()), SYNC_ITEMOPERATIONSSTATUS_INVALIDATT);
+        if(!$attach) {
+                    throw new StatusException(sprintf("Grommunio->GetAttachmentData('%s'): Error, unable to open attachment number '%s' with: 0x%X", $attname, $attachnum, mapi_last_hresult()), SYNC_ITEMOPERATIONSSTATUS_INVALIDATT);
+        }
 
         // get necessary attachment props
         $attprops = mapi_getprops($attach, array(PR_ATTACH_MIME_TAG, PR_ATTACH_MIME_TAG_W, PR_ATTACH_METHOD));
@@ -719,19 +724,21 @@ 
             $stream = mapi_inetmapi_imtoinet($this->session, $addrbook, $embMessage, array('use_tnef' => -1));
             // set the default contenttype for this kind of messages
             $attachment->contenttype = "message/rfc822";
+        } else {
+                    $stream = mapi_openproperty($attach, PR_ATTACH_DATA_BIN, IID_IStream, 0, 0);
         }
-        else
-            $stream = mapi_openproperty($attach, PR_ATTACH_DATA_BIN, IID_IStream, 0, 0);
 
-        if(!$stream)
-            throw new StatusException(sprintf("Grommunio->GetAttachmentData('%s'): Error, unable to open attachment data stream: 0x%X", $attname, mapi_last_hresult()), SYNC_ITEMOPERATIONSSTATUS_INVALIDATT);
+        if(!$stream) {
+                    throw new StatusException(sprintf("Grommunio->GetAttachmentData('%s'): Error, unable to open attachment data stream: 0x%X", $attname, mapi_last_hresult()), SYNC_ITEMOPERATIONSSTATUS_INVALIDATT);
+        }
 
         // put the mapi stream into a wrapper to get a standard stream
         $attachment->data = MAPIStreamWrapper::Open($stream);
-        if (isset($attprops[PR_ATTACH_MIME_TAG]))
-            $attachment->contenttype = $attprops[PR_ATTACH_MIME_TAG];
-        elseif (isset($attprops[PR_ATTACH_MIME_TAG_W]))
-            $attachment->contenttype = $attprops[PR_ATTACH_MIME_TAG_W];
+        if (isset($attprops[PR_ATTACH_MIME_TAG])) {
+                    $attachment->contenttype = $attprops[PR_ATTACH_MIME_TAG];
+        } elseif (isset($attprops[PR_ATTACH_MIME_TAG_W])) {
+                    $attachment->contenttype = $attprops[PR_ATTACH_MIME_TAG_W];
+        }
             //TODO default contenttype
         return $attachment;
     }
@@ -751,23 +758,27 @@ 
      */
     public function EmptyFolder($folderid, $includeSubfolders = true) {
         $folderentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($folderid));
-        if (!$folderentryid)
-            throw new StatusException(sprintf("Grommunio->EmptyFolder('%s','%s'): Error, unable to open folder (no entry id)", $folderid, Utils::PrintAsString($includeSubfolders)), SYNC_ITEMOPERATIONSSTATUS_SERVERERROR);
+        if (!$folderentryid) {
+                    throw new StatusException(sprintf("Grommunio->EmptyFolder('%s','%s'): Error, unable to open folder (no entry id)", $folderid, Utils::PrintAsString($includeSubfolders)), SYNC_ITEMOPERATIONSSTATUS_SERVERERROR);
+        }
         $folder = mapi_msgstore_openentry($this->store, $folderentryid);
 
-        if (!$folder)
-            throw new StatusException(sprintf("Grommunio->EmptyFolder('%s','%s'): Error, unable to open parent folder (open entry)", $folderid, Utils::PrintAsString($includeSubfolders)), SYNC_ITEMOPERATIONSSTATUS_SERVERERROR);
+        if (!$folder) {
+                    throw new StatusException(sprintf("Grommunio->EmptyFolder('%s','%s'): Error, unable to open parent folder (open entry)", $folderid, Utils::PrintAsString($includeSubfolders)), SYNC_ITEMOPERATIONSSTATUS_SERVERERROR);
+        }
 
         $flags = 0;
-        if ($includeSubfolders)
-            $flags = DEL_ASSOCIATED;
+        if ($includeSubfolders) {
+                    $flags = DEL_ASSOCIATED;
+        }
 
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->EmptyFolder('%s','%s'): emptying folder",$folderid, Utils::PrintAsString($includeSubfolders)));
 
         // empty folder!
         mapi_folder_emptyfolder($folder, $flags);
-        if (mapi_last_hresult())
-            throw new StatusException(sprintf("Grommunio->EmptyFolder('%s','%s'): Error, mapi_folder_emptyfolder() failed: 0x%X", $folderid, Utils::PrintAsString($includeSubfolders), mapi_last_hresult()), SYNC_ITEMOPERATIONSSTATUS_SERVERERROR);
+        if (mapi_last_hresult()) {
+                    throw new StatusException(sprintf("Grommunio->EmptyFolder('%s','%s'): Error, mapi_folder_emptyfolder() failed: 0x%X", $folderid, Utils::PrintAsString($includeSubfolders), mapi_last_hresult()), SYNC_ITEMOPERATIONSSTATUS_SERVERERROR);
+        }
 
         return true;
     }
@@ -788,12 +799,14 @@ 
         // Use standard meeting response code to process meeting request
         list($fid, $requestid) = Utils::SplitMessageId($requestid);
         $reqentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($folderid), hex2bin($requestid));
-        if (!$reqentryid)
-            throw new StatusException(sprintf("Grommunio->MeetingResponse('%s', '%s', '%s'): Error, unable to entryid of the message 0x%X", $requestid, $folderid, $response, mapi_last_hresult()), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
+        if (!$reqentryid) {
+                    throw new StatusException(sprintf("Grommunio->MeetingResponse('%s', '%s', '%s'): Error, unable to entryid of the message 0x%X", $requestid, $folderid, $response, mapi_last_hresult()), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
+        }
 
         $mapimessage = mapi_msgstore_openentry($this->store, $reqentryid);
-        if(!$mapimessage)
-            throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Error, unable to open request message for response 0x%X", $requestid, $folderid, $response, mapi_last_hresult()), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
+        if(!$mapimessage) {
+                    throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Error, unable to open request message for response 0x%X", $requestid, $folderid, $response, mapi_last_hresult()), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
+        }
 
         // ios sends calendar item in MeetingResponse
         // @see https://jira.z-hub.io/browse/ZP-1524
@@ -834,11 +847,13 @@ 
 
         $meetingrequest = new Meetingrequest($this->store, $mapimessage, $this->session);
 
-        if(!$meetingrequest->isMeetingRequest())
-            throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Error, attempt to respond to non-meeting request", $requestid, $folderid, $response), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
+        if(!$meetingrequest->isMeetingRequest()) {
+                    throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Error, attempt to respond to non-meeting request", $requestid, $folderid, $response), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
+        }
 
-        if($meetingrequest->isLocalOrganiser())
-            throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Error, attempt to response to meeting request that we organized", $requestid, $folderid, $response), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
+        if($meetingrequest->isLocalOrganiser()) {
+                    throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Error, attempt to response to meeting request that we organized", $requestid, $folderid, $response), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
+        }
 
         // Process the meeting response. We don't have to send the actual meeting response
         // e-mail, because the device will send it itself. This seems not to be the case
@@ -906,8 +921,9 @@ 
                ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): found other calendar entryid", $requestid, $folderid, $response));
             }
 
-            if ($requestid == $calendarid)
-                throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Error finding the accepted meeting response in the calendar", $requestid, $folderid, $response), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
+            if ($requestid == $calendarid) {
+                            throw new StatusException(sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): Error finding the accepted meeting response in the calendar", $requestid, $folderid, $response), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
+            }
         }
 
         // delete meeting request from Inbox
@@ -971,8 +987,9 @@ 
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->ChangesSinkInitialize(): folderid '%s'", $folderid));
 
         $entryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($folderid));
-        if (!$entryid)
-            return false;
+        if (!$entryid) {
+                    return false;
+        }
 
         // add entryid to the monitored folders
         $this->changesSinkFolders[$entryid] = $folderid;
@@ -1000,8 +1017,9 @@ 
         $hierarchyNotifications = array();
         $sinkresult = @mapi_sink_timedwait($this->changesSink, $timeout * 1000);
 
-        if (!is_array($sinkresult))
-            throw new StatusException("Grommunio->ChangesSink(): Sink returned invalid notification, aborting", SyncCollections::OBSOLETE_CONNECTION);
+        if (!is_array($sinkresult)) {
+                    throw new StatusException("Grommunio->ChangesSink(): Sink returned invalid notification, aborting", SyncCollections::OBSOLETE_CONNECTION);
+        }
 
         // reverse array so that the changes on folders are before changes on messages and
         // it's possible to filter such notifications
@@ -1116,8 +1134,7 @@ 
                             }
                             $response->recipientcount++;
                             $response->recipient[] = $entry;
-                        }
-                        elseif (is_int($recipient)) {
+                        } elseif (is_int($recipient)) {
                             $response->status = $recipient;
                         }
                     }
@@ -1170,22 +1187,27 @@ 
         //TODO: use PR_ANR for this restriction instead of PR_DISPLAY_NAME and PR_ACCOUNT
         $addrbook = $this->getAddressbook();
         // FIXME: create a function to get the adressbook contentstable
-        if ($addrbook)
-            $ab_entryid = mapi_ab_getdefaultdir($addrbook);
-        if ($ab_entryid)
-            $ab_dir = mapi_ab_openentry($addrbook, $ab_entryid);
-        if ($ab_dir)
-            $table = mapi_folder_getcontentstable($ab_dir);
+        if ($addrbook) {
+                    $ab_entryid = mapi_ab_getdefaultdir($addrbook);
+        }
+        if ($ab_entryid) {
+                    $ab_dir = mapi_ab_openentry($addrbook, $ab_entryid);
+        }
+        if ($ab_dir) {
+                    $table = mapi_folder_getcontentstable($ab_dir);
+        }
 
-        if (!$table)
-            throw new StatusException(sprintf("Grommunio->GetGALSearchResults(): could not open addressbook: 0x%X", mapi_last_hresult()), SYNC_SEARCHSTATUS_STORE_CONNECTIONFAILED);
+        if (!$table) {
+                    throw new StatusException(sprintf("Grommunio->GetGALSearchResults(): could not open addressbook: 0x%X", mapi_last_hresult()), SYNC_SEARCHSTATUS_STORE_CONNECTIONFAILED);
+        }
 
         $restriction = MAPIUtils::GetSearchRestriction(u2w($searchquery));
         mapi_table_restrict($table, $restriction);
         mapi_table_sort($table, array(PR_DISPLAY_NAME => TABLE_SORT_ASCEND));
 
-        if (mapi_last_hresult())
-            throw new StatusException(sprintf("Grommunio->GetGALSearchResults(): could not apply restriction: 0x%X", mapi_last_hresult()), SYNC_SEARCHSTATUS_STORE_TOOCOMPLEX);
+        if (mapi_last_hresult()) {
+                    throw new StatusException(sprintf("Grommunio->GetGALSearchResults(): could not apply restriction: 0x%X", mapi_last_hresult()), SYNC_SEARCHSTATUS_STORE_TOOCOMPLEX);
+        }
 
         //range for the search results, default symbian range end is 50, wm 99,
         //so we'll use that of nokia
@@ -1203,8 +1225,9 @@ 
         //do not return more results as requested in range
         $querylimit = (($rangeend + 1) < $querycnt) ? ($rangeend + 1) : $querycnt;
 
-        if ($querycnt > 0)
-            $abentries = mapi_table_queryrows($table, array(PR_ENTRYID, PR_ACCOUNT, PR_DISPLAY_NAME, PR_SMTP_ADDRESS, PR_BUSINESS_TELEPHONE_NUMBER, PR_GIVEN_NAME, PR_SURNAME, PR_MOBILE_TELEPHONE_NUMBER, PR_HOME_TELEPHONE_NUMBER, PR_TITLE, PR_COMPANY_NAME, PR_OFFICE_LOCATION, PR_EMS_AB_THUMBNAIL_PHOTO), $rangestart, $querylimit);
+        if ($querycnt > 0) {
+                    $abentries = mapi_table_queryrows($table, array(PR_ENTRYID, PR_ACCOUNT, PR_DISPLAY_NAME, PR_SMTP_ADDRESS, PR_BUSINESS_TELEPHONE_NUMBER, PR_GIVEN_NAME, PR_SURNAME, PR_MOBILE_TELEPHONE_NUMBER, PR_HOME_TELEPHONE_NUMBER, PR_TITLE, PR_COMPANY_NAME, PR_OFFICE_LOCATION, PR_EMS_AB_THUMBNAIL_PHOTO), $rangestart, $querylimit);
+        }
 
         for ($i = 0; $i < $querylimit; $i++) {
             if (!isset($abentries[$i][PR_SMTP_ADDRESS])) {
@@ -1214,8 +1237,9 @@ 
 
             $items[$i][SYNC_GAL_DISPLAYNAME] = w2u($abentries[$i][PR_DISPLAY_NAME]);
 
-            if (strlen(trim($items[$i][SYNC_GAL_DISPLAYNAME])) == 0)
-                $items[$i][SYNC_GAL_DISPLAYNAME] = w2u($abentries[$i][PR_ACCOUNT]);
+            if (strlen(trim($items[$i][SYNC_GAL_DISPLAYNAME])) == 0) {
+                            $items[$i][SYNC_GAL_DISPLAYNAME] = w2u($abentries[$i][PR_ACCOUNT]);
+            }
 
             $items[$i][SYNC_GAL_ALIAS] = w2u($abentries[$i][PR_ACCOUNT]);
             //it's not possible not get first and last name of an user
@@ -1223,32 +1247,42 @@ 
             //to displayname and leave firstname unset
             //this was changed in Zarafa 6.40, so we try to get first and
             //last name and fall back to the old behaviour if these values are not set
-            if (isset($abentries[$i][PR_GIVEN_NAME]))
-                $items[$i][SYNC_GAL_FIRSTNAME] = w2u($abentries[$i][PR_GIVEN_NAME]);
-            if (isset($abentries[$i][PR_SURNAME]))
-                $items[$i][SYNC_GAL_LASTNAME] = w2u($abentries[$i][PR_SURNAME]);
+            if (isset($abentries[$i][PR_GIVEN_NAME])) {
+                            $items[$i][SYNC_GAL_FIRSTNAME] = w2u($abentries[$i][PR_GIVEN_NAME]);
+            }
+            if (isset($abentries[$i][PR_SURNAME])) {
+                            $items[$i][SYNC_GAL_LASTNAME] = w2u($abentries[$i][PR_SURNAME]);
+            }
 
-            if (!isset($items[$i][SYNC_GAL_LASTNAME])) $items[$i][SYNC_GAL_LASTNAME] = $items[$i][SYNC_GAL_DISPLAYNAME];
+            if (!isset($items[$i][SYNC_GAL_LASTNAME])) {
+                $items[$i][SYNC_GAL_LASTNAME] = $items[$i][SYNC_GAL_DISPLAYNAME];
+            }
 
             $items[$i][SYNC_GAL_EMAILADDRESS] = w2u($abentries[$i][PR_SMTP_ADDRESS]);
             //check if an user has an office number or it might produce warnings in the log
-            if (isset($abentries[$i][PR_BUSINESS_TELEPHONE_NUMBER]))
-                $items[$i][SYNC_GAL_PHONE] = w2u($abentries[$i][PR_BUSINESS_TELEPHONE_NUMBER]);
+            if (isset($abentries[$i][PR_BUSINESS_TELEPHONE_NUMBER])) {
+                            $items[$i][SYNC_GAL_PHONE] = w2u($abentries[$i][PR_BUSINESS_TELEPHONE_NUMBER]);
+            }
             //check if an user has a mobile number or it might produce warnings in the log
-            if (isset($abentries[$i][PR_MOBILE_TELEPHONE_NUMBER]))
-                $items[$i][SYNC_GAL_MOBILEPHONE] = w2u($abentries[$i][PR_MOBILE_TELEPHONE_NUMBER]);
+            if (isset($abentries[$i][PR_MOBILE_TELEPHONE_NUMBER])) {
+                            $items[$i][SYNC_GAL_MOBILEPHONE] = w2u($abentries[$i][PR_MOBILE_TELEPHONE_NUMBER]);
+            }
             //check if an user has a home number or it might produce warnings in the log
-            if (isset($abentries[$i][PR_HOME_TELEPHONE_NUMBER]))
-                $items[$i][SYNC_GAL_HOMEPHONE] = w2u($abentries[$i][PR_HOME_TELEPHONE_NUMBER]);
+            if (isset($abentries[$i][PR_HOME_TELEPHONE_NUMBER])) {
+                            $items[$i][SYNC_GAL_HOMEPHONE] = w2u($abentries[$i][PR_HOME_TELEPHONE_NUMBER]);
+            }
 
-            if (isset($abentries[$i][PR_COMPANY_NAME]))
-                $items[$i][SYNC_GAL_COMPANY] = w2u($abentries[$i][PR_COMPANY_NAME]);
+            if (isset($abentries[$i][PR_COMPANY_NAME])) {
+                            $items[$i][SYNC_GAL_COMPANY] = w2u($abentries[$i][PR_COMPANY_NAME]);
+            }
 
-            if (isset($abentries[$i][PR_TITLE]))
-                $items[$i][SYNC_GAL_TITLE] = w2u($abentries[$i][PR_TITLE]);
+            if (isset($abentries[$i][PR_TITLE])) {
+                            $items[$i][SYNC_GAL_TITLE] = w2u($abentries[$i][PR_TITLE]);
+            }
 
-            if (isset($abentries[$i][PR_OFFICE_LOCATION]))
-                $items[$i][SYNC_GAL_OFFICE] = w2u($abentries[$i][PR_OFFICE_LOCATION]);
+            if (isset($abentries[$i][PR_OFFICE_LOCATION])) {
+                            $items[$i][SYNC_GAL_OFFICE] = w2u($abentries[$i][PR_OFFICE_LOCATION]);
+            }
 
             if ($searchpicture !== false && isset($abentries[$i][PR_EMS_AB_THUMBNAIL_PHOTO])) {
                 $items[$i][SYNC_GAL_PICTURE] = StringStreamWrapper::Open($abentries[$i][PR_EMS_AB_THUMBNAIL_PHOTO]);
@@ -1297,8 +1331,10 @@ 
         // do the search and wait for all the results available
         while (time() - $searchStart < SEARCH_WAIT) {
             $searchcriteria = mapi_folder_getsearchcriteria($searchFolder);
-            if(($searchcriteria["searchstate"] & SEARCH_REBUILD) == 0)
-                break; // Search is done
+            if(($searchcriteria["searchstate"] & SEARCH_REBUILD) == 0) {
+                            break;
+            }
+            // Search is done
             sleep(1);
         }
 
@@ -1393,8 +1429,7 @@ 
         // setup the correct store
         if ($this->Setup($store, false, $folderid)) {
             return $this->store;
-        }
-        else {
+        } else {
             ZLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->GetMAPIStoreForFolderId('%s', '%s'): store is not available", $store, $folderid));
             return false;
         }
@@ -1505,8 +1540,7 @@ 
 
         if (isset($this->folderStatCache[$user][$folderid])) {
             return $this->folderStatCache[$user][$folderid];
-        }
-        else {
+        } else {
             // a timestamp that changes once per hour is returned in case there is no data found for this folder. It will be synchronized only once per hour.
             return gmdate("Y-m-d-H");
         }
@@ -1581,8 +1615,7 @@ 
             if (isset($stateMessageProps[PR_LAST_MODIFICATION_TIME])) {
                 return $stateMessageProps[PR_LAST_MODIFICATION_TIME];
             }
-        }
-        catch (StateNotFoundException $e) { }
+        } catch (StateNotFoundException $e) { }
         return "0";
     }
 
@@ -1779,8 +1812,7 @@ 
                 if ($devid) {
                     $this->setDeviceUserData($this->userDeviceData, bin2hex($hierarchyRows[0][PR_ENTRYID]), $devid, $this->mainUser, "statefolder");
                 }
-            }
-            elseif ($rowCnt == 0) {
+            } elseif ($rowCnt == 0) {
                 // legacy code: create the hidden state folder and the device subfolder
                 // this should happen when the user configures the device (autodiscover or first sync if no autodiscover)
 
@@ -1792,12 +1824,10 @@ 
                 if ($rowCnt == 1) {
                     $hierarchyRows = mapi_table_queryrows($hierarchy, [PR_ENTRYID], 0, 1);
                     $stateFolder = mapi_msgstore_openentry($this->store, $hierarchyRows[0][PR_ENTRYID]);
-                }
-                elseif ($rowCnt == 0) {
+                } elseif ($rowCnt == 0) {
                     $stateFolder = mapi_folder_createfolder($rootfolder, STORE_STATE_FOLDER, "");
                     mapi_setprops($stateFolder, array(PR_ATTR_HIDDEN => true));
-                }
-                else {
+                } else {
                     // TODO: handle this
                 }
                 if (isset($stateFolder) && $stateFolder) {
@@ -1806,12 +1836,10 @@ 
                     $this->stateFolder = mapi_msgstore_openentry($this->store, $devStateFolderProps[PR_ENTRYID]);
                     mapi_setprops($this->stateFolder, array(PR_ATTR_HIDDEN => true));
                     // we don't cache the entryid in redis, because this will happen on the next request anyway
-                }
-                else {
+                } else {
                     // TODO: unable to create state folder - throw exception
                 }
-            }
-            else {
+            } else {
                 // This case is rather unlikely that there would be several
                 // hidden folders having PR_DISPLAY_NAME the same as device id.
 
@@ -1852,8 +1880,7 @@ 
             if ($rowCnt == 1) {
                 $stateFolderRows = mapi_table_queryrows($stateFolderContents, [PR_ENTRYID], 0, 1);
                 return mapi_msgstore_openentry($this->store, $stateFolderRows[0][PR_ENTRYID]);
-            }
-            elseif($rowCnt > 1) {
+            } elseif($rowCnt > 1) {
                 ZLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->getStateMessage(): Found several (%d) states for '%s'", $rowCnt, $messageName));
             }
         }
@@ -1880,8 +1907,7 @@ 
         }
         try {
             $stateMessage = $this->getStateMessage($devid, $type, $key, $counter);
-        }
-        catch (StateNotFoundException $e) {
+        } catch (StateNotFoundException $e) {
             // if message is not available, try to create a new one
             $stateMessage = mapi_folder_createmessage($this->stateFolder, MAPI_ASSOCIATED);
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->setStateMessage(): mapi_folder_createmessage 0x%08X", mapi_last_hresult()));
@@ -1999,8 +2025,7 @@ 
             if (mapi_last_hresult()) {
                 ZLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->adviseStoreToSink(): failed to advised store '%s' with code 0x%X. Polling will be performed.", $store, mapi_last_hresult()));
                 return false;
-            }
-            else {
+            } else {
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->adviseStoreToSink(): advised store '%s'", $store));
                 $this->changesSinkStores[] = $store;
             }
@@ -2020,14 +2045,16 @@ 
     private function openMessageStore($user) {
         // During PING requests the operations store has to be switched constantly
         // the cache prevents the same store opened several times
-        if (isset($this->storeCache[$user]))
-           return  $this->storeCache[$user];
+        if (isset($this->storeCache[$user])) {
+                   return  $this->storeCache[$user];
+        }
 
         $entryid = false;
         $return_public = false;
 
-        if (strtoupper($user) == 'SYSTEM')
-            $return_public = true;
+        if (strtoupper($user) == 'SYSTEM') {
+                    $return_public = true;
+        }
 
         // loop through the storestable if authenticated user of public folder
         if ($user == $this->mainUser || $return_public === true) {
@@ -2049,9 +2076,9 @@ 
                     }
                 }
             }
+        } else {
+                    $entryid = @mapi_msgstore_createentryid($this->defaultstore, $user);
         }
-        else
-            $entryid = @mapi_msgstore_createentryid($this->defaultstore, $user);
 
         if($entryid) {
             $store = @mapi_openmsgstore($this->session, $entryid);
@@ -2062,13 +2089,13 @@ 
             }
 
             // add this store to the cache
-            if (!isset($this->storeCache[$user]))
-                $this->storeCache[$user] = $store;
+            if (!isset($this->storeCache[$user])) {
+                            $this->storeCache[$user] = $store;
+            }
 
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->openMessageStore('%s'): Found '%s' store: '%s'", $user, (($return_public)?'PUBLIC':'DEFAULT'),$store));
             return $store;
-        }
-        else {
+        } else {
             ZLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->openMessageStore('%s'): No store found for this user", $user));
             return false;
         }
@@ -2124,8 +2151,7 @@ 
         //if oof state is set it must be set of oof and get otherwise
         if (isset($oof->oofstate)) {
             $this->settingsOofSet($oof);
-        }
-        else {
+        } else {
             $this->settingsOofGet($oof);
         }
     }
@@ -2163,26 +2189,22 @@ 
                     @mapi_setprops($this->defaultstore, array(PR_EC_OUTOFOFFICE => false));
                     @mapi_deleteprops($this->defaultstore, array(PR_EC_OUTOFOFFICE_FROM, PR_EC_OUTOFOFFICE_UNTIL));
                     ZLog::Write(LOGLEVEL_INFO, "Grommunio->settingsOofGet(): Out of office is set but the from and until are in the past. Disabling out of office.");
-                }
-                elseif ($oofprops[PR_EC_OUTOFOFFICE_FROM] < $oofprops[PR_EC_OUTOFOFFICE_UNTIL]) {
+                } elseif ($oofprops[PR_EC_OUTOFOFFICE_FROM] < $oofprops[PR_EC_OUTOFOFFICE_UNTIL]) {
                     $oof->oofstate = SYNC_SETTINGSOOF_TIMEBASED;
                     $oof->starttime = $oofprops[PR_EC_OUTOFOFFICE_FROM];
                     $oof->endtime = $oofprops[PR_EC_OUTOFOFFICE_UNTIL];
-                }
-                else {
+                } else {
                     ZLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->settingsOofGet(): Time based out of office set but end time ('%s') is before startime ('%s').",
                         date("Y-m-d H:i:s", $oofprops[PR_EC_OUTOFOFFICE_FROM]), date("Y-m-d H:i:s", $oofprops[PR_EC_OUTOFOFFICE_UNTIL])));
                     $oof->Status = SYNC_SETTINGSSTATUS_PROTOCOLLERROR;
                 }
-            }
-            elseif ($oof->oofstate == SYNC_SETTINGSOOF_GLOBAL && (isset($oofprops[PR_EC_OUTOFOFFICE_FROM]) || isset($oofprops[PR_EC_OUTOFOFFICE_UNTIL]))) {
+            } elseif ($oof->oofstate == SYNC_SETTINGSOOF_GLOBAL && (isset($oofprops[PR_EC_OUTOFOFFICE_FROM]) || isset($oofprops[PR_EC_OUTOFOFFICE_UNTIL]))) {
                 ZLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->settingsOofGet(): Time based out of office set but either start time ('%s') or end time ('%s') is missing.",
                     (isset($oofprops[PR_EC_OUTOFOFFICE_FROM]) ? date("Y-m-d H:i:s", $oofprops[PR_EC_OUTOFOFFICE_FROM]) : 'empty'),
                     (isset($oofprops[PR_EC_OUTOFOFFICE_UNTIL]) ? date("Y-m-d H:i:s", $oofprops[PR_EC_OUTOFOFFICE_UNTIL]) : 'empty')));
                 $oof->Status = SYNC_SETTINGSSTATUS_PROTOCOLLERROR;
             }
-        }
-        else {
+        } else {
             ZLog::Write(LOGLEVEL_WARN, "Grommunio->Unable to get out of office information");
         }
 
@@ -2213,16 +2235,13 @@ 
                 if(isset($oof->starttime) && isset($oof->endtime)) {
                     $props[PR_EC_OUTOFOFFICE_FROM] = $oof->starttime;
                     $props[PR_EC_OUTOFOFFICE_UNTIL] = $oof->endtime;
-                }
-                elseif (isset($oof->starttime) || isset($oof->endtime)) {
+                } elseif (isset($oof->starttime) || isset($oof->endtime)) {
                     $oof->Status = SYNC_SETTINGSSTATUS_PROTOCOLLERROR;
                 }
-            }
-            else {
+            } else {
                 $deleteProps = array(PR_EC_OUTOFOFFICE_FROM, PR_EC_OUTOFOFFICE_UNTIL);
             }
-        }
-        elseif($oof->oofstate == SYNC_SETTINGSOOF_DISABLED) {
+        } elseif($oof->oofstate == SYNC_SETTINGSOOF_DISABLED) {
             $props[PR_EC_OUTOFOFFICE] = false;
             $deleteProps = array(PR_EC_OUTOFOFFICE_FROM, PR_EC_OUTOFOFFICE_UNTIL);
         }
@@ -2266,8 +2285,7 @@ 
                 $emailaddresses->primarysmtpaddress = $user["primary_email"];
                 $account->emailaddresses = $emailaddresses;
                 $userinformation->accounts[] = $account;
-            }
-            else {
+            } else {
                 $userinformation->emailaddresses[] = $user["primary_email"];
             }
             return true;
@@ -2519,10 +2537,12 @@ 
         $addrbook = $this->getAddressbook();
         // FIXME: create a function to get the adressbook contentstable
         $ab_entryid = mapi_ab_getdefaultdir($addrbook);
-        if ($ab_entryid)
-            $ab_dir = mapi_ab_openentry($addrbook, $ab_entryid);
-        if ($ab_dir)
-            $table = mapi_folder_getcontentstable($ab_dir);
+        if ($ab_entryid) {
+                    $ab_dir = mapi_ab_openentry($addrbook, $ab_entryid);
+        }
+        if ($ab_dir) {
+                    $table = mapi_folder_getcontentstable($ab_dir);
+        }
 
         if (!$table) {
             ZLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->resolveRecipientGAL(): Unable to open addressbook:0x%X", mapi_last_hresult()));
@@ -2539,12 +2559,10 @@ 
             // some devices request 0 ambiguous recipients
             if ($querycnt == 1 && $maxAmbiguousRecipients == 0) {
                 $rowsToQuery = 1;
-            }
-            elseif ($querycnt > 1 && $maxAmbiguousRecipients == 0) {
+            } elseif ($querycnt > 1 && $maxAmbiguousRecipients == 0) {
                 ZLog::Write(LOGLEVEL_INFO, sprintf("Grommunio->resolveRecipientGAL(): GAL search found %d recipients but the device hasn't requested ambiguous recipients", $querycnt));
                 return $recipientGal;
-            }
-            elseif ($querycnt > 1 && $maxAmbiguousRecipients == 1) {
+            } elseif ($querycnt > 1 && $maxAmbiguousRecipients == 1) {
                 $rowsToQuery = $querycnt;
             }
             // get the certificate every time because caching the certificate is less expensive than opening addressbook entry again
@@ -2565,21 +2583,18 @@ 
                             ZLog::Write(LOGLEVEL_WBXML, sprintf("Grommunio->resolveRecipientGAL(): distlist's '%s' member: '%s'", $to, $distListMembers[$j][PR_DISPLAY_NAME]));
                             $recipientGal[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_GAL, $to, $distListMembers[$j], $nrDistListMembers);
                         }
-                    }
-                    else {
+                    } else {
                         ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->resolveRecipientGAL(): '%s' is a dist list, but return it as is.", $to));
                         $recipientGal[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_GAL, $abentries[$i][PR_SMTP_ADDRESS], $abentries[$i]);
                     }
-                }
-                elseif ($abentries[$i][PR_OBJECT_TYPE] == MAPI_MAILUSER) {
+                } elseif ($abentries[$i][PR_OBJECT_TYPE] == MAPI_MAILUSER) {
                     $recipientGal[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_GAL, $abentries[$i][PR_SMTP_ADDRESS], $abentries[$i]);
                 }
             }
 
             ZLog::Write(LOGLEVEL_WBXML, "Grommunio->resolveRecipientGAL(): Found a recipient in GAL");
             return $recipientGal;
-        }
-        else {
+        } else {
             ZLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->resolveRecipientGAL(): No recipient found for: '%s' in GAL", $to));
             return SYNC_RESOLVERECIPSSTATUS_RESPONSE_UNRESOLVEDRECIP;
         }
@@ -2655,8 +2670,7 @@ 
                     break;
                 }
             }
-        }
-        else {
+        } else {
             ZLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->resolveRecipientContact(): Unable to open public store: 0x%X", $result));
         }
 
@@ -2711,18 +2725,15 @@ 
 
         if ($type == SYNC_RESOLVERECIPIENTS_TYPE_GAL) {
             $certificateProp = PR_EMS_AB_TAGGED_X509_CERT;
-        }
-        elseif ($type == SYNC_RESOLVERECIPIENTS_TYPE_CONTACT) {
+        } elseif ($type == SYNC_RESOLVERECIPIENTS_TYPE_CONTACT) {
             $certificateProp = PR_USER_X509_CERTIFICATE;
-        }
-        else {
+        } else {
             $certificateProp = null;
         }
 
         if (isset($recipientProperties[$certificateProp]) && is_array($recipientProperties[$certificateProp]) && !empty($recipientProperties[$certificateProp])) {
             $certificates = $this->getCertificates($recipientProperties[$certificateProp], $recipientCount);
-        }
-        else {
+        } else {
             $certificates = $this->getCertificates(false);
             ZLog::Write(LOGLEVEL_INFO, sprintf("Grommunio->createResolveRecipient(): No certificate found for '%s' (requested email address: '%s')", $recipientProperties[PR_DISPLAY_NAME], $email));
         }
@@ -2854,8 +2865,7 @@ 
             $deviceIdDisabled = ( ($deviceId !==null) && in_array($deviceId, array_map('strtolower', $enabledFeatures[PR_EC_DISABLED_FEATURES])) )? true : false;
             if ($mobileDisabled) {
                 throw new FatalException("User is disabled for grommunio-sync.");
-            }
-            elseif ($deviceIdDisabled) {
+            } elseif ($deviceIdDisabled) {
                 throw new FatalException(sprintf("User has deviceId %s disabled for usage with grommunio-sync.", $deviceId));
             }
         }

lib/grommunio/mapiutils.php

Braces +56 added lines, -48 removed lines

@@ -377,8 +377,7 @@ 
         if ($ret == MAPI_E_NOT_FOUND) {
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIUtils->readPropStream: property 0x%08X not found. It is either empty or not set. It will be ignored.", $prop));
             return "";
-        }
-        elseif ($ret) {
+        } elseif ($ret) {
             ZLog::Write(LOGLEVEL_ERROR, "MAPIUtils->readPropStream error opening stream: 0x%08X", $ret);
             return "";
         }
@@ -386,8 +385,9 @@ 
         $string = "";
         while(1) {
             $data = mapi_stream_read($stream, 1024);
-            if(strlen($data) == 0)
-                break;
+            if(strlen($data) == 0) {
+                            break;
+            }
             $string .= $data;
         }
 
@@ -480,75 +480,85 @@ 
      */
     public static function GetNativeBodyType($messageprops) {
         //check if the properties are set and get the error code if needed
-        if (!isset($messageprops[PR_BODY]))             $messageprops[PR_BODY]              = self::GetError(PR_BODY, $messageprops);
-        if (!isset($messageprops[PR_RTF_COMPRESSED]))   $messageprops[PR_RTF_COMPRESSED]    = self::GetError(PR_RTF_COMPRESSED, $messageprops);
-        if (!isset($messageprops[PR_HTML]))             $messageprops[PR_HTML]              = self::GetError(PR_HTML, $messageprops);
-        if (!isset($messageprops[PR_RTF_IN_SYNC]))      $messageprops[PR_RTF_IN_SYNC]       = self::GetError(PR_RTF_IN_SYNC, $messageprops);
+        if (!isset($messageprops[PR_BODY])) {
+            $messageprops[PR_BODY]              = self::GetError(PR_BODY, $messageprops);
+        }
+        if (!isset($messageprops[PR_RTF_COMPRESSED])) {
+            $messageprops[PR_RTF_COMPRESSED]    = self::GetError(PR_RTF_COMPRESSED, $messageprops);
+        }
+        if (!isset($messageprops[PR_HTML])) {
+            $messageprops[PR_HTML]              = self::GetError(PR_HTML, $messageprops);
+        }
+        if (!isset($messageprops[PR_RTF_IN_SYNC])) {
+            $messageprops[PR_RTF_IN_SYNC]       = self::GetError(PR_RTF_IN_SYNC, $messageprops);
+        }
 
         if ( // 1
                 ($messageprops[PR_BODY]             == MAPI_E_NOT_FOUND) &&
                 ($messageprops[PR_RTF_COMPRESSED]   == MAPI_E_NOT_FOUND) &&
-                ($messageprops[PR_HTML]             == MAPI_E_NOT_FOUND))
-                    return SYNC_BODYPREFERENCE_PLAIN;
-                elseif ( // 2
+                ($messageprops[PR_HTML]             == MAPI_E_NOT_FOUND)) {
+                            return SYNC_BODYPREFERENCE_PLAIN;
+        } elseif ( // 2
                         ($messageprops[PR_BODY]             == MAPI_E_NOT_ENOUGH_MEMORY) &&
                         ($messageprops[PR_RTF_COMPRESSED]   == MAPI_E_NOT_FOUND) &&
-                        ($messageprops[PR_HTML]             == MAPI_E_NOT_FOUND))
-                        return SYNC_BODYPREFERENCE_PLAIN;
-                elseif ( // 3
+                        ($messageprops[PR_HTML]             == MAPI_E_NOT_FOUND)) {
+                                        return SYNC_BODYPREFERENCE_PLAIN;
+                } elseif ( // 3
                         ($messageprops[PR_BODY]             == MAPI_E_NOT_ENOUGH_MEMORY) &&
                         ($messageprops[PR_RTF_COMPRESSED]   == MAPI_E_NOT_ENOUGH_MEMORY) &&
-                        ($messageprops[PR_HTML]             == MAPI_E_NOT_FOUND))
-                        return SYNC_BODYPREFERENCE_RTF;
-                elseif ( // 4
+                        ($messageprops[PR_HTML]             == MAPI_E_NOT_FOUND)) {
+                                        return SYNC_BODYPREFERENCE_RTF;
+                } elseif ( // 4
                         ($messageprops[PR_BODY]             == MAPI_E_NOT_ENOUGH_MEMORY) &&
                         ($messageprops[PR_RTF_COMPRESSED]   == MAPI_E_NOT_ENOUGH_MEMORY) &&
                         ($messageprops[PR_HTML]             == MAPI_E_NOT_ENOUGH_MEMORY) &&
-                        ($messageprops[PR_RTF_IN_SYNC]))
-                        return SYNC_BODYPREFERENCE_RTF;
-                elseif ( // 5
+                        ($messageprops[PR_RTF_IN_SYNC])) {
+                                        return SYNC_BODYPREFERENCE_RTF;
+                } elseif ( // 5
                         ($messageprops[PR_BODY]             == MAPI_E_NOT_ENOUGH_MEMORY) &&
                         ($messageprops[PR_RTF_COMPRESSED]   == MAPI_E_NOT_ENOUGH_MEMORY) &&
                         ($messageprops[PR_HTML]             == MAPI_E_NOT_ENOUGH_MEMORY) &&
-                        (!$messageprops[PR_RTF_IN_SYNC]))
-                        return SYNC_BODYPREFERENCE_HTML;
-                elseif ( // 6
+                        (!$messageprops[PR_RTF_IN_SYNC])) {
+                                        return SYNC_BODYPREFERENCE_HTML;
+                } elseif ( // 6
                         ($messageprops[PR_RTF_COMPRESSED]   != MAPI_E_NOT_FOUND   || $messageprops[PR_RTF_COMPRESSED]  == MAPI_E_NOT_ENOUGH_MEMORY) &&
                         ($messageprops[PR_HTML]             != MAPI_E_NOT_FOUND   || $messageprops[PR_HTML]            == MAPI_E_NOT_ENOUGH_MEMORY) &&
-                        ($messageprops[PR_RTF_IN_SYNC]))
-                        return SYNC_BODYPREFERENCE_RTF;
-                elseif ( // 7
+                        ($messageprops[PR_RTF_IN_SYNC])) {
+                                        return SYNC_BODYPREFERENCE_RTF;
+                } elseif ( // 7
                         ($messageprops[PR_RTF_COMPRESSED]   != MAPI_E_NOT_FOUND   || $messageprops[PR_RTF_COMPRESSED]  == MAPI_E_NOT_ENOUGH_MEMORY) &&
                         ($messageprops[PR_HTML]             != MAPI_E_NOT_FOUND   || $messageprops[PR_HTML]            == MAPI_E_NOT_ENOUGH_MEMORY) &&
-                        (!$messageprops[PR_RTF_IN_SYNC]))
-                        return SYNC_BODYPREFERENCE_HTML;
-                elseif ( // 8
+                        (!$messageprops[PR_RTF_IN_SYNC])) {
+                                        return SYNC_BODYPREFERENCE_HTML;
+                } elseif ( // 8
                         ($messageprops[PR_BODY]             != MAPI_E_NOT_FOUND   || $messageprops[PR_BODY]            == MAPI_E_NOT_ENOUGH_MEMORY) &&
                         ($messageprops[PR_RTF_COMPRESSED]   != MAPI_E_NOT_FOUND   || $messageprops[PR_RTF_COMPRESSED]  == MAPI_E_NOT_ENOUGH_MEMORY) &&
-                        ($messageprops[PR_RTF_IN_SYNC]))
-                        return SYNC_BODYPREFERENCE_RTF;
-                elseif ( // 9.1
+                        ($messageprops[PR_RTF_IN_SYNC])) {
+                                        return SYNC_BODYPREFERENCE_RTF;
+                } elseif ( // 9.1
                         ($messageprops[PR_BODY]             != MAPI_E_NOT_FOUND   || $messageprops[PR_BODY]            == MAPI_E_NOT_ENOUGH_MEMORY) &&
                         ($messageprops[PR_RTF_COMPRESSED]   != MAPI_E_NOT_FOUND   || $messageprops[PR_RTF_COMPRESSED]  == MAPI_E_NOT_ENOUGH_MEMORY) &&
-                        (!$messageprops[PR_RTF_IN_SYNC]))
-                        return SYNC_BODYPREFERENCE_PLAIN;
-                elseif ( // 9.2
+                        (!$messageprops[PR_RTF_IN_SYNC])) {
+                                        return SYNC_BODYPREFERENCE_PLAIN;
+                } elseif ( // 9.2
                         ($messageprops[PR_RTF_COMPRESSED]   != MAPI_E_NOT_FOUND   || $messageprops[PR_RTF_COMPRESSED]  == MAPI_E_NOT_ENOUGH_MEMORY) &&
                         ($messageprops[PR_BODY]             == MAPI_E_NOT_FOUND) &&
-                        ($messageprops[PR_HTML]             == MAPI_E_NOT_FOUND))
-                        return SYNC_BODYPREFERENCE_RTF;
-                elseif ( // 9.3
+                        ($messageprops[PR_HTML]             == MAPI_E_NOT_FOUND)) {
+                                        return SYNC_BODYPREFERENCE_RTF;
+                } elseif ( // 9.3
                         ($messageprops[PR_BODY]             != MAPI_E_NOT_FOUND   || $messageprops[PR_BODY]            == MAPI_E_NOT_ENOUGH_MEMORY) &&
                         ($messageprops[PR_RTF_COMPRESSED]   == MAPI_E_NOT_FOUND) &&
-                        ($messageprops[PR_HTML]             == MAPI_E_NOT_FOUND))
-                        return SYNC_BODYPREFERENCE_PLAIN;
-                elseif ( // 9.4
+                        ($messageprops[PR_HTML]             == MAPI_E_NOT_FOUND)) {
+                                        return SYNC_BODYPREFERENCE_PLAIN;
+                } elseif ( // 9.4
                         ($messageprops[PR_HTML]             != MAPI_E_NOT_FOUND   || $messageprops[PR_HTML]            == MAPI_E_NOT_ENOUGH_MEMORY) &&
                         ($messageprops[PR_BODY]             == MAPI_E_NOT_FOUND) &&
-                        ($messageprops[PR_RTF_COMPRESSED]   == MAPI_E_NOT_FOUND))
-                        return SYNC_BODYPREFERENCE_HTML;
-                else // 10
+                        ($messageprops[PR_RTF_COMPRESSED]   == MAPI_E_NOT_FOUND)) {
+                                        return SYNC_BODYPREFERENCE_HTML;
+                } else {
+                    // 10
                     return SYNC_BODYPREFERENCE_PLAIN;
+                }
     }
 
     /**
@@ -656,8 +666,7 @@ 
             if ($eid1['length'] < $eid1['min_length'] || $eid1['id'] != $eid2['id']) {
                 return false;
             }
-        }
-        elseif ($eid1['length'] < $eid1['min_length'] || $eid1['uniqueId'] != $eid2['uniqueId']) {
+        } elseif ($eid1['length'] < $eid1['min_length'] || $eid1['uniqueId'] != $eid2['uniqueId']) {
             return false;
         }
 
@@ -795,8 +804,7 @@ 
             if (substr($entryId, $len - ($offset + 2), $len - $offset) == '00') {
                 $padding .= '00';
                 $offset += 2;
-            }
-            else {
+            } else {
                 // if non-null character found then break the loop
                 break;
             }

lib/grommunio/mapiphpwrapper.php

Braces +14 added lines, -12 removed lines

@@ -89,8 +89,9 @@ 
         $parentsourcekey = $props[PR_PARENT_SOURCE_KEY];
         $entryid = mapi_msgstore_entryidfromsourcekey($this->store, $parentsourcekey, $sourcekey);
 
-        if(!$entryid)
-            return SYNC_E_IGNORE;
+        if(!$entryid) {
+                    return SYNC_E_IGNORE;
+        }
 
         $mapimessage = mapi_msgstore_openentry($this->store, $entryid);
         try {
@@ -103,19 +104,16 @@ 
                 if ($message->SupportsPrivateStripping()) {
                     ZLog::Write(LOGLEVEL_DEBUG, "PHPWrapper->ImportMessageChange(): stripping data of private message from a shared folder");
                     $message->StripData(Streamer::STRIP_PRIVATE_DATA);
-                }
-                else {
+                } else {
                     ZLog::Write(LOGLEVEL_DEBUG, "PHPWrapper->ImportMessageChange(): ignoring private message from a shared folder");
                     return SYNC_E_IGNORE;
                 }
             }
-        }
-        catch (SyncObjectBrokenException $mbe) {
+        } catch (SyncObjectBrokenException $mbe) {
             $brokenSO = $mbe->GetSyncObject();
             if (!$brokenSO) {
                 ZLog::Write(LOGLEVEL_ERROR, sprintf("PHPWrapper->ImportMessageChange(): Caught SyncObjectBrokenException but broken SyncObject available"));
-            }
-            else {
+            } else {
                 if (!isset($brokenSO->id)) {
                     $brokenSO->id = "Unknown ID";
                     ZLog::Write(LOGLEVEL_ERROR, sprintf("PHPWrapper->ImportMessageChange(): Caught SyncObjectBrokenException but no ID of object set"));
@@ -128,8 +126,11 @@ 
 
 
         // substitute the MAPI SYNC_NEW_MESSAGE flag by a grommunio-sync proprietary flag
-        if ($flags == SYNC_NEW_MESSAGE) $message->flags = SYNC_NEWMESSAGE;
-        else $message->flags = $flags;
+        if ($flags == SYNC_NEW_MESSAGE) {
+            $message->flags = SYNC_NEWMESSAGE;
+        } else {
+            $message->flags = $flags;
+        }
 
         $this->importer->ImportMessageChange($this->prefix.bin2hex($sourcekey), $message);
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportMessageChange(): change for: '%s'", $this->prefix.bin2hex($sourcekey)));
@@ -196,8 +197,9 @@ 
         $folder = $this->mapiprovider->GetFolder($props);
 
         // do not import folder if there is something "wrong" with it
-        if ($folder === false)
-            return 0;
+        if ($folder === false) {
+                    return 0;
+        }
 
         $this->importer->ImportFolderChange($folder);
         return 0;

lib/grommunio/mapiprovider.php

Braces +494 added lines, -365 removed lines

@@ -48,21 +48,23 @@ 
         // Gets the Sync object from a MAPI object according to its message class
 
         $props = mapi_getprops($mapimessage, array(PR_MESSAGE_CLASS));
-        if(isset($props[PR_MESSAGE_CLASS]))
-            $messageclass = $props[PR_MESSAGE_CLASS];
-        else
-            $messageclass = "IPM";
-
-        if(strpos($messageclass,"IPM.Contact") === 0)
-            return $this->getContact($mapimessage, $contentparameters);
-        else if(strpos($messageclass,"IPM.Appointment") === 0)
-            return $this->getAppointment($mapimessage, $contentparameters);
-        else if(strpos($messageclass,"IPM.Task") === 0 && strpos($messageclass, "IPM.TaskRequest") === false)
-            return $this->getTask($mapimessage, $contentparameters);
-        else if(strpos($messageclass,"IPM.StickyNote") === 0)
-            return $this->getNote($mapimessage, $contentparameters);
-        else
-            return $this->getEmail($mapimessage, $contentparameters);
+        if(isset($props[PR_MESSAGE_CLASS])) {
+                    $messageclass = $props[PR_MESSAGE_CLASS];
+        } else {
+                    $messageclass = "IPM";
+        }
+
+        if(strpos($messageclass,"IPM.Contact") === 0) {
+                    return $this->getContact($mapimessage, $contentparameters);
+        } else if(strpos($messageclass,"IPM.Appointment") === 0) {
+                    return $this->getAppointment($mapimessage, $contentparameters);
+        } else if(strpos($messageclass,"IPM.Task") === 0 && strpos($messageclass, "IPM.TaskRequest") === false) {
+                    return $this->getTask($mapimessage, $contentparameters);
+        } else if(strpos($messageclass,"IPM.StickyNote") === 0) {
+                    return $this->getNote($mapimessage, $contentparameters);
+        } else {
+                    return $this->getEmail($mapimessage, $contentparameters);
+        }
     }
 
     /**
@@ -140,12 +142,14 @@ 
         }
 
         // when set the task to complete using the WebAccess, the dateComplete property is not set correctly
-        if ($message->complete == 1 && !isset($message->datecompleted))
-            $message->datecompleted = time();
+        if ($message->complete == 1 && !isset($message->datecompleted)) {
+                    $message->datecompleted = time();
+        }
 
         // if no reminder is set, announce that to the mobile
-        if (!isset($message->reminderset))
-            $message->reminderset = 0;
+        if (!isset($message->reminderset)) {
+                    $message->reminderset = 0;
+        }
 
         return $message;
     }
@@ -174,16 +178,18 @@ 
 
         // Set reminder time if reminderset is true
         if(isset($messageprops[$appointmentprops["reminderset"]]) && $messageprops[$appointmentprops["reminderset"]] == true) {
-            if ($messageprops[$appointmentprops["remindertime"]] == 0x5AE980E1)
-                $message->reminder = 15;
-            else
-                $message->reminder = $messageprops[$appointmentprops["remindertime"]];
+            if ($messageprops[$appointmentprops["remindertime"]] == 0x5AE980E1) {
+                            $message->reminder = 15;
+            } else {
+                            $message->reminder = $messageprops[$appointmentprops["remindertime"]];
+            }
         }
 
-        if(!isset($message->uid))
-            $message->uid = bin2hex($messageprops[$appointmentprops["sourcekey"]]);
-        else
-            $message->uid = Utils::GetICalUidFromOLUid($message->uid);
+        if(!isset($message->uid)) {
+                    $message->uid = bin2hex($messageprops[$appointmentprops["sourcekey"]]);
+        } else {
+                    $message->uid = Utils::GetICalUidFromOLUid($message->uid);
+        }
 
         // Always set organizer information because some devices do not work properly without it
         if( isset($messageprops[$appointmentprops["representingentryid"]]) &&
@@ -201,14 +207,12 @@ 
         if (!empty($messageprops[$appointmentprops["timezonetag"]])) {
             $tz = $this->getTZFromMAPIBlob($messageprops[$appointmentprops["timezonetag"]]);
             $appTz = true;
-        }
-        elseif (!empty($messageprops[$appointmentprops["timezonedesc"]])) {
+        } elseif (!empty($messageprops[$appointmentprops["timezonedesc"]])) {
             // Windows uses UTC in timezone description in opposite to mstzones in TimezoneUtil which uses GMT
             $wintz = str_replace("UTC", "GMT", $messageprops[$appointmentprops["timezonedesc"]]);
             $tz = TimezoneUtil::GetFullTZFromTZName(TimezoneUtil::GetTZNameFromWinTZ($wintz));
             $appTz = true;
-        }
-        else {
+        } else {
             // set server default timezone (correct timezone should be configured!)
             $tz = TimezoneUtil::GetFullTZ();
         }
@@ -236,20 +240,22 @@ 
             throw $mbe;
         }
 
-        if(count($rows) > 0)
-            $message->attendees = array();
+        if(count($rows) > 0) {
+                    $message->attendees = array();
+        }
 
         foreach($rows as $row) {
             $attendee = new SyncAttendee();
 
             $attendee->name = w2u($row[PR_DISPLAY_NAME]);
             //smtp address is always a proper email address
-            if(isset($row[PR_SMTP_ADDRESS]))
-                $attendee->email = w2u($row[PR_SMTP_ADDRESS]);
-            elseif (isset($row[PR_ADDRTYPE]) && isset($row[PR_EMAIL_ADDRESS])) {
+            if(isset($row[PR_SMTP_ADDRESS])) {
+                            $attendee->email = w2u($row[PR_SMTP_ADDRESS]);
+            } elseif (isset($row[PR_ADDRTYPE]) && isset($row[PR_EMAIL_ADDRESS])) {
                 //if address type is SMTP, it's also a proper email address
-                if ($row[PR_ADDRTYPE] == "SMTP")
-                    $attendee->email = w2u($row[PR_EMAIL_ADDRESS]);
+                if ($row[PR_ADDRTYPE] == "SMTP") {
+                                    $attendee->email = w2u($row[PR_EMAIL_ADDRESS]);
+                }
                 //if address type is ZARAFA, the PR_EMAIL_ADDRESS contains username
                 elseif ($row[PR_ADDRTYPE] == "ZARAFA") {
                     $userinfo = @nsp_getuserinfo($row[PR_EMAIL_ADDRESS]);
@@ -260,8 +266,7 @@ 
                     // @see https://jira.z-hub.io/browse/ZP-1178
                     elseif (isset($row[PR_SEARCH_KEY])) {
                         $attendee->email = w2u($this->getEmailAddressFromSearchKey($row[PR_SEARCH_KEY]));
-                    }
-                    else {
+                    } else {
                         ZLog::Write(LOGLEVEL_WARN, sprintf("MAPIProvider->getAppointment: The attendee '%s' of type ZARAFA can not be resolved. Code: 0x%X", $row[PR_EMAIL_ADDRESS], mapi_last_hresult()));
                     }
                 }
@@ -281,14 +286,16 @@ 
             // don't send one of those fields, the phone will give an error ... so
             // we don't send it in that case.
             // also ignore the "attendee" if the email is equal to the organizers' email
-            if(isset($attendee->name) && isset($attendee->email) && $attendee->email != "" && (!isset($message->organizeremail) || (isset($message->organizeremail) && $attendee->email != $message->organizeremail)))
-                array_push($message->attendees, $attendee);
+            if(isset($attendee->name) && isset($attendee->email) && $attendee->email != "" && (!isset($message->organizeremail) || (isset($message->organizeremail) && $attendee->email != $message->organizeremail))) {
+                            array_push($message->attendees, $attendee);
+            }
         }
 
         // Status 0 = no meeting, status 1 = organizer, status 2/3/4/5 = tentative/accepted/declined/notresponded
         if(isset($messageprops[$appointmentprops["meetingstatus"]]) && $messageprops[$appointmentprops["meetingstatus"]] > 1) {
-            if (!isset($message->attendees) || !is_array($message->attendees))
-                $message->attendees = array();
+            if (!isset($message->attendees) || !is_array($message->attendees)) {
+                            $message->attendees = array();
+            }
             // Work around iOS6 cancellation issue when there are no attendees for this meeting. Just add ourselves as the sole attendee.
             if(count($message->attendees) == 0) {
 
@@ -324,8 +331,7 @@ 
 
         if (!isset($message->nativebodytype)) {
             $message->nativebodytype = MAPIUtils::GetNativeBodyType($messageprops);
-        }
-        elseif ($message->nativebodytype == SYNC_BODYPREFERENCE_UNDEFINED) {
+        } elseif ($message->nativebodytype == SYNC_BODYPREFERENCE_UNDEFINED) {
             $nbt = MAPIUtils::GetNativeBodyType($messageprops);
             ZLog::Write(LOGLEVEL_INFO, sprintf("MAPIProvider->getAppointment(): native body type is undefined. Set it to %d.", $nbt));
             $message->nativebodytype = $nbt;
@@ -373,10 +379,11 @@ 
      * @return
      */
     private function getRecurrence($mapimessage, $recurprops, &$syncMessage, &$syncRecurrence, $tz) {
-        if ($syncRecurrence instanceof SyncTaskRecurrence)
-            $recurrence = new TaskRecurrence($this->store, $mapimessage);
-        else
-            $recurrence = new Recurrence($this->store, $mapimessage);
+        if ($syncRecurrence instanceof SyncTaskRecurrence) {
+                    $recurrence = new TaskRecurrence($this->store, $mapimessage);
+        } else {
+                    $recurrence = new Recurrence($this->store, $mapimessage);
+        }
 
         switch($recurrence->recur["type"]) {
             case 10: // daily
@@ -421,8 +428,9 @@ 
             case 0x21:
                 $syncRecurrence->until = $recurrence->recur["end"];
                 // fixes Mantis #350 : recur-end does not consider timezones - use ClipEnd if available
-                if (isset($recurprops[$recurrence->proptags["enddate_recurring"]]))
-                    $syncRecurrence->until = $recurprops[$recurrence->proptags["enddate_recurring"]];
+                if (isset($recurprops[$recurrence->proptags["enddate_recurring"]])) {
+                                    $syncRecurrence->until = $recurprops[$recurrence->proptags["enddate_recurring"]];
+                }
                 // add one day (minus 1 sec) to the end time to make sure the last occurrence is covered
                 $syncRecurrence->until += 86399;
                 break;
@@ -434,14 +442,17 @@ 
         }
 
         // Correct 'alldayevent' because outlook fails to set it on recurring items of 24 hours or longer
-        if(isset($recurrence->recur["endocc"], $recurrence->recur["startocc"]) && ($recurrence->recur["endocc"] - $recurrence->recur["startocc"] >= 1440))
-            $syncMessage->alldayevent = true;
+        if(isset($recurrence->recur["endocc"], $recurrence->recur["startocc"]) && ($recurrence->recur["endocc"] - $recurrence->recur["startocc"] >= 1440)) {
+                    $syncMessage->alldayevent = true;
+        }
 
         // Interval is different according to the type/subtype
         switch($recurrence->recur["type"]) {
             case 10:
-                if($recurrence->recur["subtype"] == 0)
-                    $syncRecurrence->interval = (int)($recurrence->recur["everyn"] / 1440);  // minutes
+                if($recurrence->recur["subtype"] == 0) {
+                                    $syncRecurrence->interval = (int)($recurrence->recur["everyn"] / 1440);
+                }
+                // minutes
                 break;
             case 11:
             case 12:
@@ -452,24 +463,34 @@ 
                 break; // months
         }
 
-        if(isset($recurrence->recur["weekdays"]))
-            $syncRecurrence->dayofweek = $recurrence->recur["weekdays"]; // bitmask of days (1 == sunday, 128 == saturday
-        if(isset($recurrence->recur["nday"]))
-            $syncRecurrence->weekofmonth = $recurrence->recur["nday"]; // N'th {DAY} of {X} (0-5)
-        if(isset($recurrence->recur["month"]))
-            $syncRecurrence->monthofyear = (int)($recurrence->recur["month"] / (60 * 24 * 29)) + 1; // works ok due to rounding. see also $monthminutes below (1-12)
-        if(isset($recurrence->recur["monthday"]))
-            $syncRecurrence->dayofmonth = $recurrence->recur["monthday"]; // day of month (1-31)
+        if(isset($recurrence->recur["weekdays"])) {
+                    $syncRecurrence->dayofweek = $recurrence->recur["weekdays"];
+        }
+        // bitmask of days (1 == sunday, 128 == saturday
+        if(isset($recurrence->recur["nday"])) {
+                    $syncRecurrence->weekofmonth = $recurrence->recur["nday"];
+        }
+        // N'th {DAY} of {X} (0-5)
+        if(isset($recurrence->recur["month"])) {
+                    $syncRecurrence->monthofyear = (int)($recurrence->recur["month"] / (60 * 24 * 29)) + 1;
+        }
+        // works ok due to rounding. see also $monthminutes below (1-12)
+        if(isset($recurrence->recur["monthday"])) {
+                    $syncRecurrence->dayofmonth = $recurrence->recur["monthday"];
+        }
+        // day of month (1-31)
 
         // All changed exceptions are appointments within the 'exceptions' array. They contain the same items as a normal appointment
         foreach($recurrence->recur["changed_occurences"] as $change) {
             $exception = new SyncAppointmentException();
 
             // start, end, basedate, subject, remind_before, reminderset, location, busystatus, alldayevent, label
-            if(isset($change["start"]))
-                $exception->starttime = $this->getGMTTimeByTZ($change["start"], $tz);
-            if(isset($change["end"]))
-                $exception->endtime = $this->getGMTTimeByTZ($change["end"], $tz);
+            if(isset($change["start"])) {
+                            $exception->starttime = $this->getGMTTimeByTZ($change["start"], $tz);
+            }
+            if(isset($change["end"])) {
+                            $exception->endtime = $this->getGMTTimeByTZ($change["end"], $tz);
+            }
             if(isset($change["basedate"])) {
                 $exception->exceptionstarttime = $this->getGMTTimeByTZ($this->getDayStartOfTimestamp($change["basedate"]) + $recurrence->recur["startocc"] * 60, $tz);
 
@@ -480,27 +501,36 @@ 
                     $this->setMessageBodyForType($exceptionobj, SYNC_BODYPREFERENCE_PLAIN, $exception);
                 }
             }
-            if(isset($change["subject"]))
-                $exception->subject = w2u($change["subject"]);
-            if(isset($change["reminder_before"]) && $change["reminder_before"])
-                $exception->reminder = $change["remind_before"];
-            if(isset($change["location"]))
-                $exception->location = w2u($change["location"]);
-            if(isset($change["busystatus"]))
-                $exception->busystatus = $change["busystatus"];
-            if(isset($change["alldayevent"]))
-                $exception->alldayevent = $change["alldayevent"];
+            if(isset($change["subject"])) {
+                            $exception->subject = w2u($change["subject"]);
+            }
+            if(isset($change["reminder_before"]) && $change["reminder_before"]) {
+                            $exception->reminder = $change["remind_before"];
+            }
+            if(isset($change["location"])) {
+                            $exception->location = w2u($change["location"]);
+            }
+            if(isset($change["busystatus"])) {
+                            $exception->busystatus = $change["busystatus"];
+            }
+            if(isset($change["alldayevent"])) {
+                            $exception->alldayevent = $change["alldayevent"];
+            }
 
             // set some data from the original appointment
-            if (isset($syncMessage->uid))
-                $exception->uid = $syncMessage->uid;
-            if (isset($syncMessage->organizername))
-                $exception->organizername = $syncMessage->organizername;
-            if (isset($syncMessage->organizeremail))
-                $exception->organizeremail = $syncMessage->organizeremail;
+            if (isset($syncMessage->uid)) {
+                            $exception->uid = $syncMessage->uid;
+            }
+            if (isset($syncMessage->organizername)) {
+                            $exception->organizername = $syncMessage->organizername;
+            }
+            if (isset($syncMessage->organizeremail)) {
+                            $exception->organizeremail = $syncMessage->organizeremail;
+            }
 
-            if(!isset($syncMessage->exceptions))
-                $syncMessage->exceptions = array();
+            if(!isset($syncMessage->exceptions)) {
+                            $syncMessage->exceptions = array();
+            }
 
             // If the user is working from a location other than the office the busystatus should be interpreted as free.
             if (isset($exception->busystatus) && $exception->busystatus == fbWorkingElsewhere) {
@@ -528,8 +558,9 @@ 
             $exception->exceptionstarttime = $this->getGMTTimeByTZ($this->getDayStartOfTimestamp($deleted) + $recurrence->recur["startocc"] * 60, $tz);
             $exception->deleted = "1";
 
-            if(!isset($syncMessage->exceptions))
-                $syncMessage->exceptions = array();
+            if(!isset($syncMessage->exceptions)) {
+                            $syncMessage->exceptions = array();
+            }
 
             array_push($syncMessage->exceptions, $exception);
         }
@@ -565,9 +596,9 @@ 
         $emailproperties = MAPIMapping::GetEmailProperties();
         $messageprops = $this->getProps($mapimessage, $emailproperties);
 
-        if(isset($messageprops[PR_SOURCE_KEY]))
-            $sourcekey = $messageprops[PR_SOURCE_KEY];
-        else {
+        if(isset($messageprops[PR_SOURCE_KEY])) {
+                    $sourcekey = $messageprops[PR_SOURCE_KEY];
+        } else {
             $mbe = new SyncObjectBrokenException("The message doesn't have a sourcekey");
             $mbe->SetSyncObject($message);
             throw $mbe;
@@ -582,22 +613,25 @@ 
             // remove encapsulating double quotes from the representingname
             $fromname = preg_replace('/^\"(.*)\"$/',"\${1}", $messageprops[$emailproperties["representingname"]]);
         }
-        if(isset($messageprops[$emailproperties["representingentryid"]]))
-            $fromaddr = $this->getSMTPAddressFromEntryID($messageprops[$emailproperties["representingentryid"]]);
+        if(isset($messageprops[$emailproperties["representingentryid"]])) {
+                    $fromaddr = $this->getSMTPAddressFromEntryID($messageprops[$emailproperties["representingentryid"]]);
+        }
 
         // if the email address can't be resolved, fall back to PR_SENT_REPRESENTING_SEARCH_KEY
         if ($fromaddr == "" && isset($messageprops[$emailproperties["representingsearchkey"]])) {
             $fromaddr = $this->getEmailAddressFromSearchKey($messageprops[$emailproperties["representingsearchkey"]]);
         }
 
-        if($fromname == $fromaddr)
-            $fromname = "";
+        if($fromname == $fromaddr) {
+                    $fromname = "";
+        }
 
-        if($fromname)
-            $from = "\"" . w2u($fromname) . "\" <" . w2u($fromaddr) . ">";
-        else
-            //START CHANGED dw2412 HTC shows "error" if sender name is unknown
+        if($fromname) {
+                    $from = "\"" . w2u($fromname) . "\" <" . w2u($fromaddr) . ">";
+        } else {
+                    //START CHANGED dw2412 HTC shows "error" if sender name is unknown
             $from = "\"" . w2u($fromaddr) . "\" <" . w2u($fromaddr) . ">";
+        }
             //END CHANGED dw2412 HTC shows "error" if sender name is unknown
 
         $message->from = $from;
@@ -611,14 +645,14 @@ 
             $props = $this->getProps($mapimessage, $meetingrequestproperties);
 
             // Get the GOID
-            if(isset($props[$meetingrequestproperties["goidtag"]]))
-                $message->meetingrequest->globalobjid = base64_encode($props[$meetingrequestproperties["goidtag"]]);
+            if(isset($props[$meetingrequestproperties["goidtag"]])) {
+                            $message->meetingrequest->globalobjid = base64_encode($props[$meetingrequestproperties["goidtag"]]);
+            }
 
             // Set Timezone
             if (isset($props[$meetingrequestproperties["timezonetag"]])) {
                 $tz = $this->getTZFromMAPIBlob($props[$meetingrequestproperties["timezonetag"]]);
-            }
-            else {
+            } else {
                 $tz = TimezoneUtil::GetFullTZ();
             }
 
@@ -630,11 +664,10 @@ 
                 if (isset($props[$meetingrequestproperties["recReplTime"]])){
                     $basedate = $props[$meetingrequestproperties["recReplTime"]];
                     $message->meetingrequest->recurrenceid = $this->getGMTTimeByTZ($basedate, $this->getGMTTZ());
-                }
-                else {
-                    if (!isset($props[$meetingrequestproperties["goidtag"]]) || !isset($props[$meetingrequestproperties["recurStartTime"]]) || !isset($props[$meetingrequestproperties["timezonetag"]]))
-                        ZLog::Write(LOGLEVEL_WARN, "Missing property to set correct basedate for exception");
-                    else {
+                } else {
+                    if (!isset($props[$meetingrequestproperties["goidtag"]]) || !isset($props[$meetingrequestproperties["recurStartTime"]]) || !isset($props[$meetingrequestproperties["timezonetag"]])) {
+                                            ZLog::Write(LOGLEVEL_WARN, "Missing property to set correct basedate for exception");
+                    } else {
                         $basedate = Utils::ExtractBaseDate($props[$meetingrequestproperties["goidtag"]], $props[$meetingrequestproperties["recurStartTime"]]);
                         $message->meetingrequest->recurrenceid = $this->getGMTTimeByTZ($basedate, $tz);
                     }
@@ -644,8 +677,7 @@ 
             // Organizer is the sender
             if (strpos($message->messageclass, "IPM.Schedule.Meeting.Resp") === 0) {
                 $message->meetingrequest->organizer = $message->to;
-            }
-            else {
+            } else {
                 $message->meetingrequest->organizer = $message->from;
             }
 
@@ -658,8 +690,9 @@ 
             }
 
             // Force the 'alldayevent' in the object at all times. (non-existent == 0)
-            if(!isset($message->meetingrequest->alldayevent) || $message->meetingrequest->alldayevent == "")
-                $message->meetingrequest->alldayevent = 0;
+            if(!isset($message->meetingrequest->alldayevent) || $message->meetingrequest->alldayevent == "") {
+                            $message->meetingrequest->alldayevent = 0;
+            }
 
             // Instancetype
             // 0 = single appointment
@@ -667,29 +700,33 @@ 
             // 2 = single instance of recurring appointment
             // 3 = exception of recurring appointment
             $message->meetingrequest->instancetype = 0;
-            if (isset($props[$meetingrequestproperties["isrecurringtag"]]) && $props[$meetingrequestproperties["isrecurringtag"]] == 1)
-                $message->meetingrequest->instancetype = 1;
-            else if ((!isset($props[$meetingrequestproperties["isrecurringtag"]]) || $props[$meetingrequestproperties["isrecurringtag"]] == 0 )&& isset($message->meetingrequest->recurrenceid))
-                if (isset($props[$meetingrequestproperties["appSeqNr"]]) && $props[$meetingrequestproperties["appSeqNr"]] == 0 )
+            if (isset($props[$meetingrequestproperties["isrecurringtag"]]) && $props[$meetingrequestproperties["isrecurringtag"]] == 1) {
+                            $message->meetingrequest->instancetype = 1;
+            } else if ((!isset($props[$meetingrequestproperties["isrecurringtag"]]) || $props[$meetingrequestproperties["isrecurringtag"]] == 0 )&& isset($message->meetingrequest->recurrenceid)) {
+                            if (isset($props[$meetingrequestproperties["appSeqNr"]]) && $props[$meetingrequestproperties["appSeqNr"]] == 0 )
                     $message->meetingrequest->instancetype = 2;
-                else
-                    $message->meetingrequest->instancetype = 3;
+            } else {
+                                    $message->meetingrequest->instancetype = 3;
+                }
 
             // Disable reminder if it is off
-            if(!isset($props[$meetingrequestproperties["reminderset"]]) || $props[$meetingrequestproperties["reminderset"]] == false)
-                $message->meetingrequest->reminder = "";
+            if(!isset($props[$meetingrequestproperties["reminderset"]]) || $props[$meetingrequestproperties["reminderset"]] == false) {
+                            $message->meetingrequest->reminder = "";
+            }
             //the property saves reminder in minutes, but we need it in secs
             else {
                 ///set the default reminder time to seconds
-                if ($props[$meetingrequestproperties["remindertime"]] == 0x5AE980E1)
-                    $message->meetingrequest->reminder = 900;
-                else
-                    $message->meetingrequest->reminder = $props[$meetingrequestproperties["remindertime"]] * 60;
+                if ($props[$meetingrequestproperties["remindertime"]] == 0x5AE980E1) {
+                                    $message->meetingrequest->reminder = 900;
+                } else {
+                                    $message->meetingrequest->reminder = $props[$meetingrequestproperties["remindertime"]] * 60;
+                }
             }
 
             // Set sensitivity to 0 if missing
-            if(!isset($message->meetingrequest->sensitivity))
-                $message->meetingrequest->sensitivity = 0;
+            if(!isset($message->meetingrequest->sensitivity)) {
+                            $message->meetingrequest->sensitivity = 0;
+            }
 
             // If the user is working from a location other than the office the busystatus should be interpreted as free.
             if (isset($message->meetingrequest->busystatus) && $message->meetingrequest->busystatus == fbWorkingElsewhere) {
@@ -761,8 +798,7 @@ 
             if(isset($row[PR_ATTACH_NUM])) {
                 if (Request::GetProtocolVersion() >= 12.0) {
                     $attach = new SyncBaseAttachment();
-                }
-                else {
+                } else {
                     $attach = new SyncAttachment();
                 }
 
@@ -793,8 +829,9 @@ 
 
                     // if displayname does not have the eml extension for embedde messages, android and WP devices won't open it
                     if ($attach->method == ATTACH_EMBEDDED_MSG) {
-                        if (strtolower(substr($attach->displayname, -4)) != '.eml')
-                            $attach->displayname .= '.eml';
+                        if (strtolower(substr($attach->displayname, -4)) != '.eml') {
+                                                    $attach->displayname .= '.eml';
+                        }
                     }
                     // android devices require attachment size in order to display an attachment properly
                     if (!isset($attachprops[PR_ATTACH_SIZE])) {
@@ -807,33 +844,37 @@ 
                         }
                         $stat = mapi_stream_stat($stream);
                         $attach->estimatedDataSize = $stat['cb'];
-                    }
-                    else {
+                    } else {
                         $attach->estimatedDataSize = $attachprops[PR_ATTACH_SIZE];
                     }
 
-                    if (isset($attachprops[PR_ATTACH_CONTENT_ID]) && $attachprops[PR_ATTACH_CONTENT_ID])
-                        $attach->contentid = $attachprops[PR_ATTACH_CONTENT_ID];
+                    if (isset($attachprops[PR_ATTACH_CONTENT_ID]) && $attachprops[PR_ATTACH_CONTENT_ID]) {
+                                            $attach->contentid = $attachprops[PR_ATTACH_CONTENT_ID];
+                    }
 
-                    if (!isset($attach->contentid) && isset($attachprops[PR_ATTACH_CONTENT_ID_W]) && $attachprops[PR_ATTACH_CONTENT_ID_W])
-                        $attach->contentid = $attachprops[PR_ATTACH_CONTENT_ID_W];
+                    if (!isset($attach->contentid) && isset($attachprops[PR_ATTACH_CONTENT_ID_W]) && $attachprops[PR_ATTACH_CONTENT_ID_W]) {
+                                            $attach->contentid = $attachprops[PR_ATTACH_CONTENT_ID_W];
+                    }
 
-                    if (isset($attachprops[PR_ATTACHMENT_HIDDEN]) && $attachprops[PR_ATTACHMENT_HIDDEN]) $attach->isinline = 1;
+                    if (isset($attachprops[PR_ATTACHMENT_HIDDEN]) && $attachprops[PR_ATTACHMENT_HIDDEN]) {
+                        $attach->isinline = 1;
+                    }
 
                     if (isset($attach->contentid, $attachprops[PR_ATTACH_FLAGS]) && $attachprops[PR_ATTACH_FLAGS] & 4) {
                         $attach->isinline = 1;
                     }
 
-                    if(!isset($message->asattachments))
-                        $message->asattachments = array();
+                    if(!isset($message->asattachments)) {
+                                            $message->asattachments = array();
+                    }
 
                     array_push($message->asattachments, $attach);
-                }
-                else {
+                } else {
                     $attach->attsize = $attachprops[PR_ATTACH_SIZE];
                     $attach->attname = sprintf("%s:%s:%s", $entryid, $row[PR_ATTACH_NUM], $parentSourcekey);
-                    if(!isset($message->attachments))
-                        $message->attachments = array();
+                    if(!isset($message->attachments)) {
+                                            $message->attachments = array();
+                    }
 
                     array_push($message->attachments, $attach);
                 }
@@ -854,12 +895,13 @@ 
 
             $addrtype = isset($row[PR_ADDRTYPE]) ? $row[PR_ADDRTYPE] : "";
 
-            if (isset($row[PR_SMTP_ADDRESS]))
-                $address = $row[PR_SMTP_ADDRESS];
-            elseif ($addrtype == "SMTP" && isset($row[PR_EMAIL_ADDRESS]))
-                $address = $row[PR_EMAIL_ADDRESS];
-            elseif ($addrtype == "ZARAFA" && isset($row[PR_ENTRYID]))
-                $address = $this->getSMTPAddressFromEntryID($row[PR_ENTRYID]);
+            if (isset($row[PR_SMTP_ADDRESS])) {
+                            $address = $row[PR_SMTP_ADDRESS];
+            } elseif ($addrtype == "SMTP" && isset($row[PR_EMAIL_ADDRESS])) {
+                            $address = $row[PR_EMAIL_ADDRESS];
+            } elseif ($addrtype == "ZARAFA" && isset($row[PR_ENTRYID])) {
+                            $address = $this->getSMTPAddressFromEntryID($row[PR_ENTRYID]);
+            }
 
             // if the user was not found, do a fallback to PR_SEARCH_KEY
             // @see https://jira.z-hub.io/browse/ZP-1178
@@ -869,13 +911,12 @@ 
 
             $name = isset($row[PR_DISPLAY_NAME]) ? $row[PR_DISPLAY_NAME] : "";
 
-            if($name == "" || $name == $address)
-                $fulladdr = w2u($address);
-            else {
+            if($name == "" || $name == $address) {
+                            $fulladdr = w2u($address);
+            } else {
                 if (substr($name, 0, 1) != '"' && substr($name, -1) != '"') {
                     $fulladdr = "\"" . w2u($name) ."\" <" . w2u($address) . ">";
-                }
-                else {
+                } else {
                     $fulladdr = w2u($name) ."<" . w2u($address) . ">";
                 }
             }
@@ -887,22 +928,30 @@ 
             }
         }
 
-        if (is_array($message->to) && !empty($message->to)) $message->to = implode(", ", $message->to);
-        if (is_array($message->cc) && !empty($message->cc)) $message->cc = implode(", ", $message->cc);
+        if (is_array($message->to) && !empty($message->to)) {
+            $message->to = implode(", ", $message->to);
+        }
+        if (is_array($message->cc) && !empty($message->cc)) {
+            $message->cc = implode(", ", $message->cc);
+        }
 
         // without importance some mobiles assume "0" (low) - Mantis #439
-        if (!isset($message->importance))
-            $message->importance = IMPORTANCE_NORMAL;
+        if (!isset($message->importance)) {
+                    $message->importance = IMPORTANCE_NORMAL;
+        }
 
-        if (!isset($message->internetcpid)) $message->internetcpid = (defined('STORE_INTERNET_CPID')) ? constant('STORE_INTERNET_CPID') : INTERNET_CPID_WINDOWS1252;
+        if (!isset($message->internetcpid)) {
+            $message->internetcpid = (defined('STORE_INTERNET_CPID')) ? constant('STORE_INTERNET_CPID') : INTERNET_CPID_WINDOWS1252;
+        }
         $this->setFlag($mapimessage, $message);
         //TODO checkcontentclass
-        if (!isset($message->contentclass)) $message->contentclass = DEFAULT_EMAIL_CONTENTCLASS;
+        if (!isset($message->contentclass)) {
+            $message->contentclass = DEFAULT_EMAIL_CONTENTCLASS;
+        }
 
         if (!isset($message->nativebodytype)) {
             $message->nativebodytype = MAPIUtils::GetNativeBodyType($messageprops);
-        }
-        elseif ($message->nativebodytype == SYNC_BODYPREFERENCE_UNDEFINED) {
+        } elseif ($message->nativebodytype == SYNC_BODYPREFERENCE_UNDEFINED) {
             $nbt = MAPIUtils::GetNativeBodyType($messageprops);
             ZLog::Write(LOGLEVEL_INFO, sprintf("MAPIProvider->getEmail(): native body type is undefined. Set it to %d.", $nbt));
             $message->nativebodytype = $nbt;
@@ -989,8 +1038,7 @@ 
         $folder->serverid = ZPush::GetDeviceManager()->GetFolderIdForBackendId($folder->BackendId, true, $folderOrigin, $folderprops[PR_DISPLAY_NAME]);
         if($folderprops[PR_PARENT_ENTRYID] == $storeprops[PR_IPM_SUBTREE_ENTRYID] || $folderprops[PR_PARENT_ENTRYID] == $storeprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID]) {
             $folder->parentid = "0";
-        }
-        else {
+        } else {
             $folder->parentid = ZPush::GetDeviceManager()->GetFolderIdForBackendId(bin2hex($folderprops[PR_PARENT_SOURCE_KEY]));
         }
         $folder->displayname = w2u($folderprops[PR_DISPLAY_NAME]);
@@ -1013,45 +1061,61 @@ 
         $storeprops = $this->GetStoreProps();
         $inboxprops = $this->GetInboxProps();
 
-        if($entryid == $storeprops[PR_IPM_WASTEBASKET_ENTRYID])
-            return SYNC_FOLDER_TYPE_WASTEBASKET;
-        if($entryid == $storeprops[PR_IPM_SENTMAIL_ENTRYID])
-            return SYNC_FOLDER_TYPE_SENTMAIL;
-        if($entryid == $storeprops[PR_IPM_OUTBOX_ENTRYID])
-            return SYNC_FOLDER_TYPE_OUTBOX;
+        if($entryid == $storeprops[PR_IPM_WASTEBASKET_ENTRYID]) {
+                    return SYNC_FOLDER_TYPE_WASTEBASKET;
+        }
+        if($entryid == $storeprops[PR_IPM_SENTMAIL_ENTRYID]) {
+                    return SYNC_FOLDER_TYPE_SENTMAIL;
+        }
+        if($entryid == $storeprops[PR_IPM_OUTBOX_ENTRYID]) {
+                    return SYNC_FOLDER_TYPE_OUTBOX;
+        }
 
         // Public folders do not have inboxprops
         // @see https://jira.z-hub.io/browse/ZP-995
         if (!empty($inboxprops)) {
-            if($entryid == $inboxprops[PR_ENTRYID])
-                return SYNC_FOLDER_TYPE_INBOX;
-            if($entryid == $inboxprops[PR_IPM_DRAFTS_ENTRYID])
-                return SYNC_FOLDER_TYPE_DRAFTS;
-            if($entryid == $inboxprops[PR_IPM_TASK_ENTRYID])
-                return SYNC_FOLDER_TYPE_TASK;
-            if($entryid == $inboxprops[PR_IPM_APPOINTMENT_ENTRYID])
-                return SYNC_FOLDER_TYPE_APPOINTMENT;
-            if($entryid == $inboxprops[PR_IPM_CONTACT_ENTRYID])
-                return SYNC_FOLDER_TYPE_CONTACT;
-            if($entryid == $inboxprops[PR_IPM_NOTE_ENTRYID])
-                return SYNC_FOLDER_TYPE_NOTE;
-            if($entryid == $inboxprops[PR_IPM_JOURNAL_ENTRYID])
-                return SYNC_FOLDER_TYPE_JOURNAL;
+            if($entryid == $inboxprops[PR_ENTRYID]) {
+                            return SYNC_FOLDER_TYPE_INBOX;
+            }
+            if($entryid == $inboxprops[PR_IPM_DRAFTS_ENTRYID]) {
+                            return SYNC_FOLDER_TYPE_DRAFTS;
+            }
+            if($entryid == $inboxprops[PR_IPM_TASK_ENTRYID]) {
+                            return SYNC_FOLDER_TYPE_TASK;
+            }
+            if($entryid == $inboxprops[PR_IPM_APPOINTMENT_ENTRYID]) {
+                            return SYNC_FOLDER_TYPE_APPOINTMENT;
+            }
+            if($entryid == $inboxprops[PR_IPM_CONTACT_ENTRYID]) {
+                            return SYNC_FOLDER_TYPE_CONTACT;
+            }
+            if($entryid == $inboxprops[PR_IPM_NOTE_ENTRYID]) {
+                            return SYNC_FOLDER_TYPE_NOTE;
+            }
+            if($entryid == $inboxprops[PR_IPM_JOURNAL_ENTRYID]) {
+                            return SYNC_FOLDER_TYPE_JOURNAL;
+            }
         }
 
         // user created folders
-        if ($class == "IPF.Note")
-            return SYNC_FOLDER_TYPE_USER_MAIL;
-        if ($class == "IPF.Task")
-            return SYNC_FOLDER_TYPE_USER_TASK;
-        if ($class == "IPF.Appointment")
-            return SYNC_FOLDER_TYPE_USER_APPOINTMENT;
-        if ($class == "IPF.Contact")
-            return SYNC_FOLDER_TYPE_USER_CONTACT;
-        if ($class == "IPF.StickyNote")
-            return SYNC_FOLDER_TYPE_USER_NOTE;
-        if ($class == "IPF.Journal")
-            return  SYNC_FOLDER_TYPE_USER_JOURNAL;
+        if ($class == "IPF.Note") {
+                    return SYNC_FOLDER_TYPE_USER_MAIL;
+        }
+        if ($class == "IPF.Task") {
+                    return SYNC_FOLDER_TYPE_USER_TASK;
+        }
+        if ($class == "IPF.Appointment") {
+                    return SYNC_FOLDER_TYPE_USER_APPOINTMENT;
+        }
+        if ($class == "IPF.Contact") {
+                    return SYNC_FOLDER_TYPE_USER_CONTACT;
+        }
+        if ($class == "IPF.StickyNote") {
+                    return SYNC_FOLDER_TYPE_USER_NOTE;
+        }
+        if ($class == "IPF.Journal") {
+                    return  SYNC_FOLDER_TYPE_USER_JOURNAL;
+        }
 
         return SYNC_FOLDER_TYPE_OTHER;
     }
@@ -1069,15 +1133,17 @@ 
 
         $inboxProps = array();
         $inbox = mapi_msgstore_getreceivefolder($this->store);
-        if(!mapi_last_hresult())
-            $inboxProps = mapi_getprops($inbox, array(PR_ENTRYID));
+        if(!mapi_last_hresult()) {
+                    $inboxProps = mapi_getprops($inbox, array(PR_ENTRYID));
+        }
 
         $root = mapi_msgstore_openentry($this->store, null); // TODO use getRootProps()
         $rootProps = mapi_getprops($root, array(PR_IPM_APPOINTMENT_ENTRYID, PR_IPM_CONTACT_ENTRYID, PR_IPM_DRAFTS_ENTRYID, PR_IPM_JOURNAL_ENTRYID, PR_IPM_NOTE_ENTRYID, PR_IPM_TASK_ENTRYID, PR_ADDITIONAL_REN_ENTRYIDS));
 
         $additional_ren_entryids = array();
-        if(isset($rootProps[PR_ADDITIONAL_REN_ENTRYIDS]))
-            $additional_ren_entryids = $rootProps[PR_ADDITIONAL_REN_ENTRYIDS];
+        if(isset($rootProps[PR_ADDITIONAL_REN_ENTRYIDS])) {
+                    $additional_ren_entryids = $rootProps[PR_ADDITIONAL_REN_ENTRYIDS];
+        }
 
         $defaultfolders = array(
                         "inbox"                 =>      array("inbox"=>PR_ENTRYID),
@@ -1170,7 +1236,9 @@ 
      */
     private function setEmail($mapimessage, $message) {
         // update categories
-        if (!isset($message->categories)) $message->categories = array();
+        if (!isset($message->categories)) {
+            $message->categories = array();
+        }
         $emailmap = MAPIMapping::GetEmailMapping();
         $this->setPropsInMAPI($mapimessage, $message, array("categories" => $emailmap["categories"]));
 
@@ -1209,12 +1277,12 @@ 
             $delprops[] = $flagprops["completetime"];
             $delprops[] = $flagprops["flagstatus"];
             $delprops[] = $flagprops["flagicon"];
-        }
-        else {
+        } else {
             $this->setPropsInMAPI($mapimessage, $message->flag, $flagmapping);
             $props[$flagprops["todoitemsflags"]] = 1;
-            if (isset($message->subject) && strlen($message->subject) > 0)
-                $props[$flagprops["todotitle"]] = $message->subject;
+            if (isset($message->subject) && strlen($message->subject) > 0) {
+                            $props[$flagprops["todotitle"]] = $message->subject;
+            }
             // ordinal date is utc current time
             if (!isset($message->flag->ordinaldate) || empty($message->flag->ordinaldate)) {
                 $props[$flagprops["ordinaldate"]] = time();
@@ -1257,10 +1325,11 @@ 
      */
     private function setAppointment($mapimessage, $appointment) {
         // Get timezone info
-        if(isset($appointment->timezone))
-            $tz = $this->getTZFromSyncBlob(base64_decode($appointment->timezone));
-        else
-            $tz = false;
+        if(isset($appointment->timezone)) {
+                    $tz = $this->getTZFromSyncBlob(base64_decode($appointment->timezone));
+        } else {
+                    $tz = false;
+        }
 
         // start and end time may not be set - try to get them from the existing appointment for further calculation - see https://jira.z-hub.io/browse/ZP-983
         if (!isset($appointment->starttime) || !isset($appointment->endtime)) {
@@ -1382,8 +1451,7 @@ 
                         $noexceptions = false;
                         // Delete exception
                         $recurrence->createException(array(), $basedate, true);
-                    }
-                    else {
+                    } else {
                         // Change exception
                         $mapiexception = array("basedate" => $basedate);
                         //other exception properties which are not handled in recurrence
@@ -1397,25 +1465,31 @@ 
                             $mapiexception["end"] = $this->getLocaltimeByTZ($exception->endtime, $tz);
                             $exceptionprops[$appointmentprops["endtime"]] = $exception->endtime;
                         }
-                        if(isset($exception->subject))
-                            $exceptionprops[$appointmentprops["subject"]] = $mapiexception["subject"] = u2w($exception->subject);
-                        if(isset($exception->location))
-                            $exceptionprops[$appointmentprops["location"]] = $mapiexception["location"] = u2w($exception->location);
-                        if(isset($exception->busystatus))
-                            $exceptionprops[$appointmentprops["busystatus"]] = $mapiexception["busystatus"] = $exception->busystatus;
+                        if(isset($exception->subject)) {
+                                                    $exceptionprops[$appointmentprops["subject"]] = $mapiexception["subject"] = u2w($exception->subject);
+                        }
+                        if(isset($exception->location)) {
+                                                    $exceptionprops[$appointmentprops["location"]] = $mapiexception["location"] = u2w($exception->location);
+                        }
+                        if(isset($exception->busystatus)) {
+                                                    $exceptionprops[$appointmentprops["busystatus"]] = $mapiexception["busystatus"] = $exception->busystatus;
+                        }
                         if(isset($exception->reminder)) {
                             $exceptionprops[$appointmentprops["reminderset"]] = $mapiexception["reminder_set"] = 1;
                             $exceptionprops[$appointmentprops["remindertime"]] = $mapiexception["remind_before"] = $exception->reminder;
                         }
-                        if(isset($exception->alldayevent))
-                            $exceptionprops[$appointmentprops["alldayevent"]] = $mapiexception["alldayevent"] = $exception->alldayevent;
+                        if(isset($exception->alldayevent)) {
+                                                    $exceptionprops[$appointmentprops["alldayevent"]] = $mapiexception["alldayevent"] = $exception->alldayevent;
+                        }
 
 
-                        if(!isset($recur["changed_occurences"]))
-                            $recur["changed_occurences"] = array();
+                        if(!isset($recur["changed_occurences"])) {
+                                                    $recur["changed_occurences"] = array();
+                        }
 
-                        if (isset($exception->body))
-                            $exceptionprops[$appointmentprops["body"]] = u2w($exception->body);
+                        if (isset($exception->body)) {
+                                                    $exceptionprops[$appointmentprops["body"]] = u2w($exception->body);
+                        }
 
                         if (isset($exception->asbody)) {
                             $this->setASbody($exception->asbody, $exceptionprops, $appointmentprops);
@@ -1430,8 +1504,7 @@ 
                             $noexceptions = false;
                             if($recurrence->isException($basedate)){
                                 $recurrence->modifyException($exceptionprops, $basedate);
-                            }
-                            else {
+                            } else {
                                 $recurrence->createException($exceptionprops, $basedate);
                             }
                         }
@@ -1444,8 +1517,7 @@ 
             if ($noexceptions) {
                 $recurrence->setRecurrence($tz, $recur);
             }
-        }
-        else {
+        } else {
             $props[$appointmentprops["isrecurring"]] = false;
         }
 
@@ -1521,8 +1593,7 @@ 
                     $recip[PR_RECIPIENT_TYPE] = isset($attendee->attendeetype) ? $attendee->attendeetype : MAPI_TO;
                     $recip[PR_RECIPIENT_FLAGS] = recipSendable;
                     $recip[PR_RECIPIENT_TRACKSTATUS] = isset($attendee->attendeestatus) ? $attendee->attendeestatus : olResponseNone;
-                }
-                else {
+                } else {
                     $recip[PR_DISPLAY_NAME] = u2w($attendee->name);
                     $recip[PR_SEARCH_KEY] = "SMTP:".$recip[PR_EMAIL_ADDRESS]."\0";
                     $recip[PR_ADDRTYPE] = "SMTP";
@@ -1552,14 +1623,17 @@ 
         mapi_setprops($mapimessage, array(PR_MESSAGE_CLASS => "IPM.Contact"));
 
         // normalize email addresses
-        if (isset($contact->email1address) && (($contact->email1address = $this->extractEmailAddress($contact->email1address)) === false))
-            unset($contact->email1address);
+        if (isset($contact->email1address) && (($contact->email1address = $this->extractEmailAddress($contact->email1address)) === false)) {
+                    unset($contact->email1address);
+        }
 
-        if (isset($contact->email2address) && (($contact->email2address = $this->extractEmailAddress($contact->email2address)) === false))
-            unset($contact->email2address);
+        if (isset($contact->email2address) && (($contact->email2address = $this->extractEmailAddress($contact->email2address)) === false)) {
+                    unset($contact->email2address);
+        }
 
-        if (isset($contact->email3address) && (($contact->email3address = $this->extractEmailAddress($contact->email3address)) === false))
-            unset($contact->email3address);
+        if (isset($contact->email3address) && (($contact->email3address = $this->extractEmailAddress($contact->email3address)) === false)) {
+                    unset($contact->email3address);
+        }
 
         $contactmapping = MAPIMapping::GetContactMapping();
         $contactprops = MAPIMapping::GetContactProperties();
@@ -1578,18 +1652,23 @@ 
         $nremails = array();
         $abprovidertype = 0;
 
-        if (isset($contact->email1address))
-            $this->setEmailAddress($contact->email1address, $cname, 1, $props, $contactprops, $nremails, $abprovidertype);
-        if (isset($contact->email2address))
-            $this->setEmailAddress($contact->email2address, $cname, 2, $props, $contactprops, $nremails, $abprovidertype);
-        if (isset($contact->email3address))
-            $this->setEmailAddress($contact->email3address, $cname, 3, $props, $contactprops, $nremails, $abprovidertype);
+        if (isset($contact->email1address)) {
+                    $this->setEmailAddress($contact->email1address, $cname, 1, $props, $contactprops, $nremails, $abprovidertype);
+        }
+        if (isset($contact->email2address)) {
+                    $this->setEmailAddress($contact->email2address, $cname, 2, $props, $contactprops, $nremails, $abprovidertype);
+        }
+        if (isset($contact->email3address)) {
+                    $this->setEmailAddress($contact->email3address, $cname, 3, $props, $contactprops, $nremails, $abprovidertype);
+        }
 
         $props[$contactprops["addressbooklong"]] = $abprovidertype;
         $props[$contactprops["displayname"]] = $props[$contactprops["subject"]] = $cname;
 
         //pda multiple e-mail addresses bug fix for the contact
-        if (!empty($nremails)) $props[$contactprops["addressbookmv"]] = $nremails;
+        if (!empty($nremails)) {
+            $props[$contactprops["addressbookmv"]] = $nremails;
+        }
 
 
         //set addresses
@@ -1601,12 +1680,10 @@ 
         if (isset($props[$contactprops["businessaddress"]])) {
             $props[$contactprops["mailingaddress"]] = 2;
             $this->setMailingAddress($contact->businesscity, $contact->businesscountry, $contact->businesspostalcode, $contact->businessstate, $contact->businessstreet, $props[$contactprops["businessaddress"]], $props, $contactprops);
-        }
-        elseif (isset($props[$contactprops["homeaddress"]])) {
+        } elseif (isset($props[$contactprops["homeaddress"]])) {
             $props[$contactprops["mailingaddress"]] = 1;
             $this->setMailingAddress($contact->homecity, $contact->homecountry, $contact->homepostalcode, $contact->homestate, $contact->homestreet, $props[$contactprops["homeaddress"]], $props, $contactprops);
-        }
-        elseif (isset($props[$contactprops["otheraddress"]])) {
+        } elseif (isset($props[$contactprops["otheraddress"]])) {
             $props[$contactprops["mailingaddress"]] = 3;
             $this->setMailingAddress($contact->othercity, $contact->othercountry, $contact->otherpostalcode, $contact->otherstate, $contact->otherstreet, $props[$contactprops["otheraddress"]], $props, $contactprops);
         }
@@ -1667,8 +1744,9 @@ 
             $middlename = (isset($contact->middlename)) ? $contact->middlename : "";
             $company = (isset($contact->companyname)) ? $contact->companyname : "";
             $props[$contactprops["fileas"]] = Utils::BuildFileAs($lastname, $firstname, $middlename, $company);
+        } else {
+            ZLog::Write(LOGLEVEL_DEBUG, "FILEAS_ORDER not defined");
         }
-        else ZLog::Write(LOGLEVEL_DEBUG, "FILEAS_ORDER not defined");
 
         mapi_setprops($mapimessage, $props);
         return true;
@@ -1715,8 +1793,10 @@ 
         if (isset($task->recurrence) && class_exists('TaskRecurrence')) {
             $deadoccur = false;
             if ((isset($task->recurrence->occurrences) && $task->recurrence->occurrences == 1) ||
-                (isset($task->recurrence->deadoccur) && $task->recurrence->deadoccur == 1)) //ios5 sends deadoccur inside the recurrence
+                (isset($task->recurrence->deadoccur) && $task->recurrence->deadoccur == 1)) {
+                //ios5 sends deadoccur inside the recurrence
                 $deadoccur = true;
+            }
 
             // Set PR_ICON_INDEX to 1281 to show correct icon in category view
             $props[$taskprops["icon"]] = 1281;
@@ -1778,7 +1858,9 @@ 
     private function setNote($mapimessage, $note) {
         // Touchdown does not send categories if all are unset or there is none.
         // Setting it to an empty array will unset the property in KC as well
-        if (!isset($note->categories)) $note->categories = array();
+        if (!isset($note->categories)) {
+            $note->categories = array();
+        }
 
         // update icon index to correspond to the color
         if (isset($note->Color) && $note->Color > -1 && $note->Color < 5) {
@@ -1863,10 +1945,11 @@ 
 
                 // UTF8->windows1252.. this is ok for all numerical values
                 if(mapi_prop_type($mapiprop) != PT_BINARY && mapi_prop_type($mapiprop) != PT_MV_BINARY) {
-                    if(is_array($message->$asprop))
-                        $value = array_map("u2wi", $message->$asprop);
-                    else
-                        $value = u2wi($message->$asprop);
+                    if(is_array($message->$asprop)) {
+                                            $value = array_map("u2wi", $message->$asprop);
+                    } else {
+                                            $value = u2wi($message->$asprop);
+                    }
                 } else {
                     $value = $message->$asprop;
                 }
@@ -1889,8 +1972,10 @@ 
                 // decode base64 value
                 if($mapiprop == PR_RTF_COMPRESSED) {
                     $value = base64_decode($value);
-                    if(strlen($value) == 0)
-                        continue; // PDA will sometimes give us an empty RTF, which we'll ignore.
+                    if(strlen($value) == 0) {
+                                            continue;
+                    }
+                    // PDA will sometimes give us an empty RTF, which we'll ignore.
 
                     // Note that you can still remove notes because when you remove notes it gives
                     // a valid compressed RTF with nothing in it.
@@ -1900,13 +1985,11 @@ 
                 if (is_array($value) && empty($value)) {
                     $propsToDelete[] = $mapiprop;
                     ZLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->setPropsInMAPI(): Property '%s' to be deleted as it is an empty array", $asprop));
-                }
-                else {
+                } else {
                     // all properties will be set at once
                     $propsToSet[$mapiprop] = $value;
                 }
-            }
-            elseif (in_array($asprop, $unsetVars)) {
+            } elseif (in_array($asprop, $unsetVars)) {
                 $propsToDelete[] = $mapiprop;
             }
         }
@@ -1967,24 +2050,28 @@ 
             if(isset($messageprops[$mapiprop])) {
                 if(mapi_prop_type($mapiprop) == PT_BOOLEAN) {
                     // Force to actual '0' or '1'
-                    if($messageprops[$mapiprop])
-                        $message->$asprop = 1;
-                    else
-                        $message->$asprop = 0;
+                    if($messageprops[$mapiprop]) {
+                                            $message->$asprop = 1;
+                    } else {
+                                            $message->$asprop = 0;
+                    }
                 } else {
                     // Special handling for PR_MESSAGE_FLAGS
-                    if($mapiprop == PR_MESSAGE_FLAGS)
-                        $message->$asprop = $messageprops[$mapiprop] & 1; // only look at 'read' flag
-                    else if($mapiprop == PR_RTF_COMPRESSED)
-                        //do not send rtf to the mobile
+                    if($mapiprop == PR_MESSAGE_FLAGS) {
+                                            $message->$asprop = $messageprops[$mapiprop] & 1;
+                    }
+                    // only look at 'read' flag
+                    else if($mapiprop == PR_RTF_COMPRESSED) {
+                                            //do not send rtf to the mobile
                         continue;
-                    else if(is_array($messageprops[$mapiprop]))
-                        $message->$asprop = array_map("w2u", $messageprops[$mapiprop]);
-                    else {
-                        if(mapi_prop_type($mapiprop) != PT_BINARY && mapi_prop_type($mapiprop) != PT_MV_BINARY)
-                            $message->$asprop = w2u($messageprops[$mapiprop]);
-                        else
-                            $message->$asprop = $messageprops[$mapiprop];
+                    } else if(is_array($messageprops[$mapiprop])) {
+                                            $message->$asprop = array_map("w2u", $messageprops[$mapiprop]);
+                    } else {
+                        if(mapi_prop_type($mapiprop) != PT_BINARY && mapi_prop_type($mapiprop) != PT_MV_BINARY) {
+                                                    $message->$asprop = w2u($messageprops[$mapiprop]);
+                        } else {
+                                                    $message->$asprop = $messageprops[$mapiprop];
+                        }
                     }
                 }
             }
@@ -2112,13 +2199,15 @@ 
      * @return long
      */
     private function getGMTTimeByTZ($localtime, $tz) {
-        if(!isset($tz) || !is_array($tz))
-            return $localtime;
+        if(!isset($tz) || !is_array($tz)) {
+                    return $localtime;
+        }
 
-        if($this->isDST($localtime, $tz))
-            return $localtime + $tz["bias"]*60 + $tz["dstbias"]*60;
-        else
-            return $localtime + $tz["bias"]*60;
+        if($this->isDST($localtime, $tz)) {
+                    return $localtime + $tz["bias"]*60 + $tz["dstbias"]*60;
+        } else {
+                    return $localtime + $tz["bias"]*60;
+        }
     }
 
     /**
@@ -2131,13 +2220,16 @@ 
      * @return long
      */
     private function getLocaltimeByTZ($gmttime, $tz) {
-        if(!isset($tz) || !is_array($tz))
-            return $gmttime;
+        if(!isset($tz) || !is_array($tz)) {
+                    return $gmttime;
+        }
 
-        if($this->isDST($gmttime - $tz["bias"]*60, $tz)) // may bug around the switch time because it may have to be 'gmttime - bias - dstbias'
+        if($this->isDST($gmttime - $tz["bias"]*60, $tz)) {
+            // may bug around the switch time because it may have to be 'gmttime - bias - dstbias'
             return $gmttime - $tz["bias"]*60 - $tz["dstbias"]*60;
-        else
-            return $gmttime - $tz["bias"]*60;
+        } else {
+                    return $gmttime - $tz["bias"]*60;
+        }
     }
 
     /**
@@ -2153,8 +2245,9 @@ 
         if( !isset($tz) || !is_array($tz) ||
             !isset($tz["dstbias"]) || $tz["dstbias"] == 0 ||
             !isset($tz["dststartmonth"]) || $tz["dststartmonth"] == 0 ||
-            !isset($tz["dstendmonth"]) || $tz["dstendmonth"] == 0)
-            return false;
+            !isset($tz["dstendmonth"]) || $tz["dstendmonth"] == 0) {
+                    return false;
+        }
 
         $year = gmdate("Y", $localtime);
         $start = $this->getTimestampOfWeek($year, $tz["dststartmonth"], $tz["dststartweek"], $tz["dststartday"], $tz["dststarthour"], $tz["dststartminute"], $tz["dststartsecond"]);
@@ -2162,16 +2255,18 @@ 
 
         if($start < $end) {
             // northern hemisphere (july = dst)
-          if($localtime >= $start && $localtime < $end)
-              $dst = true;
-          else
-              $dst = false;
+          if($localtime >= $start && $localtime < $end) {
+                        $dst = true;
+          } else {
+                        $dst = false;
+          }
         } else {
             // southern hemisphere (january = dst)
-          if($localtime >= $end && $localtime < $start)
-              $dst = false;
-          else
-              $dst = true;
+          if($localtime >= $end && $localtime < $start) {
+                        $dst = false;
+          } else {
+                        $dst = true;
+          }
         }
 
         return $dst;
@@ -2192,16 +2287,18 @@ 
      * @return long
      */
     private function getTimestampOfWeek($year, $month, $week, $wday, $hour, $minute, $second) {
-        if ($month == 0)
-            return;
+        if ($month == 0) {
+                    return;
+        }
 
         $date = gmmktime($hour, $minute, $second, $month, 1, $year);
 
         // Find first day in month which matches day of the week
         while(1) {
             $wdaynow = gmdate("w", $date);
-            if($wdaynow == $wday)
-                break;
+            if($wdaynow == $wday) {
+                            break;
+            }
             $date += 24 * 60 * 60;
         }
 
@@ -2212,10 +2309,11 @@ 
         // specified weekday exists
         while(1) {
             $monthnow = gmdate("n", $date); // gmdate returns 1-12
-            if($monthnow > $month)
-                $date = $date - (24 * 7 * 60 * 60);
-            else
-                break;
+            if($monthnow > $month) {
+                            $date = $date - (24 * 7 * 60 * 60);
+            } else {
+                            break;
+            }
         }
 
         return $date;
@@ -2245,22 +2343,25 @@ 
         $addrbook = $this->getAddressbook();
 
         $mailuser = mapi_ab_openentry($addrbook, $entryid);
-        if(!$mailuser)
-            return "";
+        if(!$mailuser) {
+                    return "";
+        }
 
         $props = mapi_getprops($mailuser, array(PR_ADDRTYPE, PR_SMTP_ADDRESS, PR_EMAIL_ADDRESS));
 
         $addrtype = isset($props[PR_ADDRTYPE]) ? $props[PR_ADDRTYPE] : "";
 
-        if(isset($props[PR_SMTP_ADDRESS]))
-            return $props[PR_SMTP_ADDRESS];
+        if(isset($props[PR_SMTP_ADDRESS])) {
+                    return $props[PR_SMTP_ADDRESS];
+        }
 
-        if($addrtype == "SMTP" && isset($props[PR_EMAIL_ADDRESS]))
-            return $props[PR_EMAIL_ADDRESS];
-        elseif ($addrtype == "ZARAFA" && isset($props[PR_EMAIL_ADDRESS])) {
+        if($addrtype == "SMTP" && isset($props[PR_EMAIL_ADDRESS])) {
+                    return $props[PR_EMAIL_ADDRESS];
+        } elseif ($addrtype == "ZARAFA" && isset($props[PR_EMAIL_ADDRESS])) {
             $userinfo = nsp_getuserinfo($props[PR_EMAIL_ADDRESS]);
-            if (is_array($userinfo) && isset($userinfo["primary_email"]))
-                return $userinfo["primary_email"];
+            if (is_array($userinfo) && isset($userinfo["primary_email"])) {
+                            return $userinfo["primary_email"];
+            }
         }
 
         return "";
@@ -2350,19 +2451,31 @@ 
      * @return
      */
      private function setAddress($type, &$city, &$country, &$postalcode, &$state, &$street, &$props, &$properties) {
-        if (isset($city)) $props[$properties[$type."city"]] = $city = u2w($city);
+        if (isset($city)) {
+            $props[$properties[$type."city"]] = $city = u2w($city);
+        }
 
-        if (isset($country)) $props[$properties[$type."country"]] = $country = u2w($country);
+        if (isset($country)) {
+            $props[$properties[$type."country"]] = $country = u2w($country);
+        }
 
-        if (isset($postalcode)) $props[$properties[$type."postalcode"]] = $postalcode = u2w($postalcode);
+        if (isset($postalcode)) {
+            $props[$properties[$type."postalcode"]] = $postalcode = u2w($postalcode);
+        }
 
-        if (isset($state)) $props[$properties[$type."state"]] = $state = u2w($state);
+        if (isset($state)) {
+            $props[$properties[$type."state"]] = $state = u2w($state);
+        }
 
-        if (isset($street)) $props[$properties[$type."street"]] = $street = u2w($street);
+        if (isset($street)) {
+            $props[$properties[$type."street"]] = $street = u2w($street);
+        }
 
         //set composed address
         $address = Utils::BuildAddressString($street, $postalcode, $city, $state, $country);
-        if ($address) $props[$properties[$type."address"]] = $address;
+        if ($address) {
+            $props[$properties[$type."address"]] = $address;
+        }
     }
 
     /**
@@ -2381,12 +2494,24 @@ 
      * @return
      */
     private function setMailingAddress($city, $country, $postalcode,  $state, $street, $address, &$props, &$properties) {
-        if (isset($city)) $props[$properties["city"]] = $city;
-        if (isset($country)) $props[$properties["country"]] = $country;
-        if (isset($postalcode)) $props[$properties["postalcode"]] = $postalcode;
-        if (isset($state)) $props[$properties["state"]] = $state;
-        if (isset($street)) $props[$properties["street"]] = $street;
-        if (isset($address)) $props[$properties["postaladdress"]] = $address;
+        if (isset($city)) {
+            $props[$properties["city"]] = $city;
+        }
+        if (isset($country)) {
+            $props[$properties["country"]] = $country;
+        }
+        if (isset($postalcode)) {
+            $props[$properties["postalcode"]] = $postalcode;
+        }
+        if (isset($state)) {
+            $props[$properties["state"]] = $state;
+        }
+        if (isset($street)) {
+            $props[$properties["street"]] = $street;
+        }
+        if (isset($address)) {
+            $props[$properties["postaladdress"]] = $address;
+        }
     }
 
     /**
@@ -2403,8 +2528,9 @@ 
             $recur["complete"] = $message->complete;
         }
 
-        if(!isset($message->recurrence->interval))
-            $message->recurrence->interval = 1;
+        if(!isset($message->recurrence->interval)) {
+                    $message->recurrence->interval = 1;
+        }
 
         //set the default value of numoccur
         $recur["numoccur"] = 0;
@@ -2414,10 +2540,11 @@ 
         switch($message->recurrence->type) {
             case 0:
                 $recur["type"] = 10;
-                if(isset($message->recurrence->dayofweek))
-                    $recur["subtype"] = 1;
-                else
-                    $recur["subtype"] = 0;
+                if(isset($message->recurrence->dayofweek)) {
+                                    $recur["subtype"] = 1;
+                } else {
+                                    $recur["subtype"] = 0;
+                }
 
                 $recur["everyn"] = $message->recurrence->interval * (60 * 24);
                 $recur["recurrencetype"] = 1;
@@ -2473,18 +2600,21 @@ 
             $recur["term"] = 0x23;
         }
 
-        if(isset($message->recurrence->dayofweek))
-            $recur["weekdays"] = $message->recurrence->dayofweek;
-        if(isset($message->recurrence->weekofmonth))
-            $recur["nday"] = $message->recurrence->weekofmonth;
+        if(isset($message->recurrence->dayofweek)) {
+                    $recur["weekdays"] = $message->recurrence->dayofweek;
+        }
+        if(isset($message->recurrence->weekofmonth)) {
+                    $recur["nday"] = $message->recurrence->weekofmonth;
+        }
         if(isset($message->recurrence->monthofyear)) {
             // MAPI stores months as the amount of minutes until the beginning of the month in a
             // non-leapyear. Why this is, is totally unclear.
             $monthminutes = array(0,44640,84960,129600,172800,217440,260640,305280,348480,393120,437760,480960);
             $recur["month"] = $monthminutes[$message->recurrence->monthofyear-1];
         }
-        if(isset($message->recurrence->dayofmonth))
-            $recur["monthday"] = $message->recurrence->dayofmonth;
+        if(isset($message->recurrence->dayofmonth)) {
+                    $recur["monthday"] = $message->recurrence->dayofmonth;
+        }
     }
 
     /**
@@ -2499,9 +2629,13 @@ 
      *  @return string or false on error
      */
     private function extractEmailAddress($email) {
-        if (!isset($this->zRFC822)) $this->zRFC822 = new Mail_RFC822();
+        if (!isset($this->zRFC822)) {
+            $this->zRFC822 = new Mail_RFC822();
+        }
         $parsedAddress = $this->zRFC822->parseAddressList($email);
-        if (!isset($parsedAddress[0]->mailbox) || !isset($parsedAddress[0]->host)) return false;
+        if (!isset($parsedAddress[0]->mailbox) || !isset($parsedAddress[0]->host)) {
+            return false;
+        }
 
         return $parsedAddress[0]->mailbox.'@'.$parsedAddress[0]->host;
     }
@@ -2530,8 +2664,9 @@ 
                 break;
             case SYNC_BODYPREFERENCE_MIME:
                 $stat = $this->imtoinet($mapimessage, $message);
-                if (isset($message->asbody))
-                    $message->asbody->type = $bpReturnType;
+                if (isset($message->asbody)) {
+                                    $message->asbody->type = $bpReturnType;
+                }
                 return $stat;
         }
 
@@ -2539,8 +2674,7 @@ 
         if ($stream) {
             $stat = mapi_stream_stat($stream);
             $streamsize = $stat['cb'];
-        }
-        else {
+        } else {
             $streamsize = 0;
         }
 
@@ -2551,24 +2685,20 @@ 
             if ($bpReturnType == SYNC_BODYPREFERENCE_RTF) {
                 $body = $this->mapiReadStream($stream, $streamsize);
                 $message->asbody->data = StringStreamWrapper::Open(base64_encode($body));
-            }
-            elseif (isset($message->internetcpid) && $bpReturnType == SYNC_BODYPREFERENCE_HTML) {
+            } elseif (isset($message->internetcpid) && $bpReturnType == SYNC_BODYPREFERENCE_HTML) {
                 // if PR_HTML is UTF-8 we can stream it directly, else we have to convert to UTF-8 & wrap it
                 if ($message->internetcpid == INTERNET_CPID_UTF8) {
                     $message->asbody->data = MAPIStreamWrapper::Open($stream, $truncateHtmlSafe);
-                }
-                else {
+                } else {
                     $body = $this->mapiReadStream($stream, $streamsize);
                     $message->asbody->data = StringStreamWrapper::Open(Utils::ConvertCodepageStringToUtf8($message->internetcpid, $body), $truncateHtmlSafe);
                     $message->internetcpid = INTERNET_CPID_UTF8;
                 }
-            }
-            else {
+            } else {
                 $message->asbody->data = MAPIStreamWrapper::Open($stream);
             }
             $message->asbody->estimatedDataSize = $streamsize;
-        }
-        else {
+        } else {
             $body = $this->mapiReadStream($stream, $streamsize);
             $message->body = str_replace("\n","\r\n", w2u(str_replace("\r", "", $body)));
             $message->bodysize = $streamsize;
@@ -2609,8 +2739,7 @@ 
         if (isset($mapiEmail[PR_EC_IMAP_EMAIL]) || MAPIUtils::GetError(PR_EC_IMAP_EMAIL, $mapiEmail) == MAPI_E_NOT_ENOUGH_MEMORY) {
             $stream = mapi_openproperty($mapimessage, PR_EC_IMAP_EMAIL, IID_IStream, 0, 0);
             ZLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->imtoinet(): using PR_EC_IMAP_EMAIL as full RFC822 message");
-        }
-        else {
+        } else {
             $addrbook = $this->getAddressbook();
             $stream = mapi_inetmapi_imtoinet($this->session, $addrbook, $mapimessage, array('use_tnef' => -1, 'ignore_missing_attachments' => 1));
         }
@@ -2619,13 +2748,13 @@ 
             $streamsize = $mstreamstat["cb"];
             if (isset($streamsize)) {
                 if (Request::GetProtocolVersion() >= 12.0) {
-                    if (!isset($message->asbody))
-                        $message->asbody = new SyncBaseBody();
+                    if (!isset($message->asbody)) {
+                                            $message->asbody = new SyncBaseBody();
+                    }
                     $message->asbody->data = MAPIStreamWrapper::Open($stream);
                     $message->asbody->estimatedDataSize = $streamsize;
                     $message->asbody->truncated = 0;
-                }
-                else {
+                } else {
                     $message->mimedata = MAPIStreamWrapper::Open($stream);
                     $message->mimesize = $streamsize;
                     $message->mimetruncated = 0;
@@ -2696,8 +2825,7 @@ 
             if (Request::GetProtocolVersion() >= 14.0 && $bpo->GetPreview()) {
                 $message->asbody->preview = Utils::Utf8_truncate(MAPIUtils::readPropStream($mapimessage, PR_BODY), $bpo->GetPreview());
             }
-        }
-        else {
+        } else {
             // Override 'body' for truncation
             $truncsize = Utils::GetTruncSize($contentparameters->GetTruncation());
             $this->setMessageBodyForType($mapimessage, SYNC_BODYPREFERENCE_PLAIN, $message);
@@ -2707,8 +2835,9 @@ 
                 $message->bodytruncated = 1;
             }
 
-            if (!isset($message->body) || strlen($message->body) == 0)
-                $message->body = " ";
+            if (!isset($message->body) || strlen($message->body) == 0) {
+                            $message->body = " ";
+            }
 
             if ($contentparameters->GetMimeSupport() == SYNC_MIMESUPPORT_ALWAYS) {
                 //set the html body for iphone in AS 2.5 version
@@ -2728,7 +2857,9 @@ 
     */
     private function setFlag($mapimessage, &$message){
         // do nothing if protocol version is lower than 12.0 as flags haven't been defined before
-        if (Request::GetProtocolVersion() < 12.0 ) return;
+        if (Request::GetProtocolVersion() < 12.0 ) {
+            return;
+        }
 
         $message->flag = new SyncMailFlags();
 
@@ -2762,8 +2893,7 @@ 
                 case SYNC_BODYPREFERENCE_MIME:
                     break;
             }
-        }
-        else {
+        } else {
             ZLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->setASbody either type or data are not set. Setting to empty body");
             $props[$appointmentprops["body"]] = "";
         }
@@ -2899,8 +3029,7 @@ 
                         $this->specialFoldersData[] = substr($persistData, 8, $unpackedData['elDataSize']);
                         // Add PersistId and DataElementsSize lengths to the data size as they're not part of it
                         $persistData = substr($persistData, $unpackedData['dataSize'] + 4);
-                    }
-                    else {
+                    } else {
                         ZLog::Write(LOGLEVEL_INFO, "MAPIProvider->getSpecialFoldersData(): persistent data is not valid");
                         break;
                     }