grommunio / grommunio-sync

lib/grommunio/mapistreamwrapper.php

Spacing +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
     public static function Open($mapistream, $truncatehtmlsafe = false) {
         $context = stream_context_create([self::PROTOCOL => ['stream' => &$mapistream, 'truncatehtmlsafe' => $truncatehtmlsafe]]);
 
-        return fopen(self::PROTOCOL . '://', 'r', false, $context);
+        return fopen(self::PROTOCOL.'://', 'r', false, $context);
     }
 }
 

lib/grommunio/importer.php

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
             $folderidForBackendId = GSync::GetDeviceManager()->GetFolderIdForBackendId($this->folderidHex);
             // Only append backend id if the mapping backendid<->folderid is available.
             if ($folderidForBackendId != $this->folderidHex) {
-                $this->prefix = $folderidForBackendId . ':';
+                $this->prefix = $folderidForBackendId.':';
             }
         } else {
             $storeprops = mapi_getprops($store, [PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
@@ -294,7 +294,7 @@ 
 
             $sourcekeyprops = mapi_getprops($mapimessage, [PR_SOURCE_KEY]);
 
-            return $this->prefix . bin2hex($sourcekeyprops[PR_SOURCE_KEY]);
+            return $this->prefix.bin2hex($sourcekeyprops[PR_SOURCE_KEY]);
         }
 
         throw new StatusException(sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Error updating object: 0x%X", $id, get_class($message), mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
@@ -501,10 +501,10 @@ 
             // prepend the destination short folderid, if it exists
             $destShortId = GSync::GetDeviceManager()->GetFolderIdForBackendId($newfolder);
             if ($destShortId !== $newfolder) {
-                $prefix = $destShortId . ':';
+                $prefix = $destShortId.':';
             }
 
-            return $prefix . bin2hex($sourcekeyprops[PR_SOURCE_KEY]);
+            return $prefix.bin2hex($sourcekeyprops[PR_SOURCE_KEY]);
         }
 
         return false;

lib/request/validatecert.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
         $validateCert = new SyncValidateCert();
         $validateCert->Decode(self::$decoder);
         $cert_der = base64_decode($validateCert->certificates[0]);
-        $cert_pem = "-----BEGIN CERTIFICATE-----\n" . chunk_split(base64_encode($cert_der), 64, "\n") . "-----END CERTIFICATE-----\n";
+        $cert_pem = "-----BEGIN CERTIFICATE-----\n".chunk_split(base64_encode($cert_der), 64, "\n")."-----END CERTIFICATE-----\n";
 
         $checkpurpose = (defined('CAINFO') && CAINFO) ? openssl_x509_checkpurpose($cert_pem, X509_PURPOSE_SMIME_SIGN, [CAINFO]) : openssl_x509_checkpurpose($cert_pem, X509_PURPOSE_SMIME_SIGN);
         if (true === $checkpurpose) {

lib/request/itemoperations.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
             }
 
             if (!$fetch && !$efc && !$move) {
-                SLog::Write(LOGLEVEL_DEBUG, 'Unknown item operation:' . print_r($el, 1));
+                SLog::Write(LOGLEVEL_DEBUG, 'Unknown item operation:'.print_r($el, 1));
                 self::$topCollector->AnnounceInformation('Unknown operation', true);
 
                 return false;
@@ -247,7 +247,7 @@ 
                         if (self::$decoder->getElementStartTag(SYNC_ITEMOPERATIONS_DELETESUBFOLDERS)) {
                             $operation['deletesubfolders'] = true;
                             if (($dsf = self::$decoder->getElementContent()) !== false) {
-                                $operation['deletesubfolders'] = (bool) $dsf;
+                                $operation['deletesubfolders'] = (bool)$dsf;
                                 if (!self::$decoder->getElementEndTag()) {
                                     return false;
                                 }

lib/request/getitemestimate.php

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
                 elseif (self::$decoder->getElementStartTag(SYNC_CONVERSATIONMODE)) {
                     $spa->SetConversationMode(true);
                     if (($conversationmode = self::$decoder->getElementContent()) !== false) {
-                        $spa->SetConversationMode((bool) $conversationmode);
+                        $spa->SetConversationMode((bool)$conversationmode);
                         if (!self::$decoder->getElementEndTag()) {
                             return false;
                         }
@@ -181,14 +181,14 @@ 
                         $sc->AddParameter($spa, 'status', SYNC_GETITEMESTSTATUS_COLLECTIONINVALID);
                     }
 
-                    self::$topCollector->AnnounceInformation('StateNotFoundException ' . $sc->GetParameter($spa, 'status'), true);
+                    self::$topCollector->AnnounceInformation('StateNotFoundException '.$sc->GetParameter($spa, 'status'), true);
                 } catch (StatusException $stex) {
                     if (SYNC_GETITEMESTSTATUS_COLLECTIONINVALID == $stex->getCode()) {
                         $sc->AddParameter($spa, 'status', SYNC_GETITEMESTSTATUS_COLLECTIONINVALID);
                     } else {
                         $sc->AddParameter($spa, 'status', SYNC_GETITEMESTSTATUS_SYNCSTATENOTPRIMED);
                     }
-                    self::$topCollector->AnnounceInformation('StatusException ' . $sc->GetParameter($spa, 'status'), true);
+                    self::$topCollector->AnnounceInformation('StatusException '.$sc->GetParameter($spa, 'status'), true);
                 }
             }
         }

lib/request/requestprocessor.php

Spacing +2 added lines, -2 removed lines

@@ -100,7 +100,7 @@ 
             }
         } catch (Exception $ex) {
             // Log 10 KB of the WBXML data
-            SLog::Write(LOGLEVEL_FATAL, 'WBXML 10K debug data: ' . Request::GetInputAsBase64(10240), false);
+            SLog::Write(LOGLEVEL_FATAL, 'WBXML 10K debug data: '.Request::GetInputAsBase64(10240), false);
 
             throw $ex;
         }
@@ -108,7 +108,7 @@ 
         // also log WBXML in happy case
         if (SLog::IsWbxmlDebugEnabled()) {
             // Log 4 KB in the happy case
-            SLog::Write(LOGLEVEL_WBXML, 'WBXML-IN : ' . Request::GetInputAsBase64(4096), false);
+            SLog::Write(LOGLEVEL_WBXML, 'WBXML-IN : '.Request::GetInputAsBase64(4096), false);
         }
 
         return true;

lib/request/sync.php

Spacing +11 added lines, -11 removed lines

@@ -200,7 +200,7 @@ 
                     if (self::$decoder->getElementStartTag(SYNC_DELETESASMOVES)) {
                         $spa->SetDeletesAsMoves(true);
                         if (($dam = self::$decoder->getElementContent()) !== false) {
-                            $spa->SetDeletesAsMoves((bool) $dam);
+                            $spa->SetDeletesAsMoves((bool)$dam);
                             if (!self::$decoder->getElementEndTag()) {
                                 return false;
                             }
@@ -243,7 +243,7 @@ 
                     if (self::$decoder->getElementStartTag(SYNC_CONVERSATIONMODE)) {
                         $spa->SetConversationMode(true);
                         if (($conversationmode = self::$decoder->getElementContent()) !== false) {
-                            $spa->SetConversationMode((bool) $conversationmode);
+                            $spa->SetConversationMode((bool)$conversationmode);
                             if (!self::$decoder->getElementEndTag()) {
                                 return false;
                             }
@@ -609,7 +609,7 @@ 
 
             if (self::$decoder->getElementStartTag(SYNC_WINDOWSIZE)) {
                 $sc->SetGlobalWindowSize(self::$decoder->getElementContent());
-                SLog::Write(LOGLEVEL_DEBUG, 'Sync(): Global WindowSize requested: ' . $sc->GetGlobalWindowSize());
+                SLog::Write(LOGLEVEL_DEBUG, 'Sync(): Global WindowSize requested: '.$sc->GetGlobalWindowSize());
                 if (!self::$decoder->getElementEndTag()) { // SYNC_WINDOWSIZE
                     return false;
                 }
@@ -1172,7 +1172,7 @@ 
         }
 
         // Stream outgoing changes
-        if (SYNC_STATUS_SUCCESS == $status && true == $sc->GetParameter($spa, 'getchanges') && $windowSize > 0 && (bool) $exporter) {
+        if (SYNC_STATUS_SUCCESS == $status && true == $sc->GetParameter($spa, 'getchanges') && $windowSize > 0 && (bool)$exporter) {
             self::$topCollector->AnnounceInformation(sprintf('Streaming data of %d objects', (($changecount > $windowSize) ? $windowSize : $changecount)));
 
             // Output message changes per folder
@@ -1222,7 +1222,7 @@ 
 
             // $progress is not an array when exporting the last message
             // so we get the number to display from the streamimporter if it's available
-            if ((bool) $streamimporter) {
+            if ((bool)$streamimporter) {
                 $n = $streamimporter->GetImportedMessages();
             }
 
@@ -1239,7 +1239,7 @@ 
                 }
             }
 
-            self::$topCollector->AnnounceInformation(sprintf('Outgoing %d objects%s', $n, ($n >= $windowSize) ? ' of ' . $changecount : ''), $this->singleFolder);
+            self::$topCollector->AnnounceInformation(sprintf('Outgoing %d objects%s', $n, ($n >= $windowSize) ? ' of '.$changecount : ''), $this->singleFolder);
             $this->saveMultiFolderInfo('outgoing', $n);
             $this->saveMultiFolderInfo('queued', $changecount);
 
@@ -1502,7 +1502,7 @@ 
                             SLog::Write(LOGLEVEL_DEBUG, 'SMS sync are not supported. Ignoring message.');
                             // TODO we should create the SMS
                             // return a fake serverid which we can identify later
-                            $actiondata['clientids'][$clientid] = self::GSYNCIGNORESMS . $clientid;
+                            $actiondata['clientids'][$clientid] = self::GSYNCIGNORESMS.$clientid;
                             $actiondata['statusids'][$clientid] = SYNC_STATUS_SUCCESS;
                         }
                         // check incoming message without logging WARN messages about errors
@@ -1591,9 +1591,9 @@ 
      * @return string
      */
     private function getMultiFolderInfoLine($amountOfFolders) {
-        $s = $amountOfFolders . ' folders';
+        $s = $amountOfFolders.' folders';
         if (isset($this->multiFolderInfo['incoming'])) {
-            $s .= ': ' . $this->multiFolderInfo['incoming'] . ' saved';
+            $s .= ': '.$this->multiFolderInfo['incoming'].' saved';
         }
         if (isset($this->multiFolderInfo['outgoing'], $this->multiFolderInfo['queued']) && $this->multiFolderInfo['outgoing'] > 0) {
             $s .= sprintf(': Streamed %d out of %d', $this->multiFolderInfo['outgoing'], $this->multiFolderInfo['queued']);
@@ -1601,10 +1601,10 @@ 
             $s .= ': no changes';
         } else {
             if (isset($this->multiFolderInfo['outgoing'])) {
-                $s .= '/' . $this->multiFolderInfo['outgoing'] . ' streamed';
+                $s .= '/'.$this->multiFolderInfo['outgoing'].' streamed';
             }
             if (isset($this->multiFolderInfo['queued'])) {
-                $s .= '/' . $this->multiFolderInfo['queued'] . ' queued';
+                $s .= '/'.$this->multiFolderInfo['queued'].' queued';
             }
         }
         if (isset($this->multiFolderInfo['exception'])) {

lib/syncobjects/syncfolder.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
             SYNC_FOLDERHIERARCHY_TYPE => [self::STREAMER_VAR => 'type',
                 self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => 18,
                     self::STREAMER_CHECK_CMPHIGHER => 0,
-                    self::STREAMER_CHECK_CMPLOWER => 20,  ], ],
+                    self::STREAMER_CHECK_CMPLOWER => 20, ], ],
 
             SYNC_FOLDERHIERARCHY_IGNORE_STORE => [self::STREAMER_VAR => 'Store',
                 self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE, ],

lib/syncobjects/syncobject.php

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
      * @return string
      */
     public function __toString() {
-        $str = get_class($this) . " (\n";
+        $str = get_class($this)." (\n";
 
         $streamerVars = [];
         foreach ($this->mapping as $k => $v) {
@@ -59,14 +59,14 @@ 
 
             // self::STREAMER_ARRAY ?
             if (is_array($v)) {
-                $str .= "\t" . $strV . $k . '(Array) size: ' . count($v) . "\n";
+                $str .= "\t".$strV.$k.'(Array) size: '.count($v)."\n";
                 foreach ($v as $value) {
-                    $str .= "\t\t" . Utils::PrintAsString($value) . "\n";
+                    $str .= "\t\t".Utils::PrintAsString($value)."\n";
                 }
             } elseif ($v instanceof SyncObject) {
-                $str .= "\t" . $strV . $k . ' => ' . str_replace("\n", "\n\t\t\t", $v->__toString()) . "\n";
+                $str .= "\t".$strV.$k.' => '.str_replace("\n", "\n\t\t\t", $v->__toString())."\n";
             } else {
-                $str .= "\t" . $strV . $k . ' => ' . (isset($this->{$k}) ? Utils::PrintAsString($this->{$k}) : 'null') . "\n";
+                $str .= "\t".$strV.$k.' => '.(isset($this->{$k}) ? Utils::PrintAsString($this->{$k}) : 'null')."\n";
             }
         }
         $str .= ')';