grommunio / grommunio-sync

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) {

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/request/getitemestimate.php

Braces +9 added lines, -18 removed lines

@@ -38,16 +38,14 @@ 
 				if (self::$decoder->getElementStartTag(SYNC_SYNCKEY)) {
 					try {
 						$spa->SetSyncKey(self::$decoder->getElementContent());
-					}
-					catch (StateInvalidException $siex) {
+					} catch (StateInvalidException $siex) {
 						$spastatus = SYNC_GETITEMESTSTATUS_SYNCSTATENOTPRIMED;
 					}
 
 					if (!self::$decoder->getElementEndTag()) {
 						return false;
 					}
-				}
-				elseif (self::$decoder->getElementStartTag(SYNC_GETITEMESTIMATE_FOLDERID)) {
+				} elseif (self::$decoder->getElementStartTag(SYNC_GETITEMESTIMATE_FOLDERID)) {
 					$fid = self::$decoder->getElementContent();
 					$spa->SetFolderId($fid);
 					$spa->SetBackendFolderId(self::$deviceManager->GetBackendIdForFolderId($fid));
@@ -149,8 +147,7 @@ 
 			if (!$spa->HasContentClass() && $spa->HasFolderId()) {
 				try {
 					$spa->SetContentClass(self::$deviceManager->GetFolderClassFromCacheByID($spa->GetFolderId()));
-				}
-				catch (NoHierarchyCacheAvailableException $nhca) {
+				} catch (NoHierarchyCacheAvailableException $nhca) {
 					$spastatus = SYNC_GETITEMESTSTATUS_COLLECTIONINVALID;
 				}
 			}
@@ -165,8 +162,7 @@ 
 			if ($spastatus) {
 				// the CPO has a folder id now, so we can set the status
 				$sc->AddParameter($spa, "status", $spastatus);
-			}
-			else {
+			} else {
 				try {
 					$sc->AddParameter($spa, "state", self::$deviceManager->GetStateManager()->GetSyncState($spa->GetSyncKey()));
 
@@ -174,26 +170,22 @@ 
 					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);
-					}
-					else {
+					} else {
 						$sc->AddParameter($spa, "status", SYNC_GETITEMESTSTATUS_SYNCSTATENOTPRIMED);
 					}
 					self::$topCollector->AnnounceInformation("StatusException " . $sc->GetParameter($spa, "status"), true);
@@ -216,8 +208,7 @@ 
 
 		try {
 			$sc->CountChanges();
-		}
-		catch (StatusException $ste) {
+		} catch (StatusException $ste) {
 			$status = SYNC_GETITEMESTSTATUS_COLLECTIONINVALID;
 		}
 		$changes = $sc->GetChangedFolderIds();

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

lib/request/search.php

Braces +5 added lines, -10 removed lines

@@ -145,8 +145,7 @@ 
 				if (!self::$decoder->getElementEndTag()) { // SYNC_SEARCH_AND
 					return false;
 				}
-			}
-			elseif (self::$decoder->getElementStartTag(SYNC_SEARCH_EQUALTO)) {
+			} elseif (self::$decoder->getElementStartTag(SYNC_SEARCH_EQUALTO)) {
 				// linkid can be an empty tag as well as have value
 				if (self::$decoder->getElementStartTag(SYNC_DOCUMENTLIBRARY_LINKID)) {
 					if (($linkId = self::$decoder->getElementContent()) !== false) {
@@ -346,18 +345,15 @@ 
 				if ($searchname == ISearchProvider::SEARCH_GAL) {
 					// get search results from the searchprovider
 					$rows = $searchprovider->GetGALSearchResults($searchquery, $searchrange, $searchpicture);
-				}
-				elseif ($searchname == ISearchProvider::SEARCH_MAILBOX) {
+				} elseif ($searchname == ISearchProvider::SEARCH_MAILBOX) {
 					$backendFolderId = self::$deviceManager->GetBackendIdForFolderId($cpo->GetSearchFolderid());
 					$cpo->SetSearchFolderid($backendFolderId);
 					$rows = $searchprovider->GetMailboxSearchResults($cpo);
 				}
-			}
-			catch (StatusException $stex) {
+			} catch (StatusException $stex) {
 				$storestatus = $stex->getCode();
 			}
-		}
-		else {
+		} else {
 			$rows = ['searchtotal' => 0];
 			$status = SYNC_SEARCHSTATUS_SERVERERROR;
 			SLog::Write(LOGLEVEL_WARN, sprintf("Searchtype '%s' is not supported.", $searchname));
@@ -471,8 +467,7 @@ 
 								self::$encoder->endTag(); // properties
 					}
 				}
-			}
-			elseif ($searchname == ISearchProvider::SEARCH_MAILBOX) {
+			} elseif ($searchname == ISearchProvider::SEARCH_MAILBOX) {
 				foreach ($rows as $u) {
 					// TODO: unclear if any clients *require* the folder id where the message is located (it's not available anymore)
 					// $folderid = self::$deviceManager->GetFolderIdForBackendId($u['folderid']);

lib/request/requestprocessor.php

Braces +1 added lines, -2 removed lines

@@ -98,8 +98,7 @@
 			if (!$handler->Handle(Request::GetCommandCode())) {
 				throw new WBXMLException(sprintf("Unknown error in %s->Handle()", get_class($handler)));
 			}
-		}
-		catch (Exception $ex) {
+		} catch (Exception $ex) {
 			// Log 10 KB of the WBXML data
 			SLog::Write(LOGLEVEL_FATAL, "WBXML 10K debug data: " . Request::GetInputAsBase64(10240), false);
 

lib/request/getattachment.php

Braces +1 added lines, -2 removed lines

@@ -40,8 +40,7 @@
 			}
 			self::$topCollector->AnnounceInformation(sprintf("Streamed %d KB attachment", round($l / 1024)), true);
 			SLog::Write(LOGLEVEL_DEBUG, sprintf("HandleGetAttachment(): attachment with %d KB sent to mobile", round($l / 1024)));
-		}
-		catch (StatusException $s) {
+		} catch (StatusException $s) {
 			// StatusException already logged so we just need to pass it upwards to send a HTTP error
 			throw new HTTPReturnCodeException($s->getMessage(), HTTP_CODE_500, null, LOGLEVEL_DEBUG);
 		}

lib/request/sendmail.php

Braces +7 added lines, -14 removed lines

@@ -24,8 +24,7 @@ 
 		}
 		if ($commandCode == GSync::COMMAND_SMARTFORWARD) {
 			$forward = Request::GetGETItemId();
-		}
-		elseif ($commandCode == GSync::COMMAND_SMARTREPLY) {
+		} elseif ($commandCode == GSync::COMMAND_SMARTREPLY) {
 			$reply = Request::GetGETItemId();
 		}
 
@@ -38,11 +37,9 @@ 
 
 			if ($el[EN_TAG] == SYNC_COMPOSEMAIL_SENDMAIL) {
 				$sendmail = true;
-			}
-			elseif ($el[EN_TAG] == SYNC_COMPOSEMAIL_SMARTREPLY) {
+			} elseif ($el[EN_TAG] == SYNC_COMPOSEMAIL_SMARTREPLY) {
 				$smartreply = true;
-			}
-			elseif ($el[EN_TAG] == SYNC_COMPOSEMAIL_SMARTFORWARD) {
+			} elseif ($el[EN_TAG] == SYNC_COMPOSEMAIL_SMARTFORWARD) {
 				$smartforward = true;
 			}
 
@@ -51,8 +48,7 @@ 
 			}
 
 			$sm->Decode(self::$decoder);
-		}
-		else {
+		} else {
 			$sm->mime = self::$decoder->GetPlainInputStream();
 			// no wbxml output is provided, only a http OK
 			$sm->saveinsent = Request::GetGETSaveInSent();
@@ -92,8 +88,7 @@ 
 			// Even if they are a part of SyncSendMail object, they won't be streamed.
 			if ($smartreply || $reply) {
 				$sm->replyflag = true;
-			}
-			else {
+			} else {
 				$sm->forwardflag = true;
 			}
 
@@ -108,8 +103,7 @@ 
 
 		try {
 			$status = self::$backend->SendMail($sm);
-		}
-		catch (StatusException $se) {
+		} catch (StatusException $se) {
 			$status = $se->getCode();
 			$statusMessage = $se->getMessage();
 		}
@@ -123,8 +117,7 @@ 
 				self::$encoder->content($status); // TODO return the correct status
 				self::$encoder->endTag();
 				self::$encoder->endTag();
-			}
-			else {
+			} else {
 				throw new HTTPReturnCodeException($statusMessage, HTTP_CODE_500, null, LOGLEVEL_WARN);
 			}
 		}

lib/request/meetingresponse.php

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
 				if ($calendarid === false) {
 					throw new StatusException("HandleMeetingResponse() not possible", SYNC_MEETRESPSTATUS_SERVERERROR);
 				}
-			}
-			catch (StatusException $stex) {
+			} catch (StatusException $stex) {
 				$status = $stex->getCode();
 			}
 

lib/request/sync.php

Braces +46 added lines, -92 removed lines

@@ -41,8 +41,7 @@ 
 				SLog::Write(LOGLEVEL_INFO, "Request->HandleSync(): Sync request aborted, as exporting of folders has not yet completed");
 				self::$topCollector->AnnounceInformation("Aborted due incomplete folder sync", true);
 				$status = SYNC_STATUS_FOLDERHIERARCHYCHANGED;
-			}
-			else {
+			} else {
 				SLog::Write(LOGLEVEL_INFO, "Request->HandleSync(): FolderSync marked as complete");
 			}
 		}
@@ -99,8 +98,7 @@ 
 								return false;
 							}
 						}
-					}
-					else {
+					} else {
 						return false;
 					}
 
@@ -133,16 +131,14 @@ 
 							$spa->RemoveSyncKey();
 							$spa->DelFolderStat();
 							$spa->SetMoveState(false);
-						}
-						elseif ($synckey !== false) {
+						} elseif ($synckey !== false) {
 							if ($synckey !== $spa->GetSyncKey() && $synckey !== $spa->GetNewSyncKey()) {
 								SLog::Write(LOGLEVEL_DEBUG, "HandleSync(): Synckey does not match latest saved for this folder or there is a move state, removing folderstat to force Exporter setup");
 								$spa->DelFolderStat();
 							}
 							$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 +159,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();
 						}
@@ -176,8 +171,7 @@ 
 
 					if ($spa->HasContentClass()) {
 						self::$topCollector->AnnounceInformation(sprintf("%s request", $spa->GetContentClass()), $this->singleFolder);
-					}
-					else {
+					} else {
 						SLog::Write(LOGLEVEL_WARN, "Not possible to determine class of request. Request did not contain class and apparently there is an issue with the HierarchyCache.");
 					}
 
@@ -480,8 +474,7 @@ 
 								if (!self::$decoder->getElementEndTag()) {
 									return false;
 								}
-							}
-							else {
+							} else {
 								$foldertype = false;
 							}
 
@@ -500,8 +493,7 @@ 
 								if (!self::$decoder->getElementEndTag()) { // end clientid
 									return false;
 								}
-							}
-							else {
+							} else {
 								$clientid = false;
 							}
 
@@ -516,8 +508,7 @@ 
 								if (!self::$decoder->getElementEndTag()) { // end applicationdata
 									return false;
 								}
-							}
-							else {
+							} else {
 								$message = false;
 							}
 
@@ -534,8 +525,7 @@ 
 
 									if ($status == SYNC_STATUS_SUCCESS) {
 										$this->importMessage($spa, $actiondata, $element[EN_TAG], $message, $clientid, $serverid, $foldertype, $nchanges);
-									}
-									else {
+									} else {
 										SLog::Write(LOGLEVEL_WARN, "Ignored incoming change, global status indicates problem.");
 									}
 									break;
@@ -543,8 +533,7 @@ 
 
 							if ($actiondata["fetchids"]) {
 								self::$topCollector->AnnounceInformation(sprintf("Fetching %d", $nchanges));
-							}
-							else {
+							} else {
 								self::$topCollector->AnnounceInformation(sprintf("Incoming %d", $nchanges));
 							}
 
@@ -563,8 +552,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();
 							}
 						}
@@ -627,8 +615,7 @@ 
 
 			if (self::$decoder->getElementStartTag(SYNC_PARTIAL)) {
 				$partial = true;
-			}
-			else {
+			} else {
 				$partial = false;
 			}
 
@@ -657,13 +644,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");
@@ -686,8 +671,7 @@ 
 			if (!$sc->HasCollections()) {
 				$status = SYNC_STATUS_SYNCREQUESTINCOMPLETE;
 			}
-		}
-		elseif (isset($hbinterval)) {
+		} elseif (isset($hbinterval)) {
 			// load the hierarchy data - there are no permissions to verify so we just set it to false
 			if (!$sc->LoadCollection(false, true, false)) {
 				$status = SYNC_STATUS_FOLDERHIERARCHYCHANGED;
@@ -730,12 +714,10 @@ 
 					// 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;
-					}
-					else {
+					} else {
 						$status = SYNC_STATUS_FOLDERHIERARCHYCHANGED;
 						self::$topCollector->AnnounceInformation(sprintf("StatusException code: %d", $status), $this->singleFolder);
 						$this->saveMultiFolderInfo("exception", "StatusException");
@@ -752,8 +734,7 @@ 
 					foreach ($sc as $folderid => $spa) {
 						if (self::$deviceManager->CheckHearbeatStateIntegrity($spa->GetFolderId(), $spa->GetUuid(), $spa->GetUuidCounter())) {
 							$status = SYNC_COMMONSTATUS_SYNCSTATEVERSIONINVALID;
-						}
-						else {
+						} else {
 							$sc->SaveCollection($spa);
 						}
 					}
@@ -774,8 +755,7 @@ 
 						if ($changecount > 0 && $sc->WaitedForChanges() && self::$deviceManager->CheckHearbeatStateIntegrity($spa->GetFolderId(), $spa->GetUuid(), $spa->GetUuidCounter())) {
 							SLog::Write(LOGLEVEL_DEBUG, sprintf("HandleSync(): heartbeat: found %d changes in '%s' which was already synchronized. Heartbeat aborted!", $changecount, $folderid));
 							$status = SYNC_COMMONSTATUS_SYNCSTATEVERSIONINVALID;
-						}
-						else {
+						} else {
 							SLog::Write(LOGLEVEL_DEBUG, sprintf("HandleSync(): heartbeat: found %d changes in '%s'", $changecount, $folderid));
 						}
 					}
@@ -875,8 +855,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,12 +870,10 @@ 
 
 								$changecount = $exporter->GetChangeCount();
 							}
-						}
-						catch (StatusException $stex) {
+						} catch (StatusException $stex) {
 							if ($stex->getCode() === SYNC_FSSTATUS_CODEUNKNOWN && $spa->HasSyncKey()) {
 								$status = SYNC_STATUS_INVALIDSYNCKEY;
-							}
-							else {
+							} else {
 								$status = $stex->getCode();
 							}
 						}
@@ -910,8 +887,7 @@ 
 							if ($changecount > 0) {
 								self::$deviceManager->SetFolderSyncStatus($folderid, DeviceManager::FLD_SYNC_INITIALIZED);
 							}
-						}
-						elseif ($status != SYNC_STATUS_SUCCESS) {
+						} elseif ($status != SYNC_STATUS_SUCCESS) {
 							self::$topCollector->AnnounceInformation(sprintf("StatusException code: %d", $status), $this->singleFolder);
 							$this->saveMultiFolderInfo("exception", "StatusException");
 						}
@@ -1055,8 +1031,7 @@ 
 		self::$encoder->startTag(SYNC_SYNCKEY);
 		if ($status == SYNC_STATUS_SUCCESS && $spa->HasNewSyncKey()) {
 			self::$encoder->content($spa->GetNewSyncKey());
-		}
-		else {
+		} else {
 			self::$encoder->content($spa->GetSyncKey());
 		}
 		self::$encoder->endTag();
@@ -1150,8 +1125,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();
 				}
 
@@ -1168,8 +1142,7 @@ 
 					self::$encoder->startTag(SYNC_DATA);
 					$data->Encode(self::$encoder);
 					self::$encoder->endTag();
-				}
-				else {
+				} else {
 					SLog::Write(LOGLEVEL_WARN, sprintf("Unable to Fetch '%s'", $id));
 				}
 				self::$encoder->endTag();
@@ -1215,13 +1188,11 @@ 
 					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."));
-					}
-					else {
+					} else {
 						if (!isset($brokenSO->id)) {
 							$brokenSO->id = "Unknown ID";
 							SLog::Write(LOGLEVEL_ERROR, sprintf("HandleSync(): Caught SyncObjectBrokenException but no ID of object set. This should be fixed in the backend."));
@@ -1285,13 +1256,11 @@ 
 					$newFolderStatAfterExport = self::$backend->GetFolderStat(GSync::GetAdditionalSyncFolderStore($spa->GetBackendFolderId()), $spa->GetBackendFolderId());
 					if ($newFolderStat === $newFolderStatAfterExport) {
 						$this->setFolderStat($spa, $newFolderStat);
-					}
-					else {
+					} else {
 						SLog::Write(LOGLEVEL_DEBUG, "Sync() Folderstat differs after export, force another exporter run.");
 					}
 				}
-			}
-			else {
+			} else {
 				self::$deviceManager->SetFolderSyncStatus($spa->GetFolderId(), DeviceManager::FLD_SYNC_INPROGRESS);
 			}
 		}
@@ -1316,15 +1285,13 @@ 
 				elseif (!$spa->HasSyncKey()) {
 					$state = "";
 				}
-			}
-			catch (StatusException $stex) {
+			} catch (StatusException $stex) {
 				$status = $stex->getCode();
 			}
 
 			if (isset($state) && $status == SYNC_STATUS_SUCCESS) {
 				self::$deviceManager->GetStateManager()->SetSyncState($spa->GetNewSyncKey(), $state, $spa->GetFolderId());
-			}
-			else {
+			} else {
 				SLog::Write(LOGLEVEL_ERROR, sprintf("HandleSync(): error saving '%s' - no state information available", $spa->GetNewSyncKey()));
 			}
 		}
@@ -1365,13 +1332,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");
@@ -1411,8 +1376,7 @@ 
 				// if there is a valid state obtained after importing changes in a previous loop, we use that state
 				if (isset($actiondata["failstate"], $actiondata["failstate"]["failedsyncstate"])) {
 					$this->importer->Config($actiondata["failstate"]["failedsyncstate"], $spa->GetConflict());
-				}
-				else {
+				} else {
 					$this->importer->Config($sc->GetParameter($spa, "state"), $spa->GetConflict());
 				}
 
@@ -1420,8 +1384,7 @@ 
 				$this->importer->ConfigContentParameters($spa->GetCPO());
 				$this->importer->LoadConflicts($spa->GetCPO(), $sc->GetParameter($spa, "state"));
 			}
-		}
-		catch (StatusException $stex) {
+		} catch (StatusException $stex) {
 			$status = $stex->getCode();
 		}
 
@@ -1503,13 +1466,11 @@ 
 						// check incoming message without logging WARN messages about errors
 						elseif (!($message instanceof SyncObject) || !$message->Check(true)) {
 							$actiondata["statusids"][$serverid] = SYNC_STATUS_CLIENTSERVERCONVERSATIONERROR;
-						}
-						else {
+						} else {
 							if (isset($message->read)) {
 								// Currently, 'read' is only sent by the PDA when it is ONLY setting the read flag.
 								$this->importer->ImportMessageReadFlag($serverid, $message->read);
-							}
-							elseif (!isset($message->flag)) {
+							} elseif (!isset($message->flag)) {
 								$this->importer->ImportMessageChange($serverid, $message);
 							}
 
@@ -1521,8 +1482,7 @@ 
 
 							$actiondata["statusids"][$serverid] = SYNC_STATUS_SUCCESS;
 						}
-					}
-					catch (StatusException $stex) {
+					} catch (StatusException $stex) {
 						$actiondata["statusids"][$serverid] = $stex->getCode();
 					}
 					break;
@@ -1546,14 +1506,12 @@ 
 						elseif (!($message instanceof SyncObject) || !$message->Check(true)) {
 							$actiondata["clientids"][$clientid] = false;
 							$actiondata["statusids"][$clientid] = SYNC_STATUS_CLIENTSERVERCONVERSATIONERROR;
-						}
-						else {
+						} else {
 							$actiondata["clientids"][$clientid] = false;
 							$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;
@@ -1568,8 +1526,7 @@ 
 							SLog::Write(LOGLEVEL_DEBUG, "SMS sync are not supported. Ignoring message.");
 							// TODO we should delete the SMS
 							$actiondata["statusids"][$serverid] = SYNC_STATUS_SUCCESS;
-						}
-						else {
+						} else {
 							// if message deletions are to be moved, move them
 							if ($spa->GetDeletesAsMoves()) {
 								$folderid = self::$backend->GetWasteBasket();
@@ -1587,8 +1544,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;
 						}
@@ -1636,11 +1592,9 @@ 
 		}
 		if (isset($this->multiFolderInfo["outgoing"], $this->multiFolderInfo["queued"]) && $this->multiFolderInfo["outgoing"] > 0) {
 			$s .= sprintf(": Streamed %d out of %d", $this->multiFolderInfo["outgoing"], $this->multiFolderInfo["queued"]);
-		}
-		elseif (!isset($this->multiFolderInfo["outgoing"]) && !isset($this->multiFolderInfo["queued"])) {
+		} elseif (!isset($this->multiFolderInfo["outgoing"]) && !isset($this->multiFolderInfo["queued"])) {
 			$s .= ": no changes";
-		}
-		else {
+		} else {
 			if (isset($this->multiFolderInfo["outgoing"])) {
 				$s .= "/" . $this->multiFolderInfo["outgoing"] . " streamed";
 			}

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

lib/log/syslog.php

Braces +3 added lines, -6 removed lines

@@ -102,8 +102,7 @@ 
 				if (isset($match[1])) {
 					return $this->GetProgramName() . '/' . $match[1];
 				}
-			}
-			elseif (basename($trace['file'], '.php') != 'slog') {
+			} elseif (basename($trace['file'], '.php') != 'slog') {
 				return $this->GetProgramName() . '/core';
 			}
 		}
@@ -162,8 +161,7 @@ 
 		// when the users differ, we need to log both
 		if (strcasecmp($this->GetAuthUser(), $this->GetUser()) == 0) {
 			$log .= ' [' . $this->GetUser() . ']';
-		}
-		else {
+		} else {
 			$log .= ' [' . $this->GetAuthUser() . Request::IMPERSONATE_DELIM . $this->GetUser() . ']';
 		}
 		if ($loglevel >= LOGLEVEL_DEVICEID) {
@@ -195,8 +193,7 @@ 
 				socket_sendto($sock, $syslog_message, strlen($syslog_message), 0, $this->GetHost(), $this->GetPort());
 			}
 			socket_close($sock);
-		}
-		else {
+		} else {
 			openlog($this->GenerateProgramName(), LOG_PID, LOG_SYSLOG_FACILITY);
 			syslog(
 				$this->GetGsyncLogLevelToSyslogLogLevel($loglevel),

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	 */
 	public function SetPort($value) {
 		if (is_numeric($value)) {
-			$this->port = (int) $value;
+			$this->port = (int)$value;
 		}
 	}