mdaniels5757 / waca

search.php

Braces +5 added lines, -10 removed lines

@@ -32,8 +32,7 @@ 
 
 if (isset($_SESSION['user'])) {
 	$sessionuser = $_SESSION['user'];
-}
-else {
+} else {
 	$sessionuser = "";
 }
 
@@ -96,8 +95,7 @@ 
 		$smarty->assign("target", $target);
         
 		$smarty->display("search/searchresult.tpl");
-	}
-	elseif ($_GET['type'] == 'IP') {
+	} elseif ($_GET['type'] == 'IP') {
 		$qterm = '%' . $term . '%';
         
 		$statement = gGetDb()->prepare("SELECT * FROM request WHERE email <> 'acc@toolserver.org' and ip <> '127.0.0.1' and ip LIKE :term or forwardedip LIKE :term2;");
@@ -115,8 +113,7 @@ 
 		$smarty->assign("target", $target);
         
 		$smarty->display("search/searchresult.tpl");
-	}
-	elseif ($_GET['type'] == 'Request') {
+	} elseif ($_GET['type'] == 'Request') {
 		$qterm = '%' . $term . '%';
         
 		$statement = gGetDb()->prepare("SELECT * FROM request WHERE name LIKE :term;");
@@ -133,15 +130,13 @@ 
 		$smarty->assign("target", $target);
         
 		$smarty->display("search/searchresult.tpl");
-	}
-	else {
+	} else {
 		BootstrapSkin::displayAlertBox("Unknown search type", "alert-error", "Error");
 		$smarty->display("search/searchform.tpl");
 		BootstrapSkin::displayInternalFooter();
 		die();
 	}
-}
-else {
+} else {
 	$smarty->display("search/searchform.tpl");
 }
 

zoompage.php

Braces +4 added lines, -8 removed lines

@@ -31,8 +31,7 @@ 
 
 	if (isset($_GET['ecoverride']) && User::getCurrent()->isAdmin()) {
 		$smarty->assign('ecoverride', true);
-	}
-	else {
+	} else {
 		$smarty->assign('ecoverride', false);
 	}
         
@@ -79,16 +78,14 @@ 
 	if ($request->getStatus() == "Closed") {
 		$hash = md5($request->getId() . $request->getEmail() . $request->getTrustedIp() . microtime()); //If the request is closed, change the hash based on microseconds similar to the checksums.
 		$smarty->assign("isclosed", true);
-	}
-	else {
+	} else {
 		$hash = md5($request->getId() . $request->getEmail() . $request->getTrustedIp());
 		$smarty->assign("isclosed", false);
 	}
 	$smarty->assign("hash", $hash);
 	if ($hash == $urlhash) {
 		$correcthash = true;
-	}
-	else {
+	} else {
 		$correcthash = false;
 	}
 	
@@ -127,8 +124,7 @@ 
 				if (!$ipisprivate) {
 					$iprdns = $rdnsProvider->getRdns($p2);
 					$iplocation = $locationProvider->getIpLocation($p2);
-				}
-				else {
+				} else {
 					// this is going to fail, so why bother trying?
 					$iprdns = false;
 					$iplocation = false;

PrecacheGeolocation.php

Braces +5 added lines, -3 removed lines

@@ -69,13 +69,15 @@
         echo ". IP location fetch complete.\n";
         $database->commit();
         echo ". Committed txn.\n";
-    } catch (Exception $ex) {
+    }
+    catch (Exception $ex) {
         echo ". Encountered exception: " . $ex->getMessage(). "\n";
         $database->rollBack();
         echo ". Rolled back txn\n";
         throw $ex;
-    } finally {
-        if($database->hasActiveTransaction()){
+    }
+    finally {
+        if($database->hasActiveTransaction()) {
             $database->rollBack();
             echo ". Rolled back txn\n";
         }

index.php

Braces +4 added lines, -8 removed lines

@@ -89,8 +89,7 @@ 
 		BootstrapSkin::displayAlertBox($ex->getMessage(), "alert-error", "Unknown error", true, false);
 		BootstrapSkin::displayPublicFooter();
 	}
-}
-else {
+} else {
 	if ($_SERVER['REQUEST_METHOD'] == "POST") {
 		$errorEncountered = false;
         
@@ -127,8 +126,7 @@ 
 			}
             
 			$smarty->display("request/request-form.tpl");
-		}
-		else if ($enableEmailConfirm == 1) {
+		} else if ($enableEmailConfirm == 1) {
 			$request->generateEmailConfirmationHash();
 
 			$database->transactionally(function() use($request)
@@ -143,8 +141,7 @@ 
 			$request->sendConfirmationEmail();
             
 			$smarty->display("request/email-confirmation.tpl");
-		}
-		else {
+		} else {
 			$request->setEmailConfirm(0); // Since it can't be null
 			$database->transactionally(function() use($request)
 			{
@@ -158,8 +155,7 @@ 
 		}
         
 		BootstrapSkin::displayPublicFooter();
-	}
-	else {
+	} else {
 		$smarty->display("request/request-form.tpl");
 		BootstrapSkin::displayPublicFooter();
 	}

RecreateTrustedIPs.php

Braces +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
 	$hashPos = strpos($rawline, '#');
 	if ($hashPos !== false) {
 		$line = substr($rawline, 0, $hashPos);
-	}
-	else {
+	} else {
 		$line = $rawline;
 	}
     

includes/session.php

Braces +5 added lines, -10 removed lines

@@ -69,8 +69,7 @@ 
 
 					reattachOAuthAccount(User::getCurrent());
 				}
-			}
-			else {
+			} else {
 				global $enforceOAuth;
 
 				if ($enforceOAuth) {
@@ -83,8 +82,7 @@ 
 			BootstrapSkin::displayAlertBox("I'm sorry, but, your account has not been approved by a site administrator yet. Please stand by.", "alert-error", "New account", true, false);
 			BootstrapSkin::displayInternalFooter();
 			die();
-		}
-		elseif (User::getCurrent()->isSuspended()) {
+		} elseif (User::getCurrent()->isSuspended()) {
 			$database = gGetDb();
 			$suspendstatement = $database->prepare(<<<SQL
 SELECT comment 
@@ -105,8 +103,7 @@ 
 			$smarty->display("login/suspended.tpl");
 			BootstrapSkin::displayInternalFooter();
 			die();
-		}
-		elseif (User::getCurrent()->isDeclined()) {
+		} elseif (User::getCurrent()->isDeclined()) {
 			$database = gGetDb();
 			$suspendstatement = $database->prepare(<<<SQL
 SELECT comment
@@ -127,11 +124,9 @@ 
 			$smarty->display("login/declined.tpl");
 			BootstrapSkin::displayInternalFooter();
 			die();
-		}
-		elseif ((!User::getCurrent()->isCommunityUser()) && (User::getCurrent()->isUser() || User::getCurrent()->isAdmin())) {
+		} elseif ((!User::getCurrent()->isCommunityUser()) && (User::getCurrent()->isUser() || User::getCurrent()->isAdmin())) {
 			$secure = 1;
-		}
-		else {
+		} else {
 			//die("Not logged in!");
 		}
 	}

includes/PdoDatabase.php

Braces +2 added lines, -4 removed lines

@@ -91,8 +91,7 @@ 
 		// all over the rest of the code
 		if ($this->hasActiveTransaction) {
 			return false;
-		}
-		else {
+		} else {
 			// set the transaction isolation level for every transaction.
 			$this->exec("SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;");
 
@@ -146,8 +145,7 @@ 
 			// TODO: yuk.
 			if (defined("PUBLICMODE")) {
 				BootstrapSkin::displayPublicFooter();
-			}
-			else {
+			} else {
 				BootstrapSkin::displayInternalFooter();
 			}
 

includes/DataObjects/Notification.php

Braces +3 added lines, -6 removed lines

@@ -31,12 +31,10 @@ 
 			if ($statement->execute()) {
 				$this->isNew = false;
 				$this->id = $this->dbObject->lastInsertId();
-			}
-			else {
+			} else {
 				throw new Exception($statement->errorInfo());
 			}
-		}
-		else {
+		} else {
 			throw new Exception("You shouldn't be doing this...");
 		}
 	}
@@ -250,8 +248,7 @@ 
 	{
 		if ($ban->getDuration() == -1) {
 			$duration = "indefinitely";
-		}
-		else {
+		} else {
 			$duration = "until " . date("F j, Y, g:i a", $ban->getDuration());
 		}
 

includes/DataObjects/User.php

Braces +8 added lines, -16 removed lines

@@ -46,8 +46,7 @@ 
 		if (self::$currentUser === null) {
 			if (isset($_SESSION['userID'])) {
 				self::$currentUser = self::getById($_SESSION['userID'], $database);
-			}
-			else {
+			} else {
 				$anonymousCoward = new CommunityUser();
 
 				self::$currentUser = $anonymousCoward;
@@ -259,12 +258,10 @@ 
 		if ($filter === null) {
 			$userListQuery = "SELECT username FROM user;";
 			$userListResult = $database->query($userListQuery);
-		}
-		elseif ($filter === true) {
+		} elseif ($filter === true) {
 			$userListQuery = "SELECT username FROM user WHERE status IN ('User', 'Admin');";
 			$userListResult = $database->query($userListQuery);
-		}
-		else {
+		} else {
 			$userListQuery = "SELECT username FROM user WHERE status = :status;";
 			$userListResult = $database->prepare($userListQuery);
 			$userListResult->execute(array(":status" => $filter));
@@ -314,12 +311,10 @@ 
 			if ($statement->execute()) {
 				$this->isNew = false;
 				$this->id = (int)$this->dbObject->lastInsertId();
-			}
-			else {
+			} else {
 				throw new Exception($statement->errorInfo());
 			}
-		}
-		else {
+		} else {
 // update
 			$statement = $this->dbObject->prepare(<<<SQL
 				UPDATE `user` SET 
@@ -699,8 +694,7 @@ 
 
 		if ($this->oauthidentitycache == null) {
 			$this->identityCache = null;
-		}
-		else {
+		} else {
 			$this->identityCache = unserialize($this->oauthidentitycache);
 		}
         
@@ -718,14 +712,12 @@ 
 				) {
 				// Use cached value - it's either valid or we don't care.
 				return $this->identityCache;
-			}
-			else {
+			} else {
 				// Cache expired and not forcing use of cached value
 				$this->getIdentityCache();
 				return $this->identityCache;
 			}
-		}
-		else {
+		} else {
 			// Cache isn't ours or doesn't exist
 			$this->getIdentityCache();
 			return $this->identityCache;