mdaniels5757 / waca

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

users.php

Braces +6 added lines, -12 removed lines

@@ -154,8 +154,7 @@ 
 		$smarty->display("usermanagement/changelevel-reason.tpl");
 		BootstrapSkin::displayInternalFooter();
 		die();
-	}
-	else {
+	} else {
 		$user->demote($_POST['reason']);
 
 		BootstrapSkin::displayAlertBox( 
@@ -198,8 +197,7 @@ 
 			false);
 		BootstrapSkin::displayInternalFooter();
 		die();
-	}
-	elseif (!isset($_POST['reason'])) {
+	} elseif (!isset($_POST['reason'])) {
 		global $smarty;
 		$smarty->assign("user", $user);
 		$smarty->assign("status", "Suspended");
@@ -207,8 +205,7 @@ 
 		$smarty->display("usermanagement/changelevel-reason.tpl");
 		BootstrapSkin::displayInternalFooter();
 		die();
-	}
-	else {
+	} else {
 		$user->suspend($_POST['reason']);
 
 		Notification::userSuspended($user, $_POST['reason']);
@@ -301,8 +298,7 @@ 
 		$smarty->display("usermanagement/changelevel-reason.tpl");
 		BootstrapSkin::displayInternalFooter();
 		die();
-	}
-	else {
+	} else {
 		$user->decline($_POST['reason']);
 
 		Notification::userDeclined($user, $_POST['reason']);
@@ -346,8 +342,7 @@ 
 		$smarty->display("usermanagement/renameuser.tpl");
 		BootstrapSkin::displayInternalFooter();
 		die();
-	}
-	else {
+	} else {
 		if (!isset($_POST['newname']) || trim($_POST['newname']) == "") {
 			BootstrapSkin::displayAlertBox("The new username cannot be empty.", "alert-error", "Error", true, false);
 			BootstrapSkin::displayInternalFooter();
@@ -429,8 +424,7 @@ 
 		global $smarty;
 		$smarty->assign("user", $user);
 		$smarty->display("usermanagement/edituser.tpl");
-	}
-	else {
+	} else {
 		$database = gGetDb();
 		if (!$database->beginTransaction()) {
 			BootstrapSkin::displayAlertBox(

tests/includes/StringFunctionsTest.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 		$this->e = null;
 	}
 
-	public function testFormatAsUsername()	{
+	public function testFormatAsUsername() {
 		// Happy path
 		$this->assertEquals($this->e->formatAsUsername("this"), "This");
 		$this->assertEquals($this->e->formatAsUsername("1this"), "1this");

Braces +2 added lines, -1 removed lines

@@ -19,7 +19,8 @@
 		$this->e = null;
 	}
 
-	public function testFormatAsUsername()	{
+	public function testFormatAsUsername()
+	{
 		// Happy path
 		$this->assertEquals($this->e->formatAsUsername("this"), "This");
 		$this->assertEquals($this->e->formatAsUsername("1this"), "1this");