enwikipedia-acc / waca

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

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="

includes/Helpers/DebugHelper.php

Spacing +2 added lines, -2 removed lines

@@ -26,10 +26,10 @@
 			$output .= "#{$count}: ";
             
 			if (isset($line['type']) && $line['type'] != "") {
-				$output .= $line['class'] . $line['type'];
+				$output .= $line['class'].$line['type'];
 			}
             
-			$output .= $line['function'] . "(...)";
+			$output .= $line['function']."(...)";
 			$output .= " [{$line['file']}#{$line['line']}\r\n";
             
 			$count++;

includes/Validation/RequestValidationHelper.php

Spacing +4 added lines, -4 removed lines

@@ -61,7 +61,7 @@ 
 		}
 
 		// username can't contain #@/<>[]|{}
-		if (preg_match("/[" . preg_quote("#@/<>[]|{}", "/") . "]/", $this->request->getName()) === 1) {
+		if (preg_match("/[".preg_quote("#@/<>[]|{}", "/")."]/", $this->request->getName()) === 1) {
 			$errorList[ValidationError::NAME_INVALIDCHAR] = new ValidationError(ValidationError::NAME_INVALIDCHAR);
 		}
 
@@ -176,7 +176,7 @@ 
 	{
 		global $enableTitleblacklist;
 		if ($enableTitleblacklist == 1) {
-			$apiResult = file_get_contents("https://en.wikipedia.org/w/api.php?action=titleblacklist&tbtitle=" . urlencode($this->request->getName()) . "&tbaction=new-account&tbnooverride&format=php");
+			$apiResult = file_get_contents("https://en.wikipedia.org/w/api.php?action=titleblacklist&tbtitle=".urlencode($this->request->getName())."&tbaction=new-account&tbnooverride&format=php");
 
 			$data = unserialize($apiResult);
 
@@ -192,7 +192,7 @@ 
 	{
 		global $mediawikiWebServiceEndpoint;
 
-		$userexist = file_get_contents($mediawikiWebServiceEndpoint . "?action=query&list=users&ususers=" . urlencode($this->request->getName()) . "&format=php");
+		$userexist = file_get_contents($mediawikiWebServiceEndpoint."?action=query&list=users&ususers=".urlencode($this->request->getName())."&format=php");
 		$ue = unserialize($userexist);
 		if (!isset ($ue['query']['users']['0']['missing']) && isset ($ue['query']['users']['0']['userid'])) {
 			return true;
@@ -206,7 +206,7 @@ 
 		global $mediawikiWebServiceEndpoint;
 
 		$reqname = str_replace("_", " ", $this->request->getName());
-		$userexist = file_get_contents($mediawikiWebServiceEndpoint . "?action=query&meta=globaluserinfo&guiuser=" . urlencode($reqname) . "&format=php");
+		$userexist = file_get_contents($mediawikiWebServiceEndpoint."?action=query&meta=globaluserinfo&guiuser=".urlencode($reqname)."&format=php");
 		$ue = unserialize($userexist);
 		if (isset ($ue['query']['globaluserinfo']['id'])) {
 			return true;

functions.php

Spacing +16 added lines, -16 removed lines

@@ -37,7 +37,7 @@ 
 	// Get the closing user's Email signature and append it to the Email.
 	if (User::getCurrent()->getEmailSig() != "") {
 		$emailsig = html_entity_decode(User::getCurrent()->getEmailSig(), ENT_QUOTES, "UTF-8");
-		mail($target, "RE: [ACC #$id] English Wikipedia Account Request", $template->getText() . "\n\n" . $emailsig, $headers);
+		mail($target, "RE: [ACC #$id] English Wikipedia Account Request", $template->getText()."\n\n".$emailsig, $headers);
 	}
 	else {
 		mail($target, "RE: [ACC #$id] English Wikipedia Account Request", $template->getText(), $headers);
@@ -106,8 +106,8 @@ 
 		}
 		else {
 			// This is the login form, not the request form. We need protection here.
-			$path = 'https://' . $_SERVER["SERVER_NAME"] . $_SERVER["REQUEST_URI"];
-			header("Location: " . $path);
+			$path = 'https://'.$_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];
+			header("Location: ".$path);
 		}
 	}
 
@@ -203,7 +203,7 @@ 
 
 function displayPreview($wikicode)
 {
-	$parseresult = unserialize(file_get_contents('http://en.wikipedia.org/w/api.php?action=parse&format=php&text=' . urlencode($wikicode)));
+	$parseresult = unserialize(file_get_contents('http://en.wikipedia.org/w/api.php?action=parse&format=php&text='.urlencode($wikicode)));
 	$out = "<br />\n<h3>Preview</h3>\n<div style=\"border: 2px dashed rgb(26, 79, 133);\">\n<div style=\"margin: 20px;\">";
 	$out .= $parseresult['parse']['text']['*'];
 	$out .= '</div></div>';
@@ -293,8 +293,8 @@ 
  */
 function welcomerbotRenderSig($creator, $sig)
 {
-	$signature = html_entity_decode($sig) . ' ~~~~~';
-	if (!preg_match("/((\[\[[ ]*(w:)?[ ]*(en:)?)|(\{\{subst:))[ ]*User[ ]*:[ ]*" . $creator . "[ ]*(\]\]|\||\}\}|\/)/i", $signature)) {
+	$signature = html_entity_decode($sig).' ~~~~~';
+	if (!preg_match("/((\[\[[ ]*(w:)?[ ]*(en:)?)|(\{\{subst:))[ ]*User[ ]*:[ ]*".$creator."[ ]*(\]\]|\||\}\}|\/)/i", $signature)) {
 		$signature = "--[[User:$creator|$creator]] ([[User talk:$creator|talk]]) ~~~~~";
 	}
 	return $signature;
@@ -332,25 +332,25 @@ 
 		$pluralise = false;
 	}
 	elseif ($secs > 10 && $secs < $minuteCut) {
-		$output = round($secs / $second) . " second";
+		$output = round($secs / $second)." second";
 	}
 	elseif ($secs >= $minuteCut && $secs < $hourCut) {
-		$output = round($secs / $minute) . " minute";
+		$output = round($secs / $minute)." minute";
 	}
 	elseif ($secs >= $hourCut && $secs < $dayCut) {
-		$output = round($secs / $hour) . " hour";
+		$output = round($secs / $hour)." hour";
 	}
 	elseif ($secs >= $dayCut && $secs < $weekCut) {
-		$output = round($secs / $day) . " day";
+		$output = round($secs / $day)." day";
 	}
 	elseif ($secs >= $weekCut && $secs < $month) {
-		$output = round($secs / $week) . " week";
+		$output = round($secs / $week)." week";
 	}
 	elseif ($secs >= $month && $secs < $year) {
-		$output = round($secs / $month) . " month";
+		$output = round($secs / $month)." month";
 	}
 	elseif ($secs >= $year && $secs < $year * 10) {
-		$output = round($secs / $year) . " year";
+		$output = round($secs / $year)." year";
 	}
 	else {
 		$output = "a long time ago";
@@ -358,7 +358,7 @@ 
 	}
     
 	if ($pluralise) {
-		$output = (substr($output, 0, 2) <> "1 ") ? $output . "s ago" : $output . " ago";
+		$output = (substr($output, 0, 2) <> "1 ") ? $output."s ago" : $output." ago";
 	}
 
 	return $output;
@@ -404,9 +404,9 @@ 
 {
 	$userList = "";
 	foreach ($users as $v) {
-		$userList .= "\"" . htmlentities($v) . "\", ";
+		$userList .= "\"".htmlentities($v)."\", ";
 	}
-	$userList = "[" . rtrim($userList, ", ") . "]";
+	$userList = "[".rtrim($userList, ", ")."]";
 	$tailscript = <<<JS
 $('.username-typeahead').typeahead({
 	source: {$userList}

Indentation +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 
 /** Initialises the PHP Session */
 function initialiseSession() {
-    session_start();
+	session_start();
 }
 
 /**
@@ -160,7 +160,7 @@ 
 			"requests" => $requests, 
 			"total" => $totalRequests, 
 			"api" => $v['api'],
-            "type" => $type);
+			"type" => $type);
 	}
     
 	global $smarty;

Braces +2 added lines, -1 removed lines

@@ -27,7 +27,8 @@
 $session = new session();
 
 /** Initialises the PHP Session */
-function initialiseSession() {
+function initialiseSession()
+{
     session_start();
 }