grommunio / grommunio-sync

grommunio-sync-top.php

Braces +1 added lines, -2 removed lines

@@ -57,8 +57,7 @@
 		else {
 			echo "grommunio-sync interprocess communication (IPC) is not available or TopCollector is disabled.\n";
 		}
-	}
-	catch (GSyncException $zpe) {
+	} catch (GSyncException $zpe) {
 		fwrite(STDERR, get_class($zpe) . ": " . $zpe->getMessage() . "\n");
 
 		exit(1);

lib/request/foldersync.php

Braces +4 added lines, -8 removed lines

@@ -49,11 +49,9 @@ 
 
 			// there are no SyncParameters for the hierarchy, but we use it to save the latest synckeys
 			$spa = self::$deviceManager->GetStateManager()->GetSynchedFolderState(false);
-		}
-		catch (StateNotFoundException $snfex) {
+		} catch (StateNotFoundException $snfex) {
 			$status = SYNC_FSSTATUS_SYNCKEYERROR;
-		}
-		catch (StateInvalidException $sive) {
+		} catch (StateInvalidException $sive) {
 			$status = SYNC_FSSTATUS_SYNCKEYERROR;
 		}
 
@@ -121,8 +119,7 @@ 
 						SLog::Write(LOGLEVEL_WARN, sprintf("Request->HandleFolderSync(): ignoring incoming folderchange for folder '%s' as status indicates problem.", $folder->displayname));
 						self::$topCollector->AnnounceInformation("Incoming change ignored", true);
 					}
-				}
-				catch (StatusException $stex) {
+				} catch (StatusException $stex) {
 					$status = $stex->getCode();
 				}
 			}
@@ -199,8 +196,7 @@ 
 
 				// get the new state from the backend
 				$newsyncstate = (isset($exporter)) ? $exporter->GetState() : "";
-			}
-			catch (StatusException $stex) {
+			} catch (StatusException $stex) {
 				if ($stex->getCode() == SYNC_FSSTATUS_CODEUNKNOWN) {
 					$status = SYNC_FSSTATUS_SYNCKEYERROR;
 				}

lib/request/sync.php

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/grommunio/grommunio.php

Braces +3 added lines, -6 removed lines

@@ -163,8 +163,7 @@ 
 					throw new ServiceUnavailableException("Error connecting to KC (login)");
 				}
 			}
-		}
-		catch (MAPIException $ex) {
+		} catch (MAPIException $ex) {
 			throw new AuthenticationRequiredException($ex->getDisplayMessage());
 		}
 
@@ -1660,8 +1659,7 @@ 
 			if (isset($stateMessageProps[PR_LAST_MODIFICATION_TIME])) {
 				return $stateMessageProps[PR_LAST_MODIFICATION_TIME];
 			}
-		}
-		catch (StateNotFoundException $e) {
+		} catch (StateNotFoundException $e) {
 		}
 
 		return "0";
@@ -1966,8 +1964,7 @@ 
 
 		try {
 			$stateMessage = $this->getStateMessage($devid, $type, $key, $counter);
-		}
-		catch (StateNotFoundException $e) {
+		} catch (StateNotFoundException $e) {
 			// if message is not available, try to create a new one
 			$stateMessage = mapi_folder_createmessage($this->stateFolder, MAPI_ASSOCIATED);
 			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->setStateMessage(): mapi_folder_createmessage 0x%08X", mapi_last_hresult()));

lib/core/devicemanager.php

Braces +3 added lines, -6 removed lines

@@ -165,8 +165,7 @@ 
 					$this->setDeviceUserData($this->type, [self::$user => $this->device], self::$devid, -1, $doCas = "merge");
 					SLog::Write(LOGLEVEL_DEBUG, "DeviceManager->Save(): Device data saved");
 				}
-			}
-			catch (StateNotFoundException $snfex) {
+			} catch (StateNotFoundException $snfex) {
 				SLog::Write(LOGLEVEL_ERROR, "DeviceManager->Save(): Exception: " . $snfex->getMessage());
 			}
 		}
@@ -950,11 +949,9 @@ 
 				}
 				$this->stateManager->SetDevice($this->device);
 			}
-		}
-		catch (StateNotFoundException $snfex) {
+		} catch (StateNotFoundException $snfex) {
 			$this->hierarchySyncRequired = true;
-		}
-		catch (UnavailableException $uaex) {
+		} catch (UnavailableException $uaex) {
 			// This is temporary and can be ignored e.g. in PING - see https://jira.z-hub.io/browse/ZP-1054
 			// If the hash was not available before we treat it like a StateNotFoundException.
 			if ($this->deviceHash === false) {

lib/core/statemanager.php

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

lib/core/synccollections.php

Braces +5 added lines, -10 removed lines

@@ -60,8 +60,7 @@ 
 			}
 
 			return true;
-		}
-		catch (GSyncException $e) {
+		} catch (GSyncException $e) {
 		}
 
 		return false;
@@ -165,8 +164,7 @@ 
 
 				return true;
 			}
-		}
-		catch (StateInvalidException $sive) {
+		} catch (StateInvalidException $sive) {
 			// in case there is something wrong with the state, just stop here
 			// later when trying to retrieve the SyncParameters nothing will be found
 
@@ -193,8 +191,7 @@ 
 			try {
 				// make sure the hierarchy cache is loaded when we are loading hierarchy states
 				$this->addparms[$folderid]["state"] = $this->stateManager->GetSyncState($spa->GetLatestSyncKey($confirmedOnly), ($folderid === false));
-			}
-			catch (StateNotFoundException $snfe) {
+			} catch (StateNotFoundException $snfe) {
 				// if we can't find the state, first we should try a sync of that folder, so
 				// we generate a fake change, so a sync on this folder is triggered
 				$this->changes[$folderid] = 1;
@@ -698,8 +695,7 @@ 
 					$changecount = $exporter->GetChangeCount();
 				}
 			}
-		}
-		catch (StatusException $ste) {
+		} catch (StatusException $ste) {
 			if ($ste->getCode() == SYNC_STATUS_FOLDERHIERARCHYCHANGED) {
 				SLog::Write(LOGLEVEL_WARN, "SyncCollections->CountChange(): exporter can not be re-configured due to state error, emulating change in folder to force Sync.");
 				$this->changes[$folderid] = 1;
@@ -767,8 +763,7 @@ 
 
 					$this->hierarchyExporterChecked = true;
 				}
-			}
-			catch (StatusException $ste) {
+			} catch (StatusException $ste) {
 				throw new StatusException("SyncCollections->countHierarchyChange(): exporter can not be re-configured.", self::ERROR_WRONG_HIERARCHY, null, LOGLEVEL_WARN);
 			}
 

lib/core/slog.php

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.
 		}

index.php

Braces +2 added lines, -4 removed lines

@@ -150,8 +150,7 @@ 
 
 		// destruct backend after all data is on the stream
 		$backend->Logoff();
-	}
-	catch (NoPostRequestException $nopostex) {
+	} catch (NoPostRequestException $nopostex) {
 		if ($nopostex->getCode() == NoPostRequestException::OPTIONS_REQUEST) {
 			header(GSync::GetServerHeader());
 			header(GSync::GetSupportedProtocolVersions());
@@ -166,8 +165,7 @@ 
 				GSync::PrintGrommunioSyncLegal('GET not supported', $nopostex->getMessage());
 			}
 		}
-	}
-	catch (Exception $ex) {
+	} catch (Exception $ex) {
 		// Extract any previous exception message for logging purpose.
 		$exclass = get_class($ex);
 		$exception_message = $ex->getMessage();