mdaniels5757 / waca

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

Braces +5 added lines, -3 removed lines

@@ -69,13 +69,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";
         }

Spacing +2 added lines, -2 removed lines

@@ -70,12 +70,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/Helpers/Logger.php

Braces +2 added lines, -4 removed lines

@@ -360,8 +360,7 @@ 
 			$countStatement->bindValue(":userFilter", 0, PDO::PARAM_INT);
 			$searchStatement->bindValue(":userid", 0, PDO::PARAM_INT);
 			$countStatement->bindValue(":userid", 0, PDO::PARAM_INT);
-		}
-		else {
+		} else {
 			$searchStatement->bindValue(":userFilter", 1, PDO::PARAM_INT);
 			$countStatement->bindValue(":userFilter", 1, PDO::PARAM_INT);
 			$searchStatement->bindValue(":userid", User::getByUsername($userFilter, $database)->getId(), PDO::PARAM_INT);
@@ -373,8 +372,7 @@ 
 			$countStatement->bindValue(":actionFilter", 0, PDO::PARAM_INT);
 			$searchStatement->bindValue(":action", "", PDO::PARAM_STR);
 			$countStatement->bindValue(":action", "", PDO::PARAM_STR);
-		}
-		else {
+		} else {
 			$searchStatement->bindValue(":actionFilter", 1, PDO::PARAM_INT);
 			$countStatement->bindValue(":actionFilter", 1, PDO::PARAM_INT);
 			$searchStatement->bindValue(":action", $actionFilter, PDO::PARAM_STR);

includes/API/Actions/StatsAction.php

Braces +1 added lines, -2 removed lines

@@ -49,8 +49,7 @@
 
 		if ($username !== '') {
 			$this->user = \User::getByUsername($username, $this->database);
-		}
-		else {
+		} else {
 			$this->user = \User::getByOnWikiUsername($wikiusername, $this->database);
 		}
 

includes/Providers/CachedApiAntispoofProvider.php

Braces +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
 			$cacheEntry->save();
 
 			$cacheResult = $cacheEntry;
-		}
-		else {
+		} else {
 			$data = $cacheResult->getData();
 		}
 

includes/BootstrapSkin.php

Braces +3 added lines, -6 removed lines

@@ -119,8 +119,7 @@ 
 		// not equal to one, as zero uses the plural form too.
 		if ($resultSetCount != 1) {
 			$onlinemessage = $resultSetCount . " Account Creators currently online (past 5 minutes): $creators";
-		}
-		else {
+		} else {
 			$onlinemessage = $resultSetCount . " Account Creator currently online (past 5 minutes): $creators";
 		}
 
@@ -128,8 +127,7 @@ 
 
 		if (isset($_SESSION['user'])) {
 			$smarty->assign("onlineusers", $online);
-		}
-		else {
+		} else {
 			$emptystring = "";
 			$smarty->assign("onlineusers", $emptystring);
 		}
@@ -176,8 +174,7 @@ 
 
 		if ($return) {
 			return $returnData;
-		}
-		else {
+		} else {
 			echo $returnData;
 			return null;
 		}

includes/statistics/StatsMonthlyStats.php

Braces +1 added lines, -2 removed lines

@@ -145,8 +145,7 @@
 				$out .= '<img src="' . $baseurl . '/render/' . $i[0] . '" alt="' . $i[1] . '"/>';
 			}
 
-		}
-		else {
+		} else {
 			$out .= BootstrapSkin::displayAlertBox("Graph drawing is currently disabled.", "alert-info", "", false, false, true);
 		}
 

includes/statistics/StatsUsers.php

Braces +1 added lines, -2 removed lines

@@ -18,8 +18,7 @@
 	{
 		if (!isset($_GET['user'])) {
 			return $this->getUserList();
-		}
-		else {
+		} else {
 			return $this->getUserDetail($_GET['user']);
 		}
 	}

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

includes/DataObjects/GeoLocation.php

Braces +2 added lines, -4 removed lines

@@ -47,12 +47,10 @@
 			if ($statement->execute()) {
 				$this->isNew = false;
 				$this->id = $this->dbObject->lastInsertId();
-			}
-			else {
+			} else {
 				throw new Exception($statement->errorInfo());
 			}
-		}
-		else {
+		} else {
 // update
 			$statement = $this->dbObject->prepare("UPDATE `geolocation` SET address = :address, data = :data WHERE id = :id;");
 			$statement->bindValue(":address", $this->address);