grommunio / grommunio-sync

lib/core/changesmemorywrapper.php

Braces +2 added lines, -4 removed lines

@@ -86,8 +86,7 @@ 
 						SLog::Write(LOGLEVEL_INFO, sprintf("ChangesMemoryWrapper->Config(AdditionalFolders) : previously synchronized folder '%s' is not to be synched anymore. Sending delete to mobile.", $folder->displayname));
 						$this->ImportFolderDeletion($folder);
 					}
-				}
-				else {
+				} else {
 					$folderIdsOnClient[] = $sid;
 				}
 			}
@@ -187,8 +186,7 @@ 
 	public function ImportMessageDeletion($id, $asSoftDelete = false) {
 		if ($asSoftDelete === true) {
 			$this->changes[] = [self::SOFTDELETION, $id];
-		}
-		else {
+		} else {
 			$this->changes[] = [self::DELETION, $id];
 		}
 

lib/core/interprocessdata.php

Braces +3 added lines, -6 removed lines

@@ -36,8 +36,7 @@ 
 			// this method is not suitable for the TopCollector atm
 			$type = Request::GetDeviceID();
 			$this->ipcProvider = GSync::GetRedis();
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			// ipcProvider could not initialise
 			SLog::Write(LOGLEVEL_ERROR, sprintf("%s could not initialise IPC Redis provider: %s", get_class($this), $e->getMessage()));
 		}
@@ -193,8 +192,7 @@ 
 		elseif ($doCas == "replace") {
 			if (!$rawdata) {
 				$ok = ($this->ipcProvider->get()->hset($key, $compKey, json_encode($data)) !== false);
-			}
-			else {
+			} else {
 				$ok = $this->ipcProvider->CASHash($key, $compKey, $rawdata, json_encode($data));
 			}
 		}
@@ -270,8 +268,7 @@ 
 			}
 			if (!$subkey) {
 				$_data[$devid][$user] = $_data;
-			}
-			else {
+			} else {
 				if (!isset($_data[$devid][$user])) {
 					$_data[$devid][$user] = [];
 				}

lib/core/asdevice.php

Braces +7 added lines, -14 removed lines

@@ -83,8 +83,7 @@ 
 
 		if (!$stripHierarchyCache && $this->hierarchyCache !== false && $this->hierarchyCache instanceof ChangesMemoryWrapper) {
 			$this->hierarchyCache->StripData();
-		}
-		else {
+		} else {
 			unset($this->hierarchyCache);
 		}
 
@@ -245,8 +244,7 @@ 
 							$foundMessage = true;
 							if (count($this->ignoredMessageIds[$folderid]) == 1) {
 								unset($this->ignoredMessageIds[$folderid]);
-							}
-							else {
+							} else {
 								unset($this->ignoredMessageIds[$folderid][array_search($id, $this->ignoredMessageIds[$folderid])]);
 							}
 
@@ -314,8 +312,7 @@ 
 		if ($hierarchydata !== false && $hierarchydata instanceof ChangesMemoryWrapper) {
 			$this->hierarchyCache = $hierarchydata;
 			$this->hierarchyCache->CopyOldState();
-		}
-		else {
+		} else {
 			$this->hierarchyCache = new ChangesMemoryWrapper();
 		}
 
@@ -407,8 +404,7 @@ 
 				$this->backend2folderidCache = false;
 			}
 			$this->changed = true;
-		}
-		else {
+		} else {
 			$contentData = $this->contentData;
 
 			if (!isset($contentData[$folderid])) {
@@ -422,8 +418,7 @@ 
 
 			if ($uuid) {
 				$contentData[$folderid]->{self::FOLDERUUID} = $uuid;
-			}
-			else {
+			} else {
 				$contentData[$folderid]->{self::FOLDERUUID} = false;
 			}
 
@@ -678,8 +673,7 @@ 
 		}
 		if ($status !== false) {
 			$contentData[$folderid]->{self::FOLDERSYNCSTATUS} = $status;
-		}
-		elseif (isset($contentData[$folderid]->{self::FOLDERSYNCSTATUS})) {
+		} elseif (isset($contentData[$folderid]->{self::FOLDERSYNCSTATUS})) {
 			unset($contentData[$folderid]->{self::FOLDERSYNCSTATUS});
 		}
 
@@ -939,8 +933,7 @@ 
 		foreach ($this->additionalfolders as $keepFolder) {
 			if ($keepFolder['store'] !== $store) {
 				$newAF[$keepFolder['folderid']] = $keepFolder;
-			}
-			else {
+			} else {
 				$noDupsCheck[$keepFolder['folderid']] = true;
 			}
 		}

lib/core/loopdetection.php

Braces +11 added lines, -22 removed lines

@@ -264,8 +264,7 @@ 
 					if (isset($se['stat'], $se['stat']['hierarchy']) && $se['stat']['hierarchy'] == SYNC_FSSTATUS_SYNCKEYERROR) {
 						SLog::Write(LOGLEVEL_DEBUG, "LoopDetection->ProcessLoopDetectionIsHierarchyResyncRequired(): a full FolderReSync was already requested. Resetting fail counter.");
 						$seenFailed = [];
-					}
-					else {
+					} else {
 						$seenFolderSync = true;
 						if (!empty($seenFailed)) {
 							SLog::Write(LOGLEVEL_DEBUG, "LoopDetection->ProcessLoopDetectionIsHierarchyResyncRequired(): seen FolderSync after other failing command");
@@ -355,8 +354,7 @@ 
 			foreach ($stack as $entry) {
 				if ($entry['id'] != $updateentry['id']) {
 					$nstack[] = $entry;
-				}
-				else {
+				} else {
 					$nstack[] = $updateentry;
 					$found = true;
 				}
@@ -589,8 +587,7 @@ 
 			if (!isset($current["uuid"]) || $current["uuid"] != $uuid) {
 				SLog::Write(LOGLEVEL_DEBUG, "LoopDetection->IsSyncStateObsolete(): yes, uuid changed or not set");
 				$obsolete = true;
-			}
-			else {
+			} else {
 				SLog::Write(LOGLEVEL_DEBUG, sprintf(
 					"LoopDetection->IsSyncStateObsolete(): check folderid: '%s' uuid '%s' counter: %d - last counter: %d with %d queued",
 					$folderid,
@@ -610,8 +607,7 @@ 
 					$obsolete = true;
 				}
 			}
-		}
-		else {
+		} else {
 			SLog::Write(LOGLEVEL_DEBUG, sprintf("LoopDetection->IsSyncStateObsolete(): check folderid: '%s' uuid '%s' counter: %d - no data found: not obsolete", $folderid, $uuid, $counter));
 		}
 
@@ -685,8 +681,7 @@ 
 					SLog::Write(LOGLEVEL_DEBUG, "LoopDetection->Detect(): UUID changed and while items where sent to device - forcing loop mode");
 					$loop = true; // force loop mode
 					$current['queued'] = $queuedMessages;
-				}
-				else {
+				} else {
 					$current['queued'] = 0;
 				}
 
@@ -747,8 +742,7 @@ 
 							// return suggested new window size
 							$current['windowLimit'] = 25;
 							$loop = $current['windowLimit'];
-						}
-						else {
+						} else {
 							// case 3.1) we have just encountered a loop!
 							SLog::Write(LOGLEVEL_DEBUG, "LoopDetection->Detect(): case 3.1 detected - loop detected, init loop mode");
 							if (isset($current['windowLimit'])) {
@@ -760,14 +754,12 @@ 
 							$current['maxCount'] = $counter + (($maxItems < $queuedMessages) ? $maxItems : $queuedMessages);
 							$loop = true;   // loop mode!!
 						}
-					}
-					elseif ($queuedMessages == 0) {
+					} elseif ($queuedMessages == 0) {
 						// case 3.2) there was a loop before but now the changes are GONE
 						SLog::Write(LOGLEVEL_DEBUG, "LoopDetection->Detect(): case 3.2 detected - changes gone - clearing loop data");
 						$current['queued'] = 0;
 						unset($current['loopcount'], $current['ignored'], $current['maxCount'], $current['potential'], $current['windowLimit']);
-					}
-					else {
+					} else {
 						// case 3.3) still looping the same message! Increase counter
 						SLog::Write(LOGLEVEL_DEBUG, "LoopDetection->Detect(): case 3.3 detected - in loop mode, increase loop counter");
 						++$current['loopcount'];
@@ -916,14 +908,11 @@ 
 
 			if ($user == false && $devid == false) {
 				$loopdata = [];
-			}
-			elseif ($user == false && $devid != false) {
+			} elseif ($user == false && $devid != false) {
 				$loopdata[$devid] = [];
-			}
-			elseif ($user != false && $devid != false) {
+			} elseif ($user != false && $devid != false) {
 				$loopdata[$devid][$user] = [];
-			}
-			elseif ($user != false && $devid == false) {
+			} elseif ($user != false && $devid == false) {
 				SLog::Write(LOGLEVEL_WARN, sprintf("Not possible to reset loop detection data for user '%s' without a specifying a device id", $user));
 				$stat = false;
 			}

lib/core/gsync.php

Braces +13 added lines, -26 removed lines

@@ -178,8 +178,7 @@ 
 
 		if (defined('BASE_PATH_CLI') && file_exists(BASE_PATH_CLI)) {
 			define('REAL_BASE_PATH', BASE_PATH_CLI);
-		}
-		else {
+		} else {
 			define('REAL_BASE_PATH', BASE_PATH);
 		}
 
@@ -212,8 +211,7 @@ 
 			if (LOG_SYSLOG_HOST && LOG_SYSLOG_PORT <= 0) {
 				throw new FatalMisconfigurationException("LOG_SYSLOG_HOST is defined but the LOG_SYSLOG_PORT does not seem to be valid.");
 			}
-		}
-		elseif (strtolower(LOGBACKEND) == 'filelog') {
+		} elseif (strtolower(LOGBACKEND) == 'filelog') {
 			define('LOGBACKEND_CLASS', 'FileLog');
 			if (!defined('LOGFILEDIR')) {
 				throw new FatalMisconfigurationException("The LOGFILEDIR is not configured. Check if the config.php file is in place.");
@@ -238,8 +236,7 @@ 
 			// check ownership on the (eventually) just created files
 			Utils::FixFileOwner(LOGFILE);
 			Utils::FixFileOwner(LOGERRORFILE);
-		}
-		else {
+		} else {
 			define('LOGBACKEND_CLASS', LOGBACKEND);
 		}
 
@@ -249,8 +246,7 @@ 
 			if (!@date_default_timezone_set(TIMEZONE)) {
 				throw new FatalMisconfigurationException(sprintf("The configured TIMEZONE '%s' is not valid. Please check supported timezones at http://www.php.net/manual/en/timezones.php", constant('TIMEZONE')));
 			}
-		}
-		elseif (!ini_get('date.timezone')) {
+		} elseif (!ini_get('date.timezone')) {
 			date_default_timezone_set('Europe/Vienna');
 		}
 
@@ -287,8 +283,7 @@ 
 
 		if (!defined('SYNC_CONTACTS_MAXPICTURESIZE')) {
 			define('SYNC_CONTACTS_MAXPICTURESIZE', 49152);
-		}
-		elseif ((!is_int(SYNC_CONTACTS_MAXPICTURESIZE) || SYNC_CONTACTS_MAXPICTURESIZE < 1)) {
+		} elseif ((!is_int(SYNC_CONTACTS_MAXPICTURESIZE) || SYNC_CONTACTS_MAXPICTURESIZE < 1)) {
 			throw new FatalMisconfigurationException("The SYNC_CONTACTS_MAXPICTURESIZE value must be a number higher than 0.");
 		}
 
@@ -298,14 +293,12 @@ 
 
 		if (!defined('PING_LOWER_BOUND_LIFETIME')) {
 			define('PING_LOWER_BOUND_LIFETIME', false);
-		}
-		elseif (PING_LOWER_BOUND_LIFETIME !== false && (!is_int(PING_LOWER_BOUND_LIFETIME) || PING_LOWER_BOUND_LIFETIME < 1 || PING_LOWER_BOUND_LIFETIME > 3540)) {
+		} elseif (PING_LOWER_BOUND_LIFETIME !== false && (!is_int(PING_LOWER_BOUND_LIFETIME) || PING_LOWER_BOUND_LIFETIME < 1 || PING_LOWER_BOUND_LIFETIME > 3540)) {
 			throw new FatalMisconfigurationException("The PING_LOWER_BOUND_LIFETIME value must be 'false' or a number between 1 and 3540 inclusively.");
 		}
 		if (!defined('PING_HIGHER_BOUND_LIFETIME')) {
 			define('PING_HIGHER_BOUND_LIFETIME', false);
-		}
-		elseif (PING_HIGHER_BOUND_LIFETIME !== false && (!is_int(PING_HIGHER_BOUND_LIFETIME) || PING_HIGHER_BOUND_LIFETIME < 1 || PING_HIGHER_BOUND_LIFETIME > 3540)) {
+		} elseif (PING_HIGHER_BOUND_LIFETIME !== false && (!is_int(PING_HIGHER_BOUND_LIFETIME) || PING_HIGHER_BOUND_LIFETIME < 1 || PING_HIGHER_BOUND_LIFETIME > 3540)) {
 			throw new FatalMisconfigurationException("The PING_HIGHER_BOUND_LIFETIME value must be 'false' or a number between 1 and 3540 inclusively.");
 		}
 		if (PING_HIGHER_BOUND_LIFETIME !== false && PING_LOWER_BOUND_LIFETIME !== false && PING_HIGHER_BOUND_LIFETIME < PING_LOWER_BOUND_LIFETIME) {
@@ -314,8 +307,7 @@ 
 
 		if (!defined('RETRY_AFTER_DELAY')) {
 			define('RETRY_AFTER_DELAY', 300);
-		}
-		elseif (RETRY_AFTER_DELAY !== false && (!is_int(RETRY_AFTER_DELAY) || RETRY_AFTER_DELAY < 1)) {
+		} elseif (RETRY_AFTER_DELAY !== false && (!is_int(RETRY_AFTER_DELAY) || RETRY_AFTER_DELAY < 1)) {
 			throw new FatalMisconfigurationException("The RETRY_AFTER_DELAY value must be 'false' or a number greater than 0.");
 		}
 
@@ -330,8 +322,7 @@ 
 		// the check on additional folders will not throw hard errors, as this is probably changed on live systems
 		if (isset($additionalFolders) && !is_array($additionalFolders)) {
 			SLog::Write(LOGLEVEL_ERROR, "GSync::CheckConfig(): The additional folders synchronization not available as array.");
-		}
-		else {
+		} else {
 			// check configured data
 			foreach ($additionalFolders as $af) {
 				if (!is_array($af) || !isset($af['store']) || !isset($af['folderid']) || !isset($af['name']) || !isset($af['type'])) {
@@ -478,11 +469,9 @@ 
 
 		if (is_file($subdirbackend)) {
 			$toLoad = $subdirbackend;
-		}
-		elseif (is_file($stdbackend)) {
+		} elseif (is_file($stdbackend)) {
 			$toLoad = $stdbackend;
-		}
-		else {
+		} else {
 			return false;
 		}
 
@@ -543,8 +532,7 @@ 
 	public static function GetAdditionalSyncFolderStore($backendid, $noDebug = false) {
 		if (isset(self::getAddSyncFolders()[$backendid]->Store)) {
 			$val = self::getAddSyncFolders()[$backendid]->Store;
-		}
-		else {
+		} else {
 			$val = self::GetDeviceManager()->GetAdditionalUserSyncFolder($backendid);
 			if (isset($val['store'])) {
 				$val = $val['store'];
@@ -593,8 +581,7 @@ 
 
 			if (isset($additionalFolders) && !is_array($additionalFolders)) {
 				SLog::Write(LOGLEVEL_ERROR, "GSync::getAddSyncFolders() : The additional folders synchronization not available as array.");
-			}
-			else {
+			} else {
 				foreach ($additionalFolders as $af) {
 					if (!is_array($af) || !isset($af['store']) || !isset($af['folderid']) || !isset($af['name']) || !isset($af['type'])) {
 						SLog::Write(LOGLEVEL_ERROR, "GSync::getAddSyncFolders() : the additional folder synchronization is not configured correctly. Missing parameters. Entry will be ignored.");

lib/core/stateobject.php

Braces +4 added lines, -8 removed lines

@@ -209,8 +209,7 @@ 
 				$this->data[$prop] = new $val->gsSyncStateClass();
 				$this->data[$prop]->jsonDeserialize($val);
 				$this->data[$prop]->postUnserialize();
-			}
-			elseif (is_object($val)) {
+			} elseif (is_object($val)) {
 				// json_decode converts arrays into objects, convert them back to arrays
 				$this->data[$prop] = [];
 				foreach ($val as $k => $v) {
@@ -219,19 +218,16 @@ 
 						// TODO: case should be removed when removing ASDevice backwards compatibility
 						if (strcasecmp($v->gsSyncStateClass, "ASDevice") == 0) {
 							$this->data[$prop][$k] = new ASDevice(Request::GetDeviceID(), Request::GetDeviceType(), Request::GetGETUser(), Request::GetUserAgent());
-						}
-						else {
+						} else {
 							$this->data[$prop][$k] = new $v->gsSyncStateClass();
 						}
 						$this->data[$prop][$k]->jsonDeserialize($v);
 						$this->data[$prop][$k]->postUnserialize();
-					}
-					else {
+					} else {
 						$this->data[$prop][$k] = $v;
 					}
 				}
-			}
-			else {
+			} else {
 				$this->data[$prop] = $val;
 			}
 		}

lib/core/devicemanager.php

Braces +9 added lines, -18 removed lines

@@ -74,8 +74,7 @@ 
 			$this->loadDeviceData();
 
 			GSync::GetTopCollector()->SetUserAgent($this->device->GetDeviceUserAgent());
-		}
-		else {
+		} else {
 			throw new FatalNotImplementedException("Can not proceed without a device id.");
 		}
 
@@ -165,8 +164,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());
 			}
 		}
@@ -448,8 +446,7 @@ 
 	public function GetWindowSize($folderid, $uuid, $statecounter, $queuedmessages) {
 		if (isset($this->windowSize[$folderid])) {
 			$items = $this->windowSize[$folderid];
-		}
-		else {
+		} else {
 			$items = WINDOW_SIZE_MAX;
 		} // 512 by default
 
@@ -460,8 +457,7 @@ 
 		if ($loop !== false) {
 			if ($loop === true) {
 				$items = ($items == 0) ? 0 : 1 + ($this->loopdetection->IgnoreNextMessage(false) ? 1 : 0);
-			}
-			else {
+			} else {
 				// we got a new suggested window size
 				$items = $loop;
 				SLog::Write(LOGLEVEL_DEBUG, sprintf("Mobile loop pre stage detected! Forcing smaller window size of %d before entering loop detection mode", $items));
@@ -543,8 +539,7 @@ 
 				// do not limit when the owner or impersonated user is syncing!
 				if ($origin == DeviceManager::FLD_ORIGIN_USER || $origin == DeviceManager::FLD_ORIGIN_IMPERSONATED) {
 					SLog::Write(LOGLEVEL_DEBUG, "Not checking for specific sync limit as this is the owner/impersonated user.");
-				}
-				else {
+				} else {
 					$spKey = false;
 					$spFilter = false;
 					// 1. step: check if there is a general limitation for the store
@@ -935,8 +930,7 @@ 
 						SLog::Write(LOGLEVEL_INFO, "Using old style device for this request and updating when concluding");
 						$device = $device->devices[$_deviceuser];
 						$device->lastupdatetime = time();
-					}
-					else {
+					} else {
 						SLog::Write(LOGLEVEL_WARN, sprintf("Could not find '%s' in device state. Dropping previous device state!", $_deviceuser));
 					}
 				}
@@ -944,17 +938,14 @@ 
 					$this->device = $device;
 					$this->device->LoadedDevice();
 					$this->deviceHash = $deviceHash;
-				}
-				else {
+				} else {
 					SLog::Write(LOGLEVEL_WARN, "Loaded device is not a device object. Dropping new loaded state and keeping initialized object!");
 				}
 				$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 +4 added lines, -8 removed lines

@@ -101,8 +101,7 @@ 
 				if ($data !== false) {
 					$this->synchedFolders[$folderid] = $data;
 				}
-			}
-			catch (StateNotFoundException $ex) {
+			} catch (StateNotFoundException $ex) {
 			}
 		}
 
@@ -142,8 +141,7 @@ 
 		if (!isset($synckey) || $synckey == "0" || $synckey == false) {
 			$this->uuid = $this->getNewUuid();
 			$this->newStateCounter = 1;
-		}
-		else {
+		} else {
 			list($uuid, $counter) = self::ParseStateKey($synckey);
 			$this->uuid = $uuid;
 			$this->newStateCounter = $counter + 1;
@@ -231,8 +229,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;
 		}
 	}
@@ -377,8 +374,7 @@ 
 	public static function UnLinkState(&$device, $folderid, $removeFromDevice = true, $retrieveUUIDFromDevice = true) {
 		if ($retrieveUUIDFromDevice === true) {
 			$savedUuid = $device->GetFolderUUID($folderid);
-		}
-		else {
+		} else {
 			$savedUuid = $retrieveUUIDFromDevice;
 		}
 

lib/core/provisioningmanager.php

Braces +3 added lines, -6 removed lines

@@ -78,8 +78,7 @@ 
 			$this->policyHash = $d[self::KEY_POLICYHASH];
 			$this->updatetime = $d[self::KEY_UPDATETIME];
 			$this->loadtime = time();
-		}
-		else {
+		} else {
 			$this->policyKey = ASDevice::UNDEFINED;
 			$this->policyHash = ASDevice::UNDEFINED;
 			$this->updatetime = 0;
@@ -122,8 +121,7 @@ 
 			if ($this->policyHash !== ASDevice::UNDEFINED && $this->policyHash != $policyHash) {
 				$p = true;
 				SLog::Write(LOGLEVEL_INFO, sprintf("ProvisioningManager->ProvisioningRequired(): saved policy hash '%s' changed to '%s'. Provisioning required.", $this->policyHash, $policyHash));
-			}
-			elseif (!$noDebug) {
+			} elseif (!$noDebug) {
 				SLog::Write(LOGLEVEL_DEBUG, sprintf("ProvisioningManager->ProvisioningRequired() saved policy hash '%s' matches", $policyHash));
 			}
 		}
@@ -185,8 +183,7 @@ 
 				if ($status >= SYNC_PROVISION_RWSTATUS_PENDING) {
 					SLog::Write(LOGLEVEL_INFO, sprintf("ProvisioningManager->GetProvisioningWipeStatus(): REMOTE WIPE due for user '%s' on device '%s' - status: '%s'", self::$user, self::$devid, $status));
 					$status = SYNC_PROVISION_RWSTATUS_PENDING;
-				}
-				else {
+				} else {
 					SLog::Write(LOGLEVEL_INFO, sprintf("ProvisioningManager->GetProvisioningWipeStatus(): no remote wipe pending - status: '%s'", $status));
 				}
 			}