mdaniels5757 / waca

includes/statistics/StatsUsers.php

Braces +1 added lines, -2 removed lines

@@ -18,8 +18,7 @@
 	{
 		if (!isset($_GET['user'])) {
 			return $this->getUserList();
-		}
-		else {
+		} else {
 			return $this->getUserDetail($_GET['user']);
 		}
 	}

includes/statistics/StatsTopCreators.php

Spacing +3 added lines, -3 removed lines

@@ -180,8 +180,8 @@ 
 
 	$out .= '>';
 
-	$out .= '<td>' . $rowno . '</td>';
-	$out .= '<td>' . $row['COUNT(*)'] . '</td>';
+	$out .= '<td>'.$rowno.'</td>';
+	$out .= '<td>'.$row['COUNT(*)'].'</td>';
 
 	global $baseurl;
 	$out .= '<td><a ';
@@ -193,7 +193,7 @@ 
 		$out .= 'class="text-success" ';
 	}
 
-	$out .= 'href="' . $baseurl . '/statistics.php?page=Users&amp;user=' . $row['user_id'] . '">' . $row['log_user'] . '</a></td>';
+	$out .= 'href="'.$baseurl.'/statistics.php?page=Users&amp;user='.$row['user_id'].'">'.$row['log_user'].'</a></td>';
 
 	$out .= '</tr>';
 

includes/statistics/StatsIdUsers.php

Indentation +30 added lines, -30 removed lines

@@ -14,31 +14,31 @@ 
 
 class StatsIdUsers extends StatisticsPage
 {
-    protected function execute()
-    {
-        return $this->getUserList();
-    }
+	protected function execute()
+	{
+		return $this->getUserList();
+	}
 
-    public function getPageTitle()
-    {
-        return "User identification status";
-    }
+	public function getPageTitle()
+	{
+		return "User identification status";
+	}
 
-    public function getPageName()
-    {
-        return "IdUsers";
-    }
+	public function getPageName()
+	{
+		return "IdUsers";
+	}
 
-    public function isProtected()
-    {
-        return true;
-    }
+	public function isProtected()
+	{
+		return true;
+	}
 
-    private function getUserList()
-    {
-        global $currentIdentificationVersion, $forceIdentification;
+	private function getUserList()
+	{
+		global $currentIdentificationVersion, $forceIdentification;
 
-        $query = <<<SQL
+		$query = <<<SQL
 select username, status, checkuser, identified, case 
     when coalesce(identified, 0) = 0 then 'Not identified'
     when identified < ${forceIdentification} then 'Expired'
@@ -51,16 +51,16 @@ 
 order by username;
 SQL;
 
-        $qb = new QueryBrowser();
-        $qb->rowFetchMode = PDO::FETCH_NUM;
-        $qb->overrideTableTitles = array("User name", "Access level", "Checkuser?", "Version", "Identification status");
-        $r = $qb->executeQueryToTable($query);
+		$qb = new QueryBrowser();
+		$qb->rowFetchMode = PDO::FETCH_NUM;
+		$qb->overrideTableTitles = array("User name", "Access level", "Checkuser?", "Version", "Identification status");
+		$r = $qb->executeQueryToTable($query);
 
-        return $r;
-    }
+		return $r;
+	}
 
-    public function requiresWikiDatabase()
-    {
-        return false;
-    }
+	public function requiresWikiDatabase()
+	{
+		return false;
+	}
 }

includes/DataObjects/GeoLocation.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	public static function getByAddress($address, PdoDatabase $database, $forUpdate = false)
 	{
 		$lockMode = $forUpdate ? ' FOR UPDATE' : '';
-		$sql = "SELECT * FROM geolocation WHERE address = :id LIMIT 1" . $lockMode;
+		$sql = "SELECT * FROM geolocation WHERE address = :id LIMIT 1".$lockMode;
 
 		$statement = $database->prepare($sql);
 		$statement->bindValue(":id", $address);

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 `geolocation` SET address = :address, data = :data WHERE id = :id;");
 			$statement->bindValue(":address", $this->address);

includes/DataObjects/RDnsCache.php

Braces +2 added lines, -4 removed lines

@@ -41,12 +41,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 `rdnscache` SET address = :address, data = :data WHERE id = :id;");
 			$statement->bindValue(":address", $this->address);

includes/DataObjects/Comment.php

Braces +3 added lines, -6 removed lines

@@ -26,8 +26,7 @@ 
 		if (User::getCurrent()->isAdmin() || User::getCurrent()->isCheckuser()) {
 			// current user is an admin or checkuser, so retrieve everything.
 			$statement = $database->prepare("SELECT * FROM comment WHERE request = :target;");
-		}
-		else {
+		} else {
 			// current user isn't an admin, so limit to only those which are visible to users, and private comments
 			// the user has posted themselves.
 			$statement = $database->prepare(<<<SQL
@@ -70,12 +69,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 comment

includes/DataObjects/Notification.php

Spacing +25 added lines, -25 removed lines

@@ -98,7 +98,7 @@ 
 		$blacklist = array("DCC", "CCTP", "PRIVMSG");
 		$message = str_replace($blacklist, "(IRC Blacklist)", $message); //Lets stop DCC etc
 
-		$msg = IrcColourCode::RESET . IrcColourCode::BOLD . "[$whichami]" . IrcColourCode::RESET . ": $message";
+		$msg = IrcColourCode::RESET.IrcColourCode::BOLD."[$whichami]".IrcColourCode::RESET.": $message";
 
 		try {
 			$database = gGetDb('notifications');
@@ -136,7 +136,7 @@ 
 	 */
 	public static function userApproved(User $user)
 	{
-		self::send("{$user->getUsername()} approved by " . User::getCurrent()->getUsername());
+		self::send("{$user->getUsername()} approved by ".User::getCurrent()->getUsername());
 	}
 
 	/**
@@ -145,7 +145,7 @@ 
 	 */
 	public static function userPromoted(User $user)
 	{
-		self::send("{$user->getUsername()} promoted to tool admin by " . User::getCurrent()->getUsername());
+		self::send("{$user->getUsername()} promoted to tool admin by ".User::getCurrent()->getUsername());
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 */
 	public static function userDeclined(User $user, $reason)
 	{
-		self::send("{$user->getUsername()} declined by " . User::getCurrent()->getUsername() . " ($reason)");
+		self::send("{$user->getUsername()} declined by ".User::getCurrent()->getUsername()." ($reason)");
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	 */
 	public static function userDemoted(User $user, $reason)
 	{
-		self::send("{$user->getUsername()} demoted by " . User::getCurrent()->getUsername() . " ($reason)");
+		self::send("{$user->getUsername()} demoted by ".User::getCurrent()->getUsername()." ($reason)");
 	}
 
 	/**
@@ -175,7 +175,7 @@ 
 	 */
 	public static function userSuspended(User $user, $reason)
 	{
-		self::send("{$user->getUsername()} suspended by " . User::getCurrent()->getUsername() . " ($reason)");
+		self::send("{$user->getUsername()} suspended by ".User::getCurrent()->getUsername()." ($reason)");
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	 */
 	public static function userPrefChange(User $user)
 	{
-		self::send("{$user->getUsername()}'s preferences were changed by " . User::getCurrent()->getUsername());
+		self::send("{$user->getUsername()}'s preferences were changed by ".User::getCurrent()->getUsername());
 	}
 
 	/**
@@ -194,7 +194,7 @@ 
 	 */
 	public static function userRenamed(User $user, $old)
 	{
-		self::send(User::getCurrent()->getUsername() . " renamed $old to {$user->getUsername()}");
+		self::send(User::getCurrent()->getUsername()." renamed $old to {$user->getUsername()}");
 	}
 
 	#endregion
@@ -207,7 +207,7 @@ 
 	 */
 	public static function interfaceMessageEdited(InterfaceMessage $message)
 	{
-		self::send("Message {$message->getDescription()} ({$message->getId()}) edited by " . User::getCurrent()->getUsername());
+		self::send("Message {$message->getDescription()} ({$message->getId()}) edited by ".User::getCurrent()->getUsername());
 	}
 	#endregion
 
@@ -218,7 +218,7 @@ 
 	 */
 	public static function welcomeTemplateCreated(WelcomeTemplate $template)
 	{
-		self::send("Welcome template {$template->getId()} created by " . User::getCurrent()->getUsername());
+		self::send("Welcome template {$template->getId()} created by ".User::getCurrent()->getUsername());
 	}
 
 	/**
@@ -227,7 +227,7 @@ 
 	 */
 	public static function welcomeTemplateDeleted($templateid)
 	{
-		self::send("Welcome template {$templateid} deleted by " . User::getCurrent()->getUsername());
+		self::send("Welcome template {$templateid} deleted by ".User::getCurrent()->getUsername());
 	}
 
 	/**
@@ -236,7 +236,7 @@ 
 	 */
 	public static function welcomeTemplateEdited(WelcomeTemplate $template)
 	{
-		self::send("Welcome template {$template->getId()} edited by " . User::getCurrent()->getUsername());
+		self::send("Welcome template {$template->getId()} edited by ".User::getCurrent()->getUsername());
 	}
 
 	#endregion
@@ -252,7 +252,7 @@ 
 			$duration = "indefinitely";
 		}
 		else {
-			$duration = "until " . date("F j, Y, g:i a", $ban->getDuration());
+			$duration = "until ".date("F j, Y, g:i a", $ban->getDuration());
 		}
 
 		$username = User::getCurrent()->getUsername();
@@ -267,7 +267,7 @@ 
 	 */
 	public static function unbanned(Ban $ban, $unbanreason)
 	{
-		self::send($ban->getTarget() . " unbanned by " . User::getCurrent()->getUsername() . " (" . $unbanreason . ")");
+		self::send($ban->getTarget()." unbanned by ".User::getCurrent()->getUsername()." (".$unbanreason.")");
 	}
 
 	#endregion
@@ -283,15 +283,15 @@ 
 		global $baseurl;
 
 		self::send(
-			IrcColourCode::DARK_GREY . "[["
-			. IrcColourCode::DARK_GREEN . "acc:"
-			. IrcColourCode::ORANGE . $request->getId()
-			. IrcColourCode::DARK_GREY . "]]"
-			. IrcColourCode::RED . " N "
-			. IrcColourCode::DARK_BLUE . $baseurl . "/acc.php?action=zoom&id={$request->getId()} "
-			. IrcColourCode::DARK_RED . "* "
-			. IrcColourCode::DARK_GREEN . $request->getName()
-			. IrcColourCode::DARK_RED . " * "
+			IrcColourCode::DARK_GREY."[["
+			. IrcColourCode::DARK_GREEN."acc:"
+			. IrcColourCode::ORANGE.$request->getId()
+			. IrcColourCode::DARK_GREY."]]"
+			. IrcColourCode::RED." N "
+			. IrcColourCode::DARK_BLUE.$baseurl."/acc.php?action=zoom&id={$request->getId()} "
+			. IrcColourCode::DARK_RED."* "
+			. IrcColourCode::DARK_GREEN.$request->getName()
+			. IrcColourCode::DARK_RED." * "
 			. IrcColourCode::RESET
 			);
 	}
@@ -434,7 +434,7 @@ 
 	 */
 	public static function emailCreated(EmailTemplate $template)
 	{
-		self::send("Email {$template->getId()} ({$template->getName()}) created by " . User::getCurrent()->getUsername());
+		self::send("Email {$template->getId()} ({$template->getName()}) created by ".User::getCurrent()->getUsername());
 	}
 
 	/**
@@ -443,7 +443,7 @@ 
 	 */
 	public static function emailEdited(EmailTemplate $template)
 	{
-		self::send("Email {$template->getId()} ({$template->getName()}) edited by " . User::getCurrent()->getUsername());
+		self::send("Email {$template->getId()} ({$template->getName()}) edited by ".User::getCurrent()->getUsername());
 	}
 
 	#endregion

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/Request.php

Braces +5 added lines, -10 removed lines

@@ -83,12 +83,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("UPDATE `request` SET " .
 				"status = :status, checksum = :checksum, emailsent = :emailsent, emailconfirm = :emailconfirm, " .
@@ -372,12 +370,10 @@ 
 		if ($this->reserved != 0) {
 			if ($this->reserved == User::getCurrent()->getId()) {
 				return false;
-			}
-			else {
+			} else {
 				return true;
 			}
-		}
-		else {
+		} else {
 			return false;
 		}
 
@@ -392,8 +388,7 @@ 
 
 		if ($this->getEmailConfirm() == $si) {
 			$this->setEmailConfirm("Confirmed");
-		}
-		else {
+		} else {
 			throw new TransactionException("Confirmation hash does not match the expected value", "Email confirmation failed");
 		}
 	}

Spacing +12 added lines, -12 removed lines

@@ -63,11 +63,11 @@ 
 		if ($this->isNew) {
 // insert
 			$statement = $this->dbObject->prepare(
-				"INSERT INTO `request` (" .
-				"email, ip, name, comment, status, date, checksum, emailsent, emailconfirm, reserved, useragent, forwardedip" .
-				") VALUES (" .
-				":email, :ip, :name, :comment, :status, CURRENT_TIMESTAMP(), :checksum, :emailsent," .
-				":emailconfirm, :reserved, :useragent, :forwardedip" .
+				"INSERT INTO `request` (".
+				"email, ip, name, comment, status, date, checksum, emailsent, emailconfirm, reserved, useragent, forwardedip".
+				") VALUES (".
+				":email, :ip, :name, :comment, :status, CURRENT_TIMESTAMP(), :checksum, :emailsent,".
+				":emailconfirm, :reserved, :useragent, :forwardedip".
 				");");
 			$statement->bindValue(":email", $this->email);
 			$statement->bindValue(":ip", $this->ip);
@@ -90,9 +90,9 @@ 
 		}
 		else {
 // update
-			$statement = $this->dbObject->prepare("UPDATE `request` SET " .
-				"status = :status, checksum = :checksum, emailsent = :emailsent, emailconfirm = :emailconfirm, " .
-				"reserved = :reserved " .
+			$statement = $this->dbObject->prepare("UPDATE `request` SET ".
+				"status = :status, checksum = :checksum, emailsent = :emailsent, emailconfirm = :emailconfirm, ".
+				"reserved = :reserved ".
 				"WHERE id = :id;");
 			$statement->bindValue(":id", $this->id);
 			$statement->bindValue(":status", $this->status);
@@ -196,7 +196,7 @@ 
 
 	public function updateChecksum()
 	{
-		$this->checksum = md5($this->id . $this->name . $this->email . microtime());
+		$this->checksum = md5($this->id.$this->name.$this->email.microtime());
 	}
 
 	public function getEmailSent()
@@ -323,7 +323,7 @@ 
 			$query = $this->dbObject->prepare("SELECT * FROM request WHERE (ip = :ip OR forwardedip LIKE :forwarded) AND ip != :clearedip AND id != :id AND emailconfirm = 'Confirmed';");
 
 			$trustedIp = $this->getTrustedIp();
-			$trustedFilter = '%' . $trustedIp . '%';
+			$trustedFilter = '%'.$trustedIp.'%';
 
 			$query->bindValue(":id", $this->id);
 			$query->bindValue(":ip", $trustedIp);
@@ -351,7 +351,7 @@ 
 			return false;
 		}
 
-		$apiResult = file_get_contents("https://en.wikipedia.org/w/api.php?action=titleblacklist&tbtitle=" . urlencode($this->name) . "&tbaction=new-account&tbnooverride&format=php");
+		$apiResult = file_get_contents("https://en.wikipedia.org/w/api.php?action=titleblacklist&tbtitle=".urlencode($this->name)."&tbaction=new-account&tbnooverride&format=php");
 
 		$data = unserialize($apiResult);
 
@@ -423,7 +423,7 @@ 
 	
 	public function getObjectDescription()
 	{
-		return '<a href="acc.php?action=zoom&amp;id=' . $this->getId() . '">Request #' . $this->getId() . " (" . htmlentities($this->name) . ")</a>";
+		return '<a href="acc.php?action=zoom&amp;id='.$this->getId().'">Request #'.$this->getId()." (".htmlentities($this->name).")</a>";
 	}
 
 	public function getClosureReason()

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`