enwikipedia-acc / waca

includes/AutoLoader.php

Spacing +8 added lines, -8 removed lines

@@ -19,14 +19,14 @@
 		}
 
 		$paths = array(
-			$filepath . 'includes/' . $class . ".php",
-			$filepath . 'includes/DataObjects/' . $class . ".php",
-			$filepath . 'includes/Providers/' . $class . ".php",
-			$filepath . 'includes/Providers/Interfaces/' . $class . ".php",
-			$filepath . 'includes/Validation/' . $class . ".php",
-			$filepath . 'includes/Helpers/' . $class . ".php",
-			$filepath . 'includes/Helpers/Interfaces/' . $class . ".php",
-			$filepath . $class . ".php",
+			$filepath.'includes/'.$class.".php",
+			$filepath.'includes/DataObjects/'.$class.".php",
+			$filepath.'includes/Providers/'.$class.".php",
+			$filepath.'includes/Providers/Interfaces/'.$class.".php",
+			$filepath.'includes/Validation/'.$class.".php",
+			$filepath.'includes/Helpers/'.$class.".php",
+			$filepath.'includes/Helpers/Interfaces/'.$class.".php",
+			$filepath.$class.".php",
 		);
 
 		foreach ($paths as $file) {

includes/Providers/IpLocationProvider.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 	{
 		try {
 			if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-				$xml = @file_get_contents($this->getApiBase() . '?key=' . $this->apikey . '&ip=' . $ip . '&format=xml');
+				$xml = @file_get_contents($this->getApiBase().'?key='.$this->apikey.'&ip='.$ip.'&format=xml');
 
 				$response = @new SimpleXMLElement($xml);
 

includes/Providers/CachedApiAntispoofProvider.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
 		$cacheResult = AntiSpoofCache::getByUsername($username, gGetDb());
 		if ($cacheResult == false) {
 			// get the data from the API
-			$data = file_get_contents($mediawikiWebServiceEndpoint . "?action=antispoof&format=php&username=" . urlencode($username));
+			$data = file_get_contents($mediawikiWebServiceEndpoint."?action=antispoof&format=php&username=".urlencode($username));
 
 			$cacheEntry = new AntiSpoofCache();
 			$cacheEntry->setDatabase(gGetDb());
@@ -35,7 +35,7 @@ 
 			$cacheResult->delete();
 
 			if (isset($result['error']['info'])) {
-				throw new Exception("Unrecognised API response to query: " . $result['error']['info']);
+				throw new Exception("Unrecognised API response to query: ".$result['error']['info']);
 			}
 
 			throw new Exception("Unrecognised API response to query.");
@@ -53,7 +53,7 @@ 
 
 		if ($result['antispoof']['result'] == "error") {
 			// we've got conflicts, let's do something with them.
-			throw new Exception("Encountered error while getting result: " . $result['antispoof']['error']);
+			throw new Exception("Encountered error while getting result: ".$result['antispoof']['error']);
 		}
 
 		throw new Exception("Unrecognised API response to query.");

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

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

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

includes/DataObjects/Request.php

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 LIMIT 1;");
 			$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()
@@ -311,7 +311,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);
@@ -339,7 +339,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);
 
@@ -411,7 +411,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/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>";
 	}
 }

includes/BootstrapSkin.php

Spacing +4 added lines, -4 removed lines

@@ -118,13 +118,13 @@ 
 
 		// not equal to one, as zero uses the plural form too.
 		if ($resultSetCount != 1) {
-			$onlinemessage = $resultSetCount . " Account Creators currently online (past 5 minutes): $creators";
+			$onlinemessage = $resultSetCount." Account Creators currently online (past 5 minutes): $creators";
 		}
 		else {
-			$onlinemessage = $resultSetCount . " Account Creator currently online (past 5 minutes): $creators";
+			$onlinemessage = $resultSetCount." Account Creator currently online (past 5 minutes): $creators";
 		}
 
-		$online = '<p class="span6 text-right"><small>' . $onlinemessage . '</small></p>';
+		$online = '<p class="span6 text-right"><small>'.$onlinemessage.'</small></p>';
 
 		if (isset($_SESSION['user'])) {
 			$smarty->assign("onlineusers", $online);
@@ -171,7 +171,7 @@ 
 		$returnData = $smarty->fetch("alert.tpl");
 
 		if ($centre) {
-			$returnData = '<div class="row-fluid"><div class="span8 offset2">' . $returnData . '</div></div>';
+			$returnData = '<div class="row-fluid"><div class="span8 offset2">'.$returnData.'</div></div>';
 		}
 
 		if ($return) {

Braces +1 added lines, -2 removed lines

@@ -102,8 +102,7 @@
 		$creators = implode(
 			", ",
 			array_map(
-				function($arg)
-				{
+				function($arg) {
 					/** @var User $arg */
 					return
 						"<a href=\"statistics.php?page=Users&amp;user="