enwikipedia-acc / waca

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;

acc.php

Spacing +20 added lines, -20 removed lines

@@ -351,7 +351,7 @@ 
 	$user = User::getByUsername($_POST['username'], gGetDb());
     
 	if ($user == false || !$user->authenticate($_POST['password'])) {
-		header("Location: $baseurl/acc.php?error=authfail&tplUsername=" . urlencode($_POST['username']));
+		header("Location: $baseurl/acc.php?error=authfail&tplUsername=".urlencode($_POST['username']));
 		die();
 	}
     
@@ -904,7 +904,7 @@ 
 				Logger::unbanned($database, $ban, $_POST['unbanreason']);
 			});
         
-			BootstrapSkin::displayAlertBox("Unbanned " . $ban->getTarget(), "alert-info", "", false, false);
+			BootstrapSkin::displayAlertBox("Unbanned ".$ban->getTarget(), "alert-info", "", false, false);
 			BootstrapSkin::displayInternalFooter();
 			Notification::unbanned($ban, $_POST['unbanreason']);
 			die();
@@ -1036,7 +1036,7 @@ 
         
 		if ($request->getStatus() == $_GET['target']) {
 			SessionAlert::error(
-				"Cannot set status, target already deferred to " . htmlentities($_GET['target']), 
+				"Cannot set status, target already deferred to ".htmlentities($_GET['target']), 
 				"Error");
 			header("Location: acc.php?action=zoom&id={$request->getId()}");
 			die();
@@ -1152,7 +1152,7 @@ 
 	if ($request->getEmailSent() == "1" && !isset($_GET['override']) && $gem != 0) {
 		$alertContent = "<p>This request has already been closed in a manner that has generated an e-mail to the user, Proceed?</p><br />";
 		$alertContent .= "<div class=\"row-fluid\">";
-		$alertContent .= "<a class=\"btn btn-success offset3 span3\"  href=\"$baseurl/acc.php?sum=" . $_GET['sum'] . "&amp;action=done&amp;id=" . $_GET['id'] . "&amp;override=yes&amp;email=" . $_GET['email'] . "\">Yes</a>";
+		$alertContent .= "<a class=\"btn btn-success offset3 span3\"  href=\"$baseurl/acc.php?sum=".$_GET['sum']."&amp;action=done&amp;id=".$_GET['id']."&amp;override=yes&amp;email=".$_GET['email']."\">Yes</a>";
 		$alertContent .= "<a class=\"btn btn-danger span3\" href=\"$baseurl/acc.php\">No</a>";
 		$alertContent .= "</div>";
         
@@ -1163,9 +1163,9 @@ 
 	
 	// check the request is not reserved by someone else
 	if ($request->getReserved() != 0 && !isset($_GET['reserveoverride']) && $request->getReserved() != User::getCurrent()->getId()) {
-		$alertContent = "<p>This request is currently marked as being handled by " . $request->getReservedObject()->getUsername() . ", Proceed?</p><br />";
+		$alertContent = "<p>This request is currently marked as being handled by ".$request->getReservedObject()->getUsername().", Proceed?</p><br />";
 		$alertContent .= "<div class=\"row-fluid\">";
-		$alertContent .= "<a class=\"btn btn-success offset3 span3\"  href=\"$baseurl/acc.php?" . $_SERVER["QUERY_STRING"] . "&reserveoverride=yes\">Yes</a>";
+		$alertContent .= "<a class=\"btn btn-success offset3 span3\"  href=\"$baseurl/acc.php?".$_SERVER["QUERY_STRING"]."&reserveoverride=yes\">Yes</a>";
 		$alertContent .= "<a class=\"btn btn-danger span3\" href=\"$baseurl/acc.php\">No</a>";
 		$alertContent .= "</div>";
         
@@ -1181,7 +1181,7 @@ 
 	}
 	
 	// Checks whether the username is already in use on Wikipedia.
-	$userexist = file_get_contents("http://en.wikipedia.org/w/api.php?action=query&list=users&ususers=" . urlencode($request->getName()) . "&format=php");
+	$userexist = file_get_contents("http://en.wikipedia.org/w/api.php?action=query&list=users&ususers=".urlencode($request->getName())."&format=php");
 	$ue = unserialize($userexist);
 	if (!isset ($ue['query']['users']['0']['missing'])) {
 		$exists = true;
@@ -1202,7 +1202,7 @@ 
 	if ($isForCreated && !$exists && !isset($_GET['createoverride'])) {
 		$alertContent = "<p>You have chosen to mark this request as \"created\", but the account does not exist on the English Wikipedia, proceed?</p><br />";
 		$alertContent .= "<div class=\"row-fluid\">";
-		$alertContent .= "<a class=\"btn btn-success offset3 span3\"  href=\"$baseurl/acc.php?" . $_SERVER["QUERY_STRING"] . "&amp;createoverride=yes\">Yes</a>";
+		$alertContent .= "<a class=\"btn btn-success offset3 span3\"  href=\"$baseurl/acc.php?".$_SERVER["QUERY_STRING"]."&amp;createoverride=yes\">Yes</a>";
 		$alertContent .= "<a class=\"btn btn-danger span3\" href=\"$baseurl/acc.php\">No</a>";
 		$alertContent .= "</div>";
         
@@ -1247,18 +1247,18 @@ 
 			die();
 		}
 
-		$headers = 'From: accounts-enwiki-l@lists.wikimedia.org' . "\r\n";
+		$headers = 'From: accounts-enwiki-l@lists.wikimedia.org'."\r\n";
 		if (!User::getCurrent()->isAdmin() || isset($_POST['ccmailist']) && $_POST['ccmailist'] == "on") {
-			$headers .= 'Cc: accounts-enwiki-l@lists.wikimedia.org' . "\r\n";
+			$headers .= 'Cc: accounts-enwiki-l@lists.wikimedia.org'."\r\n";
 		}
 
-		$headers .= 'X-ACC-Request: ' . $request->getId() . "\r\n";
-		$headers .= 'X-ACC-UserID: ' . User::getCurrent()->getId() . "\r\n";
+		$headers .= 'X-ACC-Request: '.$request->getId()."\r\n";
+		$headers .= 'X-ACC-UserID: '.User::getCurrent()->getId()."\r\n";
 
 		// 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($request->getEmail(), "RE: [ACC #{$request->getId()}] English Wikipedia Account Request", $_POST['msgbody'] . "\n\n" . $emailsig, $headers);
+			mail($request->getEmail(), "RE: [ACC #{$request->getId()}] English Wikipedia Account Request", $_POST['msgbody']."\n\n".$emailsig, $headers);
 		}
 		else {
 			mail($request->getEmail(), "RE: [ACC #{$request->getId()}] English Wikipedia Account Request", $_POST['msgbody'], $headers);
@@ -1283,7 +1283,7 @@ 
 			
 			Notification::requestClosed($request, $crea);
 			BootstrapSkin::displayAlertBox(
-				"Request " . $request->getId() . " (" . htmlentities($request->getName(), ENT_COMPAT, 'UTF-8') . ") marked as 'Done'.", 
+				"Request ".$request->getId()." (".htmlentities($request->getName(), ENT_COMPAT, 'UTF-8').") marked as 'Done'.", 
 				"alert-success");
 		}
 		else if ($_POST['action'] == "mail") {
@@ -1349,7 +1349,7 @@ 
 		}
 
 		Notification::requestClosed($request, $crea);
-		BootstrapSkin::displayAlertBox("Request " . $request->getId() . " (" . htmlentities($request->getName(), ENT_COMPAT, 'UTF-8') . ") marked as 'Done'.", "alert-success");
+		BootstrapSkin::displayAlertBox("Request ".$request->getId()." (".htmlentities($request->getName(), ENT_COMPAT, 'UTF-8').") marked as 'Done'.", "alert-success");
 		
 		$towhom = $request->getEmail();
 		if ($gem != "0") {
@@ -1518,7 +1518,7 @@ 
 			if (!isset($_GET['confclosed'])) {
 				if ($request->getStatus() == "Closed") {
 					// FIXME: bootstrappify properly
-					throw new TransactionException('This request is currently closed. Are you sure you wish to reserve it?<br /><ul><li><a href="' . $_SERVER["REQUEST_URI"] . '&confclosed=yes">Yes, reserve this closed request</a></li><li><a href="' . $baseurl . '/acc.php">No, return to main request interface</a></li></ul>', "Request closed", "alert-info");
+					throw new TransactionException('This request is currently closed. Are you sure you wish to reserve it?<br /><ul><li><a href="'.$_SERVER["REQUEST_URI"].'&confclosed=yes">Yes, reserve this closed request</a></li><li><a href="'.$baseurl.'/acc.php">No, return to main request interface</a></li></ul>', "Request closed", "alert-info");
 				}
 			}	
         
@@ -1589,7 +1589,7 @@ 
 			}
 		}
 		else {
-			echo "You cannot break " . htmlentities($reservedUser->getUsername()) . "'s reservation";
+			echo "You cannot break ".htmlentities($reservedUser->getUsername())."'s reservation";
 		}
 	}
 	else {
@@ -1689,7 +1689,7 @@ 
 	}
     
 	if (!isset($_POST['comment']) || $_POST['comment'] == "") {
-		header("Location: acc.php?action=zoom&id=" . $request->getId());
+		header("Location: acc.php?action=zoom&id=".$request->getId());
 		die(); 
 	}
     
@@ -1722,7 +1722,7 @@ 
     
 	Notification::commentCreated($comment);
     
-	header("Location: acc.php?action=zoom&id=" . $request->getId());
+	header("Location: acc.php?action=zoom&id=".$request->getId());
 }
 elseif ($action == "changepassword") {
 	if ((!isset($_POST['oldpassword'])) || $_POST['oldpassword'] == "") {
@@ -1800,7 +1800,7 @@ 
 			Notification::commentEdited($comment);
         
 			SessionAlert::success("Comment has been saved successfully");
-			header("Location: $baseurl/acc.php?action=zoom&id=" . $comment->getRequest());
+			header("Location: $baseurl/acc.php?action=zoom&id=".$comment->getRequest());
 		});
         
 		die();    

Indentation +25 added lines, -25 removed lines

@@ -2036,41 +2036,41 @@
 	});
 }
 elseif ($action == "listall") {
-    global $availableRequestStates, $enableEmailConfirm;
+	global $availableRequestStates, $enableEmailConfirm;
 
 	if (isset($_GET['status']) && isset($availableRequestStates[$_GET['status']])) {
 		$type = $_GET['status']; // safe, we've verified it's sane in the above if statement.
 
-	    $database = gGetDb();
+		$database = gGetDb();
 
-	    if ($enableEmailConfirm == 1) {
-	        $query = "SELECT * FROM request WHERE status = :type AND emailconfirm = 'Confirmed';";
-	    } else {
-	        $query = "SELECT * FROM request WHERE status = :type;";
-	    }
+		if ($enableEmailConfirm == 1) {
+			$query = "SELECT * FROM request WHERE status = :type AND emailconfirm = 'Confirmed';";
+		} else {
+			$query = "SELECT * FROM request WHERE status = :type;";
+		}
 
-	    $statement = $database->prepare($query);
+		$statement = $database->prepare($query);
 
-        $statement->bindValue(":type", $type);
-        $statement->execute();
+		$statement->bindValue(":type", $type);
+		$statement->execute();
 
-        $requests = $statement->fetchAll(PDO::FETCH_CLASS, "Request");
-        foreach ($requests as $req) {
-        	/** @var Request $req */
-            $req->setDatabase($database);
-        }
+		$requests = $statement->fetchAll(PDO::FETCH_CLASS, "Request");
+		foreach ($requests as $req) {
+			/** @var Request $req */
+			$req->setDatabase($database);
+		}
 
-        global $smarty;
-        $smarty->assign("requests", $requests);
-        $smarty->assign("showStatus", false);
-        $html = $smarty->fetch("mainpage/requesttable.tpl");
-        echo $html;
-    } else {
-        echo defaultpage();
-    }
+		global $smarty;
+		$smarty->assign("requests", $requests);
+		$smarty->assign("showStatus", false);
+		$html = $smarty->fetch("mainpage/requesttable.tpl");
+		echo $html;
+	} else {
+		echo defaultpage();
+	}
 
-    BootstrapSkin::displayInternalFooter();
-    die();
+	BootstrapSkin::displayInternalFooter();
+	die();
 }
 # If the action specified does not exist, goto the default page.
 else {

Braces +22 added lines, -35 removed lines

@@ -154,8 +154,7 @@ 
 
 	$database = gGetDb();
     
-	$database->transactionally(function() use ($database, $useOauthSignup)
-	{
+	$database->transactionally(function() use ($database, $useOauthSignup) {
     
 		$newUser = new User();
 		$newUser->setDatabase($database);
@@ -483,8 +482,7 @@ 
         
 		$database = gGetDb();
         
-		$database->transactionally(function() use ($database)
-		{
+		$database->transactionally(function() use ($database) {
 			global $smarty;
             
 			$message = InterfaceMessage::getById($_GET['edit'], $database);
@@ -572,8 +570,7 @@ 
             
 			$database = gGetDb();
             
-			$database->transactionally(function() use ($database, $baseurl)
-			{
+			$database->transactionally(function() use ($database, $baseurl) {
 				$template = new WelcomeTemplate();
 				$template->setDatabase($database);
 				$template->setUserCode($_POST['usercode']);
@@ -658,8 +655,7 @@ 
 			die();
 		}
         
-		$database->transactionally(function() use($database, $template)
-		{
+		$database->transactionally(function() use($database, $template) {
 			$tid = $template->getId();
             
 			$database
@@ -695,8 +691,7 @@ 
 		}
 
 		if (isset($_POST['submit'])) {
-			$database->transactionally(function() use($database, $template)
-			{
+			$database->transactionally(function() use($database, $template) {
 				$template->setUserCode($_POST['usercode']);
 				$template->setBotCode($_POST['botcode']);
 				$template->save();
@@ -827,8 +822,7 @@ 
     
 	$currentUsername = User::getCurrent()->getUsername();
     
-	$database->transactionally(function() use ($database, $ban, $duration, $currentUsername)
-	{
+	$database->transactionally(function() use ($database, $ban, $duration, $currentUsername) {
 		$ban->setDatabase($database);
 		$ban->setActive(1);
 		$ban->setType($_POST['type']);
@@ -893,8 +887,7 @@ 
 		else {
 			$database = gGetDb();
             
-			$database->transactionally(function() use ($database, $ban)
-			{
+			$database->transactionally(function() use ($database, $ban) {
 				$ban->setActive(0);
 				$ban->save();
                 
@@ -1043,8 +1036,7 @@ 
 		}
         
 		$database = gGetDb();
-		$database->transactionally(function() use ($database, $request)
-		{
+		$database->transactionally(function() use ($database, $request) {
 			global $availableRequestStates;
                 
 			$request->setReserved(0);
@@ -1194,7 +1186,8 @@ 
 	$emailTemplate = EmailTemplate::getById($gem, gGetDb());
 	if ($emailTemplate instanceof EmailTemplate) {
 		$isForCreated = $emailTemplate->getDefaultAction() === EmailTemplate::CREATED;
-	} else {
+	}
+	else {
 		$isForCreated = false;
 	}
 
@@ -1463,8 +1456,7 @@ 
 elseif ($action == "reserve") {
 	$database = gGetDb();
     
-	$database->transactionally(function() use ($database)
-	{
+	$database->transactionally(function() use ($database) {
 		$request = Request::getById($_GET['resid'], $database);
         
 		if ($request == false) {
@@ -1567,8 +1559,7 @@ 
 	if ($reservedUser->getId() != User::getCurrent()->getId()) {
 		if (User::getCurrent()->isAdmin()) {
 			if (isset($_GET['confirm']) && $_GET['confirm'] == 1) {
-				$database->transactionally(function() use($database, $request)
-				{
+				$database->transactionally(function() use($database, $request) {
 					$request->setReserved(0);
 					$request->save();
 
@@ -1593,8 +1584,7 @@ 
 		}
 	}
 	else {
-		$database->transactionally(function() use ($database, $request)
-		{
+		$database->transactionally(function() use ($database, $request) {
 			$request->setReserved(0);
 			$request->save();
 
@@ -1787,8 +1777,7 @@ 
 	
 	if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 		$database = gGetDb();
-		$database->transactionally(function() use ($database, $comment, $baseurl)
-		{
+		$database->transactionally(function() use ($database, $comment, $baseurl) {
             
 			$comment->setComment($_POST['newcomment']);
 			$comment->setVisibility($_POST['visibility']);
@@ -1836,8 +1825,7 @@ 
 		die();
 	}
     
-	$database->transactionally(function() use ($database, $user, $requestObject, $curuser)
-	{
+	$database->transactionally(function() use ($database, $user, $requestObject, $curuser) {
 		$updateStatement = $database->prepare("UPDATE request SET reserved = :userid WHERE id = :request LIMIT 1;");
 		$updateStatement->bindValue(":userid", $user->getId());
 		$updateStatement->bindValue(":request", $requestObject->getId());
@@ -1865,8 +1853,7 @@ 
 		}
 		if (isset($_POST['submit'])) {
 			$database = gGetDb();
-			$database->transactionally(function() use ($database)
-			{
+			$database->transactionally(function() use ($database) {
 				global $baseurl;
                 
 				$emailTemplate = new EmailTemplate();
@@ -1944,8 +1931,7 @@ 
 				die();
 			}
 
-			$database->transactionally(function() use ($database, $emailTemplate)
-			{
+			$database->transactionally(function() use ($database, $emailTemplate) {
 				$emailTemplate->save();
                 
 				Logger::editedEmail($database, $emailTemplate);
@@ -2010,8 +1996,7 @@ 
 }
 elseif ($action == "oauthattach") {
 	$database = gGetDb();
-	$database->transactionally(function() use ($database)
-	{
+	$database->transactionally(function() use ($database) {
 		try {
 			global $oauthConsumerToken, $oauthSecretToken, $oauthBaseUrl, $oauthBaseUrlInternal;
             
@@ -2046,7 +2031,8 @@ 
 
 	    if ($enableEmailConfirm == 1) {
 	        $query = "SELECT * FROM request WHERE status = :type AND emailconfirm = 'Confirmed';";
-	    } else {
+	    }
+	    else {
 	        $query = "SELECT * FROM request WHERE status = :type;";
 	    }
 
@@ -2066,7 +2052,8 @@ 
         $smarty->assign("showStatus", false);
         $html = $smarty->fetch("mainpage/requesttable.tpl");
         echo $html;
-    } else {
+    }
+    else {
         echo defaultpage();
     }
 

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

users.php

Spacing +10 added lines, -10 removed lines

@@ -108,7 +108,7 @@ 
 	$user->approve();
 
 	BootstrapSkin::displayAlertBox(
-		"Approved user " . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'), 
+		"Approved user ".htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'), 
 		"alert-info", 
 		"", 
 		false);
@@ -117,7 +117,7 @@ 
 
 	$headers = 'From: accounts-enwiki-l@lists.wikimedia.org';
 	// TODO: move to template?
-	mail($user->getEmail(), "ACC Account Approved", "Dear " . $user->getOnWikiName() . ",\nYour account " . $user->getUsername() . " has been approved by " . User::getCurrent()->getUsername() . ". To login please go to $baseurl/acc.php.\n- The English Wikipedia Account Creation Team", $headers);
+	mail($user->getEmail(), "ACC Account Approved", "Dear ".$user->getOnWikiName().",\nYour account ".$user->getUsername()." has been approved by ".User::getCurrent()->getUsername().". To login please go to $baseurl/acc.php.\n- The English Wikipedia Account Creation Team", $headers);
 	BootstrapSkin::displayInternalFooter();
 	die();
 }
@@ -161,7 +161,7 @@ 
 		$user->demote($_POST['reason']);
 
 		BootstrapSkin::displayAlertBox( 
-			"Changed " . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8') . "'s access to 'User'", 
+			"Changed ".htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8')."'s access to 'User'", 
 			"alert-info", 
 			"", 
 			false);
@@ -171,7 +171,7 @@ 
 		$headers = 'From: accounts-enwiki-l@lists.wikimedia.org';
         
 		// TODO: move to template?
-		mail($user->getEmail(), "ACC Account Demoted", "Dear " . $user->getOnWikiName() . ",\nYour account " . $user->getUsername() . " has been demoted by " . User::getCurrent()->getUsername() . " because " . User::getCurrent()->getUsername() . ". To contest this demotion please email accounts-enwiki-l@lists.wikimedia.org.\n- The English Wikipedia Account Creation Team", $headers);
+		mail($user->getEmail(), "ACC Account Demoted", "Dear ".$user->getOnWikiName().",\nYour account ".$user->getUsername()." has been demoted by ".User::getCurrent()->getUsername()." because ".User::getCurrent()->getUsername().". To contest this demotion please email accounts-enwiki-l@lists.wikimedia.org.\n- The English Wikipedia Account Creation Team", $headers);
 		BootstrapSkin::displayInternalFooter();
 		die();
 	}
@@ -215,7 +215,7 @@ 
 
 		Notification::userSuspended($user, $_POST['reason']);
 		BootstrapSkin::displayAlertBox(
-			"Suspended user " . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'), 
+			"Suspended user ".htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'), 
 			"alert-info", 
 			"", 
 			false);
@@ -223,7 +223,7 @@ 
 		$headers = 'From: accounts-enwiki-l@lists.wikimedia.org';
         
 		// TODO: move to template?
-		mail($user->getEmail(), "ACC Account Suspended", "Dear " . $user->getOnWikiName() . ",\nYour account " . $user->getUsername() . " has been suspended by " . User::getCurrent()->getUsername() . " because " . $_POST['reason'] . ". To contest this suspension please email accounts-enwiki-l@lists.wikimedia.org.\n- The English Wikipedia Account Creation Team", $headers);
+		mail($user->getEmail(), "ACC Account Suspended", "Dear ".$user->getOnWikiName().",\nYour account ".$user->getUsername()." has been suspended by ".User::getCurrent()->getUsername()." because ".$_POST['reason'].". To contest this suspension please email accounts-enwiki-l@lists.wikimedia.org.\n- The English Wikipedia Account Creation Team", $headers);
 		BootstrapSkin::displayInternalFooter();
 		die();
 	}
@@ -259,7 +259,7 @@ 
 	Notification::userPromoted($user);
 
 	BootstrapSkin::displayAlertBox(
-		htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8') . " promoted to 'Admin'", 
+		htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8')." promoted to 'Admin'", 
 		"alert-info", 
 		"", 
 		false);
@@ -267,7 +267,7 @@ 
 	$headers = 'From: accounts-enwiki-l@lists.wikimedia.org';
     
 	// TODO: move to template?
-	mail($user->getEmail(), "ACC Account Promoted", "Dear " . $user->getOnWikiName() . ",\nYour account " . $user->getUsername() . " has been promted to admin status by " . User::getCurrent()->getUsername() . ".\n- The English Wikipedia Account Creation Team", $headers);
+	mail($user->getEmail(), "ACC Account Promoted", "Dear ".$user->getOnWikiName().",\nYour account ".$user->getUsername()." has been promted to admin status by ".User::getCurrent()->getUsername().".\n- The English Wikipedia Account Creation Team", $headers);
 	die();
 }
 
@@ -310,7 +310,7 @@ 
 		Notification::userDeclined($user, $_POST['reason']);
 
 		BootstrapSkin::displayAlertBox(
-			"Declined user " . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'), 
+			"Declined user ".htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'), 
 			"alert-info", 
 			"", 
 			false);
@@ -318,7 +318,7 @@ 
 		$headers = 'From: accounts-enwiki-l@lists.wikimedia.org';
         
 		// TODO: move to template?
-		mail($user->getEmail(), "ACC Account Declined", "Dear " . $user->getOnWikiName() . ",\nYour account " . $user->getUsername() . " has been declined access to the account creation tool by " . User::getCurrent()->getUsername() . " because " . $_POST['reason'] . ". For more infomation please email accounts-enwiki-l@lists.wikimedia.org.\n- The English Wikipedia Account Creation Team", $headers);
+		mail($user->getEmail(), "ACC Account Declined", "Dear ".$user->getOnWikiName().",\nYour account ".$user->getUsername()." has been declined access to the account creation tool by ".User::getCurrent()->getUsername()." because ".$_POST['reason'].". For more infomation please email accounts-enwiki-l@lists.wikimedia.org.\n- The English Wikipedia Account Creation Team", $headers);
 		BootstrapSkin::displayInternalFooter();
 		die();
 	}

zoompage.php

Spacing +5 added lines, -5 removed lines

@@ -65,7 +65,7 @@ 
 	$viewableDataStatement->bindValue(":email", $request->getEmail());
 	$viewableDataStatement->bindValue(":reserved", User::getCurrent()->getId());
 	$viewableDataStatement->bindValue(":trustedIp", $request->getTrustedIp());
-	$viewableDataStatement->bindValue(":trustedProxy", '%' . $request->getTrustedIp() . '%');
+	$viewableDataStatement->bindValue(":trustedProxy", '%'.$request->getTrustedIp().'%');
     
 	$viewableDataStatement->execute();
     
@@ -77,11 +77,11 @@ 
 	#endregion
 	
 	if ($request->getStatus() == "Closed") {
-		$hash = md5($request->getId() . $request->getEmail() . $request->getTrustedIp() . microtime()); //If the request is closed, change the hash based on microseconds similar to the checksums.
+		$hash = md5($request->getId().$request->getEmail().$request->getTrustedIp().microtime()); //If the request is closed, change the hash based on microseconds similar to the checksums.
 		$smarty->assign("isclosed", true);
 	}
 	else {
-		$hash = md5($request->getId() . $request->getEmail() . $request->getTrustedIp());
+		$hash = md5($request->getId().$request->getEmail().$request->getTrustedIp());
 		$smarty->assign("isclosed", false);
 	}
 	$smarty->assign("hash", $hash);
@@ -257,10 +257,10 @@ 
 	$userListData = $userListResult->fetchAll(PDO::FETCH_COLUMN);
 	$userListProcessedData = array();
 	foreach ($userListData as $userListItem) {
-		$userListProcessedData[] = "\"" . htmlentities($userListItem) . "\"";
+		$userListProcessedData[] = "\"".htmlentities($userListItem)."\"";
 	}
     
-	$userList = '[' . implode(",", $userListProcessedData) . ']';	
+	$userList = '['.implode(",", $userListProcessedData).']';	
 	$smarty->assign("jsuserlist", $userList);
 	// end: assign to user
     

oauth/OAuthUtility.php

Spacing +8 added lines, -8 removed lines

@@ -24,7 +24,7 @@ 
 	{
 		global $toolUserAgent;
 
-		$endpoint = $this->baseUrlInternal . '/initiate&format=json&oauth_callback=oob';
+		$endpoint = $this->baseUrlInternal.'/initiate&format=json&oauth_callback=oob';
 
 		$c = new OAuthConsumer($this->consumerToken, $this->consumerSecret);
 		$parsed = parse_url($endpoint);
@@ -43,7 +43,7 @@ 
 		$data = curl_exec($ch);
 
 		if (!$data) {
-			throw new Exception('Curl error: ' . curl_error($ch));
+			throw new Exception('Curl error: '.curl_error($ch));
 		}
 
 		$token = json_decode($data);
@@ -64,7 +64,7 @@ 
 	{
 		global $toolUserAgent;
 
-		$endpoint = $this->baseUrlInternal . '/token&format=json';
+		$endpoint = $this->baseUrlInternal.'/token&format=json';
 
 		$c = new OAuthConsumer($this->consumerToken, $this->consumerSecret);
 		$rc = new OAuthConsumer($requestToken, $requestSecret);
@@ -88,7 +88,7 @@ 
 		$data = curl_exec($ch);
 
 		if (!$data) {
-			throw new Exception('Curl error: ' . curl_error($ch));
+			throw new Exception('Curl error: '.curl_error($ch));
 		}
 
 		$token = json_decode($data);
@@ -120,7 +120,7 @@ 
 
 		$ch = curl_init();
 		if ($method == "GET") {
-			curl_setopt($ch, CURLOPT_URL, $mediawikiWebServiceEndpoint . "?" . http_build_query($apiParams));
+			curl_setopt($ch, CURLOPT_URL, $mediawikiWebServiceEndpoint."?".http_build_query($apiParams));
 		}
         
 		if ($method == "POST") {
@@ -138,7 +138,7 @@ 
 		$data = curl_exec($ch);
 
 		if (!$data) {
-			throw new Exception('Curl error: ' . curl_error($ch));
+			throw new Exception('Curl error: '.curl_error($ch));
 		}
 
 		return json_decode($data);
@@ -149,7 +149,7 @@ 
 
 		global $toolUserAgent;
 
-		$endpoint = $this->baseUrlInternal . '/identify&format=json';
+		$endpoint = $this->baseUrlInternal.'/identify&format=json';
 
 		$c = new OAuthConsumer($this->consumerToken, $this->consumerSecret);
 		$rc = new OAuthToken($accessToken, $accessSecret);
@@ -172,7 +172,7 @@ 
 		$data = curl_exec($ch);
 
 		if (!$data) {
-			throw new Exception('Curl error: ' . curl_error($ch));
+			throw new Exception('Curl error: '.curl_error($ch));
 		}
 
 		$decodedData = json_decode($data);

redir.php

Braces +1 added lines, -2 removed lines

@@ -12,8 +12,7 @@
 if(!isset($_GET['tool'])
 	|| !isset($toolList[$_GET['tool']])
 	|| !isset($_GET['data'])
-)
-{
+) {
 	header("HTTP/1.1 403 Forbidden");
 	return;
 }

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
 	'google' => 'https://www.google.com/search?q=%DATA%',
 );
 
-if(!isset($_GET['tool'])
+if (!isset($_GET['tool'])
 	|| !isset($toolList[$_GET['tool']])
 	|| !isset($_GET['data'])
 )
@@ -21,8 +21,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");
 }

ClearOldData.php

Braces +1 added lines, -2 removed lines

@@ -10,8 +10,7 @@
 
 $db = gGetDb( );
 
-$db->transactionally(function() use ($db)
-{
+$db->transactionally(function() use ($db) {
 	global $cDataClearIp, $cDataClearEmail, $dataclear_interval;
     
 	$query = $db->prepare("UPDATE request SET ip = :ip, forwardedip = null, email = :mail, useragent = '' WHERE date < DATE_SUB(curdate(), INTERVAL $dataclear_interval) AND status = 'Closed';");