enwikipedia-acc / waca

PrecacheGeolocation.php

Spacing +2 added lines, -2 removed lines

@@ -63,12 +63,12 @@
         $database->commit();
         echo ". Committed txn.\n";
     } catch (Exception $ex) {
-        echo ". Encountered exception: " . $ex->getMessage(). "\n";
+        echo ". Encountered exception: ".$ex->getMessage()."\n";
         $database->rollBack();
         echo ". Rolled back txn\n";
         throw $ex;
     } finally {
-        if($database->hasActiveTransaction()){
+        if ($database->hasActiveTransaction()) {
             $database->rollBack();
             echo ". Rolled back txn\n";
         }

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

users.php

Spacing +10 added lines, -10 removed lines

@@ -106,7 +106,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);
@@ -115,7 +115,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.\nPlease note that if you cannot login immediately, we may be updating your identification information in the system.  Please let us know if you continue to have issues if you cannot login after 12 hours pass from the time you receive this approval.\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.\nPlease note that if you cannot login immediately, we may be updating your identification information in the system.  Please let us know if you continue to have issues if you cannot login after 12 hours pass from the time you receive this approval.\n- The English Wikipedia Account Creation Team", $headers);
 	BootstrapSkin::displayInternalFooter();
 	die();
 }
@@ -159,7 +159,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);
@@ -169,7 +169,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();
 	}
@@ -213,7 +213,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);
@@ -221,7 +221,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();
 	}
@@ -257,7 +257,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);
@@ -265,7 +265,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();
 }
 
@@ -308,7 +308,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);
@@ -316,7 +316,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();
 	}

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;");
 			$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/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">';

config.inc.php

Spacing +8 added lines, -8 removed lines

@@ -141,7 +141,7 @@ 
 
 $BUbasefile = "backup"; // The basefile's name.
 $BUdir = "/home/project/a/c/c/acc/backups"; // The directory where backups should be stored.
-$BUmonthdir = $BUdir . "/monthly"; // The directory where monthly backups should be stored.
+$BUmonthdir = $BUdir."/monthly"; // The directory where monthly backups should be stored.
 $BUdumper = "/opt/ts/mysql/5.1/bin/mysqldump --defaults-file=~/.my.cnf p_acc_live"; // Add parameters here if they are needed.
 $BUgzip = "/usr/bin/gzip"; // Add the gzip parameters here if needed.
 $BUtar = "/bin/tar -cvf"; // Add the tar parameters here if needed.
@@ -279,19 +279,19 @@ 
 
 $cDatabaseConfig = array(
 	"acc" => array(
-		"dsrcname" => "mysql:host=" . $toolserver_host . ";dbname=" . $toolserver_database,
+		"dsrcname" => "mysql:host=".$toolserver_host.";dbname=".$toolserver_database,
 		"username" => $toolserver_username,
 		"password" => $toolserver_password,
 		"options"  => array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4'),
 	),
 	"wikipedia" => array(
-		"dsrcname" => "mysql:host=" . $antispoof_host . ";dbname=" . $antispoof_db,
+		"dsrcname" => "mysql:host=".$antispoof_host.";dbname=".$antispoof_db,
 		"username" => $toolserver_username,
 		"password" => $toolserver_password,
 		"options"  => array(),
 	),
 	"notifications" => array(
-		"dsrcname" => "mysql:host=" . $toolserver_notification_dbhost . ";dbname=" . $toolserver_notification_database,
+		"dsrcname" => "mysql:host=".$toolserver_notification_dbhost.";dbname=".$toolserver_notification_database,
 		"username" => $notifications_username,
 		"password" => $notifications_password,
 		"options"  => array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4'),
@@ -314,11 +314,11 @@ 
 	"openssl", // email confirmation hash gen, oauth stuff
 	) as $x) {if (!extension_loaded($x)) {die("extension $x is required."); }}
 
-require_once($filepath . "includes/AutoLoader.php");
+require_once($filepath."includes/AutoLoader.php");
 
 spl_autoload_register("AutoLoader::load");
 
 // Extra includes which are just plain awkward wherever they are.
-require_once($filepath . 'oauth/OAuthUtility.php');
-require_once($filepath . 'lib/mediawiki-extensions-OAuth/lib/OAuth.php');
-require_once($filepath . 'lib/mediawiki-extensions-OAuth/lib/JWT.php');
+require_once($filepath.'oauth/OAuthUtility.php');
+require_once($filepath.'lib/mediawiki-extensions-OAuth/lib/OAuth.php');
+require_once($filepath.'lib/mediawiki-extensions-OAuth/lib/JWT.php');

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

acc.php

Spacing +23 added lines, -23 removed lines

@@ -105,7 +105,7 @@ 
 elseif ($action == "sreg") {
 	global $useOauthSignup, $smarty, $allowRegistration;
 
-	if(!$allowRegistration) {
+	if (!$allowRegistration) {
 		$smarty->display("registration/registerdisabled.tpl");
 		BootstrapSkin::displayInternalFooter();
 		die();
@@ -214,7 +214,7 @@ 
 }
 elseif ($action == "register") {
 	global $useOauthSignup, $smarty, $allowRegistration;
-	if($allowRegistration) {
+	if ($allowRegistration) {
 		$smarty->assign("useOauthSignup", $useOauthSignup);
 		$smarty->display("registration/register.tpl");
 	} else {
@@ -359,7 +359,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();
 	}
     
@@ -912,7 +912,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();
@@ -1044,7 +1044,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();
@@ -1160,7 +1160,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>";
         
@@ -1171,9 +1171,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>";
         
@@ -1189,7 +1189,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;
@@ -1210,7 +1210,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>";
         
@@ -1255,26 +1255,26 @@ 
 			die();
 		}
 
-		$headers = 'From: accounts-enwiki-l@lists.wikimedia.org' . "\r\n";
+		$headers = 'From: accounts-enwiki-l@lists.wikimedia.org'."\r\n";
 
 		// CC mailing list option
 		if (User::getCurrent()->isAdmin() || User::getCurrent()->isCheckuser()) {
 			// these people get the choice
 			if (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";
 			}
 		} else {
 			// these people do not.
-			$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);
@@ -1299,7 +1299,7 @@ 
 			
 			Notification::requestClosed($request, $crea);
 			BootstrapSkin::displayAlertBox(
-				"Request " . $request->getId() . " (" . htmlentities($request->getName(), ENT_COMPAT, 'UTF-8') . ") marked as '" . htmlentities($crea, ENT_COMPAT, 'UTF-8') . "'.", 
+				"Request ".$request->getId()." (".htmlentities($request->getName(), ENT_COMPAT, 'UTF-8').") marked as '".htmlentities($crea, ENT_COMPAT, 'UTF-8')."'.", 
 				"alert-success");
 		}
 		else if ($_POST['action'] == "mail") {
@@ -1365,7 +1365,7 @@ 
 		}
 
 		Notification::requestClosed($request, $crea);
-		BootstrapSkin::displayAlertBox("Request " . $request->getId() . " (" . htmlentities($request->getName(), ENT_COMPAT, 'UTF-8') . ") marked as '" . htmlentities($crea, ENT_COMPAT, 'UTF-8') . "'.", "alert-success");
+		BootstrapSkin::displayAlertBox("Request ".$request->getId()." (".htmlentities($request->getName(), ENT_COMPAT, 'UTF-8').") marked as '".htmlentities($crea, ENT_COMPAT, 'UTF-8')."'.", "alert-success");
 		
 		$towhom = $request->getEmail();
 		if ($gem != "0") {
@@ -1534,7 +1534,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");
 				}
 			}	
         
@@ -1605,7 +1605,7 @@ 
 			}
 		}
 		else {
-			echo "You cannot break " . htmlentities($reservedUser->getUsername()) . "'s reservation";
+			echo "You cannot break ".htmlentities($reservedUser->getUsername())."'s reservation";
 		}
 	}
 	else {
@@ -1705,7 +1705,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(); 
 	}
     
@@ -1738,7 +1738,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'] == "") {
@@ -1816,7 +1816,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();