mdaniels5757 / waca

includes/DataObjects/InterfaceMessage.php

Spacing +1 added lines, -1 removed lines

@@ -118,6 +118,6 @@
 	
 	public function getObjectDescription()
 	{
-		return '<a href="acc.php?action=messagemgmt&amp;view=' . $this->getId() . '">' . htmlentities($this->description) . "</a>";
+		return '<a href="acc.php?action=messagemgmt&amp;view='.$this->getId().'">'.htmlentities($this->description)."</a>";
 	}
 }

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

Spacing +1 added lines, -1 removed lines

@@ -108,6 +108,6 @@
 	
 	public function getObjectDescription()
 	{
-		return '<a href="acc.php?action=templatemgmt&amp;view=' . $this->getId() . '">' . htmlentities($this->usercode) . "</a>";
+		return '<a href="acc.php?action=templatemgmt&amp;view='.$this->getId().'">'.htmlentities($this->usercode)."</a>";
 	}
 }

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

Spacing +1 added lines, -1 removed lines

@@ -258,6 +258,6 @@
 	
 	public function getObjectDescription()
 	{
-		return 'Ban #' . $this->getId() . " (" . htmlentities($this->target) . ")</a>";
+		return 'Ban #'.$this->getId()." (".htmlentities($this->target).")</a>";
 	}
 }

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

Spacing +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
 		$object = $type::getById($this->objectid, $this->dbObject);
 
 		if ($object === false) {
-			return '[' . $this->objecttype . " " . $this->objectid . ']';
+			return '['.$this->objecttype." ".$this->objectid.']';
 		}
 		
 		return $object->getObjectDescription();

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

Spacing +5 added lines, -5 removed lines

@@ -23,13 +23,13 @@ 
 	public static function Create($pageName)
 	{
 		// calculate the name of the statistics page
-		$statsPage = "Stats" . $pageName;
+		$statsPage = "Stats".$pageName;
 
 		global $filepath;
 		// check the stats page definition exists...
-		if (file_exists($filepath . "/includes/statistics/Stats" . $pageName . ".php")) {
+		if (file_exists($filepath."/includes/statistics/Stats".$pageName.".php")) {
 		// and include it.
-			require_once($filepath . "/includes/statistics/Stats" . $pageName . ".php");
+			require_once($filepath."/includes/statistics/Stats".$pageName.".php");
 		}
 		else {
 			// class def doesn't exist: error
@@ -56,7 +56,7 @@ 
 		}
 		else {
 			// file exists, but no definition of the class
-			die("No definition for statistics page: " . $statsPage);
+			die("No definition for statistics page: ".$statsPage);
 		}
 	}
 
@@ -145,7 +145,7 @@ 
 		}
 
 		// not protected or access allowed
-		echo '<div class="page-header"><h1>' . $this->getPageTitle() . '</h1></div>';
+		echo '<div class="page-header"><h1>'.$this->getPageTitle().'</h1></div>';
 
 		if ($this->requiresSimpleHtmlEnvironment()) {
 			echo '<div class="row-fluid"><div class="span12">';

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

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 	'bgpview' => 'https://bgpview.io/ip/%DATA%'
 );
 
-if(!isset($_GET['tool'])
+if (!isset($_GET['tool'])
 	|| !isset($toolList[$_GET['tool']])
 	|| !isset($_GET['data'])
 )
@@ -23,8 +23,8 @@ 
 }
 
 if (isset($_GET['round2'])) {
-	echo '<script>window.location.href=' . json_encode(str_replace("%DATA%", urlencode($_GET['data']), $toolList[$_GET['tool']])) . '</script>';
+	echo '<script>window.location.href='.json_encode(str_replace("%DATA%", urlencode($_GET['data']), $toolList[$_GET['tool']])).'</script>';
 }
 else {
-	header("Location: " . $_SERVER["REQUEST_URI"] . "&round2=true");
+	header("Location: ".$_SERVER["REQUEST_URI"]."&round2=true");
 }

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

queryBrowser.php

Spacing +5 added lines, -5 removed lines

@@ -52,18 +52,18 @@ 
 		$out .= '<table class="table table-striped table-hover table-condensed"><tr>';
 
 		if ($this->numberedList == true) {
-			$out .= "<th>" . $this->numberedListTitle . "</th>";
+			$out .= "<th>".$this->numberedListTitle."</th>";
 		}
 
 		if ($this->overrideTableTitles != false) {
 			foreach ($this->overrideTableTitles as $value) {
-				$out .= "<th>" . $value . "</th>"; 
+				$out .= "<th>".$value."</th>"; 
 			}
 		}
 		else {
 			if (count($results) > 0) {
 				foreach ($results[0] as $k => $v) {
-					$out .= "<th>" . $k . "</th>"; 
+					$out .= "<th>".$k."</th>"; 
 				}
 			}
 		}
@@ -80,13 +80,13 @@ 
 				$out .= '<tr>';
                 
 				if ($this->numberedList == true) {
-					$out .= "<th>" . $currentreq . "</th>";
+					$out .= "<th>".$currentreq."</th>";
 				}
 				
 				
 				foreach ($row as $cell) {
 	
-					$out .= "<td>" . $cell . "</td>";
+					$out .= "<td>".$cell."</td>";
 				}
 	
 				

Braces +2 added lines, -4 removed lines

@@ -59,8 +59,7 @@ 
 			foreach ($this->overrideTableTitles as $value) {
 				$out .= "<th>" . $value . "</th>"; 
 			}
-		}
-		else {
+		} else {
 			if (count($results) > 0) {
 				foreach ($results[0] as $k => $v) {
 					$out .= "<th>" . $k . "</th>"; 
@@ -75,8 +74,7 @@ 
 			$currentreq++;
 			if (function_exists($this->tableCallbackFunction)) {
 				$out .= call_user_func($this->tableCallbackFunction, $row, $currentreq);	
-			}
-			else {
+			} else {
 				$out .= '<tr>';
                 
 				if ($this->numberedList == true) {