enwikipedia-acc / waca

ClearOAuthData.php

Braces +1 added lines, -2 removed lines

@@ -12,8 +12,7 @@
 
 $database = gGetDb();
 
-$database->transactionally(function() use ($database)
-{
+$database->transactionally(function() use ($database) {
 	$database->exec(<<<SQL
         UPDATE user 
         SET 

RecreateTrustedIPs.php

Braces +1 added lines, -2 removed lines

@@ -87,8 +87,7 @@
 $database = gGetDb();
 
 echo "Executing transaction...\n";
-$database->transactionally(function() use ($ip, $database)
-{
+$database->transactionally(function() use ($ip, $database) {
 	$database->exec("DELETE FROM xfftrustcache;");
 
 	$insert = $database->prepare("INSERT INTO xfftrustcache (ip) VALUES (:ip);");

index.php

Braces +3 added lines, -6 removed lines

@@ -71,8 +71,7 @@ 
 			return;
 		}
         
-		$database->transactionally(function() use($database, $request, $smarty)
-		{
+		$database->transactionally(function() use($database, $request, $smarty) {
 			if ($request === false) {
 				throw new TransactionException($smarty->fetch('request/request-not-found.tpl'), "Ooops!");
 			}
@@ -136,8 +135,7 @@ 
 		else if ($enableEmailConfirm == 1) {
 			$request->generateEmailConfirmationHash();
 
-			$database->transactionally(function() use($request)
-			{
+			$database->transactionally(function() use($request) {
 				$request->save();
 
 				// checksum depends on the ID, so we have to save again!
@@ -151,8 +149,7 @@ 
 		}
 		else {
 			$request->setEmailConfirm(0); // Since it can't be null
-			$database->transactionally(function() use($request)
-			{
+			$database->transactionally(function() use($request) {
 				$request->save();
 				$request->updateChecksum();
 				$request->save();

includes/DataObjects/User.php

Braces +5 added lines, -10 removed lines

@@ -593,8 +593,7 @@ 
     
 	public function approve()
 	{
-		$this->dbObject->transactionally(function()
-		{
+		$this->dbObject->transactionally(function() {
 			$this->status = "User";
 			$this->save();
 			Logger::approvedUser($this->dbObject, $this);
@@ -603,8 +602,7 @@ 
     
 	public function suspend($comment)
 	{
-		$this->dbObject->transactionally(function() use ($comment)
-		{
+		$this->dbObject->transactionally(function() use ($comment) {
 			$this->status = "Suspended";
 			$this->save();
 			Logger::suspendedUser($this->dbObject, $this, $comment);
@@ -613,8 +611,7 @@ 
     
 	public function decline($comment)
 	{
-		$this->dbObject->transactionally(function() use ($comment)
-		{
+		$this->dbObject->transactionally(function() use ($comment) {
 			$this->status = "Declined";
 			$this->save();
 			Logger::declinedUser($this->dbObject, $this, $comment);
@@ -623,8 +620,7 @@ 
     
 	public function promote()
 	{
-		$this->dbObject->transactionally(function()
-		{
+		$this->dbObject->transactionally(function() {
 			$this->status = "Admin";
 			$this->save();
 			Logger::promotedUser($this->dbObject, $this);
@@ -633,8 +629,7 @@ 
     
 	public function demote($comment)
 	{
-		$this->dbObject->transactionally(function() use ($comment)
-		{
+		$this->dbObject->transactionally(function() use ($comment) {
 			$this->status = "User";
 			$this->save();
 			Logger::demotedUser($this->dbObject, $this, $comment);

Indentation +3 added lines, -3 removed lines

@@ -654,9 +654,9 @@
     
 	public function isCheckuser()
 	{
-	    if($this->isCheckuserCache === null) {
-	        $this->isCheckuserCache = $this->checkuser == 1 || $this->oauthCanCheckUser();
-        }
+		if($this->isCheckuserCache === null) {
+			$this->isCheckuserCache = $this->checkuser == 1 || $this->oauthCanCheckUser();
+		}
 
 		return $this->isCheckuserCache;
 	}

includes/Helpers/Logger.php

Braces +1 added lines, -2 removed lines

@@ -217,8 +217,7 @@
 		
 		$items = array_merge($logs, $comments);
 		
-		$sortKey = function(DataObject $item)
-		{
+		$sortKey = function(DataObject $item) {
 			if ($item instanceof Log) {
 				return $item->getTimestamp();
 			}

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

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 {

Braces +26 added lines, -37 removed lines

@@ -158,8 +158,7 @@ 
 
 	$database = gGetDb();
     
-	$database->transactionally(function() use ($database, $useOauthSignup)
-	{
+	$database->transactionally(function() use ($database, $useOauthSignup) {
     
 		$newUser = new User();
 		$newUser->setDatabase($database);
@@ -217,7 +216,8 @@ 
 	if($allowRegistration) {
 		$smarty->assign("useOauthSignup", $useOauthSignup);
 		$smarty->display("registration/register.tpl");
-	} else {
+	}
+	else {
 		$smarty->display("registration/registerdisabled.tpl");
 	}
 	BootstrapSkin::displayInternalFooter();
@@ -491,8 +491,7 @@ 
         
 		$database = gGetDb();
         
-		$database->transactionally(function() use ($database)
-		{
+		$database->transactionally(function() use ($database) {
 			global $smarty;
             
 			$message = InterfaceMessage::getById($_GET['edit'], $database);
@@ -580,8 +579,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']);
@@ -666,8 +664,7 @@ 
 			die();
 		}
         
-		$database->transactionally(function() use($database, $template)
-		{
+		$database->transactionally(function() use($database, $template) {
 			$tid = $template->getId();
             
 			$database
@@ -703,8 +700,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();
@@ -835,8 +831,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']);
@@ -901,8 +896,7 @@ 
 		else {
 			$database = gGetDb();
             
-			$database->transactionally(function() use ($database, $ban)
-			{
+			$database->transactionally(function() use ($database, $ban) {
 				$ban->setActive(0);
 				$ban->save();
                 
@@ -1051,8 +1045,7 @@ 
 		}
         
 		$database = gGetDb();
-		$database->transactionally(function() use ($database, $request)
-		{
+		$database->transactionally(function() use ($database, $request) {
 			global $availableRequestStates;
                 
 			$request->setReserved(0);
@@ -1202,7 +1195,8 @@ 
 	$emailTemplate = EmailTemplate::getById($gem, gGetDb());
 	if ($emailTemplate instanceof EmailTemplate) {
 		$isForCreated = $emailTemplate->getDefaultAction() === EmailTemplate::CREATED;
-	} else {
+	}
+	else {
 		$isForCreated = false;
 	}
 
@@ -1263,7 +1257,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";
 		}
@@ -1479,8 +1474,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) {
@@ -1583,8 +1577,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();
 
@@ -1609,8 +1602,7 @@ 
 		}
 	}
 	else {
-		$database->transactionally(function() use ($database, $request)
-		{
+		$database->transactionally(function() use ($database, $request) {
 			$request->setReserved(0);
 			$request->save();
 
@@ -1803,8 +1795,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']);
@@ -1852,8 +1843,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());
@@ -1881,8 +1871,7 @@ 
 		}
 		if (isset($_POST['submit'])) {
 			$database = gGetDb();
-			$database->transactionally(function() use ($database)
-			{
+			$database->transactionally(function() use ($database) {
 				global $baseurl;
                 
 				$emailTemplate = new EmailTemplate();
@@ -1960,8 +1949,7 @@ 
 				die();
 			}
 
-			$database->transactionally(function() use ($database, $emailTemplate)
-			{
+			$database->transactionally(function() use ($database, $emailTemplate) {
 				$emailTemplate->save();
                 
 				Logger::editedEmail($database, $emailTemplate);
@@ -2026,8 +2014,7 @@ 
 }
 elseif ($action == "oauthattach") {
 	$database = gGetDb();
-	$database->transactionally(function() use ($database)
-	{
+	$database->transactionally(function() use ($database) {
 		try {
 			global $oauthConsumerToken, $oauthSecretToken, $oauthBaseUrl, $oauthBaseUrlInternal;
             
@@ -2062,7 +2049,8 @@ 
 
 	    if ($enableEmailConfirm == 1) {
 	        $query = "SELECT * FROM request WHERE status = :type AND emailconfirm = 'Confirmed';";
-	    } else {
+	    }
+	    else {
 	        $query = "SELECT * FROM request WHERE status = :type;";
 	    }
 
@@ -2082,7 +2070,8 @@ 
         $smarty->assign("showStatus", false);
         $html = $smarty->fetch("mainpage/requesttable.tpl");
         echo $html;
-    } else {
+    }
+    else {
         echo defaultpage();
     }
 

includes/BootstrapSkin.php

Braces +1 added lines, -2 removed lines

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

PrecacheGeolocation.php

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