mdaniels5757 / waca

includes/DataObjects/EmailTemplate.php

Braces +2 added lines, -4 removed lines

@@ -123,12 +123,10 @@
 			if ($statement->execute()) {
 				$this->isNew = false;
 				$this->id = $this->dbObject->lastInsertId();
-			}
-			else {
+			} else {
 				throw new Exception($statement->errorInfo());
 			}
-		}
-		else {
+		} else {
 			// update
 			$statement = $this->dbObject->prepare(<<<SQL
 UPDATE `emailtemplate`

includes/DataObjects/InterfaceMessage.php

Braces +2 added lines, -4 removed lines

@@ -48,12 +48,10 @@
 			if ($statement->execute()) {
 				$this->isNew = false;
 				$this->id = $this->dbObject->lastInsertId();
-			}
-			else {
+			} else {
 				throw new Exception($statement->errorInfo());
 			}
-		}
-		else {
+		} else {
 // update
 			$statement = $this->dbObject->prepare("UPDATE interfacemessage SET type = :type, description = :desc, content = :content, updatecounter = updatecounter + 1 WHERE id = :id;");
 			$statement->bindValue(":id", $this->id);

includes/DataObjects/AntiSpoofCache.php

Braces +1 added lines, -2 removed lines

@@ -74,8 +74,7 @@
 			if ($statement->execute()) {
 				$this->isNew = false;
 				$this->id = $this->dbObject->lastInsertId();
-			}
-			else {
+			} else {
 				throw new Exception($statement->errorInfo());
 			}
 		}

includes/DataObjects/WelcomeTemplate.php

Braces +2 added lines, -4 removed lines

@@ -47,12 +47,10 @@
 			if ($statement->execute()) {
 				$this->isNew = false;
 				$this->id = $this->dbObject->lastInsertId();
-			}
-			else {
+			} else {
 				throw new Exception($statement->errorInfo());
 			}
-		}
-		else {
+		} else {
 // update
 			$statement = $this->dbObject->prepare("UPDATE `welcometemplate` SET usercode = :usercode, botcode = :botcode WHERE id = :id;");
 			$statement->bindValue(":id", $this->id);

includes/DataObjects/Ban.php

Braces +5 added lines, -10 removed lines

@@ -29,8 +29,7 @@ 
 			$query = "SELECT * FROM ban WHERE target = :target;";
 			$statement = $database->prepare($query);
 			$statement->bindValue(":target", $target);
-		}
-		else {
+		} else {
 			$query = "SELECT * FROM ban;";
 			$statement = $database->prepare($query);
 		}
@@ -64,8 +63,7 @@ 
 			$query = "SELECT * FROM ban WHERE target = :target AND (duration > UNIX_TIMESTAMP() OR duration = -1) AND active = 1;";
 			$statement = $database->prepare($query);
 			$statement->bindValue(":target", $target);
-		}
-		else {
+		} else {
 			$query = "SELECT * FROM ban WHERE (duration > UNIX_TIMESTAMP() OR duration = -1) AND active = 1;";
 			$statement = $database->prepare($query);
 		}
@@ -160,12 +158,10 @@ 
 			if ($statement->execute()) {
 				$this->isNew = false;
 				$this->id = $this->dbObject->lastInsertId();
-			}
-			else {
+			} else {
 				throw new Exception($statement->errorInfo());
 			}
-		}
-		else {
+		} else {
 // update
 			$statement = $this->dbObject->prepare("UPDATE `ban` SET duration = :duration, active = :active, user = :user WHERE id = :id;");
 			$statement->bindValue(":id", $this->id);
@@ -215,8 +211,7 @@ 
 			}
 
 			$this->user = $u->getId();
-		}
-		else {
+		} else {
 			$this->user = $user;
 		}
 	}

includes/DataObjects/Log.php

Braces +3 added lines, -6 removed lines

@@ -35,12 +35,10 @@ 
 			if ($statement->execute()) {
 				$this->isNew = false;
 				$this->id = $this->dbObject->lastInsertId();
-			}
-			else {
+			} else {
 				throw new Exception($statement->errorInfo());
 			}
-		}
-		else {
+		} else {
 			throw new Exception("Updating logs is not available");
 		}
 	}
@@ -100,8 +98,7 @@ 
 	{
 		if (is_a($user, "User")) {
 			$this->user = $user->getId();   
-		}
-		else {
+		} else {
 			$this->user = $user;   
 		}
 	}

includes/Offline.php

Braces +2 added lines, -4 removed lines

@@ -29,8 +29,7 @@ 
 		if ($dontUseDb) {
 			if ($external) {
 				$smarty->display("offline/external.tpl");
-			}
-			else {
+			} else {
 				$smarty->assign("dontUseDbCulprit", $dontUseDbCulprit);
 				$smarty->assign("dontUseDbReason", $dontUseDbReason);
 				$smarty->assign("alerts", array());
@@ -63,8 +62,7 @@ 
 
 		if ($external) {
 			return $smarty->fetch("offline/external.tpl");
-		}
-		else {
+		} else {
 			$smarty->assign("dontUseDbCulprit", $dontUseDbCulprit);
 			$smarty->assign("dontUseDbReason", $dontUseDbReason);
 			$smarty->assign("alerts", array());

includes/StatisticsPage.php

Braces +3 added lines, -6 removed lines

@@ -30,8 +30,7 @@ 
 		if (file_exists($filepath . "/includes/statistics/Stats" . $pageName . ".php")) {
 		// and include it.
 			require_once($filepath . "/includes/statistics/Stats" . $pageName . ".php");
-		}
-		else {
+		} else {
 			// class def doesn't exist: error
 			die("Unknown statistics page");
 		}
@@ -48,13 +47,11 @@ 
 			if (get_parent_class($object) == "StatisticsPage") {
 				// all is good, return the new statistics page object
 				return $object;
-			}
-			else {
+			} else {
 				// oops. this is our class, named correctly, but it's a bad definition.
 				die("Unrecognised statistics page definition.");
 			}
-		}
-		else {
+		} else {
 			// file exists, but no definition of the class
 			die("No definition for statistics page: " . $statsPage);
 		}

redir.php

Braces +2 added lines, -4 removed lines

@@ -16,15 +16,13 @@
 if(!isset($_GET['tool'])
 	|| !isset($toolList[$_GET['tool']])
 	|| !isset($_GET['data'])
-)
-{
+) {
 	header("HTTP/1.1 403 Forbidden");
 	return;
 }
 
 if (isset($_GET['round2'])) {
 	echo '<script>window.location.href=' . json_encode(str_replace("%DATA%", urlencode($_GET['data']), $toolList[$_GET['tool']])) . '</script>';
-}
-else {
+} else {
 	header("Location: " . $_SERVER["REQUEST_URI"] . "&round2=true");
 }