grommunio / grommunio-sync

lib/core/contentparameters.php

Spacing +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
         }
 
         $asb = new BodyPreference();
-        $arr = (array) $this->bodypref;
+        $arr = (array)$this->bodypref;
         $arr[$type] = $asb;
         $this->bodypref = $arr;
 
@@ -97,7 +97,7 @@ 
         }
 
         $asb = new BodyPartPreference();
-        $arr = (array) $this->bodypartpref;
+        $arr = (array)$this->bodypartpref;
         $arr[$type] = $asb;
         $this->bodypartpref = $arr;
 

lib/core/gsync.php

Spacing +32 added lines, -32 removed lines

@@ -11,7 +11,7 @@ 
     public const UNAUTHENTICATED = 1;
     public const UNPROVISIONED = 2;
     public const NOACTIVESYNCCOMMAND = 3;
-    public const WEBSERVICECOMMAND = 4;    // DEPRECATED
+    public const WEBSERVICECOMMAND = 4; // DEPRECATED
     public const HIERARCHYCOMMAND = 5;
     public const PLAININPUT = 6;
     public const REQUESTHANDLER = 7;
@@ -73,28 +73,28 @@ 
 
     private static $supportedCommands = [
         // COMMAND                             // AS VERSION   // REQUESTHANDLER                        // OTHER SETTINGS
-        self::COMMAND_SYNC => [self::ASV_1,  self::REQUESTHANDLER => 'Sync'],
-        self::COMMAND_SENDMAIL => [self::ASV_1,  self::REQUESTHANDLER => 'SendMail'],
-        self::COMMAND_SMARTFORWARD => [self::ASV_1,  self::REQUESTHANDLER => 'SendMail'],
-        self::COMMAND_SMARTREPLY => [self::ASV_1,  self::REQUESTHANDLER => 'SendMail'],
-        self::COMMAND_GETATTACHMENT => [self::ASV_1,  self::REQUESTHANDLER => 'GetAttachment'],
-        self::COMMAND_GETHIERARCHY => [self::ASV_1,  self::REQUESTHANDLER => 'GetHierarchy',  self::HIERARCHYCOMMAND],            // deprecated but implemented
-        self::COMMAND_CREATECOLLECTION => [self::ASV_1],                                                                              // deprecated & not implemented
-        self::COMMAND_DELETECOLLECTION => [self::ASV_1],                                                                              // deprecated & not implemented
-        self::COMMAND_MOVECOLLECTION => [self::ASV_1],                                                                              // deprecated & not implemented
-        self::COMMAND_FOLDERSYNC => [self::ASV_2,  self::REQUESTHANDLER => 'FolderSync',    self::HIERARCHYCOMMAND],
-        self::COMMAND_FOLDERCREATE => [self::ASV_2,  self::REQUESTHANDLER => 'FolderChange',  self::HIERARCHYCOMMAND],
-        self::COMMAND_FOLDERDELETE => [self::ASV_2,  self::REQUESTHANDLER => 'FolderChange',  self::HIERARCHYCOMMAND],
-        self::COMMAND_FOLDERUPDATE => [self::ASV_2,  self::REQUESTHANDLER => 'FolderChange',  self::HIERARCHYCOMMAND],
-        self::COMMAND_MOVEITEMS => [self::ASV_1,  self::REQUESTHANDLER => 'MoveItems'],
-        self::COMMAND_GETITEMESTIMATE => [self::ASV_1,  self::REQUESTHANDLER => 'GetItemEstimate'],
-        self::COMMAND_MEETINGRESPONSE => [self::ASV_1,  self::REQUESTHANDLER => 'MeetingResponse'],
-        self::COMMAND_RESOLVERECIPIENTS => [self::ASV_1,  self::REQUESTHANDLER => 'ResolveRecipients'],
-        self::COMMAND_VALIDATECERT => [self::ASV_1,  self::REQUESTHANDLER => 'ValidateCert'],
-        self::COMMAND_PROVISION => [self::ASV_25, self::REQUESTHANDLER => 'Provisioning',  self::UNAUTHENTICATED, self::UNPROVISIONED],
-        self::COMMAND_SEARCH => [self::ASV_1,  self::REQUESTHANDLER => 'Search'],
-        self::COMMAND_PING => [self::ASV_2,  self::REQUESTHANDLER => 'Ping',          self::UNPROVISIONED],
-        self::COMMAND_NOTIFY => [self::ASV_1,  self::REQUESTHANDLER => 'Notify'],                                           // deprecated & not implemented
+        self::COMMAND_SYNC => [self::ASV_1, self::REQUESTHANDLER => 'Sync'],
+        self::COMMAND_SENDMAIL => [self::ASV_1, self::REQUESTHANDLER => 'SendMail'],
+        self::COMMAND_SMARTFORWARD => [self::ASV_1, self::REQUESTHANDLER => 'SendMail'],
+        self::COMMAND_SMARTREPLY => [self::ASV_1, self::REQUESTHANDLER => 'SendMail'],
+        self::COMMAND_GETATTACHMENT => [self::ASV_1, self::REQUESTHANDLER => 'GetAttachment'],
+        self::COMMAND_GETHIERARCHY => [self::ASV_1, self::REQUESTHANDLER => 'GetHierarchy', self::HIERARCHYCOMMAND], // deprecated but implemented
+        self::COMMAND_CREATECOLLECTION => [self::ASV_1], // deprecated & not implemented
+        self::COMMAND_DELETECOLLECTION => [self::ASV_1], // deprecated & not implemented
+        self::COMMAND_MOVECOLLECTION => [self::ASV_1], // deprecated & not implemented
+        self::COMMAND_FOLDERSYNC => [self::ASV_2, self::REQUESTHANDLER => 'FolderSync', self::HIERARCHYCOMMAND],
+        self::COMMAND_FOLDERCREATE => [self::ASV_2, self::REQUESTHANDLER => 'FolderChange', self::HIERARCHYCOMMAND],
+        self::COMMAND_FOLDERDELETE => [self::ASV_2, self::REQUESTHANDLER => 'FolderChange', self::HIERARCHYCOMMAND],
+        self::COMMAND_FOLDERUPDATE => [self::ASV_2, self::REQUESTHANDLER => 'FolderChange', self::HIERARCHYCOMMAND],
+        self::COMMAND_MOVEITEMS => [self::ASV_1, self::REQUESTHANDLER => 'MoveItems'],
+        self::COMMAND_GETITEMESTIMATE => [self::ASV_1, self::REQUESTHANDLER => 'GetItemEstimate'],
+        self::COMMAND_MEETINGRESPONSE => [self::ASV_1, self::REQUESTHANDLER => 'MeetingResponse'],
+        self::COMMAND_RESOLVERECIPIENTS => [self::ASV_1, self::REQUESTHANDLER => 'ResolveRecipients'],
+        self::COMMAND_VALIDATECERT => [self::ASV_1, self::REQUESTHANDLER => 'ValidateCert'],
+        self::COMMAND_PROVISION => [self::ASV_25, self::REQUESTHANDLER => 'Provisioning', self::UNAUTHENTICATED, self::UNPROVISIONED],
+        self::COMMAND_SEARCH => [self::ASV_1, self::REQUESTHANDLER => 'Search'],
+        self::COMMAND_PING => [self::ASV_2, self::REQUESTHANDLER => 'Ping', self::UNPROVISIONED],
+        self::COMMAND_NOTIFY => [self::ASV_1, self::REQUESTHANDLER => 'Notify'], // deprecated & not implemented
         self::COMMAND_ITEMOPERATIONS => [self::ASV_12, self::REQUESTHANDLER => 'ItemOperations'],
         self::COMMAND_SETTINGS => [self::ASV_12, self::REQUESTHANDLER => 'Settings'],
     ];
@@ -457,8 +457,8 @@ 
 
         $rbn = substr($backendname, 7);
 
-        $subdirbackend = REAL_BASE_PATH . 'backend/' . $rbn . '/' . $rbn . '.php';
-        $stdbackend = REAL_BASE_PATH . 'backend/' . $rbn . '.php';
+        $subdirbackend = REAL_BASE_PATH.'backend/'.$rbn.'/'.$rbn.'.php';
+        $stdbackend = REAL_BASE_PATH.'backend/'.$rbn.'.php';
 
         if (is_file($subdirbackend)) {
             $toLoad = $subdirbackend;
@@ -607,7 +607,7 @@ 
         SLog::Write(LOGLEVEL_DEBUG, 'GSync::PrintGrommunioSyncLegal()');
 
         if ($message) {
-            $message = '<h3>' . $message . '</h3>';
+            $message = '<h3>'.$message.'</h3>';
         }
         if ($additionalMessage) {
             $additionalMessage .= '<br>';
@@ -667,7 +667,7 @@ 
             return 'MS-Server-ActiveSync: 6.5.7638.1';
         }
 
-        return 'MS-Server-ActiveSync: ' . self::GetSupportedASVersion();
+        return 'MS-Server-ActiveSync: '.self::GetSupportedASVersion();
     }
 
     /**
@@ -679,13 +679,13 @@ 
      */
     public static function GetSupportedProtocolVersions($valueOnly = false) {
         $versions = implode(',', array_slice(self::$supportedASVersions, 0, (array_search(self::GetSupportedASVersion(), self::$supportedASVersions) + 1)));
-        SLog::Write(LOGLEVEL_DEBUG, 'GSync::GetSupportedProtocolVersions(): ' . $versions);
+        SLog::Write(LOGLEVEL_DEBUG, 'GSync::GetSupportedProtocolVersions(): '.$versions);
 
         if (true === $valueOnly) {
             return $versions;
         }
 
-        return 'MS-ASProtocolVersions: ' . $versions;
+        return 'MS-ASProtocolVersions: '.$versions;
     }
 
     /**
@@ -704,9 +704,9 @@ 
         }
 
         $commands = implode(',', $asCommands);
-        SLog::Write(LOGLEVEL_DEBUG, 'GSync::GetSupportedCommands(): ' . $commands);
+        SLog::Write(LOGLEVEL_DEBUG, 'GSync::GetSupportedCommands(): '.$commands);
 
-        return 'MS-ASProtocolCommands: ' . $commands;
+        return 'MS-ASProtocolCommands: '.$commands;
     }
 
     /**
@@ -723,7 +723,7 @@ 
         }
 
         $class = self::$supportedCommands[$commandCode][self::REQUESTHANDLER];
-        $handlerclass = REAL_BASE_PATH . 'lib/request/' . strtolower($class) . '.php';
+        $handlerclass = REAL_BASE_PATH.'lib/request/'.strtolower($class).'.php';
 
         if (is_file($handlerclass)) {
             include $handlerclass;

lib/core/statemanager.php

Spacing +4 added lines, -4 removed lines

@@ -415,7 +415,7 @@ 
             throw new StateInvalidException(sprintf("SyncKey '%s' is invalid", $synckey));
         }
 
-        return [$matches[1], (int) $matches[2]];
+        return [$matches[1], (int)$matches[2]];
     }
 
     /**
@@ -433,7 +433,7 @@ 
             throw new StateInvalidException(sprintf("UUID '%s' is invalid", $uuid));
         }
 
-        return '{' . $uuid . '}' . $counter;
+        return '{'.$uuid.'}'.$counter;
     }
 
     /*----------------------------------------------------------------------------------------------------------
@@ -516,8 +516,8 @@ 
             mt_rand(0, 0xFFFF),
             mt_rand(0, 0xFFFF),
             mt_rand(0, 0xFFFF),
-            mt_rand(0, 0x0FFF) | 0x4000,
-            mt_rand(0, 0x3FFF) | 0x8000,
+            mt_rand(0, 0x0FFF)|0x4000,
+            mt_rand(0, 0x3FFF)|0x8000,
             mt_rand(0, 0xFFFF),
             mt_rand(0, 0xFFFF),
             mt_rand(0, 0xFFFF)

lib/core/asdevice.php

Spacing +4 added lines, -4 removed lines

@@ -342,7 +342,7 @@ 
             $this->SetHierarchyCache();
         }
 
-        SLog::Write(LOGLEVEL_DEBUG, 'ASDevice->GetHierarchyCache(): ' . $this->hierarchyCache->GetStat());
+        SLog::Write(LOGLEVEL_DEBUG, 'ASDevice->GetHierarchyCache(): '.$this->hierarchyCache->GetStat());
 
         return $this->hierarchyCache;
     }
@@ -966,7 +966,7 @@ 
             foreach ($toOrder as $f) {
                 $s .= sprintf("'%s'('%s') ", $f['name'], $f['folderid']);
             }
-            SLog::Write(LOGLEVEL_ERROR, 'ASDevice->SetAdditionalFolderList(): cannot proceed as these folders have invalid parentids (not found): ' . $s);
+            SLog::Write(LOGLEVEL_ERROR, 'ASDevice->SetAdditionalFolderList(): cannot proceed as these folders have invalid parentids (not found): '.$s);
 
             return false;
         }
@@ -1029,12 +1029,12 @@ 
     private function generateFolderHash($backendid, $folderOrigin, $folderName) {
         // Hash backendid with crc32 and get the hex representation of it.
         // 5 chars of hash + $folderOrigin should still be enough to avoid collisions.
-        $folderId = substr($folderOrigin . dechex(crc32($backendid)), 0, 6);
+        $folderId = substr($folderOrigin.dechex(crc32($backendid)), 0, 6);
         $cnt = 0;
         // Collision avoiding. Append an increasing number to the string to hash
         // until there aren't any collisions. Probably a smaller number is also sufficient.
         while ((isset($this->contentData[$folderId]) || (is_array($this->backend2folderidCache) && in_array($folderId, $this->backend2folderidCache, true))) && $cnt < 10000) {
-            $folderId = substr($folderOrigin . dechex(crc32($backendid . $folderName . $cnt++)), 0, 6);
+            $folderId = substr($folderOrigin.dechex(crc32($backendid.$folderName.$cnt++)), 0, 6);
             SLog::Write(LOGLEVEL_WARN, sprintf("ASDevice->generateFolderHash(): collision avoiding nr %05d. Generated hash: '%s'", $cnt, $folderId));
         }
         if ($cnt >= 10000) {

lib/core/provisioningmanager.php

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
         // no policies cached in redis, get policies from admin API
         else {
             $policies = false;
-            $api_response = file_get_contents(ADMIN_API_POLICY_ENDPOINT . self::$user);
+            $api_response = file_get_contents(ADMIN_API_POLICY_ENDPOINT.self::$user);
             if ($api_response) {
                 $data = json_decode($api_response);
                 if (isset($data->data)) {
@@ -146,7 +146,7 @@ 
         $status = SYNC_PROVISION_RWSTATUS_NA;
 
         // retrieve the WIPE STATUS from the Admin API
-        $api_response = file_get_contents(ADMIN_API_WIPE_ENDPOINT . self::$user . '?devices=' . self::$devid);
+        $api_response = file_get_contents(ADMIN_API_WIPE_ENDPOINT.self::$user.'?devices='.self::$devid);
         if ($api_response) {
             $data = json_decode($api_response, true);
             if (isset($data['data'][self::$devid]['status'])) {
@@ -186,7 +186,7 @@ 
             ),
         ],
         ];
-        $ret = file_get_contents(ADMIN_API_WIPE_ENDPOINT . self::$user . '?devices=' . self::$devid, false, stream_context_create($opts));
+        $ret = file_get_contents(ADMIN_API_WIPE_ENDPOINT.self::$user.'?devices='.self::$devid, false, stream_context_create($opts));
         SLog::Write(LOGLEVEL_DEBUG, sprintf('ProvisioningManager->SetProvisioningWipeStatus() admin API response: %s', trim(Utils::PrintAsString($ret))));
 
         return false !== strpos($http_response_header[0], '201');

lib/core/gsyncdefs.php

Spacing +1 added lines, -1 removed lines

@@ -984,7 +984,7 @@
 define('LOGLEVEL_DEVICEID', 64);
 define('LOGLEVEL_WBXMLSTACK', 128);
 
-define('LOGLEVEL_ALL', LOGLEVEL_FATAL | LOGLEVEL_ERROR | LOGLEVEL_WARN | LOGLEVEL_INFO | LOGLEVEL_DEBUG | LOGLEVEL_WBXML);
+define('LOGLEVEL_ALL', LOGLEVEL_FATAL|LOGLEVEL_ERROR|LOGLEVEL_WARN|LOGLEVEL_INFO|LOGLEVEL_DEBUG|LOGLEVEL_WBXML);
 
 define('BACKEND_DISCARD_DATA', 1);
 

lib/core/pingtracking.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
      * Used to remove the current ping data from shared memory.
      */
     public function __destruct() {
-        return $this->setDeviceUserData($this->type, ['pid:' . self::$pid], self::$devid, self::$user, $subkey = -1, $doCas = 'deletekeys');
+        return $this->setDeviceUserData($this->type, ['pid:'.self::$pid], self::$devid, self::$user, $subkey = -1, $doCas = 'deletekeys');
     }
 
     /**
@@ -56,7 +56,7 @@ 
         $this->initializeParams();
         // need microtime as connections sometimes start at the same second
         self::$start = microtime(true);
-        $pingtracking = ['pid:' . self::$pid => self::$start];
+        $pingtracking = ['pid:'.self::$pid => self::$start];
 
         return $this->setDeviceUserData($this->type, $pingtracking, self::$devid, self::$user, $subkey = -1, $doCas = 'merge');
     }

lib/core/devicemanager.php

Spacing +5 added lines, -5 removed lines

@@ -165,7 +165,7 @@ 
                     SLog::Write(LOGLEVEL_DEBUG, 'DeviceManager->Save(): Device data saved');
                 }
             } catch (StateNotFoundException $snfex) {
-                SLog::Write(LOGLEVEL_ERROR, 'DeviceManager->Save(): Exception: ' . $snfex->getMessage());
+                SLog::Write(LOGLEVEL_ERROR, 'DeviceManager->Save(): Exception: '.$snfex->getMessage());
             }
         }
 
@@ -189,7 +189,7 @@ 
      * @param bool $doSave
      */
     public function DoAutomaticASDeviceSaving($doSave) {
-        SLog::Write(LOGLEVEL_DEBUG, 'DeviceManager->DoAutomaticASDeviceSaving(): save automatically: ' . Utils::PrintAsString($doSave));
+        SLog::Write(LOGLEVEL_DEBUG, 'DeviceManager->DoAutomaticASDeviceSaving(): save automatically: '.Utils::PrintAsString($doSave));
         $this->saveDevice = $doSave;
     }
 
@@ -212,7 +212,7 @@ 
         // save other information
         foreach (['model', 'imei', 'friendlyname', 'os', 'oslanguage', 'phonenumber', 'mobileoperator', 'enableoutboundsms'] as $info) {
             if (isset($deviceinformation->{$info}) && '' != $deviceinformation->{$info}) {
-                $this->device->__set('device' . $info, $deviceinformation->{$info});
+                $this->device->__set('device'.$info, $deviceinformation->{$info});
             }
         }
 
@@ -549,14 +549,14 @@ 
                     }
 
                     // 2. step: check if there is a limitation for the hashed ID (for shared/configured stores)
-                    $spKey = $store . '/' . $folderid;
+                    $spKey = $store.'/'.$folderid;
                     if (array_key_exists($spKey, $specialSyncFilter)) {
                         $spFilter = $specialSyncFilter[$spKey];
                         SLog::Write(LOGLEVEL_DEBUG, sprintf("Limit sync due to configured limitation on the folder: '%s': %s", $spKey, $spFilter));
                     }
 
                     // 3. step: check if there is a limitation for the backendId
-                    $spKey = $store . '/' . $backendFolderId;
+                    $spKey = $store.'/'.$backendFolderId;
                     if (array_key_exists($spKey, $specialSyncFilter)) {
                         $spFilter = $specialSyncFilter[$spKey];
                         SLog::Write(LOGLEVEL_DEBUG, sprintf("Limit sync due to configured limitation on the folder: '%s': %s", $spKey, $spFilter));

lib/wbxml/wbxmlencoder.php

Spacing +9 added lines, -9 removed lines

@@ -132,7 +132,7 @@ 
         // cannot send \0 characters within the XML content anywhere.
         $content = str_replace("\0", '', $content);
 
-        if ('x' == 'x' . $content) {
+        if ('x' == 'x'.$content) {
             return;
         }
         $this->_outputStack();
@@ -181,7 +181,7 @@ 
      */
     public function addBodypartStream($bp) {
         if (!is_resource($bp)) {
-            throw new WBXMLException('WBXMLEncoder->addBodypartStream(): trying to add a ' . gettype($bp) . ' instead of a stream');
+            throw new WBXMLException('WBXMLEncoder->addBodypartStream(): trying to add a '.gettype($bp).' instead of a stream');
         }
         if ($this->multipart) {
             $this->bodyparts[] = $bp;
@@ -346,9 +346,9 @@ 
             $byte = $uint & 0x7F;
             $uint = $uint >> 7;
             if (0 == $i) {
-                $out = chr($byte) . $out;
+                $out = chr($byte).$out;
             } else {
-                $out = chr($byte | 0x80) . $out;
+                $out = chr($byte|0x80).$out;
             }
         }
         fwrite($this->_out, $out);
@@ -442,10 +442,10 @@ 
     private function logStartTag($tag, $nocontent) {
         $spaces = str_repeat(' ', count($this->logStack));
         if ($nocontent) {
-            SLog::Write(LOGLEVEL_WBXML, 'O ' . $spaces . " <{$tag}/>");
+            SLog::Write(LOGLEVEL_WBXML, 'O '.$spaces." <{$tag}/>");
         } else {
             array_push($this->logStack, $tag);
-            SLog::Write(LOGLEVEL_WBXML, 'O ' . $spaces . " <{$tag}>");
+            SLog::Write(LOGLEVEL_WBXML, 'O '.$spaces." <{$tag}>");
         }
     }
 
@@ -457,7 +457,7 @@ 
     private function logEndTag() {
         $spaces = str_repeat(' ', count($this->logStack));
         $tag = array_pop($this->logStack);
-        SLog::Write(LOGLEVEL_WBXML, 'O ' . $spaces . "</{$tag}>");
+        SLog::Write(LOGLEVEL_WBXML, 'O '.$spaces."</{$tag}>");
     }
 
     /**
@@ -469,7 +469,7 @@ 
      */
     private function logContent($content) {
         $spaces = str_repeat(' ', count($this->logStack));
-        SLog::Write(LOGLEVEL_WBXML, 'O ' . $spaces . $content);
+        SLog::Write(LOGLEVEL_WBXML, 'O '.$spaces.$content);
     }
 
     /**
@@ -513,6 +513,6 @@ 
         } else {
             $data = 'more than 512K of data';
         }
-        SLog::Write(LOGLEVEL_WBXML, 'WBXML-OUT: ' . $data, false);
+        SLog::Write(LOGLEVEL_WBXML, 'WBXML-OUT: '.$data, false);
     }
 }