enwikipedia-acc / waca

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 {

includes/DataObjects/User.php

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

functions.php

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;

PrecacheGeolocation.php

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

includes/statistics/StatsIdUsers.php

Indentation +30 added lines, -30 removed lines

@@ -14,31 +14,31 @@ 
 
 class StatsIdUsers extends StatisticsPage
 {
-    protected function execute()
-    {
-        return $this->getUserList();
-    }
+	protected function execute()
+	{
+		return $this->getUserList();
+	}
 
-    public function getPageTitle()
-    {
-        return "User identification status";
-    }
+	public function getPageTitle()
+	{
+		return "User identification status";
+	}
 
-    public function getPageName()
-    {
-        return "IdUsers";
-    }
+	public function getPageName()
+	{
+		return "IdUsers";
+	}
 
-    public function isProtected()
-    {
-        return true;
-    }
+	public function isProtected()
+	{
+		return true;
+	}
 
-    private function getUserList()
-    {
-        global $currentIdentificationVersion, $forceIdentification;
+	private function getUserList()
+	{
+		global $currentIdentificationVersion, $forceIdentification;
 
-        $query = <<<SQL
+		$query = <<<SQL
 select username, status, checkuser, identified, case 
     when coalesce(identified, 0) = 0 then 'Not identified'
     when identified < ${forceIdentification} then 'Expired'
@@ -51,16 +51,16 @@ 
 order by username;
 SQL;
 
-        $qb = new QueryBrowser();
-        $qb->rowFetchMode = PDO::FETCH_NUM;
-        $qb->overrideTableTitles = array("User name", "Access level", "Checkuser?", "Version", "Identification status");
-        $r = $qb->executeQueryToTable($query);
+		$qb = new QueryBrowser();
+		$qb->rowFetchMode = PDO::FETCH_NUM;
+		$qb->overrideTableTitles = array("User name", "Access level", "Checkuser?", "Version", "Identification status");
+		$r = $qb->executeQueryToTable($query);
 
-        return $r;
-    }
+		return $r;
+	}
 
-    public function requiresWikiDatabase()
-    {
-        return false;
-    }
+	public function requiresWikiDatabase()
+	{
+		return false;
+	}
 }