mdaniels5757 / waca

includes/Providers/TorExitProvider.php

Indentation +75 added lines, -75 removed lines

@@ -13,96 +13,96 @@
 
 class TorExitProvider
 {
-    /** @var PdoDatabase */
-    private $database;
-
-    /**
-     * TorExitProvider constructor.
-     *
-     * @param PdoDatabase $database
-     */
-    public function __construct(PdoDatabase $database)
-    {
-        $this->database = $database;
-    }
-
-    /**
-     * Checks whether an IP address is a Tor exit node for one of the pre-cached IP addresses.
-     *
-     * @param string $ip IP Address
-     *
-     * @return bool
-     */
-    public function isTorExit($ip)
-    {
-        $statement = $this->database->prepare('SELECT COUNT(1) FROM tornodecache WHERE ipaddr = :ip');
-
-        $statement->execute(array(':ip' => $ip));
-
-        $count = $statement->fetchColumn();
-        $statement->closeCursor();
-
-        if ($count > 0) {
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-
-    public static function regenerate(PdoDatabase $database, HttpHelper $httpHelper, $destinationIps)
-    {
-        $query = <<<SQL
+	/** @var PdoDatabase */
+	private $database;
+
+	/**
+	 * TorExitProvider constructor.
+	 *
+	 * @param PdoDatabase $database
+	 */
+	public function __construct(PdoDatabase $database)
+	{
+		$this->database = $database;
+	}
+
+	/**
+	 * Checks whether an IP address is a Tor exit node for one of the pre-cached IP addresses.
+	 *
+	 * @param string $ip IP Address
+	 *
+	 * @return bool
+	 */
+	public function isTorExit($ip)
+	{
+		$statement = $this->database->prepare('SELECT COUNT(1) FROM tornodecache WHERE ipaddr = :ip');
+
+		$statement->execute(array(':ip' => $ip));
+
+		$count = $statement->fetchColumn();
+		$statement->closeCursor();
+
+		if ($count > 0) {
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
+
+	public static function regenerate(PdoDatabase $database, HttpHelper $httpHelper, $destinationIps)
+	{
+		$query = <<<SQL
 INSERT INTO tornodecache (ipaddr, exitaddr, exitport)
 VALUES (:ipaddr, :exitaddr, :exitport)
 ON DUPLICATE KEY
 UPDATE touched = CURRENT_TIMESTAMP, updateversion = updateversion + 1
 SQL;
 
-        $statement = $database->prepare($query);
+		$statement = $database->prepare($query);
 
-        foreach ($destinationIps as $ip) {
-            echo 'Fetching data for ' . $ip . PHP_EOL;
+		foreach ($destinationIps as $ip) {
+			echo 'Fetching data for ' . $ip . PHP_EOL;
 
-            $statement->bindValue(':exitaddr', $ip);
+			$statement->bindValue(':exitaddr', $ip);
 
-            $http = $httpHelper->get(
-                'https://check.torproject.org/cgi-bin/TorBulkExitList.py',
-                array(
-                    'ip'   => $ip,
-                    'port' => 80,
-                ));
+			$http = $httpHelper->get(
+				'https://check.torproject.org/cgi-bin/TorBulkExitList.py',
+				array(
+					'ip'   => $ip,
+					'port' => 80,
+				));
 
-            $https = $httpHelper->get(
-                'https://check.torproject.org/cgi-bin/TorBulkExitList.py',
-                array(
-                    'ip'   => $ip,
-                    'port' => 443,
-                ));
+			$https = $httpHelper->get(
+				'https://check.torproject.org/cgi-bin/TorBulkExitList.py',
+				array(
+					'ip'   => $ip,
+					'port' => 443,
+				));
 
-            foreach (array(80 => $http, 443 => $https) as $port => $response) {
-                echo '  Running for port ' . $ip . ':' . $port . PHP_EOL;
+			foreach (array(80 => $http, 443 => $https) as $port => $response) {
+				echo '  Running for port ' . $ip . ':' . $port . PHP_EOL;
 
-                $statement->bindValue(':exitport', $port);
+				$statement->bindValue(':exitport', $port);
 
-                $lines = explode("\n", $response);
+				$lines = explode("\n", $response);
 
-                foreach ($lines as $line) {
-                    // line contains a comment char, just skip the line.
-                    // This is OK as of 2016-04-06  --stw
-                    if (strpos($line, '#') !== false) {
-                        continue;
-                    }
+				foreach ($lines as $line) {
+					// line contains a comment char, just skip the line.
+					// This is OK as of 2016-04-06  --stw
+					if (strpos($line, '#') !== false) {
+						continue;
+					}
 
-                    $statement->bindValue(':ipaddr', $line);
-                    $statement->execute();
-                }
-            }
+					$statement->bindValue(':ipaddr', $line);
+					$statement->execute();
+				}
+			}
 
-            echo 'Done for ' . $ip . PHP_EOL;
-        }
+			echo 'Done for ' . $ip . PHP_EOL;
+		}
 
-        // kill old cached entries
-        $database->exec('DELETE FROM tornodecache WHERE touched < DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 1 DAY)');
-    }
+		// kill old cached entries
+		$database->exec('DELETE FROM tornodecache WHERE touched < DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 1 DAY)');
+	}
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -44,8 +44,7 @@
 
         if ($count > 0) {
             return true;
-        }
-        else {
+        } else {
             return false;
         }
     }

includes/Providers/CachedApiAntispoofProvider.php

Indentation +61 added lines, -61 removed lines

@@ -22,77 +22,77 @@
  */
 class CachedApiAntispoofProvider implements IAntiSpoofProvider
 {
-    /**
-     * @var PdoDatabase
-     */
-    private $database;
-    /**
-     * @var string
-     */
-    private $mediawikiWebServiceEndpoint;
-    /**
-     * @var HttpHelper
-     */
-    private $httpHelper;
+	/**
+	 * @var PdoDatabase
+	 */
+	private $database;
+	/**
+	 * @var string
+	 */
+	private $mediawikiWebServiceEndpoint;
+	/**
+	 * @var HttpHelper
+	 */
+	private $httpHelper;
 
-    public function __construct(PdoDatabase $database, $mediawikiWebServiceEndpoint, HttpHelper $httpHelper)
-    {
-        $this->database = $database;
-        $this->mediawikiWebServiceEndpoint = $mediawikiWebServiceEndpoint;
-        $this->httpHelper = $httpHelper;
-    }
+	public function __construct(PdoDatabase $database, $mediawikiWebServiceEndpoint, HttpHelper $httpHelper)
+	{
+		$this->database = $database;
+		$this->mediawikiWebServiceEndpoint = $mediawikiWebServiceEndpoint;
+		$this->httpHelper = $httpHelper;
+	}
 
-    public function getSpoofs($username)
-    {
-        /** @var AntiSpoofCache $cacheResult */
-        $cacheResult = AntiSpoofCache::getByUsername($username, $this->database);
-        if ($cacheResult == false) {
-            // get the data from the API
-            $data = $this->httpHelper->get($this->mediawikiWebServiceEndpoint, array(
-                'action'   => 'antispoof',
-                'format'   => 'php',
-                'username' => $username,
-            ));
+	public function getSpoofs($username)
+	{
+		/** @var AntiSpoofCache $cacheResult */
+		$cacheResult = AntiSpoofCache::getByUsername($username, $this->database);
+		if ($cacheResult == false) {
+			// get the data from the API
+			$data = $this->httpHelper->get($this->mediawikiWebServiceEndpoint, array(
+				'action'   => 'antispoof',
+				'format'   => 'php',
+				'username' => $username,
+			));
 
-            $cacheEntry = new AntiSpoofCache();
-            $cacheEntry->setDatabase($this->database);
-            $cacheEntry->setUsername($username);
-            $cacheEntry->setData($data);
-            $cacheEntry->save();
+			$cacheEntry = new AntiSpoofCache();
+			$cacheEntry->setDatabase($this->database);
+			$cacheEntry->setUsername($username);
+			$cacheEntry->setData($data);
+			$cacheEntry->save();
 
-            $cacheResult = $cacheEntry;
-        }
-        else {
-            $data = $cacheResult->getData();
-        }
+			$cacheResult = $cacheEntry;
+		}
+		else {
+			$data = $cacheResult->getData();
+		}
 
-        $result = unserialize($data);
+		$result = unserialize($data);
 
-        if (!isset($result['antispoof']) || !isset($result['antispoof']['result'])) {
-            $cacheResult->delete();
+		if (!isset($result['antispoof']) || !isset($result['antispoof']['result'])) {
+			$cacheResult->delete();
 
-            if (isset($result['error']['info'])) {
-                throw new Exception("Unrecognised API response to query: " . $result['error']['info']);
-            }
+			if (isset($result['error']['info'])) {
+				throw new Exception("Unrecognised API response to query: " . $result['error']['info']);
+			}
 
-            throw new Exception("Unrecognised API response to query.");
-        }
+			throw new Exception("Unrecognised API response to query.");
+		}
 
-        if ($result['antispoof']['result'] == "pass") {
-            // All good here!
-            return array();
-        }
+		if ($result['antispoof']['result'] == "pass") {
+			// All good here!
+			return array();
+		}
 
-        if ($result['antispoof']['result'] == "conflict") {
-            // we've got conflicts, let's do something with them.
-            return $result['antispoof']['users'];
-        }
+		if ($result['antispoof']['result'] == "conflict") {
+			// we've got conflicts, let's do something with them.
+			return $result['antispoof']['users'];
+		}
 
-        if ($result['antispoof']['result'] == "error") {
-            // we've got conflicts, let's do something with them.
-            throw new Exception("Encountered error while getting result: " . $result['antispoof']['error']);
-        }
+		if ($result['antispoof']['result'] == "error") {
+			// we've got conflicts, let's do something with them.
+			throw new Exception("Encountered error while getting result: " . $result['antispoof']['error']);
+		}
 
-        throw new Exception("Unrecognised API response to query.");
-    }
+		throw new Exception("Unrecognised API response to query.");
+	}
 }

Braces +1 added lines, -2 removed lines

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

includes/IdentificationVerifier.php

Indentation +157 added lines, -157 removed lines

@@ -26,131 +26,131 @@ 
  */
 class IdentificationVerifier
 {
-    /**
-     * This field is an array of parameters, in key => value format, that should be appended to the Meta Wikimedia
-     * Web Service Endpoint URL to query if a user is listed on the Identification Noticeboard.  Note that URL encoding
-     * of these values is *not* necessary; this is done automatically.
-     *
-     * @var string[]
-     * @category Security-Critical
-     */
-    private static $apiQueryParameters = array(
-        'action'   => 'query',
-        'format'   => 'json',
-        'prop'     => 'links',
-        'titles'   => 'Access to nonpublic information policy/Noticeboard',
-        // Username of the user to be checked, with User: prefix, goes here!  Set in isIdentifiedOnWiki()
-        'pltitles' => '',
-    );
-    /** @var HttpHelper */
-    private $httpHelper;
-    /** @var SiteConfiguration */
-    private $siteConfiguration;
-    /** @var PdoDatabase */
-    private $dbObject;
-
-    /**
-     * IdentificationVerifier constructor.
-     *
-     * @param HttpHelper        $httpHelper
-     * @param SiteConfiguration $siteConfiguration
-     * @param PdoDatabase       $dbObject
-     */
-    public function __construct(HttpHelper $httpHelper, SiteConfiguration $siteConfiguration, PdoDatabase $dbObject)
-    {
-        $this->httpHelper = $httpHelper;
-        $this->siteConfiguration = $siteConfiguration;
-        $this->dbObject = $dbObject;
-    }
-
-    /**
-     * Checks if the given user is identified to the Wikimedia Foundation.
-     *
-     * @param string $onWikiName The Wikipedia username of the user
-     *
-     * @return bool
-     * @category Security-Critical
-     */
-    public function isUserIdentified($onWikiName)
-    {
-        if ($this->checkIdentificationCache($onWikiName)) {
-            return true;
-        }
-        else {
-            if ($this->isIdentifiedOnWiki($onWikiName)) {
-                $this->cacheIdentificationStatus($onWikiName);
-
-                return true;
-            }
-            else {
-                return false;
-            }
-        }
-    }
-
-    /**
-     * Checks if the given user has a valid entry in the idcache table.
-     *
-     * @param string $onWikiName The Wikipedia username of the user
-     *
-     * @return bool
-     * @category Security-Critical
-     */
-    private function checkIdentificationCache($onWikiName)
-    {
-        $interval = $this->siteConfiguration->getIdentificationCacheExpiry();
-
-        $query = <<<SQL
+	/**
+	 * This field is an array of parameters, in key => value format, that should be appended to the Meta Wikimedia
+	 * Web Service Endpoint URL to query if a user is listed on the Identification Noticeboard.  Note that URL encoding
+	 * of these values is *not* necessary; this is done automatically.
+	 *
+	 * @var string[]
+	 * @category Security-Critical
+	 */
+	private static $apiQueryParameters = array(
+		'action'   => 'query',
+		'format'   => 'json',
+		'prop'     => 'links',
+		'titles'   => 'Access to nonpublic information policy/Noticeboard',
+		// Username of the user to be checked, with User: prefix, goes here!  Set in isIdentifiedOnWiki()
+		'pltitles' => '',
+	);
+	/** @var HttpHelper */
+	private $httpHelper;
+	/** @var SiteConfiguration */
+	private $siteConfiguration;
+	/** @var PdoDatabase */
+	private $dbObject;
+
+	/**
+	 * IdentificationVerifier constructor.
+	 *
+	 * @param HttpHelper        $httpHelper
+	 * @param SiteConfiguration $siteConfiguration
+	 * @param PdoDatabase       $dbObject
+	 */
+	public function __construct(HttpHelper $httpHelper, SiteConfiguration $siteConfiguration, PdoDatabase $dbObject)
+	{
+		$this->httpHelper = $httpHelper;
+		$this->siteConfiguration = $siteConfiguration;
+		$this->dbObject = $dbObject;
+	}
+
+	/**
+	 * Checks if the given user is identified to the Wikimedia Foundation.
+	 *
+	 * @param string $onWikiName The Wikipedia username of the user
+	 *
+	 * @return bool
+	 * @category Security-Critical
+	 */
+	public function isUserIdentified($onWikiName)
+	{
+		if ($this->checkIdentificationCache($onWikiName)) {
+			return true;
+		}
+		else {
+			if ($this->isIdentifiedOnWiki($onWikiName)) {
+				$this->cacheIdentificationStatus($onWikiName);
+
+				return true;
+			}
+			else {
+				return false;
+			}
+		}
+	}
+
+	/**
+	 * Checks if the given user has a valid entry in the idcache table.
+	 *
+	 * @param string $onWikiName The Wikipedia username of the user
+	 *
+	 * @return bool
+	 * @category Security-Critical
+	 */
+	private function checkIdentificationCache($onWikiName)
+	{
+		$interval = $this->siteConfiguration->getIdentificationCacheExpiry();
+
+		$query = <<<SQL
 			SELECT COUNT(`id`)
 			FROM `idcache`
 			WHERE `onwikiusername` = :onwikiname
 				AND DATE_ADD(`checktime`, INTERVAL {$interval}) >= NOW();
 SQL;
-        $stmt = $this->dbObject->prepare($query);
-        $stmt->bindValue(':onwikiname', $onWikiName, PDO::PARAM_STR);
-        $stmt->execute();
-
-        // Guaranteed by the query to only return a single row with a single column
-        $results = $stmt->fetch(PDO::FETCH_NUM);
-
-        // I don't expect this to ever be a value other than 0 or 1 since the `onwikiusername` column is declared as a
-        // unique key - but meh.
-        return $results[0] != 0;
-    }
-
-    /**
-     * Does pretty much exactly what it says on the label - this method will clear all expired idcache entries from the
-     * idcache table.  Meant to be called periodically by a maintenance script.
-     *
-     * @param SiteConfiguration $siteConfiguration
-     * @param PdoDatabase       $dbObject
-     *
-     * @return void
-     */
-    public static function clearExpiredCacheEntries(SiteConfiguration $siteConfiguration, PdoDatabase $dbObject)
-    {
-        $interval = $siteConfiguration->getIdentificationCacheExpiry();
-
-        $query = <<<SQL
+		$stmt = $this->dbObject->prepare($query);
+		$stmt->bindValue(':onwikiname', $onWikiName, PDO::PARAM_STR);
+		$stmt->execute();
+
+		// Guaranteed by the query to only return a single row with a single column
+		$results = $stmt->fetch(PDO::FETCH_NUM);
+
+		// I don't expect this to ever be a value other than 0 or 1 since the `onwikiusername` column is declared as a
+		// unique key - but meh.
+		return $results[0] != 0;
+	}
+
+	/**
+	 * Does pretty much exactly what it says on the label - this method will clear all expired idcache entries from the
+	 * idcache table.  Meant to be called periodically by a maintenance script.
+	 *
+	 * @param SiteConfiguration $siteConfiguration
+	 * @param PdoDatabase       $dbObject
+	 *
+	 * @return void
+	 */
+	public static function clearExpiredCacheEntries(SiteConfiguration $siteConfiguration, PdoDatabase $dbObject)
+	{
+		$interval = $siteConfiguration->getIdentificationCacheExpiry();
+
+		$query = <<<SQL
 			DELETE FROM `idcache`
 			WHERE DATE_ADD(`checktime`, INTERVAL {$interval}) < NOW();
 SQL;
-        $dbObject->prepare($query)->execute();
-    }
-
-    /**
-     * This method will add an entry to the idcache that the given Wikipedia user has been verified as identified.  This
-     * is so we don't have to hit the API every single time we check.  The cache entry is valid for as long as specified
-     * in the ACC configuration (validity enforced by checkIdentificationCache() and clearExpiredCacheEntries()).
-     *
-     * @param string $onWikiName The Wikipedia username of the user
-     *
-     * @return void
-     * @category Security-Critical
-     */
-    private function cacheIdentificationStatus($onWikiName)
-    {
-        $query = <<<SQL
+		$dbObject->prepare($query)->execute();
+	}
+
+	/**
+	 * This method will add an entry to the idcache that the given Wikipedia user has been verified as identified.  This
+	 * is so we don't have to hit the API every single time we check.  The cache entry is valid for as long as specified
+	 * in the ACC configuration (validity enforced by checkIdentificationCache() and clearExpiredCacheEntries()).
+	 *
+	 * @param string $onWikiName The Wikipedia username of the user
+	 *
+	 * @return void
+	 * @category Security-Critical
+	 */
+	private function cacheIdentificationStatus($onWikiName)
+	{
+		$query = <<<SQL
 			INSERT INTO `idcache`
 				(`onwikiusername`)
 			VALUES
@@ -159,44 +159,44 @@ 
 				`onwikiusername` = VALUES(`onwikiusername`),
 				`checktime` = CURRENT_TIMESTAMP;
 SQL;
-        $stmt = $this->dbObject->prepare($query);
-        $stmt->bindValue(':onwikiname', $onWikiName, PDO::PARAM_STR);
-        $stmt->execute();
-    }
-
-    /**
-     * Queries the Wikimedia API to determine if the specified user is listed on the identification noticeboard.
-     *
-     * @param string $onWikiName The Wikipedia username of the user
-     *
-     * @return bool
-     * @throws EnvironmentException
-     * @category Security-Critical
-     */
-    private function isIdentifiedOnWiki($onWikiName)
-    {
-        $strings = new StringFunctions();
-
-        // First character of Wikipedia usernames is always capitalized.
-        $onWikiName = $strings->ucfirst($onWikiName);
-
-        $parameters = self::$apiQueryParameters;
-        $parameters['pltitles'] = "User:" . $onWikiName;
-
-        try {
-            $endpoint = $this->siteConfiguration->getMetaWikimediaWebServiceEndpoint();
-            $response = $this->httpHelper->get($endpoint, $parameters);
-            $response = json_decode($response, true);
-        } catch (CurlException $ex) {
-            // failed getting identification status, so throw a nicer error.
-            $m = 'Could not contact metawiki API to determine user\' identification status. '
-                . 'This is probably a transient error, so please try again.';
-
-            throw new EnvironmentException($m, 0, $ex);
-        }
-
-        $page = @array_pop($response['query']['pages']);
-
-        return @$page['links'][0]['title'] === "User:" . $onWikiName;
-    }
+		$stmt = $this->dbObject->prepare($query);
+		$stmt->bindValue(':onwikiname', $onWikiName, PDO::PARAM_STR);
+		$stmt->execute();
+	}
+
+	/**
+	 * Queries the Wikimedia API to determine if the specified user is listed on the identification noticeboard.
+	 *
+	 * @param string $onWikiName The Wikipedia username of the user
+	 *
+	 * @return bool
+	 * @throws EnvironmentException
+	 * @category Security-Critical
+	 */
+	private function isIdentifiedOnWiki($onWikiName)
+	{
+		$strings = new StringFunctions();
+
+		// First character of Wikipedia usernames is always capitalized.
+		$onWikiName = $strings->ucfirst($onWikiName);
+
+		$parameters = self::$apiQueryParameters;
+		$parameters['pltitles'] = "User:" . $onWikiName;
+
+		try {
+			$endpoint = $this->siteConfiguration->getMetaWikimediaWebServiceEndpoint();
+			$response = $this->httpHelper->get($endpoint, $parameters);
+			$response = json_decode($response, true);
+		} catch (CurlException $ex) {
+			// failed getting identification status, so throw a nicer error.
+			$m = 'Could not contact metawiki API to determine user\' identification status. '
+				. 'This is probably a transient error, so please try again.';
+
+			throw new EnvironmentException($m, 0, $ex);
+		}
+
+		$page = @array_pop($response['query']['pages']);
+
+		return @$page['links'][0]['title'] === "User:" . $onWikiName;
+	}
 }

Braces +4 added lines, -5 removed lines

@@ -75,14 +75,12 @@ 
     {
         if ($this->checkIdentificationCache($onWikiName)) {
             return true;
-        }
-        else {
+        } else {
             if ($this->isIdentifiedOnWiki($onWikiName)) {
                 $this->cacheIdentificationStatus($onWikiName);
 
                 return true;
-            }
-            else {
+            } else {
                 return false;
             }
         }
@@ -187,7 +185,8 @@ 
             $endpoint = $this->siteConfiguration->getMetaWikimediaWebServiceEndpoint();
             $response = $this->httpHelper->get($endpoint, $parameters);
             $response = json_decode($response, true);
-        } catch (CurlException $ex) {
+        }
+        catch (CurlException $ex) {
             // failed getting identification status, so throw a nicer error.
             $m = 'Could not contact metawiki API to determine user\' identification status. '
                 . 'This is probably a transient error, so please try again.';

includes/ConsoleTasks/ClearOldDataTask.php

Indentation +13 added lines, -13 removed lines

@@ -13,25 +13,25 @@
 
 class ClearOldDataTask extends ConsoleTaskBase
 {
-    public function execute()
-    {
-        $dataClearInterval = $this->getSiteConfiguration()->getDataClearInterval();
+	public function execute()
+	{
+		$dataClearInterval = $this->getSiteConfiguration()->getDataClearInterval();
 
-        $query = $this->getDatabase()->prepare(<<<SQL
+		$query = $this->getDatabase()->prepare(<<<SQL
 UPDATE request
 SET ip = :ip, forwardedip = null, email = :mail, useragent = ''
 WHERE date < DATE_SUB(curdate(), INTERVAL {$dataClearInterval})
 AND status = 'Closed';
 SQL
-        );
+		);
 
-        $success = $query->execute(array(
-            ":ip"   => $this->getSiteConfiguration()->getDataClearIp(),
-            ":mail" => $this->getSiteConfiguration()->getDataClearEmail(),
-        ));
+		$success = $query->execute(array(
+			":ip"   => $this->getSiteConfiguration()->getDataClearIp(),
+			":mail" => $this->getSiteConfiguration()->getDataClearEmail(),
+		));
 
-        if (!$success) {
-            throw new Exception("Error in transaction: Could not clear data.");
-        }
-    }
+		if (!$success) {
+			throw new Exception("Error in transaction: Could not clear data.");
+		}
+	}
 }
\ No newline at end of file

includes/ConsoleTasks/ClearExpiredIdentificationData.php

Indentation +7 added lines, -7 removed lines

@@ -13,11 +13,11 @@
 
 class ClearExpiredIdentificationData extends ConsoleTaskBase
 {
-    /**
-     * @return void
-     */
-    public function execute()
-    {
-        IdentificationVerifier::clearExpiredCacheEntries($this->getSiteConfiguration(), $this->getDatabase());
-    }
+	/**
+	 * @return void
+	 */
+	public function execute()
+	{
+		IdentificationVerifier::clearExpiredCacheEntries($this->getSiteConfiguration(), $this->getDatabase());
+	}
 }

includes/ConsoleTasks/ClearOAuthDataTask.php

Indentation +9 added lines, -9 removed lines

@@ -12,14 +12,14 @@ 
 
 class ClearOAuthDataTask extends ConsoleTaskBase
 {
-    public function execute()
-    {
-        // @fixme this is unsafe.
-        // What we should be doing is iterating over all OAuth users, fetching their username, and updating the onwiki
-        // name for the user at the same time as blatting out the OAuth credentials, otherwise we risk losing all links
-        // to the user's onwiki account.
+	public function execute()
+	{
+		// @fixme this is unsafe.
+		// What we should be doing is iterating over all OAuth users, fetching their username, and updating the onwiki
+		// name for the user at the same time as blatting out the OAuth credentials, otherwise we risk losing all links
+		// to the user's onwiki account.
 
-        $this->getDatabase()->exec(<<<SQL
+		$this->getDatabase()->exec(<<<SQL
         UPDATE user
         SET
             oauthrequesttoken = NULL,
@@ -28,6 +28,6 @@ 
             oauthaccesssecret = NULL,
             oauthidentitycache = NULL;
 SQL
-        );
-    }
+		);
+	}
 }
\ No newline at end of file

includes/ConsoleTasks/OldRequestCleanupTask.php

Indentation +15 added lines, -15 removed lines

@@ -12,28 +12,28 @@
 
 class OldRequestCleanupTask extends ConsoleTaskBase
 {
-    private $expiryTime;
+	private $expiryTime;
 
-    /**
-     * OldRequestCleanupTask constructor.
-     */
-    public function __construct()
-    {
-        $this->expiryTime = $this->getSiteConfiguration()->getEmailConfirmationExpiryDays();
-    }
+	/**
+	 * OldRequestCleanupTask constructor.
+	 */
+	public function __construct()
+	{
+		$this->expiryTime = $this->getSiteConfiguration()->getEmailConfirmationExpiryDays();
+	}
 
-    public function execute()
-    {
-        $statement = $this->getDatabase()->prepare(<<<SQL
+	public function execute()
+	{
+		$statement = $this->getDatabase()->prepare(<<<SQL
             DELETE FROM request
             WHERE
                 date < DATE_SUB(CURRENT_TIMESTAMP(), INTERVAL :expiry DAY)
                 AND emailconfirm != 'Confirmed'
                 AND emailconfirm != '';
 SQL
-        );
+		);
 
-        $statement->bindValue(':expiry', $this->expiryTime);
-        $statement->execute();
-    }
+		$statement->bindValue(':expiry', $this->expiryTime);
+		$statement->execute();
+	}
 }
\ No newline at end of file

includes/ConsoleTasks/RecreateTrustedIpTableTask.php

Indentation +148 added lines, -148 removed lines

@@ -16,152 +16,152 @@
 
 class RecreateTrustedIpTableTask extends ConsoleTaskBase
 {
-    public function execute()
-    {
-
-        echo "Fetching file...\n";
-
-        $htmlfile = file($this->getSiteConfiguration()->getXffTrustedHostsFile(),
-            FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-
-        $ip = array();
-        $iprange = array();
-        $dnsdomain = array();
-
-        echo "Sorting file...\n";
-        $this->readFile($htmlfile, $iprange, $ip, $dnsdomain);
-
-        echo "Exploding CIDRs...\n";
-        $this->explodeCidrs($iprange, $ip);
-
-        echo "Resolving DNS...\n";
-        $this->resolveDns($dnsdomain, $ip);
-
-        echo "Uniq-ing array...\n";
-
-        $ip = array_unique($ip);
-
-        $database = $this->getDatabase();
-
-        $database->exec('DELETE FROM xfftrustcache;');
-
-        $insert = $database->prepare('INSERT INTO xfftrustcache (ip) VALUES (:ip);');
-
-        $this->doInserts($ip, $insert);
-    }
-
-    /**
-     * @param string[] $dnsDomains  the DNS domains to resolve
-     * @param string[] $ipAddresses existing array of IPs to add to
-     */
-    protected function resolveDns($dnsDomains, &$ipAddresses)
-    {
-        foreach ($dnsDomains as $domain) {
-            $ipList = gethostbynamel($domain);
-
-            if ($ipList === false) {
-                echo "Invalid DNS name $domain\n";
-                continue;
-            }
-
-            foreach ($ipList as $ipAddress) {
-                $ipAddresses[] = $ipAddress;
-            }
-
-            // don't DoS
-            usleep(10000);
-        }
-    }
-
-    /**
-     * @param $iprange
-     * @param $ip
-     */
-    protected function explodeCidrs($iprange, &$ip)
-    {
-        foreach ($iprange as $r) {
-            $ips = $this->getXffTrustProvider()->explodeCidr($r);
-
-            foreach ($ips as $i) {
-                $ip[] = $i;
-            }
-        }
-    }
-
-    /**
-     * @param $htmlfile
-     * @param $iprange
-     * @param $ip
-     * @param $dnsdomain
-     */
-    protected function readFile($htmlfile, &$iprange, &$ip, &$dnsdomain)
-    {
-        foreach ($htmlfile as $line_num => $rawline) {
-            // remove the comments
-            $hashPos = strpos($rawline, '#');
-            if ($hashPos !== false) {
-                $line = substr($rawline, 0, $hashPos);
-            }
-            else {
-                $line = $rawline;
-            }
-
-            $line = trim($line);
-
-            // this was a comment or empty line...
-            if ($line == "") {
-                continue;
-            }
-
-            // match a regex of an CIDR range:
-            $ipcidr = '@' . RegexConstants::IPV4 . RegexConstants::IPV4_CIDR . '@';
-            if (preg_match($ipcidr, $line) === 1) {
-                $iprange[] = $line;
-                continue;
-            }
-
-            $ipnoncidr = '@' . RegexConstants::IPV4 . '@';
-            if (preg_match($ipnoncidr, $line) === 1) {
-                $ip[] = $line;
-                continue;
-            }
-
-            // it's probably a DNS name.
-            $dnsdomain[] = $line;
-        }
-    }
-
-    /**
-     * @param array        $ip
-     * @param PDOStatement $insert
-     *
-     * @throws Exception
-     */
-    protected function doInserts($ip, PDOStatement $insert)
-    {
-        $successful = true;
-
-        foreach ($ip as $i) {
-            if (count($i) > 15) {
-                echo "Rejected $i\n";
-                $successful = false;
-
-                continue;
-            }
-
-            try {
-                $insert->execute(array(':ip' => $i));
-            }
-            catch (PDOException $ex) {
-                echo "Exception on $i :\n";
-                echo $ex->getMessage();
-                $successful = false;
-                break;
-            }
-        }
-
-        if (!$successful) {
-            throw new Exception('Encountered errors during transaction processing');
-        }
-    }
+	public function execute()
+	{
+
+		echo "Fetching file...\n";
+
+		$htmlfile = file($this->getSiteConfiguration()->getXffTrustedHostsFile(),
+			FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+
+		$ip = array();
+		$iprange = array();
+		$dnsdomain = array();
+
+		echo "Sorting file...\n";
+		$this->readFile($htmlfile, $iprange, $ip, $dnsdomain);
+
+		echo "Exploding CIDRs...\n";
+		$this->explodeCidrs($iprange, $ip);
+
+		echo "Resolving DNS...\n";
+		$this->resolveDns($dnsdomain, $ip);
+
+		echo "Uniq-ing array...\n";
+
+		$ip = array_unique($ip);
+
+		$database = $this->getDatabase();
+
+		$database->exec('DELETE FROM xfftrustcache;');
+
+		$insert = $database->prepare('INSERT INTO xfftrustcache (ip) VALUES (:ip);');
+
+		$this->doInserts($ip, $insert);
+	}
+
+	/**
+	 * @param string[] $dnsDomains  the DNS domains to resolve
+	 * @param string[] $ipAddresses existing array of IPs to add to
+	 */
+	protected function resolveDns($dnsDomains, &$ipAddresses)
+	{
+		foreach ($dnsDomains as $domain) {
+			$ipList = gethostbynamel($domain);
+
+			if ($ipList === false) {
+				echo "Invalid DNS name $domain\n";
+				continue;
+			}
+
+			foreach ($ipList as $ipAddress) {
+				$ipAddresses[] = $ipAddress;
+			}
+
+			// don't DoS
+			usleep(10000);
+		}
+	}
+
+	/**
+	 * @param $iprange
+	 * @param $ip
+	 */
+	protected function explodeCidrs($iprange, &$ip)
+	{
+		foreach ($iprange as $r) {
+			$ips = $this->getXffTrustProvider()->explodeCidr($r);
+
+			foreach ($ips as $i) {
+				$ip[] = $i;
+			}
+		}
+	}
+
+	/**
+	 * @param $htmlfile
+	 * @param $iprange
+	 * @param $ip
+	 * @param $dnsdomain
+	 */
+	protected function readFile($htmlfile, &$iprange, &$ip, &$dnsdomain)
+	{
+		foreach ($htmlfile as $line_num => $rawline) {
+			// remove the comments
+			$hashPos = strpos($rawline, '#');
+			if ($hashPos !== false) {
+				$line = substr($rawline, 0, $hashPos);
+			}
+			else {
+				$line = $rawline;
+			}
+
+			$line = trim($line);
+
+			// this was a comment or empty line...
+			if ($line == "") {
+				continue;
+			}
+
+			// match a regex of an CIDR range:
+			$ipcidr = '@' . RegexConstants::IPV4 . RegexConstants::IPV4_CIDR . '@';
+			if (preg_match($ipcidr, $line) === 1) {
+				$iprange[] = $line;
+				continue;
+			}
+
+			$ipnoncidr = '@' . RegexConstants::IPV4 . '@';
+			if (preg_match($ipnoncidr, $line) === 1) {
+				$ip[] = $line;
+				continue;
+			}
+
+			// it's probably a DNS name.
+			$dnsdomain[] = $line;
+		}
+	}
+
+	/**
+	 * @param array        $ip
+	 * @param PDOStatement $insert
+	 *
+	 * @throws Exception
+	 */
+	protected function doInserts($ip, PDOStatement $insert)
+	{
+		$successful = true;
+
+		foreach ($ip as $i) {
+			if (count($i) > 15) {
+				echo "Rejected $i\n";
+				$successful = false;
+
+				continue;
+			}
+
+			try {
+				$insert->execute(array(':ip' => $i));
+			}
+			catch (PDOException $ex) {
+				echo "Exception on $i :\n";
+				echo $ex->getMessage();
+				$successful = false;
+				break;
+			}
+		}
+
+		if (!$successful) {
+			throw new Exception('Encountered errors during transaction processing');
+		}
+	}
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -101,8 +101,7 @@
             $hashPos = strpos($rawline, '#');
             if ($hashPos !== false) {
                 $line = substr($rawline, 0, $hashPos);
-            }
-            else {
+            } else {
                 $line = $rawline;
             }
 

includes/ConsoleTasks/MigrateToRoles.php

Indentation +41 added lines, -41 removed lines

@@ -16,55 +16,55 @@
 
 class MigrateToRoles extends ConsoleTaskBase
 {
-    public function execute()
-    {
-        $communityUser = User::getCommunity();
+	public function execute()
+	{
+		$communityUser = User::getCommunity();
 
-        $database = $this->getDatabase();
-        $statement = $database->query('SELECT id, status, checkuser FROM user;');
-        $update = $database->prepare("UPDATE user SET status = 'Active' WHERE id = :id;");
+		$database = $this->getDatabase();
+		$statement = $database->query('SELECT id, status, checkuser FROM user;');
+		$update = $database->prepare("UPDATE user SET status = 'Active' WHERE id = :id;");
 
-        $users = $statement->fetchAll(PDO::FETCH_ASSOC);
+		$users = $statement->fetchAll(PDO::FETCH_ASSOC);
 
-        foreach ($users as $user) {
-            $toAdd = array('user');
+		foreach ($users as $user) {
+			$toAdd = array('user');
 
-            if($user['status'] === 'Admin'){
-                $toAdd[] = 'admin';
-            }
+			if($user['status'] === 'Admin'){
+				$toAdd[] = 'admin';
+			}
 
-            if($user['checkuser'] == 1){
-                $toAdd[] = 'checkuser';
-            }
+			if($user['checkuser'] == 1){
+				$toAdd[] = 'checkuser';
+			}
 
-            foreach ($toAdd as $x) {
-                $a = new UserRole();
-                $a->setUser($user['id']);
-                $a->setRole($x);
-                $a->setDatabase($database);
-                $a->save();
-            }
+			foreach ($toAdd as $x) {
+				$a = new UserRole();
+				$a->setUser($user['id']);
+				$a->setRole($x);
+				$a->setDatabase($database);
+				$a->save();
+			}
 
-            $logData = serialize(array(
-                'added' => $toAdd,
-                'removed' => array(),
-                'reason' => 'Initial migration'
-            ));
+			$logData = serialize(array(
+				'added' => $toAdd,
+				'removed' => array(),
+				'reason' => 'Initial migration'
+			));
 
-            $log = new Log();
-            $log->setDatabase($database);
-            $log->setAction('RoleChange');
-            $log->setObjectId($user['id']);
-            $log->setObjectType('User');
-            $log->setUser($communityUser);
-            $log->setComment($logData);
-            $log->save();
+			$log = new Log();
+			$log->setDatabase($database);
+			$log->setAction('RoleChange');
+			$log->setObjectId($user['id']);
+			$log->setObjectType('User');
+			$log->setUser($communityUser);
+			$log->setComment($logData);
+			$log->save();
 
-            if($user['status'] === 'Admin' || $user['status'] === 'User'){
-                $update->execute(array('id' => $user['id']));
-            }
-        }
+			if($user['status'] === 'Admin' || $user['status'] === 'User'){
+				$update->execute(array('id' => $user['id']));
+			}
+		}
 
-        $database->exec("UPDATE schemaversion SET version = 25;");
-    }
+		$database->exec("UPDATE schemaversion SET version = 25;");
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -29,11 +29,11 @@ 
         foreach ($users as $user) {
             $toAdd = array('user');
 
-            if($user['status'] === 'Admin'){
+            if ($user['status'] === 'Admin') {
                 $toAdd[] = 'admin';
             }
 
-            if($user['checkuser'] == 1){
+            if ($user['checkuser'] == 1) {
                 $toAdd[] = 'checkuser';
             }
 
@@ -60,7 +60,7 @@ 
             $log->setComment($logData);
             $log->save();
 
-            if($user['status'] === 'Admin' || $user['status'] === 'User'){
+            if ($user['status'] === 'Admin' || $user['status'] === 'User') {
                 $update->execute(array('id' => $user['id']));
             }
         }

Braces +3 added lines, -3 removed lines

@@ -29,11 +29,11 @@ 
         foreach ($users as $user) {
             $toAdd = array('user');
 
-            if($user['status'] === 'Admin'){
+            if($user['status'] === 'Admin') {
                 $toAdd[] = 'admin';
             }
 
-            if($user['checkuser'] == 1){
+            if($user['checkuser'] == 1) {
                 $toAdd[] = 'checkuser';
             }
 
@@ -60,7 +60,7 @@ 
             $log->setComment($logData);
             $log->save();
 
-            if($user['status'] === 'Admin' || $user['status'] === 'User'){
+            if($user['status'] === 'Admin' || $user['status'] === 'User') {
                 $update->execute(array('id' => $user['id']));
             }
         }