grommunio / grommunio-sync

lib/request/gethierarchy.php

Braces +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
 			}
 
 			// TODO execute $data->Check() to see if SyncObject is valid
-		}
-		catch (StatusException $ex) {
+		} catch (StatusException $ex) {
 			return false;
 		}
 

lib/request/foldersync.php

Braces +6 added lines, -12 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;
 		}
 
@@ -116,13 +114,11 @@ 
 								$serverid = $changesMem->ImportFolderDeletion($folder);
 								break;
 						}
-					}
-					else {
+					} else {
 						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,12 +195,10 @@ 
 
 				// 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;
-				}
-				else {
+				} else {
 					$status = $stex->getCode();
 				}
 			}

lib/request/folderchange.php

Braces +8 added lines, -16 removed lines

@@ -26,11 +26,9 @@ 
 		$create = $update = $delete = false;
 		if ($el[EN_TAG] == SYNC_FOLDERHIERARCHY_FOLDERCREATE) {
 			$create = true;
-		}
-		elseif ($el[EN_TAG] == SYNC_FOLDERHIERARCHY_FOLDERUPDATE) {
+		} elseif ($el[EN_TAG] == SYNC_FOLDERHIERARCHY_FOLDERUPDATE) {
 			$update = true;
-		}
-		elseif ($el[EN_TAG] == SYNC_FOLDERHIERARCHY_FOLDERDELETE) {
+		} elseif ($el[EN_TAG] == SYNC_FOLDERHIERARCHY_FOLDERDELETE) {
 			$delete = true;
 		}
 
@@ -130,11 +128,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();
 		}
 
@@ -169,13 +165,11 @@ 
 				if (!$delete) {
 					// when creating, $folder->serverid is false, and the returned id is already mapped by the backend
 					$folder = $changesMem->ImportFolderChange($folder);
-				}
-				else {
+				} else {
 					// delete folder
 					$changesMem->ImportFolderDeletion($folder);
 				}
-			}
-			catch (StatusException $stex) {
+			} catch (StatusException $stex) {
 				$status = $stex->getCode();
 			}
 		}
@@ -197,8 +191,7 @@ 
 			self::$encoder->endTag();
 
 			self::$encoder->endTag();
-		}
-		elseif ($update) {
+		} elseif ($update) {
 			self::$encoder->startTag(SYNC_FOLDERHIERARCHY_FOLDERUPDATE);
 
 			self::$encoder->startTag(SYNC_FOLDERHIERARCHY_STATUS);
@@ -210,8 +203,7 @@ 
 			self::$encoder->endTag();
 
 			self::$encoder->endTag();
-		}
-		elseif ($delete) {
+		} elseif ($delete) {
 			self::$encoder->startTag(SYNC_FOLDERHIERARCHY_FOLDERDELETE);
 
 			self::$encoder->startTag(SYNC_FOLDERHIERARCHY_STATUS);

lib/request/moveitems.php

Braces +2 added lines, -4 removed lines

@@ -92,12 +92,10 @@
 
 				$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;
-				}
-				else {
+				} else {
 					$status = $stex->getCode();
 				}
 			}

lib/request/validatecert.php

Braces +1 added lines, -2 removed lines

@@ -29,8 +29,7 @@
 		$checkpurpose = (defined('CAINFO') && CAINFO) ? openssl_x509_checkpurpose($cert_pem, X509_PURPOSE_SMIME_SIGN, [CAINFO]) : openssl_x509_checkpurpose($cert_pem, X509_PURPOSE_SMIME_SIGN);
 		if ($checkpurpose === true) {
 			$status = SYNC_VALIDATECERTSTATUS_SUCCESS;
-		}
-		else {
+		} else {
 			$status = SYNC_VALIDATECERTSTATUS_CANTVALIDATESIG;
 		}
 

lib/request/ping.php

Braces +14 added lines, -28 removed lines

@@ -30,27 +30,23 @@ 
 		// 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;
 				self::$topCollector->AnnounceInformation("StateInvalidException: require PingParameters", true);
-			}
-			elseif (self::$deviceManager->IsHierarchySyncRequired()) {
+			} elseif (self::$deviceManager->IsHierarchySyncRequired()) {
 				// we could be in a looping  - see LoopDetection->ProcessLoopDetectionIsHierarchySyncAdvised()
 				$pingstatus = SYNC_PINGSTATUS_FOLDERHIERSYNCREQUIRED;
 				self::$topCollector->AnnounceInformation("Potential loop detection: require HierarchySync", true);
-			}
-			else {
+			} else {
 				// we do not have a ping status for this, but SyncCollections should have generated fake changes for the folders which are broken
 				$fakechanges = $sc->GetChangedFolderIds();
 				$foundchanges = true;
 
 				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 +99,7 @@ 
 
 								continue;
 							}
-						}
-						catch (NoHierarchyCacheAvailableException $nhca) {
+						} catch (NoHierarchyCacheAvailableException $nhca) {
 							SLog::Write(LOGLEVEL_INFO, sprintf("HandlePing(): unknown collection '%s', triggering HierarchySync", $folderid));
 							$pingstatus = SYNC_PINGSTATUS_FOLDERHIERSYNCREQUIRED;
 						}
@@ -112,8 +107,7 @@ 
 						// Trigger a Sync request because then the device will be forced to resync this folder.
 						$fakechanges[$folderid] = 1;
 						$foundchanges = true;
-					}
-					elseif ($class == $spa->GetContentClass()) {
+					} elseif ($class == $spa->GetContentClass()) {
 						$pingable[] = $folderid;
 						SLog::Write(LOGLEVEL_DEBUG, sprintf("HandlePing(): using saved sync state for '%s' id '%s'", $spa->GetContentClass(), $folderid));
 					}
@@ -127,8 +121,7 @@ 
 					// if the folderid is in $pingable, we should ping it, else remove the flag
 					if (in_array($folderid, $pingable)) {
 						$spa->SetPingableFlag(true);
-					}
-					else {
+					} else {
 						$spa->DelPingableFlag();
 					}
 				}
@@ -152,8 +145,7 @@ 
 			if (!$sc->PingableFolders()) {
 				$pingstatus = SYNC_PINGSTATUS_FAILINGPARAMS;
 				SLog::Write(LOGLEVEL_DEBUG, "HandlePing(): no pingable folders found and no initialization data sent. Returning SYNC_PINGSTATUS_FAILINGPARAMS.");
-			}
-			elseif (!$this->lifetimeBetweenBound($sc->GetLifetime())) {
+			} elseif (!$this->lifetimeBetweenBound($sc->GetLifetime())) {
 				$pingstatus = SYNC_PINGSTATUS_FAILINGPARAMS;
 				SLog::Write(LOGLEVEL_DEBUG, sprintf("HandlePing(): ping lifetime not between bound (higher bound:'%d' lower bound:'%d' current lifetime:'%d'. Returning SYNC_PINGSTATUS_FAILINGPARAMS.", PING_HIGHER_BOUND_LIFETIME, PING_LOWER_BOUND_LIFETIME, $sc->GetLifetime()));
 			}
@@ -165,8 +157,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;
@@ -193,8 +184,7 @@ 
 		self::$encoder->startTag(SYNC_PING_STATUS);
 		if (isset($pingstatus) && $pingstatus) {
 			self::$encoder->content($pingstatus);
-		}
-		else {
+		} else {
 			self::$encoder->content($foundchanges ? SYNC_PINGSTATUS_CHANGES : SYNC_PINGSTATUS_HBEXPIRED);
 		}
 		self::$encoder->endTag();
@@ -204,8 +194,7 @@ 
 
 			if (empty($fakechanges)) {
 				$changes = $sc->GetChangedFolderIds();
-			}
-			else {
+			} else {
 				$changes = $fakechanges;
 			}
 
@@ -222,8 +211,7 @@ 
 						if (empty($fakechanges)) {
 							self::$topCollector->AnnounceInformation(sprintf("Found change in %s", $sc->GetCollection($folderid)->GetContentClass()), true);
 						}
-					}
-					else {
+					} else {
 						$announceAggregated += $changecount;
 					}
 					self::$deviceManager->AnnounceProcessStatus($folderid, SYNC_PINGSTATUS_CHANGES);
@@ -233,13 +221,11 @@ 
 				self::$topCollector->AnnounceInformation(sprintf("Found %d changes in %d folders", $announceAggregated, count($changes)), true);
 			}
 			self::$encoder->endTag();
-		}
-		elseif ($pingstatus == SYNC_PINGSTATUS_HBOUTOFRANGE) {
+		} elseif ($pingstatus == SYNC_PINGSTATUS_HBOUTOFRANGE) {
 			self::$encoder->startTag(SYNC_PING_LIFETIME);
 			if ($sc->GetLifetime() > PING_HIGHER_BOUND_LIFETIME) {
 				self::$encoder->content(PING_HIGHER_BOUND_LIFETIME);
-			}
-			else {
+			} else {
 				self::$encoder->content(PING_LOWER_BOUND_LIFETIME);
 			}
 			self::$encoder->endTag();

lib/request/itemoperations.php

Braces +7 added lines, -14 removed lines

@@ -39,13 +39,11 @@ 
 				$fetch = true;
 				$operation['operation'] = SYNC_ITEMOPERATIONS_FETCH;
 				self::$topCollector->AnnounceInformation("Fetch", true);
-			}
-			elseif ($el[EN_TAG] == SYNC_ITEMOPERATIONS_EMPTYFOLDERCONTENTS) {
+			} elseif ($el[EN_TAG] == SYNC_ITEMOPERATIONS_EMPTYFOLDERCONTENTS) {
 				$efc = true;
 				$operation['operation'] = SYNC_ITEMOPERATIONS_EMPTYFOLDERCONTENTS;
 				self::$topCollector->AnnounceInformation("Empty Folder", true);
-			}
-			elseif ($el[EN_TAG] == SYNC_ITEMOPERATIONS_MOVE) {
+			} elseif ($el[EN_TAG] == SYNC_ITEMOPERATIONS_MOVE) {
 				$move = true;
 				$operation['operation'] = SYNC_ITEMOPERATIONS_MOVE;
 				self::$topCollector->AnnounceInformation("Move", true);
@@ -315,24 +313,20 @@ 
 					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();
 					}
-				}
-				else {
+				} else {
 					try {
 						if (isset($operation['folderid'], $operation['serverid'])) {
 							self::$topCollector->AnnounceInformation("Fetching data from backend with item and folder id");
 							$data = self::$backend->Fetch($operation['backendfolderid'], $operation['serverid'], $operation["cpo"]);
-						}
-						elseif (isset($operation['longid'])) {
+						} elseif (isset($operation['longid'])) {
 							self::$topCollector->AnnounceInformation("Fetching data from backend with long id");
 							$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 +390,7 @@ 
 
 					// send request to backend
 					self::$backend->EmptyFolder($operation['backendfolderid'], $operation['deletesubfolders']);
-				}
-				catch (StatusException $stex) {
+				} catch (StatusException $stex) {
 					$status = $stex->getCode();
 				}
 

lib/request/provisioning.php

Braces +3 added lines, -6 removed lines

@@ -138,8 +138,7 @@ 
 					if (!$wipeRequest) {
 						// for this operation the device manager is available
 						GSync::GetDeviceManager()->SaveDeviceInformation($deviceinformation);
-					}
-					else {
+					} else {
 						SLog::Write(LOGLEVEL_DEBUG, "Ignoring incoming device information as WIPE is due.");
 					}
 					if (!self::$decoder->getElementEndTag()) {  // SYNC_SETTINGS_SET
@@ -205,8 +204,7 @@ 
 			self::$encoder->startTag(SYNC_PROVISION_DATA);
 			if ($policytype == 'MS-WAP-Provisioning-XML') {
 				self::$encoder->content('<wap-provisioningdoc><characteristic type="SecurityPolicy"><parm name="4131" value="1"/><parm name="4133" value="1"/></characteristic></wap-provisioningdoc>');
-			}
-			elseif ($policytype == 'MS-EAS-Provisioning-WBXML') {
+			} elseif ($policytype == 'MS-EAS-Provisioning-WBXML') {
 				self::$encoder->startTag(SYNC_PROVISION_EASPROVISIONDOC);
 
 				// get the provisioning object and log the loaded policy values
@@ -218,8 +216,7 @@ 
 				GSync::GetProvisioningManager()->SavePolicyHash($prov);
 				$prov->Encode(self::$encoder);
 				self::$encoder->endTag();
-			}
-			else {
+			} else {
 				SLog::Write(LOGLEVEL_WARN, "Wrong policy type");
 				self::$topCollector->AnnounceInformation("Policytype not supported", true);
 

lib/request/request.php

Braces +9 added lines, -18 removed lines

@@ -194,8 +194,7 @@ 
 		$memoryLimit = ini_get('memory_limit');
 		if ($memoryLimit == -1) {
 			self::$memoryLimit = false;
-		}
-		else {
+		} else {
 			preg_replace_callback(
 				'/(\-?\d+)(.?)/',
 				function ($m) {
@@ -223,8 +222,7 @@ 
 		if (!isset(self::$policykey)) {
 			if (isset(self::$headers["x-ms-policykey"])) {
 				self::$policykey = (int) self::filterEvilInput(self::$headers["x-ms-policykey"], self::NUMBERS_ONLY);
-			}
-			else {
+			} else {
 				self::$policykey = 0;
 			}
 		}
@@ -661,8 +659,7 @@ 
 			// Samsung devices have a intermediate timeout (90sec)
 			elseif (stripos(SYNC_TIMEOUT_MEDIUM_DEVICETYPES, self::GetDeviceType()) !== false) {
 				self::$expectedConnectionTimeout = 85;
-			}
-			else {
+			} else {
 				// for all other devices, a timeout of 30 seconds is expected
 				self::$expectedConnectionTimeout = 28;
 			}
@@ -713,23 +710,17 @@ 
 		$re = false;
 		if ($filter == self::LETTERS_ONLY) {
 			$re = "/[^A-Za-z]/";
-		}
-		elseif ($filter == self::HEX_ONLY) {
+		} elseif ($filter == self::HEX_ONLY) {
 			$re = "/[^A-Fa-f0-9]/";
-		}
-		elseif ($filter == self::WORDCHAR_ONLY) {
+		} elseif ($filter == self::WORDCHAR_ONLY) {
 			$re = "/[^A-Za-z0-9]/";
-		}
-		elseif ($filter == self::NUMBERS_ONLY) {
+		} elseif ($filter == self::NUMBERS_ONLY) {
 			$re = "/[^0-9]/";
-		}
-		elseif ($filter == self::NUMBERSDOT_ONLY) {
+		} elseif ($filter == self::NUMBERSDOT_ONLY) {
 			$re = "/[^0-9\\.]/";
-		}
-		elseif ($filter == self::HEX_EXTENDED) {
+		} elseif ($filter == self::HEX_EXTENDED) {
 			$re = "/[^A-Fa-f0-9\\:\\.]/";
-		}
-		elseif ($filter == self::HEX_EXTENDED2) {
+		} elseif ($filter == self::HEX_EXTENDED2) {
 			$re = "/[^A-Fa-f0-9\\:USGI]/";
 		} // Folder origin constants from DeviceManager::FLD_ORIGIN_* (C already hex)
 		elseif ($filter == self::ISO8601) {