grommunio / grommunio-sync

lib/utils/utils.php

Braces +8 added lines, -16 removed lines

@@ -33,8 +33,7 @@ 
 		if ($pos === false) {
 			$user = $domainuser;
 			$domain = '';
-		}
-		else {
+		} else {
 			$domain = substr($domainuser, 0, $pos);
 			$user = substr($domainuser, $pos + 1);
 		}
@@ -105,12 +104,10 @@ 
 				if (strlen($names) > 0) {
 					$lastfirst .= ", {$names}";
 					$firstlast = "{$names} {$lastname}";
-				}
-				else {
+				} else {
 					$firstlast = $lastname;
 				}
-			}
-			elseif (strlen($names) > 0) {
+			} elseif (strlen($names) > 0) {
 				$lastfirst = $firstlast = $names;
 			}
 
@@ -122,8 +119,7 @@ 
 				case SYNC_FILEAS_COMPANYONLY:
 					if (strlen($company) > 0) {
 						$fileas = $company;
-					}
-					elseif (strlen($firstlast) > 0) {
+					} elseif (strlen($firstlast) > 0) {
 						$fileas = $lastfirst;
 					}
 					break;
@@ -134,8 +130,7 @@ 
 						if (strlen($lastfirst) > 0) {
 							$fileas .= "({$lastfirst})";
 						}
-					}
-					elseif (strlen($lastfirst) > 0) {
+					} elseif (strlen($lastfirst) > 0) {
 						$fileas = $lastfirst;
 					}
 					break;
@@ -146,8 +141,7 @@ 
 						if (strlen($firstlast) > 0) {
 							$fileas .= " ({$firstlast})";
 						}
-					}
-					elseif (strlen($firstlast) > 0) {
+					} elseif (strlen($firstlast) > 0) {
 						$fileas = $firstlast;
 					}
 					break;
@@ -158,8 +152,7 @@ 
 						if (strlen($company) > 0) {
 							$fileas .= " ({$company})";
 						}
-					}
-					elseif (strlen($company) > 0) {
+					} elseif (strlen($company) > 0) {
 						$fileas = $company;
 					}
 					break;
@@ -170,8 +163,7 @@ 
 						if (strlen($company) > 0) {
 							$fileas .= " ({$company})";
 						}
-					}
-					elseif (strlen($company) > 0) {
+					} elseif (strlen($company) > 0) {
 						$fileas = $company;
 					}
 					break;

index.php

Braces +3 added lines, -6 removed lines

@@ -150,15 +150,13 @@ 
 
 		// 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());
 			header(GSync::GetSupportedCommands());
 			SLog::Write(LOGLEVEL_INFO, $nopostex->getMessage());
-		}
-		elseif ($nopostex->getCode() == NoPostRequestException::GET_REQUEST) {
+		} elseif ($nopostex->getCode() == NoPostRequestException::GET_REQUEST) {
 			if (Request::GetUserAgent()) {
 				SLog::Write(LOGLEVEL_INFO, sprintf("User-agent: '%s'", Request::GetUserAgent()));
 			}
@@ -166,8 +164,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();