grommunio / grommunio-sync

lib/syncobjects/syncmeetingrequest.php

Spacing +3 added lines, -3 removed lines

@@ -86,10 +86,10 @@ 
             // 4 = Working Elsewhere
             SYNC_POOMMAIL_BUSYSTATUS => [self::STREAMER_VAR => 'busystatus',
                 self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETTWO,
-                    self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3, 4],  ], ],
+                    self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3, 4], ], ],
 
             SYNC_POOMMAIL_TIMEZONE => [self::STREAMER_VAR => 'timezone',
-                self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => base64_encode(pack('la64vvvvvvvv' . 'la64vvvvvvvv' . 'l', 0, '', 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 0, 0, 0, 0, 0, 0, 0, 0))], ],
+                self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => base64_encode(pack('la64vvvvvvvv'.'la64vvvvvvvv'.'l', 0, '', 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 0, 0, 0, 0, 0, 0, 0, 0))], ],
 
             SYNC_POOMMAIL_GLOBALOBJID => [self::STREAMER_VAR => 'globalobjid'],
         ];
@@ -97,7 +97,7 @@ 
         if (Request::GetProtocolVersion() >= 14.0) {
             $mapping[SYNC_POOMMAIL_DISALLOWNEWTIMEPROPOSAL] = [self::STREAMER_VAR => 'disallownewtimeproposal',
                 self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETZERO,
-                    self::STREAMER_CHECK_ONEVALUEOF => [0, 1],  ], ];
+                    self::STREAMER_CHECK_ONEVALUEOF => [0, 1], ], ];
         }
 
         if (Request::GetProtocolVersion() >= 14.1) {

lib/syncobjects/synccontact.php

Spacing +10 added lines, -10 removed lines

@@ -199,16 +199,16 @@
         ];
 
         if (Request::GetProtocolVersion() >= 2.5) {
-            $mapping[SYNC_POOMCONTACTS2_CUSTOMERID] = [self::STREAMER_VAR => 'customerid',        self::STREAMER_RONOTIFY => true];
-            $mapping[SYNC_POOMCONTACTS2_GOVERNMENTID] = [self::STREAMER_VAR => 'governmentid',      self::STREAMER_RONOTIFY => true];
-            $mapping[SYNC_POOMCONTACTS2_IMADDRESS] = [self::STREAMER_VAR => 'imaddress',         self::STREAMER_RONOTIFY => true];
-            $mapping[SYNC_POOMCONTACTS2_IMADDRESS2] = [self::STREAMER_VAR => 'imaddress2',        self::STREAMER_RONOTIFY => true];
-            $mapping[SYNC_POOMCONTACTS2_IMADDRESS3] = [self::STREAMER_VAR => 'imaddress3',        self::STREAMER_RONOTIFY => true];
-            $mapping[SYNC_POOMCONTACTS2_MANAGERNAME] = [self::STREAMER_VAR => 'managername',       self::STREAMER_RONOTIFY => true];
-            $mapping[SYNC_POOMCONTACTS2_COMPANYMAINPHONE] = [self::STREAMER_VAR => 'companymainphone',  self::STREAMER_RONOTIFY => true];
-            $mapping[SYNC_POOMCONTACTS2_ACCOUNTNAME] = [self::STREAMER_VAR => 'accountname',       self::STREAMER_RONOTIFY => true];
-            $mapping[SYNC_POOMCONTACTS2_NICKNAME] = [self::STREAMER_VAR => 'nickname',          self::STREAMER_RONOTIFY => true];
-            $mapping[SYNC_POOMCONTACTS2_MMS] = [self::STREAMER_VAR => 'mms',               self::STREAMER_RONOTIFY => true];
+            $mapping[SYNC_POOMCONTACTS2_CUSTOMERID] = [self::STREAMER_VAR => 'customerid', self::STREAMER_RONOTIFY => true];
+            $mapping[SYNC_POOMCONTACTS2_GOVERNMENTID] = [self::STREAMER_VAR => 'governmentid', self::STREAMER_RONOTIFY => true];
+            $mapping[SYNC_POOMCONTACTS2_IMADDRESS] = [self::STREAMER_VAR => 'imaddress', self::STREAMER_RONOTIFY => true];
+            $mapping[SYNC_POOMCONTACTS2_IMADDRESS2] = [self::STREAMER_VAR => 'imaddress2', self::STREAMER_RONOTIFY => true];
+            $mapping[SYNC_POOMCONTACTS2_IMADDRESS3] = [self::STREAMER_VAR => 'imaddress3', self::STREAMER_RONOTIFY => true];
+            $mapping[SYNC_POOMCONTACTS2_MANAGERNAME] = [self::STREAMER_VAR => 'managername', self::STREAMER_RONOTIFY => true];
+            $mapping[SYNC_POOMCONTACTS2_COMPANYMAINPHONE] = [self::STREAMER_VAR => 'companymainphone', self::STREAMER_RONOTIFY => true];
+            $mapping[SYNC_POOMCONTACTS2_ACCOUNTNAME] = [self::STREAMER_VAR => 'accountname', self::STREAMER_RONOTIFY => true];
+            $mapping[SYNC_POOMCONTACTS2_NICKNAME] = [self::STREAMER_VAR => 'nickname', self::STREAMER_RONOTIFY => true];
+            $mapping[SYNC_POOMCONTACTS2_MMS] = [self::STREAMER_VAR => 'mms', self::STREAMER_RONOTIFY => true];
         }
 
         if (Request::GetProtocolVersion() >= 12.0) {

lib/syncobjects/syncbasebodypart.php

Spacing +2 added lines, -2 removed lines

@@ -22,13 +22,13 @@
             SYNC_AIRSYNCBASE_STATUS => [self::STREAMER_VAR => 'status'],
             SYNC_AIRSYNCBASE_TYPE => [self::STREAMER_VAR => 'type'],
             SYNC_AIRSYNCBASE_ESTIMATEDDATASIZE => [self::STREAMER_VAR => 'estimatedDataSize',
-                self::STREAMER_PRIVATE => strlen(self::STRIP_PRIVATE_SUBSTITUTE), ],          // when stripping private we set the body to self::STRIP_PRIVATE_SUBSTITUTE, so the size needs to be its length
+                self::STREAMER_PRIVATE => strlen(self::STRIP_PRIVATE_SUBSTITUTE), ], // when stripping private we set the body to self::STRIP_PRIVATE_SUBSTITUTE, so the size needs to be its length
             SYNC_AIRSYNCBASE_TRUNCATED => [self::STREAMER_VAR => 'truncated'],
             SYNC_AIRSYNCBASE_DATA => [self::STREAMER_VAR => 'data',
                 self::STREAMER_TYPE => self::STREAMER_TYPE_STREAM_ASPLAIN,
                 self::STREAMER_PROP => self::STREAMER_TYPE_MULTIPART,
                 self::STREAMER_RONOTIFY => true,
-                self::STREAMER_PRIVATE => StringStreamWrapper::Open(self::STRIP_PRIVATE_SUBSTITUTE), ],       // replace the body with self::STRIP_PRIVATE_SUBSTITUTE when stripping private
+                self::STREAMER_PRIVATE => StringStreamWrapper::Open(self::STRIP_PRIVATE_SUBSTITUTE), ], // replace the body with self::STRIP_PRIVATE_SUBSTITUTE when stripping private
             SYNC_AIRSYNCBASE_PREVIEW => [self::STREAMER_VAR => 'preview',
                 self::STREAMER_PRIVATE => self::STRIP_PRIVATE_SUBSTITUTE, ],
         ];

lib/syncobjects/syncprovisioning.php

Spacing +4 added lines, -4 removed lines

@@ -77,12 +77,12 @@ 
 
             SYNC_PROVISION_MINDEVPWLENGTH => [self::STREAMER_VAR => 'mindevpwlenngth',
                 self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => 0,
-                    self::STREAMER_CHECK_CMPLOWER => 17,  ], ],
+                    self::STREAMER_CHECK_CMPLOWER => 17, ], ],
 
             SYNC_PROVISION_MAXINACTTIMEDEVLOCK => [self::STREAMER_VAR => 'maxinacttimedevlock'],
             SYNC_PROVISION_MAXDEVPWFAILEDATTEMPTS => [self::STREAMER_VAR => 'maxdevpwfailedattempts',
                 self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => 3,
-                    self::STREAMER_CHECK_CMPLOWER => 17,  ], ],
+                    self::STREAMER_CHECK_CMPLOWER => 17, ], ],
 
             SYNC_PROVISION_MAXATTSIZE => [self::STREAMER_VAR => 'maxattsize',
                 self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
@@ -147,7 +147,7 @@ 
 
                 SYNC_PROVISION_MAXEMAILAGEFILTER => [self::STREAMER_VAR => 'maxemailagefilter',
                     self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -1,
-                        self::STREAMER_CHECK_CMPLOWER => 6,  ], ],
+                        self::STREAMER_CHECK_CMPLOWER => 6, ], ],
 
                 SYNC_PROVISION_MAXEMAILBODYTRUNCSIZE => [self::STREAMER_VAR => 'maxemailbodytruncsize',
                     self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -2], ],
@@ -187,7 +187,7 @@ 
 
                 SYNC_PROVISION_UNAPPROVEDINROMAPPLIST => [self::STREAMER_VAR => 'unapprovedinromapplist',
                     self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
-                    self::STREAMER_ARRAY => SYNC_PROVISION_APPNAME, ],  // TODO check
+                    self::STREAMER_ARRAY => SYNC_PROVISION_APPNAME, ], // TODO check
 
                 SYNC_PROVISION_APPROVEDAPPLIST => [self::STREAMER_VAR => 'approvedapplist',
                     self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,

lib/syncobjects/syncappointment.php

Spacing +2 added lines, -2 removed lines

@@ -106,7 +106,7 @@ 
                 self::STREAMER_CHECKS => [self::STREAMER_CHECK_REQUIRED => self::STREAMER_CHECK_SETTWO,
                     self::STREAMER_CHECK_ONEVALUEOF => [0, 1, 2, 3, 4], ],
                 self::STREAMER_RONOTIFY => true,
-                self::STREAMER_PRIVATE => 2,                   // if private is stripped, value will be set to 2 (busy)
+                self::STREAMER_PRIVATE => 2, // if private is stripped, value will be set to 2 (busy)
                 self::STREAMER_VALUEMAP => [0 => 'Free',
                     1 => 'Tentative',
                     2 => 'Busy',
@@ -122,7 +122,7 @@ 
             SYNC_POOMCAL_REMINDER => [self::STREAMER_VAR => 'reminder',
                 self::STREAMER_CHECKS => [self::STREAMER_CHECK_CMPHIGHER => -1],
                 self::STREAMER_RONOTIFY => true,
-                self::STREAMER_PRIVATE => true, ],              // if private is stripped, value will be unset (no reminder)
+                self::STREAMER_PRIVATE => true, ], // if private is stripped, value will be unset (no reminder)
 
             SYNC_POOMCAL_RTF => [self::STREAMER_VAR => 'rtf',
                 self::STREAMER_PRIVATE => true, ],

lib/core/interprocessdata.php

Spacing +2 added lines, -2 removed lines

@@ -286,11 +286,11 @@
     protected function getComposedKey($key1, $key2, $key3 = -1) {
         $_k = $key1;
         if ($key2 > -1) {
-            $_k .= '|-|' . $key2;
+            $_k .= '|-|'.$key2;
         }
 
         if ($key3 > -1) {
-            $_k .= '|-|' . $key3;
+            $_k .= '|-|'.$key3;
         }
 
         return $_k;

lib/core/slog.php

Spacing +6 added lines, -6 removed lines

@@ -56,7 +56,7 @@ 
         // truncate messages longer than 10 KB
         $messagesize = strlen($message);
         if ($truncate && $messagesize > 10240) {
-            $message = substr($message, 0, 10240) . sprintf(' <log message with %d bytes truncated>', $messagesize);
+            $message = substr($message, 0, 10240).sprintf(' <log message with %d bytes truncated>', $messagesize);
         }
 
         self::$lastLogs[$loglevel] = $message;
@@ -69,7 +69,7 @@ 
         }
 
         if ($loglevel & LOGLEVEL_WBXMLSTACK) {
-            self::$wbxmlDebug .= $message . PHP_EOL;
+            self::$wbxmlDebug .= $message.PHP_EOL;
         }
     }
 
@@ -116,7 +116,7 @@ 
 
             $logger = LOGBACKEND_CLASS;
             if (!class_exists($logger)) {
-                $errmsg = 'The configured logging class `' . $logger . '` does not exist. Check your configuration.';
+                $errmsg = 'The configured logging class `'.$logger.'` does not exist. Check your configuration.';
                 error_log($errmsg);
 
                 throw new \Exception($errmsg);
@@ -177,7 +177,7 @@ 
 
         default:
             $bt = debug_backtrace();
-            SLog::Write(LOGLEVEL_ERROR, "trace error: {$errfile}:{$errline} {$errstr} ({$errno}) - backtrace: " . (count($bt) - 1) . ' steps');
+            SLog::Write(LOGLEVEL_ERROR, "trace error: {$errfile}:{$errline} {$errstr} ({$errno}) - backtrace: ".(count($bt) - 1).' steps');
             for ($i = 1, $bt_length = count($bt); $i < $bt_length; ++$i) {
                 $file = $line = 'unknown';
                 if (isset($bt[$i]['file'])) {
@@ -186,7 +186,7 @@ 
                 if (isset($bt[$i]['line'])) {
                     $line = $bt[$i]['line'];
                 }
-                SLog::Write(LOGLEVEL_ERROR, "trace: {$i}:" . $file . ':' . $line . ' - ' . ((isset($bt[$i]['class'])) ? $bt[$i]['class'] . $bt[$i]['type'] : '') . $bt[$i]['function'] . '()');
+                SLog::Write(LOGLEVEL_ERROR, "trace: {$i}:".$file.':'.$line.' - '.((isset($bt[$i]['class'])) ? $bt[$i]['class'].$bt[$i]['type'] : '').$bt[$i]['function'].'()');
             }
             // throw new Exception("An error occurred.");
             break;
@@ -211,7 +211,7 @@ 
         $errstr = $error['message'];
 
         // do NOT log PHP Notice, Warning, Deprecated or Strict as FATAL
-        if ($errno & ~(E_NOTICE | E_WARNING | E_DEPRECATED | E_STRICT)) {
+        if ($errno & ~(E_NOTICE|E_WARNING|E_DEPRECATED|E_STRICT)) {
             SLog::Write(LOGLEVEL_FATAL, sprintf('Fatal error: %s:%d - %s (%s)', $errfile, $errline, $errstr, $errno));
         }
     }

lib/core/streamer.php

Indentation +7 added lines, -7 removed lines

@@ -253,13 +253,13 @@
                                 $encoder->endTag();
                             } else {
                                 if (0 == strlen($element))
-                                      // Do not output empty items. Not sure if we should output an empty tag with $encoder->startTag($map[self::STREAMER_ARRAY], false, true);
-                                      ; else {
-                                          $encoder->startTag($map[self::STREAMER_ARRAY]);
-                                          $encoder->content($element);
-                                          $encoder->endTag();
-                                          $streamed = true;
-                                      }
+                                        // Do not output empty items. Not sure if we should output an empty tag with $encoder->startTag($map[self::STREAMER_ARRAY], false, true);
+                                        ; else {
+                                            $encoder->startTag($map[self::STREAMER_ARRAY]);
+                                            $encoder->content($element);
+                                            $encoder->endTag();
+                                            $streamed = true;
+                                        }
                             }
                         }
 

lib/core/loopdetection.php

Spacing +6 added lines, -6 removed lines

@@ -361,7 +361,7 @@ 
         }
 
         $ok = false;
-        $brokenkey = self::BROKENMSGS . '-' . $folderid;
+        $brokenkey = self::BROKENMSGS.'-'.$folderid;
 
         // initialize params
         $this->initializeParams();
@@ -398,7 +398,7 @@ 
             return [];
         }
 
-        $brokenkey = self::BROKENMSGS . '-' . $folderid;
+        $brokenkey = self::BROKENMSGS.'-'.$folderid;
         $removeIds = [];
         $okIds = [];
 
@@ -538,7 +538,7 @@ 
                         || (isset($current['usage']) && $current['usage'] >= $counter)
                 )) {
                     $usage = isset($current['usage']) ? sprintf(' - counter %d already expired', $current['usage']) : '';
-                    SLog::Write(LOGLEVEL_DEBUG, 'LoopDetection->IsSyncStateObsolete(): yes, counter already processed' . $usage);
+                    SLog::Write(LOGLEVEL_DEBUG, 'LoopDetection->IsSyncStateObsolete(): yes, counter already processed'.$usage);
                     $obsolete = true;
                 }
             }
@@ -693,7 +693,7 @@ 
                             $current['loopcount'] = 1;
                             // the MaxCount is the max number of messages exported before
                             $current['maxCount'] = $counter + (($maxItems < $queuedMessages) ? $maxItems : $queuedMessages);
-                            $loop = true;   // loop mode!!
+                            $loop = true; // loop mode!!
                         }
                     } elseif (0 == $queuedMessages) {
                         // case 3.2) there was a loop before but now the changes are GONE
@@ -711,7 +711,7 @@ 
                             $this->ignore_messageid = $current['potential'];
                         }
                         $current['maxCount'] = $counter + (($maxItems < $queuedMessages) ? $maxItems : $queuedMessages);
-                        $loop = true;   // loop mode!!
+                        $loop = true; // loop mode!!
                     }
                 }
             }
@@ -786,7 +786,7 @@ 
                 $changedData = true;
 
                 // check if this message was broken before - here we know that it still is and remove it from the tracking
-                $brokenkey = self::BROKENMSGS . '-' . $folderid;
+                $brokenkey = self::BROKENMSGS.'-'.$folderid;
             // TODO: this is currently not supported here! It's in a different structure now!
 //                if (isset($loopdata[self::$devid][self::$user][$brokenkey]) && isset($loopdata[self::$devid][self::$user][$brokenkey][$messageid])) {
 //                    SLog::Write(LOGLEVEL_DEBUG, sprintf("LoopDetection->IgnoreNextMessage(): previously broken message '%s' is still broken and will not be tracked anymore", $messageid));