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');
     }

lib/log/filelog.php

Spacing +14 added lines, -14 removed lines

@@ -29,20 +29,20 @@ 
      * @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 (0 == strcasecmp($this->GetAuthUser(), $this->GetUser())) {
-                $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;
     }
@@ -54,8 +54,8 @@ 
      * @param string $message
      */
     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);
     }
 
     //
@@ -69,7 +69,7 @@ 
      * @param string $message
      */
     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);
     }
 
@@ -81,8 +81,8 @@ 
      * @param mixed $message
      */
     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);
         }
     }
@@ -95,12 +95,12 @@ 
     private function getLogToUserFile() {
         if (false === $this->log_to_user_file) {
             if (in_array(strtolower($this->GetDevid()), ['', 'validate'])) {
-                $this->setLogToUserFile(preg_replace('/[^a-z0-9]/', '_', strtolower($this->GetAuthUser())) . '.log');
+                $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'
                 );
             }

lib/log/log.php

Spacing +2 added lines, -2 removed lines

@@ -294,11 +294,11 @@
 
 break;
 
-            case LOGLEVEL_WARN:         return '[' . $s . 'WARN]';
+            case LOGLEVEL_WARN:         return '['.$s.'WARN]';
 
 break;
 
-            case LOGLEVEL_INFO:         return '[' . $s . 'INFO]';
+            case LOGLEVEL_INFO:         return '['.$s.'INFO]';
 
 break;
 

lib/log/syslog.php

Spacing +10 added lines, -10 removed lines

@@ -80,7 +80,7 @@ 
      */
     public function SetPort($value) {
         if (is_numeric($value)) {
-            $this->port = (int) $value;
+            $this->port = (int)$value;
         }
     }
 
@@ -97,14 +97,14 @@ 
         $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 (0 == strcasecmp($this->GetAuthUser(), $this->GetUser())) {
-            $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;
     }
@@ -135,17 +135,17 @@ 
             if (!isset($trace['file'])) {
                 continue;
             }
-            if (false !== strpos($trace['file'], REAL_BASE_PATH . 'backend/')) {
+            if (false !== strpos($trace['file'], REAL_BASE_PATH.'backend/')) {
                 preg_match('/\/backend\/([a-zA-Z]*)/', $trace['file'], $match);
                 if (isset($match[1])) {
-                    return $this->GetProgramName() . '/' . $match[1];
+                    return $this->GetProgramName().'/'.$match[1];
                 }
             } elseif ('slog' != basename($trace['file'], '.php')) {
-                return $this->GetProgramName() . '/core';
+                return $this->GetProgramName().'/core';
             }
         }
 
-        return $this->GetProgramName() . '/core';
+        return $this->GetProgramName().'/core';
     }
 
     /**
@@ -210,7 +210,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);

lib/grommunio/exporter.php

Spacing +2 added lines, -2 removed lines

@@ -102,7 +102,7 @@ 
 
         // change exporterflags if we are doing a ContentExport
         if ($this->folderid) {
-            $this->exporterflags |= SYNC_NORMAL | SYNC_READ_STATE;
+            $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)
@@ -111,7 +111,7 @@ 
                 if (!($this->flags & BACKEND_DISCARD_DATA)) {
                     SLog::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;
             }
         }
 

lib/grommunio/grommunio.php

Spacing +18 added lines, -19 removed lines

@@ -238,7 +238,7 @@ 
             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')) {
-                    $gsync_version = 'Grommunio-Sync_' . @constant('GROMMUNIOSYNC_VERSION');
+                    $gsync_version = 'Grommunio-Sync_'.@constant('GROMMUNIOSYNC_VERSION');
                     $user_agent = ($deviceId) ? GSync::GetDeviceManager()->GetUserAgent() : 'unknown';
                     $this->session = @mapi_logon_zarafa($this->mainUser, $pass, MAPI_SERVER, null, null, 0, $gsync_version, $user_agent);
                 } else {
@@ -289,7 +289,7 @@ 
         $this->store = $this->defaultstore;
         $this->storeName = $defaultUser;
 
-        SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Logon(): User '%s' is authenticated%s", $this->mainUser, ($this->impersonateUser ? " impersonating '" . $this->impersonateUser . "'" : '')));
+        SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Logon(): User '%s' is authenticated%s", $this->mainUser, ($this->impersonateUser ? " impersonating '".$this->impersonateUser."'" : '')));
 
         $this->isGSyncEnabled();
 
@@ -580,7 +580,7 @@ 
                             $fwbody = w2u($fwbody);
                         }
 
-                        $mapiprops[$sendMailProps['body']] = $body . "\r\n\r\n" . $fwbody;
+                        $mapiprops[$sendMailProps['body']] = $body."\r\n\r\n".$fwbody;
                     }
 
                     if (strlen($bodyHtml) > 0) {
@@ -596,7 +596,7 @@ 
                             $fwbodyHtml = w2u($fwbodyHtml);
                         }
 
-                        $mapiprops[$sendMailProps['html']] = $bodyHtml . '<br><br>' . $fwbodyHtml;
+                        $mapiprops[$sendMailProps['html']] = $bodyHtml.'<br><br>'.$fwbodyHtml;
                     }
                 }
             } else {
@@ -959,11 +959,11 @@ 
         if ($calFolderId) {
             $shortFolderId = GSync::GetDeviceManager()->GetFolderIdForBackendId($calFolderId);
             if ($calFolderId != $shortFolderId) {
-                $prefix = $shortFolderId . ':';
+                $prefix = $shortFolderId.':';
             }
         }
 
-        return $prefix . $calendarid;
+        return $prefix.$calendarid;
     }
 
     /**
@@ -1310,7 +1310,7 @@ 
             }
         }
         $nrResults = count($items);
-        $items['range'] = ($nrResults > 0) ? $rangestart . '-' . ($nrResults - 1) : '0-0';
+        $items['range'] = ($nrResults > 0) ? $rangestart.'-'.($nrResults - 1) : '0-0';
         $items['searchtotal'] = $nrResults;
 
         return $items;
@@ -1361,8 +1361,7 @@ 
 
         // 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, [PR_ENTRYID], $searchRange[0], $searchRange[1] - $searchRange[0] + 1) :
-            mapi_table_queryrows($table, [PR_ENTRYID], 0, SEARCH_MAXRESULTS);
+            mapi_table_queryrows($table, [PR_ENTRYID], $searchRange[0], $searchRange[1] - $searchRange[0] + 1) : mapi_table_queryrows($table, [PR_ENTRYID], 0, SEARCH_MAXRESULTS);
 
         $cnt = count($rows);
         $items['searchtotal'] = $cnt;
@@ -1412,7 +1411,7 @@ 
                 [
                     FUZZYLEVEL => FL_PREFIX,
                     ULPROPTAG => PR_DISPLAY_NAME,
-                    VALUE => [PR_DISPLAY_NAME => 'grommunio-sync Search Folder ' . $pid],
+                    VALUE => [PR_DISPLAY_NAME => 'grommunio-sync Search Folder '.$pid],
                 ],
             ],
             TBL_BATCH
@@ -1556,7 +1555,7 @@ 
                 $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;
             }
             SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetFolderStat() fetched status information of %d folders for store '%s'", count($this->folderStatCache[$user]), $user));
         }
@@ -1730,7 +1729,7 @@ 
                 ));
             }
         }
-        $messageName = rtrim(((false !== $key) ? $key . '-' : '') . (('' !== $type) ? $type : ''), '-');
+        $messageName = rtrim(((false !== $key) ? $key.'-' : '').(('' !== $type) ? $type : ''), '-');
         $restriction = $this->getStateMessageRestriction($messageName, $counter, $thisCounterOnly);
         $stateFolderContents = mapi_folder_getcontentstable($this->stateFolder, MAPI_ASSOCIATED);
         if ($stateFolderContents) {
@@ -1943,7 +1942,7 @@ 
                 ));
             }
         }
-        $messageName = rtrim(((false !== $key) ? $key . '-' : '') . (('' !== $type) ? $type : ''), '-');
+        $messageName = rtrim(((false !== $key) ? $key.'-' : '').(('' !== $type) ? $type : ''), '-');
         $restriction = $this->getStateMessageRestriction($messageName, $counter, true);
         $stateFolderContents = mapi_folder_getcontentstable($this->stateFolder, MAPI_ASSOCIATED);
         if ($stateFolderContents) {
@@ -1991,17 +1990,17 @@ 
             $stateMessage = mapi_folder_createmessage($this->stateFolder, MAPI_ASSOCIATED);
             SLog::Write(LOGLEVEL_DEBUG, sprintf('Grommunio->setStateMessage(): mapi_folder_createmessage 0x%08X', mapi_last_hresult()));
 
-            $messageName = rtrim(((false !== $key) ? $key . '-' : '') . (('' !== $type) ? $type : ''), '-');
+            $messageName = rtrim(((false !== $key) ? $key.'-' : '').(('' !== $type) ? $type : ''), '-');
             SLog::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);
@@ -2096,7 +2095,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()) {
                 SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->adviseStoreToSink(): failed to advised store '%s' with code 0x%X. Polling will be performed.", $store, mapi_last_hresult()));
@@ -2473,7 +2472,7 @@ 
      * @return mapiFolderObject
      */
     private function createSearchFolder($searchFolderRoot) {
-        $folderName = 'grommunio-sync Search Folder ' . @getmypid();
+        $folderName = 'grommunio-sync Search Folder '.@getmypid();
         $searchFolders = mapi_folder_gethierarchytable($searchFolderRoot);
         $restriction = [
             RES_CONTENT,
@@ -2522,7 +2521,7 @@ 
                     $resOr,
                     [RES_CONTENT,
                         [
-                            FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE,
+                            FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE,
                             ULPROPTAG => $property,
                             VALUE => u2w($term),
                         ],

lib/grommunio/mapiutils.php

Indentation +1 added lines, -1 removed lines

@@ -305,7 +305,7 @@
                     // (!EXIST(recurrence_enddate_property) && item[isRecurring] == true && item[start] <= end)
                     && !isset($p[$props['recurrenceend']]) && true == $p[$props['isrecurring']] && $p[$props['starttime']] <= $end
                 )
-           ) {
+            ) {
             SLog::Write(LOGLEVEL_DEBUG, 'MAPIUtils->IsInCalendarSyncInterval: Message is in the synchronization interval');
 
             return true;

Spacing +19 added lines, -19 removed lines

@@ -120,7 +120,7 @@ 
                     ],
                 ], // EXISTS OR
             ],
-        ];        // global OR
+        ]; // global OR
     }
 
     /**
@@ -150,9 +150,9 @@ 
             [
                 [RES_OR,
                     [
-                        [RES_CONTENT, [FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE, ULPROPTAG => PR_DISPLAY_NAME, VALUE => $query]],
-                        [RES_CONTENT, [FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE, ULPROPTAG => PR_ACCOUNT, VALUE => $query]],
-                        [RES_CONTENT, [FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE, ULPROPTAG => PR_SMTP_ADDRESS, VALUE => $query]],
+                        [RES_CONTENT, [FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE, ULPROPTAG => PR_DISPLAY_NAME, VALUE => $query]],
+                        [RES_CONTENT, [FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE, ULPROPTAG => PR_ACCOUNT, VALUE => $query]],
+                        [RES_CONTENT, [FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE, ULPROPTAG => PR_SMTP_ADDRESS, VALUE => $query]],
                     ], // RES_OR
                 ],
                 [RES_OR,
@@ -621,7 +621,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
@@ -691,13 +691,13 @@ 
         $entryId = strtoupper($entryid);
 
         $res = [
-            '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);
@@ -742,13 +742,13 @@ 
         $entryId = strtoupper($entryid);
 
         $res = [
-            '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);

lib/grommunio/mapiphpwrapper.php

Spacing +7 added lines, -7 removed lines

@@ -45,7 +45,7 @@ 
             $folderidHex = bin2hex($folderid);
             $folderid = GSync::GetDeviceManager()->GetFolderIdForBackendId($folderidHex);
             if ($folderid != $folderidHex) {
-                $this->prefix = $folderid . ':';
+                $this->prefix = $folderid.':';
             }
         }
     }
@@ -138,8 +138,8 @@ 
             $message->flags = $flags;
         }
 
-        $this->importer->ImportMessageChange($this->prefix . bin2hex($sourcekey), $message);
-        SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportMessageChange(): change for: '%s'", $this->prefix . bin2hex($sourcekey)));
+        $this->importer->ImportMessageChange($this->prefix.bin2hex($sourcekey), $message);
+        SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportMessageChange(): change for: '%s'", $this->prefix.bin2hex($sourcekey)));
 
         // Tell MAPI it doesn't need to do anything itself, as we've done all the work already.
         return SYNC_E_IGNORE;
@@ -159,8 +159,8 @@ 
 
         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));
-            SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportMessageDeletion(): delete for :'%s'", $this->prefix . bin2hex($sourcekey)));
+            $this->importer->ImportMessageDeletion($this->prefix.bin2hex($sourcekey));
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportMessageDeletion(): delete for :'%s'", $this->prefix.bin2hex($sourcekey)));
         }
     }
 
@@ -173,8 +173,8 @@ 
      */
     public function ImportPerUserReadStateChange($readstates) {
         foreach ($readstates as $readstate) {
-            $this->importer->ImportMessageReadFlag($this->prefix . bin2hex($readstate['sourcekey']), $readstate['flags'] & MSGFLAG_READ);
-            SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportPerUserReadStateChange(): read for :'%s'", $this->prefix . bin2hex($readstate['sourcekey'])));
+            $this->importer->ImportMessageReadFlag($this->prefix.bin2hex($readstate['sourcekey']), $readstate['flags'] & MSGFLAG_READ);
+            SLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper->ImportPerUserReadStateChange(): read for :'%s'", $this->prefix.bin2hex($readstate['sourcekey'])));
         }
     }
 

lib/grommunio/mapiprovider.php

Indentation +2 added lines, -2 removed lines

@@ -2263,8 +2263,8 @@
      */
     private function getTZFromMAPIBlob($data) {
         return unpack('lbias/lstdbias/ldstbias/' .
-                           'vconst1/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/' .
-                           'vconst2/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis', $data);
+                            'vconst1/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/' .
+                            'vconst2/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis', $data);
     }
 
     /**

Spacing +29 added lines, -30 removed lines

@@ -828,7 +828,7 @@ 
         switch ($recurrence->recur['type']) {
             case 10:
                 if (0 == $recurrence->recur['subtype']) {
-                    $syncRecurrence->interval = (int) ($recurrence->recur['everyn'] / 1440);
+                    $syncRecurrence->interval = (int)($recurrence->recur['everyn'] / 1440);
                 }  // minutes
 
                 break;
@@ -840,7 +840,7 @@ 
                 break; // months / weeks
 
             case 13:
-                $syncRecurrence->interval = (int) ($recurrence->recur['everyn'] / 12);
+                $syncRecurrence->interval = (int)($recurrence->recur['everyn'] / 12);
 
                 break; // months
         }
@@ -852,7 +852,7 @@ 
             $syncRecurrence->weekofmonth = $recurrence->recur['nday'];
         } // N'th {DAY} of {X} (0-5)
         if (isset($recurrence->recur['month'])) {
-            $syncRecurrence->monthofyear = (int) ($recurrence->recur['month'] / (60 * 24 * 29)) + 1;
+            $syncRecurrence->monthofyear = (int)($recurrence->recur['month'] / (60 * 24 * 29)) + 1;
         } // works ok due to rounding. see also $monthminutes below (1-12)
         if (isset($recurrence->recur['monthday'])) {
             $syncRecurrence->dayofmonth = $recurrence->recur['monthday'];
@@ -1005,9 +1005,9 @@ 
         }
 
         if ($fromname) {
-            $from = '"' . w2u($fromname) . '" <' . w2u($fromaddr) . '>';
+            $from = '"'.w2u($fromname).'" <'.w2u($fromaddr).'>';
         } else { // START CHANGED dw2412 HTC shows "error" if sender name is unknown
-            $from = '"' . w2u($fromaddr) . '" <' . w2u($fromaddr) . '>';
+            $from = '"'.w2u($fromaddr).'" <'.w2u($fromaddr).'>';
         }
         // END CHANGED dw2412 HTC shows "error" if sender name is unknown
 
@@ -1205,7 +1205,7 @@ 
                     $mime = explode('/', $mimetype);
 
                     if (2 == count($mime) && 'image' == $mime[0]) {
-                        $attach->displayname = 'inline.' . $mime[1];
+                        $attach->displayname = 'inline.'.$mime[1];
                     }
                 }
 
@@ -1302,9 +1302,9 @@ 
                 $fulladdr = w2u($address);
             } else {
                 if ('"' != substr($name, 0, 1) && '"' != substr($name, -1)) {
-                    $fulladdr = '"' . w2u($name) . '" <' . w2u($address) . '>';
+                    $fulladdr = '"'.w2u($name).'" <'.w2u($address).'>';
                 } else {
-                    $fulladdr = w2u($name) . '<' . w2u($address) . '>';
+                    $fulladdr = w2u($name).'<'.w2u($address).'>';
                 }
             }
 
@@ -1636,8 +1636,7 @@ 
                         if (isset($exception->asbody)) {
                             $this->setASbody($exception->asbody, $exceptionprops, $appointmentprops);
                             $mapiexception['body'] = $exceptionprops[$appointmentprops['body']] =
-                                (isset($exceptionprops[$appointmentprops['body']])) ? $exceptionprops[$appointmentprops['body']] :
-                                ((isset($exceptionprops[$appointmentprops['html']])) ? $exceptionprops[$appointmentprops['html']] : '');
+                                (isset($exceptionprops[$appointmentprops['body']])) ? $exceptionprops[$appointmentprops['body']] : ((isset($exceptionprops[$appointmentprops['html']])) ? $exceptionprops[$appointmentprops['html']] : '');
                         }
 
                         array_push($recur['changed_occurences'], $mapiexception);
@@ -1676,7 +1675,7 @@ 
             $props[$appointmentprops['representingname']] = (false !== $displayname) ? $displayname : Request::GetUser();
             $props[$appointmentprops['sentrepresentingemail']] = Request::GetUser();
             $props[$appointmentprops['sentrepresentingaddt']] = 'ZARAFA';
-            $props[$appointmentprops['sentrepresentinsrchk']] = $props[$appointmentprops['sentrepresentingaddt']] . ':' . $props[$appointmentprops['sentrepresentingemail']];
+            $props[$appointmentprops['sentrepresentinsrchk']] = $props[$appointmentprops['sentrepresentingaddt']].':'.$props[$appointmentprops['sentrepresentingemail']];
 
             if (isset($appointment->attendees) && is_array($appointment->attendees) && !empty($appointment->attendees)) {
                 $props[$appointmentprops['icon']] = 1026;
@@ -1710,7 +1709,7 @@ 
             $org[PR_ADDRTYPE] = isset($representingprops[$appointmentprops['sentrepresentingaddt']]) ? $representingprops[$appointmentprops['sentrepresentingaddt']] : $props[$appointmentprops['sentrepresentingaddt']];
             $org[PR_SMTP_ADDRESS] = $org[PR_EMAIL_ADDRESS] = isset($representingprops[$appointmentprops['sentrepresentingemail']]) ? $representingprops[$appointmentprops['sentrepresentingemail']] : $props[$appointmentprops['sentrepresentingemail']];
             $org[PR_SEARCH_KEY] = isset($representingprops[$appointmentprops['sentrepresentinsrchk']]) ? $representingprops[$appointmentprops['sentrepresentinsrchk']] : $props[$appointmentprops['sentrepresentinsrchk']];
-            $org[PR_RECIPIENT_FLAGS] = recipOrganizer | recipSendable;
+            $org[PR_RECIPIENT_FLAGS] = recipOrganizer|recipSendable;
             $org[PR_RECIPIENT_TYPE] = MAPI_ORIG;
 
             array_push($recips, $org);
@@ -1736,7 +1735,7 @@ 
                     $recip[PR_RECIPIENT_TRACKSTATUS] = isset($attendee->attendeestatus) ? $attendee->attendeestatus : olResponseNone;
                 } else {
                     $recip[PR_DISPLAY_NAME] = u2w($attendee->name);
-                    $recip[PR_SEARCH_KEY] = 'SMTP:' . $recip[PR_EMAIL_ADDRESS] . "\0";
+                    $recip[PR_SEARCH_KEY] = 'SMTP:'.$recip[PR_EMAIL_ADDRESS]."\0";
                     $recip[PR_ADDRTYPE] = 'SMTP';
                     $recip[PR_RECIPIENT_TYPE] = isset($attendee->attendeetype) ? $attendee->attendeetype : MAPI_TO;
                     $recip[PR_ENTRYID] = mapi_createoneoff($recip[PR_DISPLAY_NAME], $recip[PR_ADDRTYPE], $recip[PR_EMAIL_ADDRESS]);
@@ -2262,8 +2261,8 @@ 
      * @return array
      */
     private function getTZFromMAPIBlob($data) {
-        return unpack('lbias/lstdbias/ldstbias/' .
-                           'vconst1/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/' .
+        return unpack('lbias/lstdbias/ldstbias/'.
+                           'vconst1/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/'.
                            'vconst2/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis', $data);
     }
 
@@ -2275,8 +2274,8 @@ 
      * @return array
      */
     private function getTZFromSyncBlob($data) {
-        $tz = unpack('lbias/a64tzname/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/' .
-                        'lstdbias/a64tznamedst/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis/' .
+        $tz = unpack('lbias/a64tzname/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/'.
+                        'lstdbias/a64tznamedst/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis/'.
                         'ldstbias', $data);
 
         // Make the structure compatible with class.recurrence.php
@@ -2295,7 +2294,7 @@ 
      */
     private function getMAPIBlobFromTZ($tz) {
         return pack(
-            'lll' . 'vvvvvvvvv' . 'vvvvvvvvv',
+            'lll'.'vvvvvvvvv'.'vvvvvvvvv',
             $tz['bias'],
             $tz['stdbias'],
             $tz['dstbias'],
@@ -2526,11 +2525,11 @@ 
      */
     private function composeDisplayName(&$contact) {
         // Set display name and subject to a combined value of firstname and lastname
-        $cname = (isset($contact->prefix)) ? u2w($contact->prefix) . ' ' : '';
+        $cname = (isset($contact->prefix)) ? u2w($contact->prefix).' ' : '';
         $cname .= u2w($contact->firstname);
-        $cname .= (isset($contact->middlename)) ? ' ' . u2w($contact->middlename) : '';
-        $cname .= ' ' . u2w($contact->lastname);
-        $cname .= (isset($contact->suffix)) ? ' ' . u2w($contact->suffix) : '';
+        $cname .= (isset($contact->middlename)) ? ' '.u2w($contact->middlename) : '';
+        $cname .= ' '.u2w($contact->lastname);
+        $cname .= (isset($contact->suffix)) ? ' '.u2w($contact->suffix) : '';
 
         return trim($cname);
     }
@@ -2558,7 +2557,7 @@ 
             $props[$properties["emailaddresstype{$cnt}"]] = 'SMTP';
             $props[$properties["emailaddressentryid{$cnt}"]] = mapi_createoneoff($name, 'SMTP', $emailAddress);
             $nremails[] = $cnt - 1;
-            $abprovidertype |= 2 ^ ($cnt - 1);
+            $abprovidertype |= 2^($cnt - 1);
         }
     }
 
@@ -2578,29 +2577,29 @@ 
      */
     private function setAddress($type, &$city, &$country, &$postalcode, &$state, &$street, &$props, &$properties) {
         if (isset($city)) {
-            $props[$properties[$type . 'city']] = $city = u2w($city);
+            $props[$properties[$type.'city']] = $city = u2w($city);
         }
 
         if (isset($country)) {
-            $props[$properties[$type . 'country']] = $country = u2w($country);
+            $props[$properties[$type.'country']] = $country = u2w($country);
         }
 
         if (isset($postalcode)) {
-            $props[$properties[$type . 'postalcode']] = $postalcode = u2w($postalcode);
+            $props[$properties[$type.'postalcode']] = $postalcode = u2w($postalcode);
         }
 
         if (isset($state)) {
-            $props[$properties[$type . 'state']] = $state = u2w($state);
+            $props[$properties[$type.'state']] = $state = u2w($state);
         }
 
         if (isset($street)) {
-            $props[$properties[$type . 'street']] = $street = u2w($street);
+            $props[$properties[$type.'street']] = $street = u2w($street);
         }
 
         // set composed address
         $address = Utils::BuildAddressString($street, $postalcode, $city, $state, $country);
         if ($address) {
-            $props[$properties[$type . 'address']] = $address;
+            $props[$properties[$type.'address']] = $address;
         }
     }
 
@@ -2773,7 +2772,7 @@ 
             return false;
         }
 
-        return $parsedAddress[0]->mailbox . '@' . $parsedAddress[0]->host;
+        return $parsedAddress[0]->mailbox.'@'.$parsedAddress[0]->host;
     }
 
     /**