grommunio / grommunio-sync

lib/request/itemoperations.php

Spacing +1 added lines, -1 removed lines

@@ -249,7 +249,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;
 								}

Braces +3 added lines, -6 removed lines

@@ -315,8 +315,7 @@ 
 					try {
 						self::$topCollector->AnnounceInformation("Get attachment data from backend with file reference");
 						$data = self::$backend->GetAttachmentData($operation['filereference']);
-					}
-					catch (StatusException $stex) {
+					} catch (StatusException $stex) {
 						$status = $stex->getCode();
 					}
 				}
@@ -331,8 +330,7 @@ 
 							$tmp = explode(":", $operation['longid']);
 							$data = self::$backend->Fetch(self::$deviceManager->GetBackendIdForFolderId($tmp[0]), $tmp[1], $operation["cpo"]);
 						}
-					}
-					catch (StatusException $stex) {
+					} catch (StatusException $stex) {
 						// the only option to return is that we could not retrieve it
 						$status = SYNC_ITEMOPERATIONSSTATUS_CONVERSIONFAILED;
 					}
@@ -396,8 +394,7 @@ 
 
 					// send request to backend
 					self::$backend->EmptyFolder($operation['backendfolderid'], $operation['deletesubfolders']);
-				}
-				catch (StatusException $stex) {
+				} catch (StatusException $stex) {
 					$status = $stex->getCode();
 				}
 

lib/request/getitemestimate.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,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;
 						}

Braces +6 added lines, -12 removed lines

@@ -38,8 +38,7 @@ 
 				if (self::$decoder->getElementStartTag(SYNC_SYNCKEY)) {
 					try {
 						$spa->SetSyncKey(self::$decoder->getElementContent());
-					}
-					catch (StateInvalidException $siex) {
+					} catch (StateInvalidException $siex) {
 						$spastatus = SYNC_GETITEMESTSTATUS_SYNCSTATENOTPRIMED;
 					}
 
@@ -149,8 +148,7 @@ 
 			if (!$spa->HasContentClass() && $spa->HasFolderId()) {
 				try {
 					$spa->SetContentClass(self::$deviceManager->GetFolderClassFromCacheByID($spa->GetFolderId()));
-				}
-				catch (NoHierarchyCacheAvailableException $nhca) {
+				} catch (NoHierarchyCacheAvailableException $nhca) {
 					$spastatus = SYNC_GETITEMESTSTATUS_COLLECTIONINVALID;
 				}
 			}
@@ -174,22 +172,19 @@ 
 					if (!self::$backend->Setup(GSync::GetAdditionalSyncFolderStore($spa->GetBackendFolderId()))) {
 						throw new StatusException(sprintf("HandleGetItemEstimate() could not Setup() the backend for folder id %s/%s", $spa->GetFolderId(), $spa->GetBackendFolderId()), SYNC_GETITEMESTSTATUS_COLLECTIONINVALID);
 					}
-				}
-				catch (StateNotFoundException $snfex) {
+				} catch (StateNotFoundException $snfex) {
 					// ok, the key is invalid. Question is, if the hierarchycache is still ok
 					// if not, we have to issue SYNC_GETITEMESTSTATUS_COLLECTIONINVALID which triggers a FolderSync
 					try {
 						self::$deviceManager->GetFolderClassFromCacheByID($spa->GetFolderId());
 						// we got here, so the HierarchyCache is ok
 						$sc->AddParameter($spa, "status", SYNC_GETITEMESTSTATUS_SYNCKKEYINVALID);
-					}
-					catch (NoHierarchyCacheAvailableException $nhca) {
+					} catch (NoHierarchyCacheAvailableException $nhca) {
 						$sc->AddParameter($spa, "status", SYNC_GETITEMESTSTATUS_COLLECTIONINVALID);
 					}
 
 					self::$topCollector->AnnounceInformation("StateNotFoundException " . $sc->GetParameter($spa, "status"), true);
-				}
-				catch (StatusException $stex) {
+				} catch (StatusException $stex) {
 					if ($stex->getCode() == SYNC_GETITEMESTSTATUS_COLLECTIONINVALID) {
 						$sc->AddParameter($spa, "status", SYNC_GETITEMESTSTATUS_COLLECTIONINVALID);
 					}
@@ -216,8 +211,7 @@ 
 
 		try {
 			$sc->CountChanges();
-		}
-		catch (StatusException $ste) {
+		} catch (StatusException $ste) {
 			$status = SYNC_GETITEMESTSTATUS_COLLECTIONINVALID;
 		}
 		$changes = $sc->GetChangedFolderIds();

lib/request/sync.php

Spacing +4 added lines, -4 removed lines

@@ -206,7 +206,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;
 							}
@@ -249,7 +249,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;
 							}
@@ -1197,7 +1197,7 @@ 
 		}
 
 		// Stream outgoing changes
-		if ($status == SYNC_STATUS_SUCCESS && $sc->GetParameter($spa, "getchanges") == true && $windowSize > 0 && (bool) $exporter) {
+		if ($status == SYNC_STATUS_SUCCESS && $sc->GetParameter($spa, "getchanges") == true && $windowSize > 0 && (bool)$exporter) {
 			self::$topCollector->AnnounceInformation(sprintf("Streaming data of %d objects", (($changecount > $windowSize) ? $windowSize : $changecount)));
 
 			// Output message changes per folder
@@ -1249,7 +1249,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();
 			}
 

Braces +17 added lines, -34 removed lines

@@ -141,8 +141,7 @@ 
 							}
 							$spa->SetSyncKey($synckey);
 						}
-					}
-					catch (StateInvalidException $stie) {
+					} catch (StateInvalidException $stie) {
 						$spa = new SyncParameters();
 						$status = SYNC_STATUS_INVALIDSYNCKEY;
 						self::$topCollector->AnnounceInformation("State invalid - Resync folder", $this->singleFolder);
@@ -163,8 +162,7 @@ 
 						try {
 							$spa->SetContentClass(self::$deviceManager->GetFolderClassFromCacheByID($spa->GetFolderId()));
 							SLog::Write(LOGLEVEL_DEBUG, sprintf("GetFolderClassFromCacheByID from Device Manager: '%s' for id:'%s'", $spa->GetContentClass(), $spa->GetFolderId()));
-						}
-						catch (NoHierarchyCacheAvailableException $nhca) {
+						} catch (NoHierarchyCacheAvailableException $nhca) {
 							$status = SYNC_STATUS_FOLDERHIERARCHYCHANGED;
 							self::$deviceManager->ForceFullResync();
 						}
@@ -563,8 +561,7 @@ 
 							try {
 								// Save the updated state, which is used for the exporter later
 								$sc->AddParameter($spa, "state", $this->importer->GetState());
-							}
-							catch (StatusException $stex) {
+							} catch (StatusException $stex) {
 								$status = $stex->getCode();
 							}
 						}
@@ -657,13 +654,11 @@ 
 			// Load all collections - do not overwrite existing (received!), load states, check permissions and only load confirmed states!
 			try {
 				$sc->LoadAllCollections(false, true, true, true, true);
-			}
-			catch (StateInvalidException $siex) {
+			} catch (StateInvalidException $siex) {
 				$status = SYNC_STATUS_INVALIDSYNCKEY;
 				self::$topCollector->AnnounceInformation("StateNotFoundException", $this->singleFolder);
 				$this->saveMultiFolderInfo("exception", "StateNotFoundException");
-			}
-			catch (StatusException $stex) {
+			} catch (StatusException $stex) {
 				$status = SYNC_STATUS_FOLDERHIERARCHYCHANGED;
 				self::$topCollector->AnnounceInformation(sprintf("StatusException code: %d", $status), $this->singleFolder);
 				$this->saveMultiFolderInfo("exception", "StatusException");
@@ -730,8 +725,7 @@ 
 					// always check for changes
 					SLog::Write(LOGLEVEL_DEBUG, sprintf("HandleSync(): Entering Heartbeat mode"));
 					$foundchanges = $sc->CheckForChanges($sc->GetLifetime(), $interval);
-				}
-				catch (StatusException $stex) {
+				} catch (StatusException $stex) {
 					if ($stex->getCode() == SyncCollections::OBSOLETE_CONNECTION) {
 						$status = SYNC_COMMONSTATUS_SYNCSTATEVERSIONINVALID;
 					}
@@ -875,8 +869,7 @@ 
 							if ($exporter === false) {
 								throw new StatusException(sprintf("HandleSync() could not get an exporter for folder id %s/%s", $spa->GetFolderId(), $spa->GetBackendFolderId()), SYNC_STATUS_FOLDERHIERARCHYCHANGED);
 							}
-						}
-						catch (StatusException $stex) {
+						} catch (StatusException $stex) {
 							$status = $stex->getCode();
 						}
 
@@ -891,8 +884,7 @@ 
 
 								$changecount = $exporter->GetChangeCount();
 							}
-						}
-						catch (StatusException $stex) {
+						} catch (StatusException $stex) {
 							if ($stex->getCode() === SYNC_FSSTATUS_CODEUNKNOWN && $spa->HasSyncKey()) {
 								$status = SYNC_STATUS_INVALIDSYNCKEY;
 							}
@@ -1150,8 +1142,7 @@ 
 						SLog::Write(LOGLEVEL_DEBUG, sprintf("HandleSync(): message not to be streamed as requested by DeviceManager, id = %s", $id));
 						$fetchstatus = SYNC_STATUS_CLIENTSERVERCONVERSATIONERROR;
 					}
-				}
-				catch (StatusException $stex) {
+				} catch (StatusException $stex) {
 					$fetchstatus = $stex->getCode();
 				}
 
@@ -1215,8 +1206,7 @@ 
 					if ($n % 10 == 0) {
 						self::$topCollector->AnnounceInformation(sprintf("Streamed data of %d objects out of %d", $n, (($changecount > $windowSize) ? $windowSize : $changecount)));
 					}
-				}
-				catch (SyncObjectBrokenException $mbe) {
+				} catch (SyncObjectBrokenException $mbe) {
 					$brokenSO = $mbe->GetSyncObject();
 					if (!$brokenSO) {
 						SLog::Write(LOGLEVEL_ERROR, sprintf("HandleSync(): Caught SyncObjectBrokenException but broken SyncObject not available. This should be fixed in the backend."));
@@ -1316,8 +1306,7 @@ 
 				elseif (!$spa->HasSyncKey()) {
 					$state = "";
 				}
-			}
-			catch (StatusException $stex) {
+			} catch (StatusException $stex) {
 				$status = $stex->getCode();
 			}
 
@@ -1365,13 +1354,11 @@ 
 				if (!self::$backend->Setup(GSync::GetAdditionalSyncFolderStore($spa->GetBackendFolderId()))) {
 					throw new StatusException(sprintf("HandleSync() could not Setup() the backend for folder id %s/%s", $spa->GetFolderId(), $spa->GetBackendFolderId()), SYNC_STATUS_FOLDERHIERARCHYCHANGED);
 				}
-			}
-			catch (StateNotFoundException $snfex) {
+			} catch (StateNotFoundException $snfex) {
 				$status = SYNC_STATUS_INVALIDSYNCKEY;
 				self::$topCollector->AnnounceInformation("StateNotFoundException", $this->singleFolder);
 				$this->saveMultiFolderInfo("exception", "StateNotFoundException");
-			}
-			catch (StatusException $stex) {
+			} catch (StatusException $stex) {
 				$status = $stex->getCode();
 				self::$topCollector->AnnounceInformation(sprintf("StatusException code: %d", $status), $this->singleFolder);
 				$this->saveMultiFolderInfo("exception", "StateNotFoundException");
@@ -1420,8 +1407,7 @@ 
 				$this->importer->ConfigContentParameters($spa->GetCPO());
 				$this->importer->LoadConflicts($spa->GetCPO(), $sc->GetParameter($spa, "state"));
 			}
-		}
-		catch (StatusException $stex) {
+		} catch (StatusException $stex) {
 			$status = $stex->getCode();
 		}
 
@@ -1521,8 +1507,7 @@ 
 
 							$actiondata["statusids"][$serverid] = SYNC_STATUS_SUCCESS;
 						}
-					}
-					catch (StatusException $stex) {
+					} catch (StatusException $stex) {
 						$actiondata["statusids"][$serverid] = $stex->getCode();
 					}
 					break;
@@ -1552,8 +1537,7 @@ 
 							$actiondata["clientids"][$clientid] = $this->importer->ImportMessageChange(false, $message);
 							$actiondata["statusids"][$clientid] = SYNC_STATUS_SUCCESS;
 						}
-					}
-					catch (StatusException $stex) {
+					} catch (StatusException $stex) {
 						$actiondata["statusids"][$clientid] = $stex->getCode();
 					}
 					break;
@@ -1587,8 +1571,7 @@ 
 							$this->importer->ImportMessageDeletion($serverid);
 							$actiondata["statusids"][$serverid] = SYNC_STATUS_SUCCESS;
 						}
-					}
-					catch (StatusException $stex) {
+					} catch (StatusException $stex) {
 						if ($stex->getCode() != SYNC_MOVEITEMSSTATUS_SUCCESS) {
 							$actiondata["statusids"][$serverid] = SYNC_STATUS_OBJECTNOTFOUND;
 						}

lib/request/request.php

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 class Request {
-	public const MAXMEMORYUSAGE = 0.9;     // use max. 90% of allowed memory when syncing
+	public const MAXMEMORYUSAGE = 0.9; // use max. 90% of allowed memory when syncing
 	public const UNKNOWN = "unknown";
 	public const IMPERSONATE_DELIM = '#';
 
@@ -140,7 +140,7 @@ 
 			}
 
 			if (isset(self::$base64QueryDecoded['PolKey'])) {
-				self::$policykey = (int) self::filterEvilInput(self::$base64QueryDecoded['PolKey'], self::NUMBERS_ONLY);
+				self::$policykey = (int)self::filterEvilInput(self::$base64QueryDecoded['PolKey'], self::NUMBERS_ONLY);
 			}
 
 			if (isset(self::$base64QueryDecoded['ProtVer'])) {
@@ -198,7 +198,7 @@ 
 		else {
 			preg_replace_callback(
 				'/(\-?\d+)(.?)/',
-				function ($m) {
+				function($m) {
 					self::$memoryLimit = $m[1] * pow(1024, strpos('BKMG', $m[2])) * self::MAXMEMORYUSAGE;
 				},
 				strtoupper($memoryLimit)
@@ -222,7 +222,7 @@ 
 		// the policy key might be set in Request::Initialize from the base64 encoded query
 		if (!isset(self::$policykey)) {
 			if (isset(self::$headers["x-ms-policykey"])) {
-				self::$policykey = (int) self::filterEvilInput(self::$headers["x-ms-policykey"], self::NUMBERS_ONLY);
+				self::$policykey = (int)self::filterEvilInput(self::$headers["x-ms-policykey"], self::NUMBERS_ONLY);
 			}
 			else {
 				self::$policykey = 0;
@@ -637,7 +637,7 @@ 
 	 * @return int
 	 */
 	public static function GetContentLength() {
-		return (isset(self::$headers["content-length"])) ? (int) self::$headers["content-length"] : 0;
+		return (isset(self::$headers["content-length"])) ? (int)self::$headers["content-length"] : 0;
 	}
 
 	/**

lib/core/slog.php

Spacing +1 added lines, -1 removed lines

@@ -212,7 +212,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));
 		}
 	}

Braces +1 added lines, -2 removed lines

@@ -63,8 +63,7 @@
 
 		try {
 			self::getLogger()->Log($loglevel, $message);
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			// @TODO How should we handle logging error ?
 			// Ignore any error.
 		}

lib/core/loopdetection.php

Spacing +2 added lines, -2 removed lines

@@ -758,7 +758,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 ($queuedMessages == 0) {
@@ -778,7 +778,7 @@ 
 							$this->ignore_messageid = $current['potential'];
 						}
 						$current['maxCount'] = $counter + (($maxItems < $queuedMessages) ? $maxItems : $queuedMessages);
-						$loop = true;   // loop mode!!
+						$loop = true; // loop mode!!
 					}
 				}
 			}

lib/core/topcollector.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 			"ended" => 0,
 			"push" => false,
 		];
-		$this->disabled = (bool) (defined('TOPCOLLECTOR_DISABLED') && constant('TOPCOLLECTOR_DISABLED') === true);
+		$this->disabled = (bool)(defined('TOPCOLLECTOR_DISABLED') && constant('TOPCOLLECTOR_DISABLED') === true);
 		$this->checkEnabledTime = time() - self::ENABLED_CACHETIME - 1;
 		$this->AnnounceInformation("initializing");
 	}

lib/core/gsync.php

Spacing +1 added lines, -1 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;

lib/core/statemanager.php

Spacing +3 added lines, -3 removed lines

@@ -419,7 +419,7 @@ 
 			throw new StateInvalidException(sprintf("SyncKey '%s' is invalid", $synckey));
 		}
 
-		return [$matches[1], (int) $matches[2]];
+		return [$matches[1], (int)$matches[2]];
 	}
 
 	/**
@@ -520,8 +520,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)

Braces +2 added lines, -4 removed lines

@@ -101,8 +101,7 @@ 
 				if ($data !== false) {
 					$this->synchedFolders[$folderid] = $data;
 				}
-			}
-			catch (StateNotFoundException $ex) {
+			} catch (StateNotFoundException $ex) {
 			}
 		}
 
@@ -231,8 +230,7 @@ 
 
 		try {
 			return $this->statemachine->GetState($this->device->GetDeviceId(), IStateMachine::FAILSAVE, $this->uuid, $this->oldStateCounter, $this->deleteOldStates);
-		}
-		catch (StateNotFoundException $snfex) {
+		} catch (StateNotFoundException $snfex) {
 			return false;
 		}
 	}