grommunio / grommunio-sync

version.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
     $branch = trim(exec("hash git 2>/dev/null && cd $path >/dev/null 2>&1 && git branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e \"s/* \(.*\)/\\1/\""));
     $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);
+        define("GROMMUNIOSYNC_VERSION", $branch.'-'.$version);
     }
     else {
         define("GROMMUNIOSYNC_VERSION", "GIT");

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

Spacing +15 added lines, -15 removed lines

@@ -28,14 +28,14 @@ 
      */
     private function getLogToUserFile() {
         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');
+            if (in_array(strtolower($this->GetDevid()), ['', 'validate'])) {
+                $this->setLogToUserFile(preg_replace('/[^a-z0-9]/', '_', strtolower($this->GetAuthUser())).'.log');
             }
             else {
                 $this->setLogToUserFile(
-                        preg_replace('/[^a-z0-9]/', '_', strtolower($this->GetAuthUser())) .'-'.
-                        (($this->GetAuthUser() != $this->GetUser()) ? preg_replace('/[^a-z0-9]/', '_', strtolower($this->GetUser())) .'-' : '') .
-                        preg_replace('/[^a-z0-9]/', '_', strtolower($this->GetDevid())) .
+                        preg_replace('/[^a-z0-9]/', '_', strtolower($this->GetAuthUser())).'-'.
+                        (($this->GetAuthUser() != $this->GetUser()) ? preg_replace('/[^a-z0-9]/', '_', strtolower($this->GetUser())).'-' : '').
+                        preg_replace('/[^a-z0-9]/', '_', strtolower($this->GetDevid())).
                         '.log'
                         );
             }
@@ -66,21 +66,21 @@ 
      * @return string
      */
     public function BuildLogString($loglevel, $message, $includeUserDevice = true) {
-        $log = Utils::GetFormattedTime() .' ['. str_pad($this->GetPid(),5," ",STR_PAD_LEFT) .'] '. $this->GetLogLevelString($loglevel, $loglevel >= LOGLEVEL_INFO);
+        $log = Utils::GetFormattedTime().' ['.str_pad($this->GetPid(), 5, " ", STR_PAD_LEFT).'] '.$this->GetLogLevelString($loglevel, $loglevel >= LOGLEVEL_INFO);
 
         if ($includeUserDevice) {
             // when the users differ, we need to log both
             if (strcasecmp($this->GetAuthUser(), $this->GetUser()) == 0) {
-                $log .= ' ['. $this->GetUser() .']';
+                $log .= ' ['.$this->GetUser().']';
             }
             else {
-                $log .= ' ['. $this->GetAuthUser() . Request::IMPERSONATE_DELIM . $this->GetUser() .']';
+                $log .= ' ['.$this->GetAuthUser().Request::IMPERSONATE_DELIM.$this->GetUser().']';
             }
         }
         if ($includeUserDevice && (LOGLEVEL >= LOGLEVEL_DEVICEID || (LOGUSERLEVEL >= LOGLEVEL_DEVICEID && $this->IsAuthUserInSpecialLogUsers()))) {
-            $log .= ' ['. $this->GetDevid() .']';
+            $log .= ' ['.$this->GetDevid().']';
         }
-        $log .= ' ' . $message;
+        $log .= ' '.$message;
         return $log;
     }
 
@@ -98,7 +98,7 @@ 
      * @return void
      */
     protected function Write($loglevel, $message) {
-        $data = $this->BuildLogString($loglevel, $message) . PHP_EOL;
+        $data = $this->BuildLogString($loglevel, $message).PHP_EOL;
         @file_put_contents(LOGFILE, $data, FILE_APPEND);
     }
 
@@ -111,8 +111,8 @@ 
      * @return void
      */
     public function WriteForUser($loglevel, $message) {
-        $data = $this->BuildLogString($loglevel, $message, false) . PHP_EOL;
-        @file_put_contents(LOGFILEDIR . $this->getLogToUserFile(), $data, FILE_APPEND);
+        $data = $this->BuildLogString($loglevel, $message, false).PHP_EOL;
+        @file_put_contents(LOGFILEDIR.$this->getLogToUserFile(), $data, FILE_APPEND);
     }
 
     /**
@@ -123,8 +123,8 @@ 
      * @return void
      */
     protected function afterLog($loglevel, $message) {
-        if ($loglevel & (LOGLEVEL_FATAL | LOGLEVEL_ERROR | LOGLEVEL_WARN)) {
-            $data = $this->BuildLogString($loglevel, $message) . PHP_EOL;
+        if ($loglevel & (LOGLEVEL_FATAL|LOGLEVEL_ERROR|LOGLEVEL_WARN)) {
+            $data = $this->BuildLogString($loglevel, $message).PHP_EOL;
             @file_put_contents(LOGERRORFILE, $data, FILE_APPEND);
         }
     }

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

Spacing +2 added lines, -2 removed lines

@@ -114,7 +114,7 @@ 
         if ($this->isAuthUserInSpecialLogUsers) {
             return true;
         }
-        if($this->IsUserInSpecialLogUsers($this->GetAuthUser())){
+        if ($this->IsUserInSpecialLogUsers($this->GetAuthUser())) {
             $this->isAuthUserInSpecialLogUsers = true;
             return true;
         }
@@ -303,7 +303,7 @@ 
             $s = " ";
         else
             $s = "";
-        switch($loglevel) {
+        switch ($loglevel) {
             case LOGLEVEL_OFF:          return ""; break;
             case LOGLEVEL_FATAL:        return "[FATAL]"; break;
             case LOGLEVEL_ERROR:        return "[ERROR]"; break;

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

Spacing +9 added lines, -9 removed lines

@@ -104,17 +104,17 @@ 
             if (!isset($trace['file'])) {
                 continue;
             }
-            if (strpos($trace['file'], REAL_BASE_PATH . 'backend/') !== false) {
+            if (strpos($trace['file'], REAL_BASE_PATH.'backend/') !== false) {
                 preg_match('/\/backend\/([a-zA-Z]*)/', $trace['file'], $match);
                 if (isset($match[1])) {
-                    return $this->GetProgramName() . '/' . $match[1];
+                    return $this->GetProgramName().'/'.$match[1];
                 }
             } elseif (basename($trace['file'], '.php') != 'zlog') {
-                return $this->GetProgramName() . '/core';
+                return $this->GetProgramName().'/core';
             }
         }
 
-        return $this->GetProgramName() . '/core';
+        return $this->GetProgramName().'/core';
     }
 
     /**
@@ -152,15 +152,15 @@ 
         $log = $this->GetLogLevelString($loglevel); // Never pad syslog log because syslog log are usually read with a software.
         // when the users differ, we need to log both
         if (strcasecmp($this->GetAuthUser(), $this->GetUser()) == 0) {
-            $log .= ' ['. $this->GetUser() .']';
+            $log .= ' ['.$this->GetUser().']';
         }
         else {
-            $log .= ' ['. $this->GetAuthUser() . Request::IMPERSONATE_DELIM . $this->GetUser() .']';
+            $log .= ' ['.$this->GetAuthUser().Request::IMPERSONATE_DELIM.$this->GetUser().']';
         }
         if ($loglevel >= LOGLEVEL_DEVICEID) {
-            $log .= '['. $this->GetDevid() .']';
+            $log .= '['.$this->GetDevid().']';
         }
-        $log .= ' ' . $message;
+        $log .= ' '.$message;
         return $log;
     }
 
@@ -184,7 +184,7 @@ 
             $pri = ($facility * 8) + $loglevel; // multiplying the Facility number by 8 + adding the level
             $data = $this->BuildLogString($loglevel, $message);
             if (strlen(trim($data)) > 0) {
-                $syslog_message = "<{$pri}>" . date('M d H:i:s ') . '[' . $this->GetProgramName() . ']: ' . $data;
+                $syslog_message = "<{$pri}>".date('M d H:i:s ').'['.$this->GetProgramName().']: '.$data;
                 socket_sendto($sock, $syslog_message, strlen($syslog_message), 0, $this->GetHost(), $this->GetPort());
             }
             socket_close($sock);

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

Indentation +1 added lines, -1 removed lines

@@ -264,7 +264,7 @@
      * @access public
      * @return int
      */
-     public function GetChangeCount() {
+        public function GetChangeCount() {
         if ($this->exporter)
             return mapi_exportchanges_getchangecount($this->exporter);
         else

Spacing +23 added lines, -23 removed lines

@@ -15,7 +15,7 @@ 
  * that the ImportProxies are used.
  */
 
-class ExportChangesICS implements IExportChanges{
+class ExportChangesICS implements IExportChanges {
     private $folderid;
     private $store;
     private $session;
@@ -45,7 +45,7 @@ 
         $this->restriction = false;
 
         try {
-            if($folderid) {
+            if ($folderid) {
                 $entryid = mapi_msgstore_entryidfromsourcekey($store, $folderid);
             }
             else {
@@ -69,10 +69,10 @@ 
             // Get the actual ICS exporter
             if ($folder) {
                 if ($folderid) {
-                    $this->exporter = mapi_openproperty($folder, PR_CONTENTS_SYNCHRONIZER, IID_IExchangeExportChanges, 0 , 0);
+                    $this->exporter = mapi_openproperty($folder, PR_CONTENTS_SYNCHRONIZER, IID_IExchangeExportChanges, 0, 0);
                 }
                 else {
-                    $this->exporter = mapi_openproperty($folder, PR_HIERARCHY_SYNCHRONIZER, IID_IExchangeExportChanges, 0 , 0);
+                    $this->exporter = mapi_openproperty($folder, PR_HIERARCHY_SYNCHRONIZER, IID_IExchangeExportChanges, 0, 0);
                 }
             }
             else {
@@ -106,27 +106,27 @@ 
             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) {
-            $this->exporterflags |= SYNC_NORMAL | SYNC_READ_STATE;
+        if ($this->folderid) {
+            $this->exporterflags |= SYNC_NORMAL|SYNC_READ_STATE;
 
             // Initial sync, we don't want deleted items. If the initial sync is chunked
             // 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 (strlen($state) == 0 || bin2hex(substr($state, 4, 4)) == "00000000") {
                 if (!($this->flags & BACKEND_DISCARD_DATA))
                     ZLog::Write(LOGLEVEL_DEBUG, "ExportChangesICS->Config(): syncing initial data");
-                $this->exporterflags |= SYNC_NO_SOFT_DELETIONS | SYNC_NO_DELETIONS;
+                $this->exporterflags |= SYNC_NO_SOFT_DELETIONS|SYNC_NO_DELETIONS;
             }
         }
 
-        if($this->flags & BACKEND_DISCARD_DATA) {
+        if ($this->flags & BACKEND_DISCARD_DATA) {
             $this->exporterflags |= SYNC_CATCHUP;
             $this->exporterflags |= SYNC_STATE_READONLY;
         }
 
         // Put the state information in a stream that can be used by ICS
         $stream = mapi_stream_create();
-        if(strlen($state) == 0)
+        if (strlen($state) == 0)
             $state = hex2bin("0000000000000000");
 
         if (!($this->flags & BACKEND_DISCARD_DATA))
@@ -145,9 +145,9 @@ 
      * @return boolean
      * @throws StatusException
      */
-    public function ConfigContentParameters($contentparameters){
+    public function ConfigContentParameters($contentparameters) {
         $filtertype = $contentparameters->GetFilterType();
-        switch($contentparameters->GetContentClass()) {
+        switch ($contentparameters->GetContentClass()) {
             case "Email":
                 $this->restriction = ($filtertype || !Utils::CheckMapiExtVersion('7')) ? MAPIUtils::GetEmailRestriction(Utils::GetCutOffDate($filtertype)) : false;
                 break;
@@ -182,15 +182,15 @@ 
         // pass it to ICS
 
         // this should never happen!
-        if($this->exporter === false || !isset($this->statestream) || !isset($this->flags) || !isset($this->exporterflags) ||
-            ($this->folderid && !isset($this->contentParameters)) )
+        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);
 
         // PHP wrapper
         $phpwrapper = new PHPWrapper($this->session, $this->store, $importer, $this->folderid);
 
         // with a folderid we are going to get content
-        if($this->folderid) {
+        if ($this->folderid) {
             $phpwrapper->ConfigContentParameters($this->contentParameters);
 
             // ICS c++ wrapper
@@ -206,12 +206,12 @@ 
             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)
+        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,18 +238,18 @@ 
      */
     public function GetState() {
         $error = false;
-        if(!isset($this->statestream) || $this->exporter === false)
+        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) {
+        while (true) {
             $data = mapi_stream_read($this->statestream, 4096);
-            if(strlen($data))
+            if (strlen($data))
                 $state .= $data;
             else
                 break;

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

Indentation +28 added lines, -29 removed lines

@@ -899,11 +899,11 @@ 
             $items = $meetingrequest->findCalendarItems($goid);
 
             if (is_array($items)) {
-               $newitem = mapi_msgstore_openentry($this->store, $items[0]);
-               $newprops = mapi_getprops($newitem, array(PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY));
-               $calendarid = bin2hex($newprops[PR_SOURCE_KEY]);
-               $calFolderId = bin2hex($newprops[PR_PARENT_SOURCE_KEY]);
-               ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): found other calendar entryid", $requestid, $folderid, $response));
+                $newitem = mapi_msgstore_openentry($this->store, $items[0]);
+                $newprops = mapi_getprops($newitem, array(PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY));
+                $calendarid = bin2hex($newprops[PR_SOURCE_KEY]);
+                $calFolderId = bin2hex($newprops[PR_PARENT_SOURCE_KEY]);
+                ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->MeetingResponse('%s','%s', '%s'): found other calendar entryid", $requestid, $folderid, $response));
             }
 
             if ($requestid == $calendarid)
@@ -1319,12 +1319,12 @@ 
     }
 
     /**
-    * Terminates a search for a given PID
-    *
-    * @param int $pid
-    *
-    * @return boolean
-    */
+     * Terminates a search for a given PID
+     *
+     * @param int $pid
+     *
+     * @return boolean
+     */
     public function TerminateSearch($pid) {
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->TerminateSearch(): terminating search for pid %d", $pid));
         if (!isset($this->store) || $this->store === false) {
@@ -1829,7 +1829,6 @@ 
      * @param string    $type               the state type
      * @param string    $key                (opt)
      * @param string    $counter            state counter
-
      *
      * @access private
      * @return MAPIMessage
@@ -2021,7 +2020,7 @@ 
         // 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];
+            return  $this->storeCache[$user];
 
         $entryid = false;
         $return_public = false;
@@ -2352,14 +2351,14 @@ 
         }
     }
 
-   /**
-    * Function will create a search folder in FINDER_ROOT folder
-    * if folder exists then it will open it
-    *
-    * @see createSearchFolder($store, $openIfExists = true) function in the webaccess
-    *
-    * @return mapiFolderObject $folder created search folder
-    */
+    /**
+     * Function will create a search folder in FINDER_ROOT folder
+     * if folder exists then it will open it
+     *
+     * @see createSearchFolder($store, $openIfExists = true) function in the webaccess
+     *
+     * @return mapiFolderObject $folder created search folder
+     */
     private function getSearchFolder() {
         // create new or open existing search folder
         $searchFolderRoot = $this->getSearchFoldersRoot($this->store);
@@ -2377,14 +2376,14 @@ 
         return false;
     }
 
-   /**
-    * Function will open FINDER_ROOT folder in root container
-    * public folder's don't have FINDER_ROOT folder
-    *
-    * @see getSearchFoldersRoot($store) function in the webaccess
-    *
-    * @return mapiFolderObject root folder for search folders
-    */
+    /**
+     * Function will open FINDER_ROOT folder in root container
+     * public folder's don't have FINDER_ROOT folder
+     *
+     * @see getSearchFoldersRoot($store) function in the webaccess
+     *
+     * @return mapiFolderObject root folder for search folders
+     */
     private function getSearchFoldersRoot() {
         // check if we can create search folders
         $storeProps = mapi_getprops($this->store, array(PR_STORE_SUPPORT_MASK, PR_FINDER_ENTRYID));

Spacing +92 added lines, -93 removed lines

@@ -143,10 +143,10 @@ 
 
         try {
             // check if notifications are available in php-mapi
-            if(function_exists('mapi_feature') && mapi_feature('LOGONFLAGS')) {
+            if (function_exists('mapi_feature') && mapi_feature('LOGONFLAGS')) {
                 // send grommunio-sync version and user agent to ZCP - ZP-589
                 if (Utils::CheckMapiExtVersion('7.2.0')) {
-                    $zpush_version = 'Grommunio-Sync_' . @constant('GROMMUNIOSYNC_VERSION');
+                    $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);
                 }
@@ -171,7 +171,7 @@ 
             throw new AuthenticationRequiredException($ex->getDisplayMessage());
         }
 
-        if(!$this->session) {
+        if (!$this->session) {
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Logon(): logon failed for user '%s'", $this->mainUser));
             $this->defaultstore = false;
             return false;
@@ -189,7 +189,7 @@ 
         if (mapi_last_hresult() == MAPI_E_FAILONEPROVIDER)
             throw new ServiceUnavailableException("Error connecting to KC (open store)");
 
-        if($this->defaultstore === false)
+        if ($this->defaultstore === false)
             throw new AuthenticationRequiredException(sprintf("Grommunio->Logon(): User '%s' has no default store", $defaultUser));
 
         $this->store = $this->defaultstore;
@@ -266,7 +266,7 @@ 
                         }
                         else {
                             $zarafauserinfo = @nsp_getuserinfo($this->mainUser);
-                            $rights = (isset($zarafauserinfo['admin']) && $zarafauserinfo['admin'])?true:false;
+                            $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)));
                         }
                     }
@@ -336,7 +336,7 @@ 
 
         $rootfolderprops = mapi_getprops($rootfolder, array(PR_SOURCE_KEY));
 
-        $hierarchy =  mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
+        $hierarchy = mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
         $rows = mapi_table_queryallrows($hierarchy, array(PR_DISPLAY_NAME, PR_PARENT_ENTRYID, PR_ENTRYID, PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY, PR_CONTAINER_CLASS, PR_ATTR_HIDDEN, PR_EXTENDED_FOLDER_FLAGS, PR_FOLDER_TYPE));
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetHierarchy(): fetched %d folders from MAPI", count($rows)));
 
@@ -382,7 +382,7 @@ 
      */
     public function GetImporter($folderid = false) {
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetImporter() folderid: '%s'", Utils::PrintAsString($folderid)));
-        if($folderid !== false) {
+        if ($folderid !== false) {
             // check if the user of the current store has permissions to import to this folderid
             if ($this->storeName != $this->mainUser && !$this->hasSecretaryACLs($this->store, $folderid)) {
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetImporter(): missing permissions on folderid: '%s'.", Utils::PrintAsString($folderid)));
@@ -405,7 +405,7 @@ 
      * @throws StatusException
      */
     public function GetExporter($folderid = false) {
-        if($folderid !== false) {
+        if ($folderid !== false) {
             // check if the user of the current store has permissions to export from this folderid
             if ($this->storeName != $this->mainUser && !$this->hasSecretaryACLs($this->store, $folderid)) {
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetExporter(): missing permissions on folderid: '%s'.", Utils::PrintAsString($folderid)));
@@ -439,7 +439,7 @@ 
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->SendMail(): RFC822: %d bytes  forward-id: '%s' reply-id: '%s' parent-id: '%s' SaveInSent: '%s' ReplaceMIME: '%s'",
                                             $mimeLength, Utils::PrintAsString($sm->forwardflag), Utils::PrintAsString($sm->replyflag),
                                             Utils::PrintAsString((isset($sm->source->folderid) ? $sm->source->folderid : false)),
-                                            Utils::PrintAsString(($sm->saveinsent)), Utils::PrintAsString(isset($sm->replacemime)) ));
+                                            Utils::PrintAsString(($sm->saveinsent)), Utils::PrintAsString(isset($sm->replacemime))));
         if ($mimeLength == 0) {
             throw new StatusException("Grommunio->SendMail(): empty mail data", SYNC_COMMONSTATUS_MAILSUBMISSIONFAILED);
         }
@@ -449,10 +449,10 @@ 
 
         // Open the outbox and create the message there
         $storeprops = mapi_getprops($this->defaultstore, array($sendMailProps["outboxentryid"], $sendMailProps["ipmsentmailentryid"]));
-        if(isset($storeprops[$sendMailProps["outboxentryid"]]))
+        if (isset($storeprops[$sendMailProps["outboxentryid"]]))
             $outbox = mapi_msgstore_openentry($this->defaultstore, $storeprops[$sendMailProps["outboxentryid"]]);
 
-        if(!$outbox)
+        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);
@@ -504,10 +504,10 @@ 
         // which results in spooler not being able to send the message.
         // @see http://jira.zarafa.com/browse/ZP-85
         mapi_deleteprops($mapimessage,
-            array(  $sendMailProps["sentrepresentingname"], $sendMailProps["sentrepresentingemail"], $sendMailProps["representingentryid"],
+            array($sendMailProps["sentrepresentingname"], $sendMailProps["sentrepresentingemail"], $sendMailProps["representingentryid"],
                     $sendMailProps["sentrepresentingaddt"], $sendMailProps["sentrepresentinsrchk"]));
 
-        if(isset($sm->source->itemid) && $sm->source->itemid) {
+        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)))
@@ -548,7 +548,7 @@ 
                         $bodyHtml = MAPIUtils::readPropStream($mapimessage, PR_HTML);
                     }
                     $cpid = mapi_getprops($fwmessage, array($sendMailProps["internetcpid"]));
-                    if($sm->forwardflag) {
+                    if ($sm->forwardflag) {
                         // attach the original attachments to the outgoing message
                         $this->copyAttachments($mapimessage, $fwmessage);
                     }
@@ -628,7 +628,7 @@ 
      */
     public function Fetch($folderid, $id, $contentparameters) {
         // SEARCH fetches with folderid == false and PR_ENTRYID as ID
-        if (! $folderid) {
+        if (!$folderid) {
             $entryid = hex2bin($id);
             $sk = $id;
         }
@@ -639,12 +639,12 @@ 
             $entryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($folderid), hex2bin($sk));
 
         }
-        if(!$entryid)
+        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)
+        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
@@ -691,7 +691,7 @@ 
     public function GetAttachmentData($attname) {
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetAttachmentData('%s')", $attname));
 
-        if(!strpos($attname, ":"))
+        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);
@@ -701,12 +701,12 @@ 
 
         $entryid = hex2bin($id);
         $message = mapi_msgstore_openentry($this->store, $entryid);
-        if(!$message)
+        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)
+        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
@@ -723,7 +723,7 @@ 
         else
             $stream = mapi_openproperty($attach, PR_ATTACH_DATA_BIN, IID_IStream, 0, 0);
 
-        if(!$stream)
+        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
@@ -762,7 +762,7 @@ 
         if ($includeSubfolders)
             $flags = DEL_ASSOCIATED;
 
-        ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->EmptyFolder('%s','%s'): emptying folder",$folderid, Utils::PrintAsString($includeSubfolders)));
+        ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->EmptyFolder('%s','%s'): emptying folder", $folderid, Utils::PrintAsString($includeSubfolders)));
 
         // empty folder!
         mapi_folder_emptyfolder($folder, $flags);
@@ -792,7 +792,7 @@ 
             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)
+        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
@@ -834,10 +834,10 @@ 
 
         $meetingrequest = new Meetingrequest($this->store, $mapimessage, $this->session);
 
-        if(!$meetingrequest->isMeetingRequest())
+        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())
+        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
@@ -854,7 +854,7 @@ 
                 $sendresponse = true;
             }
         }
-        switch($response) {
+        switch ($response) {
             case 1:     // accept
             default:
                 $entryid = $meetingrequest->doAccept(false, $sendresponse, false, false, false, false, true); // last true is the $userAction
@@ -922,10 +922,10 @@ 
         if ($calFolderId) {
             $shortFolderId = ZPush::GetDeviceManager()->GetFolderIdForBackendId($calFolderId);
             if ($calFolderId != $shortFolderId) {
-                $prefix = $shortFolderId . ':';
+                $prefix = $shortFolderId.':';
             }
         }
-        return $prefix . $calendarid;
+        return $prefix.$calendarid;
     }
 
     /**
@@ -945,7 +945,7 @@ 
 
         $this->changesSink = @mapi_sink_create();
 
-        if (! $this->changesSink || mapi_last_hresult()) {
+        if (!$this->changesSink || mapi_last_hresult()) {
             ZLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->HasChangesSink(): sink could not be created with  0x%X", mapi_last_hresult()));
             return false;
         }
@@ -1280,7 +1280,7 @@ 
         }
         // if no folder was required then search in the entire store
         else {
-            $tmp = mapi_getprops($this->store, array(PR_ENTRYID,PR_DISPLAY_NAME,PR_IPM_SUBTREE_ENTRYID));
+            $tmp = mapi_getprops($this->store, array(PR_ENTRYID, PR_DISPLAY_NAME, PR_IPM_SUBTREE_ENTRYID));
             $searchFolders[] = $tmp[PR_IPM_SUBTREE_ENTRYID];
         }
         $items = array();
@@ -1297,15 +1297,14 @@ 
         // 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)
+            if (($searchcriteria["searchstate"] & SEARCH_REBUILD) == 0)
                 break; // Search is done
             sleep(1);
         }
 
         // if the search range is set limit the result to it, otherwise return all found messages
         $rows = (is_array($searchRange) && isset($searchRange[0], $searchRange[1])) ?
-            mapi_table_queryrows($table, array(PR_ENTRYID), $searchRange[0], $searchRange[1] - $searchRange[0] + 1) :
-            mapi_table_queryrows($table, array(PR_ENTRYID), 0, SEARCH_MAXRESULTS);
+            mapi_table_queryrows($table, array(PR_ENTRYID), $searchRange[0], $searchRange[1] - $searchRange[0] + 1) : mapi_table_queryrows($table, array(PR_ENTRYID), 0, SEARCH_MAXRESULTS);
 
         $cnt = count($rows);
         $items['searchtotal'] = $cnt;
@@ -1339,7 +1338,7 @@ 
         }
 
         $finderfolder = mapi_msgstore_openentry($this->store, $storeProps[PR_FINDER_ENTRYID]);
-        if(mapi_last_hresult() != NOERROR) {
+        if (mapi_last_hresult() != NOERROR) {
             ZLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->TerminateSearch(): Unable to open search folder (0x%X)", mapi_last_hresult()));
             return false;
         }
@@ -1356,7 +1355,7 @@ 
             TBL_BATCH);
 
         $folders = mapi_table_queryallrows($hierarchytable, array(PR_ENTRYID, PR_DISPLAY_NAME, PR_LAST_MODIFICATION_TIME));
-        foreach($folders as $folder) {
+        foreach ($folders as $folder) {
             mapi_folder_deletefolder($finderfolder, $folder[PR_ENTRYID]);
         }
         return true;
@@ -1485,20 +1484,20 @@ 
             // get the store
             $userstore = $this->openMessageStore($user);
             $rootfolder = mapi_msgstore_openentry($userstore);
-            $hierarchy =  mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
+            $hierarchy = mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
             $rows = mapi_table_queryallrows($hierarchy, array(PR_SOURCE_KEY, PR_LOCAL_COMMIT_TIME_MAX, PR_CONTENT_COUNT, PR_CONTENT_UNREAD, PR_DELETED_MSG_COUNT));
 
             if (count($rows) == 0) {
                 ZLog::Write(LOGLEVEL_INFO, sprintf("Grommunio->GetFolderStat(): could not access folder statistics for user '%s'. Probably missing 'read' permissions on the root folder! Folders of this store will be synchronized ONCE per hour only!", $user));
             }
 
-            foreach($rows as $folder) {
-                $commit_time = isset($folder[PR_LOCAL_COMMIT_TIME_MAX])? $folder[PR_LOCAL_COMMIT_TIME_MAX] : "0000000000";
-                $content_count = isset($folder[PR_CONTENT_COUNT])? $folder[PR_CONTENT_COUNT] : -1;
-                $content_unread = isset($folder[PR_CONTENT_UNREAD])? $folder[PR_CONTENT_UNREAD] : -1;
-                $content_deleted = isset($folder[PR_DELETED_MSG_COUNT])? $folder[PR_DELETED_MSG_COUNT] : -1;
+            foreach ($rows as $folder) {
+                $commit_time = isset($folder[PR_LOCAL_COMMIT_TIME_MAX]) ? $folder[PR_LOCAL_COMMIT_TIME_MAX] : "0000000000";
+                $content_count = isset($folder[PR_CONTENT_COUNT]) ? $folder[PR_CONTENT_COUNT] : -1;
+                $content_unread = isset($folder[PR_CONTENT_UNREAD]) ? $folder[PR_CONTENT_UNREAD] : -1;
+                $content_deleted = isset($folder[PR_DELETED_MSG_COUNT]) ? $folder[PR_DELETED_MSG_COUNT] : -1;
 
-                $this->folderStatCache[$user][bin2hex($folder[PR_SOURCE_KEY])] = $commit_time ."/". $content_count ."/". $content_unread ."/". $content_deleted;
+                $this->folderStatCache[$user][bin2hex($folder[PR_SOURCE_KEY])] = $commit_time."/".$content_count."/".$content_unread."/".$content_deleted;
             }
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetFolderStat() fetched status information of %d folders for store '%s'", count($this->folderStatCache[$user]), $user));
         }
@@ -1523,22 +1522,22 @@ 
         $userStoreInfo = new UserStoreInfo();
 
         $rootfolder = mapi_msgstore_openentry($this->store);
-        $hierarchy =  mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
+        $hierarchy = mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
         // Do not take hidden and system folders into account
         // TODO make this restriction generic and use for hierarchy?
         $restrict = array(RES_AND, array(
-                            array(  RES_PROPERTY,
-                                array(  RELOP => RELOP_NE,
+                            array(RES_PROPERTY,
+                                array(RELOP => RELOP_NE,
                                         ULPROPTAG => PR_ATTR_HIDDEN,
                                         VALUE => true),
                             ),
-                            array(  RES_PROPERTY,
-                                array(  RELOP => RELOP_EQ,
+                            array(RES_PROPERTY,
+                                array(RELOP => RELOP_EQ,
                                         ULPROPTAG => PR_FOLDER_TYPE,
                                         VALUE => FOLDER_GENERIC),
                             ),
-                            array(  RES_EXIST,
-                                array(  ULPROPTAG => PR_CONTAINER_CLASS),
+                            array(RES_EXIST,
+                                array(ULPROPTAG => PR_CONTAINER_CLASS),
                             ),
                         ));
         mapi_table_restrict($hierarchy, $restrict);
@@ -1665,7 +1664,7 @@ 
                 $devid));
             }
         }
-        $messageName = rtrim((($key !== false) ? $key."-" : "") . (($type !== "") ? $type : ""), "-");
+        $messageName = rtrim((($key !== false) ? $key."-" : "").(($type !== "") ? $type : ""), "-");
         $restriction = $this->getStateMessageRestriction($messageName, $counter, $thisCounterOnly);
         $stateFolderContents = mapi_folder_getcontentstable($this->stateFolder, MAPI_ASSOCIATED);
         if ($stateFolderContents) {
@@ -1675,7 +1674,7 @@ 
             if ($rowCnt > 0) {
                 $rows = mapi_table_queryallrows($stateFolderContents, [PR_ENTRYID]);
                 $entryids = [];
-                foreach($rows as $row) {
+                foreach ($rows as $row) {
                     $entryids[] = $row[PR_ENTRYID];
                 }
                 mapi_folder_deletemessages($this->stateFolder, $entryids, DELETE_HARD_DELETE);
@@ -1694,7 +1693,7 @@ 
      */
     public function LinkUserDevice($username, $devid) {
         $device = [$devid => time()];
-        $this->setDeviceUserData($this->type, $device, $username, -1, $subkey=-1, $doCas="merge");
+        $this->setDeviceUserData($this->type, $device, $username, -1, $subkey = -1, $doCas = "merge");
         return false;
     }
 
@@ -1843,7 +1842,7 @@ 
                 $devid));
             }
         }
-        $messageName = rtrim((($key !== false) ? $key."-" : "") . (($type !== "") ? $type : ""), "-");
+        $messageName = rtrim((($key !== false) ? $key."-" : "").(($type !== "") ? $type : ""), "-");
         $restriction = $this->getStateMessageRestriction($messageName, $counter, true);
         $stateFolderContents = mapi_folder_getcontentstable($this->stateFolder, MAPI_ASSOCIATED);
         if ($stateFolderContents) {
@@ -1853,7 +1852,7 @@ 
                 $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));
             }
         }
@@ -1886,17 +1885,17 @@ 
             $stateMessage = mapi_folder_createmessage($this->stateFolder, MAPI_ASSOCIATED);
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->setStateMessage(): mapi_folder_createmessage 0x%08X", mapi_last_hresult()));
 
-            $messageName = rtrim((($key !== false) ? $key."-" : "") . (($type !== "") ? $type : ""), "-");
+            $messageName = rtrim((($key !== false) ? $key."-" : "").(($type !== "") ? $type : ""), "-");
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->setStateMessage(): creating new state message '%s-%d'", $messageName, is_int($counter) ? $counter : 0));
             mapi_setprops($stateMessage, [PR_DISPLAY_NAME => $messageName, PR_MESSAGE_CLASS => 'IPM.Note.GrommunioState']);
         }
         if (isset($stateMessage)) {
-            $jsonEncodedState = is_object($state) || is_array($state) ? json_encode($state, JSON_INVALID_UTF8_IGNORE | JSON_UNESCAPED_UNICODE) : $state;
+            $jsonEncodedState = is_object($state) || is_array($state) ? json_encode($state, JSON_INVALID_UTF8_IGNORE|JSON_UNESCAPED_UNICODE) : $state;
 
             $encodedState = base64_encode($jsonEncodedState);
             $encodedStateLength = strlen($encodedState);
             mapi_setprops($stateMessage, [PR_LAST_VERB_EXECUTED => is_int($counter) ? $counter : 0]);
-            $stream = mapi_openproperty($stateMessage, PR_BODY, IID_IStream, STGM_DIRECT, MAPI_CREATE | MAPI_MODIFY);
+            $stream = mapi_openproperty($stateMessage, PR_BODY, IID_IStream, STGM_DIRECT, MAPI_CREATE|MAPI_MODIFY);
             mapi_stream_setsize($stream, $encodedStateLength);
             mapi_stream_write($stream, $encodedState);
             mapi_stream_commit($stream);
@@ -1917,14 +1916,14 @@ 
      */
     private function getStateFolderRestriction($folderName) {
         return [RES_AND, [
-            [   RES_PROPERTY,
-                [   RELOP => RELOP_EQ,
+            [RES_PROPERTY,
+                [RELOP => RELOP_EQ,
                     ULPROPTAG => PR_DISPLAY_NAME,
                     VALUE => $folderName
                 ],
             ],
-            [   RES_PROPERTY,
-                [   RELOP => RELOP_EQ,
+            [RES_PROPERTY,
+                [RELOP => RELOP_EQ,
                     ULPROPTAG => PR_ATTR_HIDDEN,
                     VALUE => true
                 ],
@@ -1944,20 +1943,20 @@ 
      */
     private function getStateMessageRestriction($messageName, $counter, $thisCounterOnly = false) {
         return [RES_AND, [
-            [   RES_PROPERTY,
-                [   RELOP => RELOP_EQ,
+            [RES_PROPERTY,
+                [RELOP => RELOP_EQ,
                     ULPROPTAG => PR_DISPLAY_NAME,
                     VALUE => $messageName
                 ],
             ],
-            [   RES_PROPERTY,
-                [   RELOP => RELOP_EQ,
+            [RES_PROPERTY,
+                [RELOP => RELOP_EQ,
                     ULPROPTAG => PR_MESSAGE_CLASS,
                     VALUE => 'IPM.Note.GrommunioState'
                 ],
             ],
-            [   RES_PROPERTY,
-                [   RELOP => $thisCounterOnly ? RELOP_EQ : RELOP_LT,
+            [RES_PROPERTY,
+                [RELOP => $thisCounterOnly ? RELOP_EQ : RELOP_LT,
                     ULPROPTAG => PR_LAST_VERB_EXECUTED,
                     VALUE => $counter
                 ],
@@ -1978,7 +1977,7 @@ 
      */
     private function getHierarchyHash() {
         $rootfolder = mapi_msgstore_openentry($this->defaultstore);
-        $hierarchy =  mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
+        $hierarchy = mapi_folder_gethierarchytable($rootfolder, CONVENIENT_DEPTH);
         return md5(serialize(mapi_table_queryallrows($hierarchy, array(PR_DISPLAY_NAME, PR_PARENT_ENTRYID))));
     }
 
@@ -1994,7 +1993,7 @@ 
     private function adviseStoreToSink($store) {
         // check if we already advised the store
         if (!in_array($store, $this->changesSinkStores)) {
-            mapi_msgstore_advise($store, null, fnevObjectModified | fnevObjectCreated | fnevObjectMoved | fnevObjectDeleted, $this->changesSink);
+            mapi_msgstore_advise($store, null, fnevObjectModified|fnevObjectCreated|fnevObjectMoved|fnevObjectDeleted, $this->changesSink);
 
             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()));
@@ -2035,11 +2034,11 @@ 
             $storestables = mapi_getmsgstorestable($this->session);
             $result = mapi_last_hresult();
 
-            if ($result == NOERROR){
+            if ($result == NOERROR) {
                 $rows = mapi_table_queryallrows($storestables, array(PR_ENTRYID, PR_DEFAULT_STORE, PR_MDB_PROVIDER));
 
-                foreach($rows as $row) {
-                    if(!$return_public && isset($row[PR_DEFAULT_STORE]) && $row[PR_DEFAULT_STORE] == true) {
+                foreach ($rows as $row) {
+                    if (!$return_public && isset($row[PR_DEFAULT_STORE]) && $row[PR_DEFAULT_STORE] == true) {
                         $entryid = $row[PR_ENTRYID];
                         break;
                     }
@@ -2053,7 +2052,7 @@ 
         else
             $entryid = @mapi_msgstore_createentryid($this->defaultstore, $user);
 
-        if($entryid) {
+        if ($entryid) {
             $store = @mapi_openmsgstore($this->session, $entryid);
 
             if (!$store) {
@@ -2065,7 +2064,7 @@ 
             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));
+            ZLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->openMessageStore('%s'): Found '%s' store: '%s'", $user, (($return_public) ? 'PUBLIC' : 'DEFAULT'), $store));
             return $store;
         }
         else {
@@ -2106,7 +2105,7 @@ 
             ($props[PR_RIGHTS] & ecRightsDeleteOwned) &&
             ($props[PR_RIGHTS] & ecRightsEditAny) &&
             ($props[PR_RIGHTS] & ecRightsDeleteAny) &&
-            ($props[PR_RIGHTS] & ecRightsFolderVisible) ) {
+            ($props[PR_RIGHTS] & ecRightsFolderVisible)) {
             return true;
         }
         return false;
@@ -2210,7 +2209,7 @@ 
                 }
             }
             if ($oof->oofstate == SYNC_SETTINGSOOF_TIMEBASED) {
-                if(isset($oof->starttime) && isset($oof->endtime)) {
+                if (isset($oof->starttime) && isset($oof->endtime)) {
                     $props[PR_EC_OUTOFOFFICE_FROM] = $oof->starttime;
                     $props[PR_EC_OUTOFOFFICE_UNTIL] = $oof->endtime;
                 }
@@ -2222,7 +2221,7 @@ 
                 $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);
         }
@@ -2309,7 +2308,7 @@ 
      * @return void
      */
     private function getImportanceAndPriority($xPriority, &$mapiprops, $sendMailProps) {
-        switch($xPriority) {
+        switch ($xPriority) {
             case 1:
             case 2:
                 $priority = PRIO_URGENT;
@@ -2342,8 +2341,8 @@ 
         $attachtable = mapi_message_getattachmenttable($fromMessage);
         $rows = mapi_table_queryallrows($attachtable, array(PR_ATTACH_NUM));
 
-        foreach($rows as $row) {
-            if(isset($row[PR_ATTACH_NUM])) {
+        foreach ($rows as $row) {
+            if (isset($row[PR_ATTACH_NUM])) {
                 $attach = mapi_message_openattach($fromMessage, $row[PR_ATTACH_NUM]);
                 $newattach = mapi_message_createattach($toMessage);
                 mapi_copyto($attach, array(), array(), $newattach, 0);
@@ -2363,7 +2362,7 @@ 
     private function getSearchFolder() {
         // create new or open existing search folder
         $searchFolderRoot = $this->getSearchFoldersRoot($this->store);
-        if($searchFolderRoot === false) {
+        if ($searchFolderRoot === false) {
             // error in finding search root folder
             // or store doesn't support search folders
             return false;
@@ -2371,7 +2370,7 @@ 
 
         $searchFolder = $this->createSearchFolder($searchFolderRoot);
 
-        if($searchFolder !== false && mapi_last_hresult() == NOERROR) {
+        if ($searchFolder !== false && mapi_last_hresult() == NOERROR) {
             return $searchFolder;
         }
         return false;
@@ -2388,14 +2387,14 @@ 
     private function getSearchFoldersRoot() {
         // check if we can create search folders
         $storeProps = mapi_getprops($this->store, array(PR_STORE_SUPPORT_MASK, PR_FINDER_ENTRYID));
-        if(($storeProps[PR_STORE_SUPPORT_MASK] & STORE_SEARCH_OK) != STORE_SEARCH_OK) {
+        if (($storeProps[PR_STORE_SUPPORT_MASK] & STORE_SEARCH_OK) != STORE_SEARCH_OK) {
             ZLog::Write(LOGLEVEL_WARN, "Grommunio->getSearchFoldersRoot(): Store doesn't support search folders. Public store doesn't have FINDER_ROOT folder");
             return false;
         }
 
         // open search folders root
         $searchRootFolder = mapi_msgstore_openentry($this->store, $storeProps[PR_FINDER_ENTRYID]);
-        if(mapi_last_hresult() != NOERROR) {
+        if (mapi_last_hresult() != NOERROR) {
             ZLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->getSearchFoldersRoot(): Unable to open search folder (0x%X)", mapi_last_hresult()));
             return false;
         }
@@ -2445,17 +2444,17 @@ 
         $searchGreater = strtotime($cpo->GetSearchValueGreater());
         $searchLess = strtotime($cpo->GetSearchValueLess());
 
-        if (version_compare(phpversion(),'5.3.4') < 0) {
+        if (version_compare(phpversion(), '5.3.4') < 0) {
             ZLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->getSearchRestriction(): Your system's PHP version (%s) might not correctly process unicode strings. Search containing such characters might not return correct results. It is recommended to update to at least PHP 5.3.4. See ZP-541 for more information.", phpversion()));
         }
         // split the search on whitespache and look for every word
         $searchText = preg_split("/\W+/u", $searchText);
         $searchProps = array(PR_BODY, PR_SUBJECT, PR_DISPLAY_TO, PR_DISPLAY_CC, PR_SENDER_NAME, PR_SENDER_EMAIL_ADDRESS, PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_EMAIL_ADDRESS);
         $resAnd = array();
-        foreach($searchText as $term) {
+        foreach ($searchText as $term) {
             $resOr = array();
 
-            foreach($searchProps as $property) {
+            foreach ($searchProps as $property) {
                 array_push($resOr,
                     array(RES_CONTENT,
                         array(
@@ -2617,7 +2616,7 @@ 
         $contactfolder = mapi_msgstore_openentry($this->defaultstore, $rootprops[PR_IPM_CONTACT_ENTRYID]);
         $subfolders = MAPIUtils::GetSubfoldersForType($contactfolder, "IPF.Contact");
         if ($subfolders !== false) {
-            foreach($subfolders as $folder) {
+            foreach ($subfolders as $folder) {
                 $contacts = $this->getContactsFromFolder($this->defaultstore, $folder[PR_ENTRYID], $to);
                 if ($contacts !== false) {
                     ZLog::Write(LOGLEVEL_WBXML, sprintf("Grommunio->resolveRecipientContact(): Found %d contacts in contacts' subfolder.", count($contacts)));
@@ -2632,9 +2631,9 @@ 
         $storestables = mapi_getmsgstorestable($this->session);
         $result = mapi_last_hresult();
 
-        if ($result == NOERROR){
+        if ($result == NOERROR) {
             $rows = mapi_table_queryallrows($storestables, array(PR_ENTRYID, PR_DEFAULT_STORE, PR_MDB_PROVIDER));
-            foreach($rows as $row) {
+            foreach ($rows as $row) {
                 if (isset($row[PR_MDB_PROVIDER]) && $row[PR_MDB_PROVIDER] == ZARAFA_STORE_PUBLIC_GUID) {
                     // TODO refactor public store
                     $publicstore = mapi_openmsgstore($this->session, $row[PR_ENTRYID]);
@@ -2642,7 +2641,7 @@ 
 
                     $subfolders = MAPIUtils::GetSubfoldersForType($publicfolder, "IPF.Contact");
                     if ($subfolders !== false) {
-                        foreach($subfolders as $folder) {
+                        foreach ($subfolders as $folder) {
                             $contacts = $this->getContactsFromFolder($publicstore, $folder[PR_ENTRYID], $to);
                             if ($contacts !== false) {
                                 ZLog::Write(LOGLEVEL_WBXML, sprintf("Grommunio->resolveRecipientContact(): Found %d contacts in public contacts folder.", count($contacts)));
@@ -2685,7 +2684,7 @@ 
             return $cert;
         }
         $cert->status = SYNC_RESOLVERECIPSSTATUS_SUCCESS;
-        $cert->certificatecount = count ($certificates);
+        $cert->certificatecount = count($certificates);
         $cert->recipientcount = $recipientCount;
         $cert->certificate = array();
         foreach ($certificates as $certificate) {
@@ -2851,7 +2850,7 @@ 
             $mobileDisabled = in_array(self::MOBILE_ENABLED, $enabledFeatures[PR_EC_DISABLED_FEATURES]);
             $deviceId = Request::GetDeviceID();
             // Checks for deviceId present in zarafaDisabledFeatures LDAP array attribute. Check is performed case insensitive.
-            $deviceIdDisabled = ( ($deviceId !==null) && in_array($deviceId, array_map('strtolower', $enabledFeatures[PR_EC_DISABLED_FEATURES])) )? true : false;
+            $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.");
             }

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

Indentation +78 added lines, -78 removed lines

@@ -25,11 +25,11 @@ 
     public static function GetEmailRestriction($timestamp) {
         // ATTENTION: ON CHANGING THIS RESTRICTION, MAPIUtils::IsInEmailSyncInterval() also needs to be changed
         $restriction = array ( RES_PROPERTY,
-                          array (   RELOP => RELOP_GE,
+                            array (   RELOP => RELOP_GE,
                                     ULPROPTAG => PR_MESSAGE_DELIVERY_TIME,
                                     VALUE => $timestamp
-                          )
-                      );
+                            )
+                        );
 
         return $restriction;
     }
@@ -56,80 +56,80 @@ 
 
         // ATTENTION: ON CHANGING THIS RESTRICTION, MAPIUtils::IsInCalendarSyncInterval() also needs to be changed
         $restriction = Array(RES_OR,
-             Array(
-                   // OR
-                   // item.end > window.start && item.start < window.end
-                   Array(RES_AND,
-                         Array(
-                               Array(RES_PROPERTY,
-                                     Array(RELOP => RELOP_LE,
-                                           ULPROPTAG => $props["starttime"],
-                                           VALUE => $end
-                                           )
-                                     ),
-                               Array(RES_PROPERTY,
-                                     Array(RELOP => RELOP_GE,
-                                           ULPROPTAG => $props["endtime"],
-                                           VALUE => $start
-                                           )
-                                     )
-                               )
-                         ),
-                   // OR
-                   Array(RES_OR,
-                         Array(
-                               // OR
-                               // (EXIST(recurrence_enddate_property) && item[isRecurring] == true && recurrence_enddate_property >= start)
-                               Array(RES_AND,
-                                     Array(
-                                           Array(RES_EXIST,
-                                                 Array(ULPROPTAG => $props["recurrenceend"],
-                                                       )
-                                                 ),
-                                           Array(RES_PROPERTY,
-                                                 Array(RELOP => RELOP_EQ,
-                                                       ULPROPTAG => $props["isrecurring"],
-                                                       VALUE => true
-                                                       )
-                                                 ),
-                                           Array(RES_PROPERTY,
-                                                 Array(RELOP => RELOP_GE,
-                                                       ULPROPTAG => $props["recurrenceend"],
-                                                       VALUE => $start
-                                                       )
-                                                 )
-                                           )
-                                     ),
-                               // OR
-                               // (!EXIST(recurrence_enddate_property) && item[isRecurring] == true && item[start] <= end)
-                               Array(RES_AND,
-                                     Array(
-                                           Array(RES_NOT,
-                                                 Array(
-                                                       Array(RES_EXIST,
-                                                             Array(ULPROPTAG => $props["recurrenceend"]
-                                                                   )
-                                                             )
-                                                       )
-                                                 ),
-                                           Array(RES_PROPERTY,
-                                                 Array(RELOP => RELOP_LE,
-                                                       ULPROPTAG => $props["starttime"],
-                                                       VALUE => $end
-                                                       )
-                                                 ),
-                                           Array(RES_PROPERTY,
-                                                 Array(RELOP => RELOP_EQ,
-                                                       ULPROPTAG => $props["isrecurring"],
-                                                       VALUE => true
-                                                       )
-                                                 )
-                                           )
-                                     )
-                               )
-                         ) // EXISTS OR
-                   )
-             );        // global OR
+                Array(
+                    // OR
+                    // item.end > window.start && item.start < window.end
+                    Array(RES_AND,
+                            Array(
+                                Array(RES_PROPERTY,
+                                        Array(RELOP => RELOP_LE,
+                                            ULPROPTAG => $props["starttime"],
+                                            VALUE => $end
+                                            )
+                                        ),
+                                Array(RES_PROPERTY,
+                                        Array(RELOP => RELOP_GE,
+                                            ULPROPTAG => $props["endtime"],
+                                            VALUE => $start
+                                            )
+                                        )
+                                )
+                            ),
+                    // OR
+                    Array(RES_OR,
+                            Array(
+                                // OR
+                                // (EXIST(recurrence_enddate_property) && item[isRecurring] == true && recurrence_enddate_property >= start)
+                                Array(RES_AND,
+                                        Array(
+                                            Array(RES_EXIST,
+                                                    Array(ULPROPTAG => $props["recurrenceend"],
+                                                        )
+                                                    ),
+                                            Array(RES_PROPERTY,
+                                                    Array(RELOP => RELOP_EQ,
+                                                        ULPROPTAG => $props["isrecurring"],
+                                                        VALUE => true
+                                                        )
+                                                    ),
+                                            Array(RES_PROPERTY,
+                                                    Array(RELOP => RELOP_GE,
+                                                        ULPROPTAG => $props["recurrenceend"],
+                                                        VALUE => $start
+                                                        )
+                                                    )
+                                            )
+                                        ),
+                                // OR
+                                // (!EXIST(recurrence_enddate_property) && item[isRecurring] == true && item[start] <= end)
+                                Array(RES_AND,
+                                        Array(
+                                            Array(RES_NOT,
+                                                    Array(
+                                                        Array(RES_EXIST,
+                                                                Array(ULPROPTAG => $props["recurrenceend"]
+                                                                    )
+                                                                )
+                                                        )
+                                                    ),
+                                            Array(RES_PROPERTY,
+                                                    Array(RELOP => RELOP_LE,
+                                                        ULPROPTAG => $props["starttime"],
+                                                        VALUE => $end
+                                                        )
+                                                    ),
+                                            Array(RES_PROPERTY,
+                                                    Array(RELOP => RELOP_EQ,
+                                                        ULPROPTAG => $props["isrecurring"],
+                                                        VALUE => true
+                                                        )
+                                                    )
+                                            )
+                                        )
+                                )
+                            ) // EXISTS OR
+                    )
+                );        // global OR
 
         return $restriction;
     }
@@ -325,7 +325,7 @@ 
                     //(!EXIST(recurrence_enddate_property) && item[isRecurring] == true && item[start] <= end)
                     !isset($p[$props["recurrenceend"]]) && $p[$props["isrecurring"]] == true && $p[$props["starttime"]] <= $end
                 )
-           ) {
+            ) {
             ZLog::Write(LOGLEVEL_DEBUG, "MAPIUtils->IsInCalendarSyncInterval: Message is in the synchronization interval");
             return true;
         }

Spacing +73 added lines, -73 removed lines

@@ -24,8 +24,8 @@ 
      */
     public static function GetEmailRestriction($timestamp) {
         // ATTENTION: ON CHANGING THIS RESTRICTION, MAPIUtils::IsInEmailSyncInterval() also needs to be changed
-        $restriction = array ( RES_PROPERTY,
-                          array (   RELOP => RELOP_GE,
+        $restriction = array(RES_PROPERTY,
+                          array(RELOP => RELOP_GE,
                                     ULPROPTAG => PR_MESSAGE_DELIVERY_TIME,
                                     VALUE => $timestamp
                           )
@@ -129,7 +129,7 @@ 
                                )
                          ) // EXISTS OR
                    )
-             );        // global OR
+             ); // global OR
 
         return $restriction;
     }
@@ -142,8 +142,8 @@ 
      * @return array
      */
     public static function GetContactPicRestriction() {
-        return array ( RES_PROPERTY,
-                        array (
+        return array(RES_PROPERTY,
+                        array(
                             RELOP => RELOP_EQ,
                             ULPROPTAG => mapi_prop_tag(PT_BOOLEAN, 0x7FFF),
                             VALUE => true
@@ -165,13 +165,13 @@ 
                     array(
                         array(RES_OR,
                             array(
-                                array(RES_CONTENT, array(FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE, ULPROPTAG => PR_DISPLAY_NAME, VALUE => $query)),
-                                array(RES_CONTENT, array(FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE, ULPROPTAG => PR_ACCOUNT, VALUE => $query)),
-                                array(RES_CONTENT, array(FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE, ULPROPTAG => PR_SMTP_ADDRESS, VALUE => $query)),
+                                array(RES_CONTENT, array(FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE, ULPROPTAG => PR_DISPLAY_NAME, VALUE => $query)),
+                                array(RES_CONTENT, array(FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE, ULPROPTAG => PR_ACCOUNT, VALUE => $query)),
+                                array(RES_CONTENT, array(FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE, ULPROPTAG => PR_SMTP_ADDRESS, VALUE => $query)),
                             ), // RES_OR
                         ),
                         array(RES_OR,
-                            array (
+                            array(
                                 array(
                                         RES_PROPERTY,
                                         array(RELOP => RELOP_EQ, ULPROPTAG => PR_OBJECT_TYPE, VALUE => MAPI_MAILUSER)
@@ -202,20 +202,20 @@ 
 
         return array(RES_OR,
                     array(
-                        array(  RES_PROPERTY,
-                                array(  RELOP => RELOP_EQ,
+                        array(RES_PROPERTY,
+                                array(RELOP => RELOP_EQ,
                                         ULPROPTAG => $props['emailaddress1'],
                                         VALUE => array($props['emailaddress1'] => $email),
                                 ),
                         ),
-                        array(  RES_PROPERTY,
-                                array(  RELOP => RELOP_EQ,
+                        array(RES_PROPERTY,
+                                array(RELOP => RELOP_EQ,
                                         ULPROPTAG => $props['emailaddress2'],
                                         VALUE => array($props['emailaddress2'] => $email),
                                 ),
                         ),
-                        array(  RES_PROPERTY,
-                                array(  RELOP => RELOP_EQ,
+                        array(RES_PROPERTY,
+                                array(RELOP => RELOP_EQ,
                                         ULPROPTAG => $props['emailaddress3'],
                                         VALUE => array($props['emailaddress3'] => $email),
                                 ),
@@ -233,8 +233,8 @@ 
      * @return array
      */
     public static function GetFolderTypeRestriction($foldertype) {
-        return array(   RES_PROPERTY,
-                        array(  RELOP => RELOP_EQ,
+        return array(RES_PROPERTY,
+                        array(RELOP => RELOP_EQ,
                                 ULPROPTAG => PR_CONTAINER_CLASS,
                                 VALUE => array(PR_CONTAINER_CLASS => $foldertype)
                         ),
@@ -384,9 +384,9 @@ 
         }
         $data = "";
         $string = "";
-        while(1) {
+        while (1) {
             $data = mapi_stream_read($stream, 1024);
-            if(strlen($data) == 0)
+            if (strlen($data) == 0)
                 break;
             $string .= $data;
         }
@@ -462,8 +462,8 @@ 
     }
 
     public static function GetSignedAttachmentRestriction() {
-        return array(  RES_PROPERTY,
-            array(  RELOP => RELOP_EQ,
+        return array(RES_PROPERTY,
+            array(RELOP => RELOP_EQ,
                 ULPROPTAG => PR_ATTACH_MIME_TAG,
                 VALUE => array(PR_ATTACH_MIME_TAG => 'multipart/signed')
             ),
@@ -486,66 +486,66 @@ 
         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))
+                ($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_BODY]             == MAPI_E_NOT_ENOUGH_MEMORY) &&
-                        ($messageprops[PR_RTF_COMPRESSED]   == MAPI_E_NOT_FOUND) &&
-                        ($messageprops[PR_HTML]             == 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 ( // 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))
+                        ($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_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_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_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_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_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_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_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_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_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_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_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_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_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))
+                        ($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_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))
+                        ($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   || $messageprops[PR_HTML]            == MAPI_E_NOT_ENOUGH_MEMORY) &&
-                        ($messageprops[PR_BODY]             == MAPI_E_NOT_FOUND) &&
-                        ($messageprops[PR_RTF_COMPRESSED]   == MAPI_E_NOT_FOUND))
+                        ($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
                     return SYNC_BODYPREFERENCE_PLAIN;
@@ -563,8 +563,8 @@ 
      */
     public static function GetError($tag, $messageprops) {
         $prBodyError = mapi_prop_tag(PT_ERROR, mapi_prop_id($tag));
-        if(isset($messageprops[$prBodyError]) && mapi_is_error($messageprops[$prBodyError])) {
-            if($messageprops[$prBodyError] == MAPI_E_NOT_ENOUGH_MEMORY_32BIT ||
+        if (isset($messageprops[$prBodyError]) && mapi_is_error($messageprops[$prBodyError])) {
+            if ($messageprops[$prBodyError] == MAPI_E_NOT_ENOUGH_MEMORY_32BIT ||
                     $messageprops[$prBodyError] == MAPI_E_NOT_ENOUGH_MEMORY_64BIT) {
                         return MAPI_E_NOT_ENOUGH_MEMORY;
                     }
@@ -594,7 +594,7 @@ 
             $rows = mapi_table_queryallrows($attachTable, array(PR_ATTACH_MIME_TAG, PR_ATTACH_NUM));
             $attnum = false;
 
-            foreach($rows as $row) {
+            foreach ($rows as $row) {
                 if (isset($row[PR_ATTACH_MIME_TAG]) && $row[PR_ATTACH_MIME_TAG] == 'multipart/signed') {
                     $attnum = $row[PR_ATTACH_NUM];
                 }
@@ -617,7 +617,7 @@ 
                 PR_SENT_REPRESENTING_ENTRYID => $props[PR_SENT_REPRESENTING_ENTRYID],
                 PR_SENT_REPRESENTING_SEARCH_KEY => $props[PR_SENT_REPRESENTING_SEARCH_KEY],
                 // mark the message as read if the main message has read flag
-                PR_MESSAGE_FLAGS => $read ? $mprops[PR_MESSAGE_FLAGS] | MSGFLAG_READ : $mprops[PR_MESSAGE_FLAGS],
+                PR_MESSAGE_FLAGS => $read ? $mprops[PR_MESSAGE_FLAGS]|MSGFLAG_READ : $mprops[PR_MESSAGE_FLAGS],
             ));
         }
         // TODO check if we need to do this for encrypted (and signed?) message as well
@@ -689,13 +689,13 @@ 
         $entryId = strtoupper($entryid);
 
         $res = array(
-            'abFlags'   => '',  // BYTE[4],  4 bytes,  8 hex characters
-            'guid'      => '',  // GUID,    16 bytes, 32 hex characters
-            'version'   => '',  // ULONG,    4 bytes,  8 hex characters
-            'type'      => '',  // ULONG,    4 bytes,  8 hex characters
-            'id'        => '',  // ULONG,    4 bytes,  8 hex characters
-            'server'    => '',  // CHAR,    variable length
-            'padding'   => '',  // TCHAR[3], 4 bytes,  8 hex characters (upto 4 bytes)
+            'abFlags'   => '', // BYTE[4],  4 bytes,  8 hex characters
+            'guid'      => '', // GUID,    16 bytes, 32 hex characters
+            'version'   => '', // ULONG,    4 bytes,  8 hex characters
+            'type'      => '', // ULONG,    4 bytes,  8 hex characters
+            'id'        => '', // ULONG,    4 bytes,  8 hex characters
+            'server'    => '', // CHAR,    variable length
+            'padding'   => '', // TCHAR[3], 4 bytes,  8 hex characters (upto 4 bytes)
         );
 
         $res['length'] = strlen($entryId);
@@ -706,7 +706,7 @@ 
         $entryId = substr($entryId, 0, strlen($entryId) - strlen($res['padding']));
 
         $res['abFlags'] = substr($entryId, $offset, 8);
-        $offset =+ 8;
+        $offset = + 8;
 
         $res['guid'] = substr($entryId, $offset, 32);
         $offset += 32;
@@ -740,13 +740,13 @@ 
         $entryId = strtoupper($entryid);
 
         $res = array(
-            'abFlags'   => '',  // BYTE[4],  4 bytes,  8 hex characters
-            'guid'      => '',  // GUID,    16 bytes, 32 hex characters
-            'version'   => '',  // ULONG,    4 bytes,  8 hex characters
-            'type'      => '',  // ULONG,    4 bytes,  8 hex characters
-            'uniqueId'  => '',  // ULONG,   16 bytes,  32 hex characters
-            'server'    => '',  // CHAR,    variable length
-            'padding'   => '',  // TCHAR[3], 4 bytes,  8 hex characters (upto 4 bytes)
+            'abFlags'   => '', // BYTE[4],  4 bytes,  8 hex characters
+            'guid'      => '', // GUID,    16 bytes, 32 hex characters
+            'version'   => '', // ULONG,    4 bytes,  8 hex characters
+            'type'      => '', // ULONG,    4 bytes,  8 hex characters
+            'uniqueId'  => '', // ULONG,   16 bytes,  32 hex characters
+            'server'    => '', // CHAR,    variable length
+            'padding'   => '', // TCHAR[3], 4 bytes,  8 hex characters (upto 4 bytes)
         );
 
         $res['length'] = strlen($entryId);
@@ -757,7 +757,7 @@ 
         $entryId = substr($entryId, 0, strlen($entryId) - strlen($res['padding']));
 
         $res['abFlags'] = substr($entryId, $offset, 8);
-        $offset =+ 8;
+        $offset = + 8;
 
         $res['guid'] = substr($entryId, $offset, 32);
         $offset += 32;

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

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
             $folderidHex = bin2hex($folderid);
             $folderid = ZPush::GetDeviceManager()->GetFolderIdForBackendId($folderidHex);
             if ($folderid != $folderidHex) {
-                $this->prefix = $folderid . ':';
+                $this->prefix = $folderid.':';
             }
         }
     }
@@ -89,7 +89,7 @@ 
         $parentsourcekey = $props[PR_PARENT_SOURCE_KEY];
         $entryid = mapi_msgstore_entryidfromsourcekey($this->store, $parentsourcekey, $sourcekey);
 
-        if(!$entryid)
+        if (!$entryid)
             return SYNC_E_IGNORE;
 
         $mapimessage = mapi_msgstore_openentry($this->store, $entryid);
@@ -151,7 +151,7 @@ 
         $amount = count($sourcekeys);
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportMessageDeletion(): Received %d remove requests from ICS", $amount));
 
-        foreach($sourcekeys as $sourcekey) {
+        foreach ($sourcekeys as $sourcekey) {
             // TODO if we would know that ICS is removing the message because it's outside the sync interval, we could send a $asSoftDelete = true to the importer. Could they pass that via $flags?
             $this->importer->ImportMessageDeletion($this->prefix.bin2hex($sourcekey));
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportMessageDeletion(): delete for :'%s'", $this->prefix.bin2hex($sourcekey)));
@@ -167,7 +167,7 @@ 
      * @return
      */
     public function ImportPerUserReadStateChange($readstates) {
-        foreach($readstates as $readstate) {
+        foreach ($readstates as $readstate) {
             $this->importer->ImportMessageReadFlag($this->prefix.bin2hex($readstate["sourcekey"]), $readstate["flags"] & MSGFLAG_READ);
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportPerUserReadStateChange(): read for :'%s'", $this->prefix.bin2hex($readstate["sourcekey"])));
         }

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/mapimapping.php

Indentation +28 added lines, -28 removed lines

@@ -374,10 +374,10 @@ 
 
 
     /**
-    * Returns the MAPI to AS mapping for email todo flags
-    *
-    * @return array
-    */
+     * Returns the MAPI to AS mapping for email todo flags
+     *
+     * @return array
+     */
     public static function GetMailFlagsMapping() {
         return array (
             "flagstatus"            => PR_FLAG_STATUS,
@@ -398,12 +398,12 @@ 
 
 
     /**
-    * Returns email todo flags' specific MAPI properties
-    *
-    * @access public
-    *
-    * @return array
-    */
+     * Returns email todo flags' specific MAPI properties
+     *
+     * @access public
+     *
+     * @return array
+     */
     public static function GetMailFlagsProperties() {
         return array(
             "todoitemsflags"        => PR_TODO_ITEM_FLAGS,
@@ -419,12 +419,12 @@ 
 
 
     /**
-    * Returns the MAPI to AS mapping for notes
-    *
-    * @access public
-    *
-    * @return array
-    */
+     * Returns the MAPI to AS mapping for notes
+     *
+     * @access public
+     *
+     * @return array
+     */
     public static function GetNoteMapping() {
         return array(
             "categories"            => "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords",
@@ -438,12 +438,12 @@ 
 
 
     /**
-    * Returns note specific MAPI properties
-    *
-    * @access public
-    *
-    * @return array
-    */
+     * Returns note specific MAPI properties
+     *
+     * @access public
+     *
+     * @return array
+     */
     public static function GetNoteProperties() {
         return array(
             "body"                  => PR_BODY,
@@ -456,12 +456,12 @@ 
 
 
     /**
-    * Returns properties for sending an email
-    *
-    * @access public
-    *
-    * @return array
-    */
+     * Returns properties for sending an email
+     *
+     * @access public
+     *
+     * @return array
+     */
     public static function GetSendMailProperties() {
         return array(
                 "outboxentryid"         => PR_IPM_OUTBOX_ENTRYID,

Spacing +12 added lines, -12 removed lines

@@ -17,7 +17,7 @@ 
      * @return array
      */
     public static function GetContactMapping() {
-        return array (
+        return array(
             "anniversary"           => PR_WEDDING_ANNIVERSARY,
             "assistantname"         => PR_ASSISTANT,
             "assistnamephonenumber" => PR_ASSISTANT_TELEPHONE_NUMBER,
@@ -93,7 +93,7 @@ 
      * @return array
      */
     public static function GetContactProperties() {
-        return array (
+        return array(
             "haspic"                => "PT_BOOLEAN:PSETID_Address:0x8015",
             "emailaddress1"         => "PT_STRING8:PSETID_Address:0x8083",
             "emailaddressdname1"    => "PT_STRING8:PSETID_Address:0x8080",
@@ -134,7 +134,7 @@ 
      * @return array
      */
     public static function GetEmailMapping() {
-        return array (
+        return array(
             // from
             "datereceived"          => PR_MESSAGE_DELIVERY_TIME,
             "displayname"           => PR_SUBJECT,
@@ -164,7 +164,7 @@ 
      * @return array
      */
     public static function GetEmailProperties() {
-        return array (
+        return array(
             // Override 'From' to show "Full Name <user@domain.com>"
             "representingname"      => PR_SENT_REPRESENTING_NAME,
             "representingentryid"   => PR_SENT_REPRESENTING_ENTRYID,
@@ -187,7 +187,7 @@ 
      * @return array
      */
     public static function GetMeetingRequestMapping() {
-        return array (
+        return array(
             "responserequested"     => PR_RESPONSE_REQUESTED,
             // timezone
             "alldayevent"           => "PT_BOOLEAN:PSETID_Appointment:0x8215",
@@ -205,7 +205,7 @@ 
 
 
     public static function GetMeetingRequestProperties() {
-        return array (
+        return array(
             "goidtag"               => "PT_BINARY:PSETID_Meeting:0x3",
             "timezonetag"           => "PT_BINARY:PSETID_Appointment:0x8233",
             "recReplTime"           => "PT_SYSTIME:PSETID_Appointment:0x8228",
@@ -257,7 +257,7 @@ 
      * @return array
      */
     public static function GetAppointmentMapping() {
-        return array (
+        return array(
             "alldayevent"           => "PT_BOOLEAN:PSETID_Appointment:0x8215",
             "body"                  => PR_BODY,
             "busystatus"            => "PT_LONG:PSETID_Appointment:0x8205",
@@ -311,8 +311,8 @@ 
             "flagdueby"             => "PT_SYSTIME:PSETID_Common:0x8560",
             "icon"                  => PR_ICON_INDEX,
             "mrwassent"             => "PT_BOOLEAN:PSETID_Appointment:0x8229",
-            "endtime"               => "PT_SYSTIME:PSETID_Appointment:0x820e",//this is here for calendar restriction, tnef and ical
-            "starttime"             => "PT_SYSTIME:PSETID_Appointment:0x820d",//this is here for calendar restriction, tnef and ical
+            "endtime"               => "PT_SYSTIME:PSETID_Appointment:0x820e", //this is here for calendar restriction, tnef and ical
+            "starttime"             => "PT_SYSTIME:PSETID_Appointment:0x820d", //this is here for calendar restriction, tnef and ical
             "clipstart"             => "PT_SYSTIME:PSETID_Appointment:0x8235", //ical only
             "recurrencetype"        => "PT_LONG:PSETID_Appointment:0x8231",
             "body"                  => PR_BODY,
@@ -329,7 +329,7 @@ 
      * @return array
      */
     public static function GetTaskMapping() {
-        return array (
+        return array(
             "body"                  => PR_BODY,
             "categories"            => "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords",
             "complete"              => "PT_BOOLEAN:PSETID_Task:0x811C",
@@ -360,7 +360,7 @@ 
      * @return array
      */
     public static function GetTaskProperties() {
-        return array (
+        return array(
             "isrecurringtag"        => "PT_BOOLEAN:PSETID_Task:0x8126",
             "recurringstate"        => "PT_BINARY:PSETID_Task:0x8116",
             "deadoccur"             => "PT_BOOLEAN:PSETID_Task:0x8109",
@@ -379,7 +379,7 @@ 
     * @return array
     */
     public static function GetMailFlagsMapping() {
-        return array (
+        return array(
             "flagstatus"            => PR_FLAG_STATUS,
             "flagtype"              => "PT_STRING8:PSETID_Common:0x8530",
             "datecompleted"         => "PT_SYSTIME:PSETID_Common:0x810F",