enwikipedia-acc / waca

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

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

Indentation +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
 	'honeypot' => 'https://www.projecthoneypot.org/ip_%DATA%',
 	'stopforumspam' => 'https://www.stopforumspam.com/ipcheck/%DATA%',
 	'google' => 'https://www.google.com/search?q=%DATA%',
-    'rangefinder' => 'https://tools.wmflabs.org/rangeblockfinder/?ip=%DATA%',
-    'ipcheck' => 'https://tools.wmflabs.org/ipcheck/index.php?ip=%DATA%'
+	'rangefinder' => 'https://tools.wmflabs.org/rangeblockfinder/?ip=%DATA%',
+	'ipcheck' => 'https://tools.wmflabs.org/ipcheck/index.php?ip=%DATA%'
 );
 
 if(!isset($_GET['tool'])

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
     'ipcheck' => 'https://tools.wmflabs.org/ipcheck/index.php?ip=%DATA%'
 );
 
-if(!isset($_GET['tool'])
+if (!isset($_GET['tool'])
 	|| !isset($toolList[$_GET['tool']])
 	|| !isset($_GET['data'])
 )
@@ -22,8 +22,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

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 {

Spacing +21 added lines, -21 removed lines

@@ -349,7 +349,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();
 	}
     
@@ -902,7 +902,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();
@@ -1034,7 +1034,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();
@@ -1150,7 +1150,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>";
         
@@ -1161,9 +1161,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>";
         
@@ -1179,7 +1179,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;
@@ -1200,7 +1200,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>";
         
@@ -1245,26 +1245,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);
@@ -1289,7 +1289,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") {
@@ -1355,7 +1355,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") {
@@ -1524,7 +1524,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");
 				}
 			}	
         
@@ -1595,7 +1595,7 @@ 
 			}
 		}
 		else {
-			echo "You cannot break " . htmlentities($reservedUser->getUsername()) . "'s reservation";
+			echo "You cannot break ".htmlentities($reservedUser->getUsername())."'s reservation";
 		}
 	}
 	else {
@@ -1695,7 +1695,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(); 
 	}
     
@@ -1728,7 +1728,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'] == "") {
@@ -1806,7 +1806,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();    

Braces +24 added lines, -36 removed lines

@@ -152,8 +152,7 @@ 
 
 	$database = gGetDb();
     
-	$database->transactionally(function() use ($database, $useOauthSignup)
-	{
+	$database->transactionally(function() use ($database, $useOauthSignup) {
     
 		$newUser = new User();
 		$newUser->setDatabase($database);
@@ -481,8 +480,7 @@ 
         
 		$database = gGetDb();
         
-		$database->transactionally(function() use ($database)
-		{
+		$database->transactionally(function() use ($database) {
 			global $smarty;
             
 			$message = InterfaceMessage::getById($_GET['edit'], $database);
@@ -570,8 +568,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']);
@@ -656,8 +653,7 @@ 
 			die();
 		}
         
-		$database->transactionally(function() use($database, $template)
-		{
+		$database->transactionally(function() use($database, $template) {
 			$tid = $template->getId();
             
 			$database
@@ -693,8 +689,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();
@@ -825,8 +820,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']);
@@ -891,8 +885,7 @@ 
 		else {
 			$database = gGetDb();
             
-			$database->transactionally(function() use ($database, $ban)
-			{
+			$database->transactionally(function() use ($database, $ban) {
 				$ban->setActive(0);
 				$ban->save();
                 
@@ -1041,8 +1034,7 @@ 
 		}
         
 		$database = gGetDb();
-		$database->transactionally(function() use ($database, $request)
-		{
+		$database->transactionally(function() use ($database, $request) {
 			global $availableRequestStates;
                 
 			$request->setReserved(0);
@@ -1192,7 +1184,8 @@ 
 	$emailTemplate = EmailTemplate::getById($gem, gGetDb());
 	if ($emailTemplate instanceof EmailTemplate) {
 		$isForCreated = $emailTemplate->getDefaultAction() === EmailTemplate::CREATED;
-	} else {
+	}
+	else {
 		$isForCreated = false;
 	}
 
@@ -1253,7 +1246,8 @@ 
 			if (isset($_POST['ccmailist']) && $_POST['ccmailist'] == "on") {
 				$headers .= 'Cc: accounts-enwiki-l@lists.wikimedia.org' . "\r\n";
 			}
-		} else {
+		}
+		else {
 			// these people do not.
 			$headers .= 'Cc: accounts-enwiki-l@lists.wikimedia.org' . "\r\n";
 		}
@@ -1469,8 +1463,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) {
@@ -1573,8 +1566,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();
 
@@ -1599,8 +1591,7 @@ 
 		}
 	}
 	else {
-		$database->transactionally(function() use ($database, $request)
-		{
+		$database->transactionally(function() use ($database, $request) {
 			$request->setReserved(0);
 			$request->save();
 
@@ -1793,8 +1784,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']);
@@ -1842,8 +1832,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;");
 		$updateStatement->bindValue(":userid", $user->getId());
 		$updateStatement->bindValue(":request", $requestObject->getId());
@@ -1871,8 +1860,7 @@ 
 		}
 		if (isset($_POST['submit'])) {
 			$database = gGetDb();
-			$database->transactionally(function() use ($database)
-			{
+			$database->transactionally(function() use ($database) {
 				global $baseurl;
                 
 				$emailTemplate = new EmailTemplate();
@@ -1950,8 +1938,7 @@ 
 				die();
 			}
 
-			$database->transactionally(function() use ($database, $emailTemplate)
-			{
+			$database->transactionally(function() use ($database, $emailTemplate) {
 				$emailTemplate->save();
                 
 				Logger::editedEmail($database, $emailTemplate);
@@ -2016,8 +2003,7 @@ 
 }
 elseif ($action == "oauthattach") {
 	$database = gGetDb();
-	$database->transactionally(function() use ($database)
-	{
+	$database->transactionally(function() use ($database) {
 		try {
 			global $oauthConsumerToken, $oauthSecretToken, $oauthBaseUrl, $oauthBaseUrlInternal;
             
@@ -2052,7 +2038,8 @@ 
 
 	    if ($enableEmailConfirm == 1) {
 	        $query = "SELECT * FROM request WHERE status = :type AND emailconfirm = 'Confirmed';";
-	    } else {
+	    }
+	    else {
 	        $query = "SELECT * FROM request WHERE status = :type;";
 	    }
 
@@ -2072,7 +2059,8 @@ 
         $smarty->assign("showStatus", false);
         $html = $smarty->fetch("mainpage/requesttable.tpl");
         echo $html;
-    } else {
+    }
+    else {
         echo defaultpage();
     }
 

search.php

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
 			die();
 		}			
 
-		$qterm = '%' . $term . '%';
+		$qterm = '%'.$term.'%';
         
 		$statement = gGetDb()->prepare("SELECT * FROM request WHERE email LIKE :term;");
 		$statement->bindValue(":term", $qterm);
@@ -100,7 +100,7 @@ 
 		$smarty->display("search/searchresult.tpl");
 	}
 	elseif ($_GET['type'] == 'IP') {
-		$qterm = '%' . $term . '%';
+		$qterm = '%'.$term.'%';
         
 		$statement = gGetDb()->prepare("SELECT * FROM request WHERE email <> 'acc@toolserver.org' and ip <> '127.0.0.1' and ip LIKE :term or forwardedip LIKE :term2;");
 		$statement->bindValue(":term", $qterm);
@@ -119,7 +119,7 @@ 
 		$smarty->display("search/searchresult.tpl");
 	}
 	elseif ($_GET['type'] == 'Request') {
-		$qterm = '%' . $term . '%';
+		$qterm = '%'.$term.'%';
         
 		$statement = gGetDb()->prepare("SELECT * FROM request WHERE name LIKE :term;");
 		$statement->bindValue(":term", $qterm);

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

Braces +5 added lines, -3 removed lines

@@ -62,13 +62,15 @@
         echo ". IP location fetch complete.\n";
         $database->commit();
         echo ". Committed txn.\n";
-    } catch (Exception $ex) {
+    }
+    catch (Exception $ex) {
         echo ". Encountered exception: " . $ex->getMessage(). "\n";
         $database->rollBack();
         echo ". Rolled back txn\n";
         throw $ex;
-    } finally {
-        if($database->hasActiveTransaction()){
+    }
+    finally {
+        if($database->hasActiveTransaction()) {
             $database->rollBack();
             echo ". Rolled back txn\n";
         }

Indentation +41 added lines, -41 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (isset($_SERVER['REQUEST_METHOD'])) {
-    die();
+	die();
 } // Web clients die.
 
 ini_set('display_errors', 1);
@@ -17,21 +17,21 @@ 
 $locationProvider = new IpLocationProvider($database, $locationProviderApiKey);
 
 while (true) {
-    echo "Beginning txn\n";
-    $database->beginTransaction();
+	echo "Beginning txn\n";
+	$database->beginTransaction();
 
-    try {
-        echo ". Fetching data...\n";
+	try {
+		echo ". Fetching data...\n";
 
-        // fetch a bunch of un-geolocated IPs from the database.
-        // note we have to parse the forwardedip field in the database so we can test against the geolocation table.
-        // This guarantees we get ten unlocated IPs back, unless there actually aren't 10 available.
-        // Alternatives include downloading a small set of forwarded IPs, splitting it in PHP, constructing an IN()
-        // clause dynamically, sending that back to the database to check if there are geolocation entries, then repeating
-        // until we have 10 to process - and the fact that we'd have to potentially retrieve all IPs from the database
-        // before we find any at all. This way keeps all of that legwork in the database, at the cost of a more complex
-        // query.
-        $statement = $database->query(<<<SQL
+		// fetch a bunch of un-geolocated IPs from the database.
+		// note we have to parse the forwardedip field in the database so we can test against the geolocation table.
+		// This guarantees we get ten unlocated IPs back, unless there actually aren't 10 available.
+		// Alternatives include downloading a small set of forwarded IPs, splitting it in PHP, constructing an IN()
+		// clause dynamically, sending that back to the database to check if there are geolocation entries, then repeating
+		// until we have 10 to process - and the fact that we'd have to potentially retrieve all IPs from the database
+		// before we find any at all. This way keeps all of that legwork in the database, at the cost of a more complex
+		// query.
+		$statement = $database->query(<<<SQL
             SELECT p.prox
             FROM (
               SELECT trim(substring_index(substring_index(r.forwardedip, ',', n.n), ',', -1)) prox
@@ -48,38 +48,38 @@ 
             WHERE NOT EXISTS (SELECT 1 FROM geolocation g WHERE g.address = p.prox FOR UPDATE)
             LIMIT 10;
 SQL
-        );
+		);
 
-        $missingIps = $statement->fetchAll(PDO::FETCH_COLUMN);
+		$missingIps = $statement->fetchAll(PDO::FETCH_COLUMN);
 
-        $count = count($missingIps);
-        if ($count === 0) {
-            echo ". Found nothing to do.\n";
-            break;
-        }
+		$count = count($missingIps);
+		if ($count === 0) {
+			echo ". Found nothing to do.\n";
+			break;
+		}
 
-        echo ". Picked {$count} IP addresses\n";
+		echo ". Picked {$count} IP addresses\n";
 
-        foreach ($missingIps as $ip) {
-            echo ". . Getting location for {$ip}...\n";
-            $data = json_encode($locationProvider->getIpLocation($ip));
-            echo ". . . {$data}\n";
-        }
+		foreach ($missingIps as $ip) {
+			echo ". . Getting location for {$ip}...\n";
+			$data = json_encode($locationProvider->getIpLocation($ip));
+			echo ". . . {$data}\n";
+		}
 
-        echo ". IP location fetch complete.\n";
-        $database->commit();
-        echo ". Committed txn.\n";
-    } catch (Exception $ex) {
-        echo ". Encountered exception: " . $ex->getMessage(). "\n";
-        $database->rollBack();
-        echo ". Rolled back txn\n";
-        throw $ex;
-    } finally {
-        if($database->hasActiveTransaction()){
-            $database->rollBack();
-            echo ". Rolled back txn\n";
-        }
-    }
+		echo ". IP location fetch complete.\n";
+		$database->commit();
+		echo ". Committed txn.\n";
+	} catch (Exception $ex) {
+		echo ". Encountered exception: " . $ex->getMessage(). "\n";
+		$database->rollBack();
+		echo ". Rolled back txn\n";
+		throw $ex;
+	} finally {
+		if($database->hasActiveTransaction()){
+			$database->rollBack();
+			echo ". Rolled back txn\n";
+		}
+	}
 }
 
 echo "Done.\n";

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, $enableEmailConfirm;
     
 	$query = $db->prepare("UPDATE request SET ip = :ip, forwardedip = null, email = :mail, useragent = '' WHERE date < DATE_SUB(curdate(), INTERVAL $dataclear_interval) AND status = 'Closed';");

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