grommunio / grommunio-sync

lib/request/folderchange.php

Braces +3 added lines, -6 removed lines

@@ -130,11 +130,9 @@ 
 			if (self::$deviceManager->GetFolderTypeFromCacheById($serverid) != SYNC_FOLDER_TYPE_UNKNOWN && !self::$backend->Setup(GSync::GetAdditionalSyncFolderStore((($parentBackendId != false) ? $parentBackendId : $backendid)))) {
 				throw new StatusException(sprintf("HandleFolderChange() could not Setup() the backend for folder id '%s'", (($parentBackendId != false) ? $parentBackendId : $backendid)), SYNC_FSSTATUS_SERVERERROR);
 			}
-		}
-		catch (StateNotFoundException $snfex) {
+		} catch (StateNotFoundException $snfex) {
 			$status = SYNC_FSSTATUS_SYNCKEYERROR;
-		}
-		catch (StatusException $stex) {
+		} catch (StatusException $stex) {
 			$status = $stex->getCode();
 		}
 
@@ -174,8 +172,7 @@ 
 					// delete folder
 					$changesMem->ImportFolderDeletion($folder);
 				}
-			}
-			catch (StatusException $stex) {
+			} catch (StatusException $stex) {
 				$status = $stex->getCode();
 			}
 		}

lib/request/moveitems.php

Braces +1 added lines, -2 removed lines

@@ -92,8 +92,7 @@
 
 				$result = $importer->ImportMessageMove($move["srcmsgid"], self::$deviceManager->GetBackendIdForFolderId($move["dstfldid"]));
 				// We discard the standard importer state for now.
-			}
-			catch (StatusException $stex) {
+			} catch (StatusException $stex) {
 				if ($stex->getCode() == SYNC_STATUS_FOLDERHIERARCHYCHANGED) { // same as SYNC_FSSTATUS_CODEUNKNOWN
 					$status = SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID;
 				}

lib/request/ping.php

Braces +4 added lines, -8 removed lines

@@ -30,8 +30,7 @@ 
 		// Load all collections - do load states, check permissions and allow unconfirmed states
 		try {
 			$sc->LoadAllCollections(true, true, true, true, false);
-		}
-		catch (StateInvalidException $siex) {
+		} catch (StateInvalidException $siex) {
 			// if no params are present, indicate to send params, else do hierarchy sync
 			if (!$params_present) {
 				$pingstatus = SYNC_PINGSTATUS_FAILINGPARAMS;
@@ -49,8 +48,7 @@ 
 
 				self::$topCollector->AnnounceInformation("StateInvalidException: force sync", true);
 			}
-		}
-		catch (StatusException $stex) {
+		} catch (StatusException $stex) {
 			$pingstatus = SYNC_PINGSTATUS_FOLDERHIERSYNCREQUIRED;
 			self::$topCollector->AnnounceInformation("StatusException: require HierarchySync", true);
 		}
@@ -103,8 +101,7 @@ 
 
 								continue;
 							}
-						}
-						catch (NoHierarchyCacheAvailableException $nhca) {
+						} catch (NoHierarchyCacheAvailableException $nhca) {
 							SLog::Write(LOGLEVEL_INFO, sprintf("HandlePing(): unknown collection '%s', triggering HierarchySync", $folderid));
 							$pingstatus = SYNC_PINGSTATUS_FOLDERHIERSYNCREQUIRED;
 						}
@@ -165,8 +162,7 @@ 
 				self::$deviceManager->DoAutomaticASDeviceSaving(false);
 				$foundchanges = $sc->CheckForChanges($sc->GetLifetime(), $interval, true);
 			}
-		}
-		catch (StatusException $ste) {
+		} catch (StatusException $ste) {
 			switch ($ste->getCode()) {
 				case SyncCollections::ERROR_NO_COLLECTIONS:
 					$pingstatus = SYNC_PINGSTATUS_FAILINGPARAMS;

lib/request/itemoperations.php

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

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

Braces +1 added lines, -2 removed lines

@@ -352,8 +352,7 @@
 					$cpo->SetSearchFolderid($backendFolderId);
 					$rows = $searchprovider->GetMailboxSearchResults($cpo);
 				}
-			}
-			catch (StatusException $stex) {
+			} catch (StatusException $stex) {
 				$storestatus = $stex->getCode();
 			}
 		}

lib/request/sendmail.php

Braces +1 added lines, -2 removed lines

@@ -108,8 +108,7 @@
 
 		try {
 			$status = self::$backend->SendMail($sm);
-		}
-		catch (StatusException $se) {
+		} catch (StatusException $se) {
 			$status = $se->getCode();
 			$statusMessage = $se->getMessage();
 		}

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

Braces +1 added lines, -2 removed lines

@@ -117,8 +117,7 @@
 					return SYNC_E_IGNORE;
 				}
 			}
-		}
-		catch (SyncObjectBrokenException $mbe) {
+		} catch (SyncObjectBrokenException $mbe) {
 			$brokenSO = $mbe->GetSyncObject();
 			if (!$brokenSO) {
 				SLog::Write(LOGLEVEL_ERROR, sprintf("PHPWrapper->ImportMessageChange(): Caught SyncObjectBrokenException but broken SyncObject available"));