mdaniels5757 / waca

includes/Providers/GlobalState/FakeGlobalStateProvider.php

Indentation +25 added lines, -25 removed lines

@@ -18,34 +18,34 @@
  */
 class FakeGlobalStateProvider extends GlobalStateProvider implements IGlobalStateProvider
 {
-    var $server = array();
-    var $get = array();
-    var $post = array();
-    var $session = array();
-    var $cookie = array();
+	var $server = array();
+	var $get = array();
+	var $post = array();
+	var $session = array();
+	var $cookie = array();
 
-    public function &getServerSuperGlobal()
-    {
-        return $this->server;
-    }
+	public function &getServerSuperGlobal()
+	{
+		return $this->server;
+	}
 
-    public function &getGetSuperGlobal()
-    {
-        return $this->get;
-    }
+	public function &getGetSuperGlobal()
+	{
+		return $this->get;
+	}
 
-    public function &getPostSuperGlobal()
-    {
-        return $this->post;
-    }
+	public function &getPostSuperGlobal()
+	{
+		return $this->post;
+	}
 
-    public function &getSessionSuperGlobal()
-    {
-        return $this->session;
-    }
+	public function &getSessionSuperGlobal()
+	{
+		return $this->session;
+	}
 
-    public function &getCookieSuperGlobal()
-    {
-        return $this->cookie;
-    }
+	public function &getCookieSuperGlobal()
+	{
+		return $this->cookie;
+	}
 }
\ No newline at end of file

includes/Providers/XffTrustProvider.php

Indentation +152 added lines, -152 removed lines

@@ -22,156 +22,156 @@
  */
 class XffTrustProvider implements IXffTrustProvider
 {
-    /**
-     * Array of IP addresses which are TRUSTED proxies
-     * @var string[]
-     */
-    private $trustedCache;
-    /**
-     * Array of IP addresses which are UNTRUSTED proxies
-     * @var string[]
-     */
-    private $untrustedCache = array();
-    /** @var PDOStatement */
-    private $trustedQuery;
-    /**
-     * @var PdoDatabase
-     */
-    private $database;
-
-    /**
-     * Creates a new instance of the trust provider
-     *
-     * @param string[]    $squidIpList List of IP addresses to pre-approve
-     * @param PdoDatabase $database
-     */
-    public function __construct($squidIpList, PdoDatabase $database)
-    {
-        $this->trustedCache = $squidIpList;
-        $this->database = $database;
-    }
-
-    /**
-     * Returns a value if the IP address is a trusted proxy
-     *
-     * @param string $ip
-     *
-     * @return bool
-     */
-    public function isTrusted($ip)
-    {
-        if (in_array($ip, $this->trustedCache)) {
-            return true;
-        }
-
-        if (in_array($ip, $this->untrustedCache)) {
-            return false;
-        }
-
-        if ($this->trustedQuery === null) {
-            $query = "SELECT COUNT(id) FROM xfftrustcache WHERE ip = :ip;";
-            $this->trustedQuery = $this->database->prepare($query);
-        }
-
-        $this->trustedQuery->execute(array(":ip" => $ip));
-        $result = $this->trustedQuery->fetchColumn();
-        $this->trustedQuery->closeCursor();
-
-        if ($result == 0) {
-            $this->untrustedCache[] = $ip;
-
-            return false;
-        }
-
-        if ($result >= 1) {
-            $this->trustedCache[] = $ip;
-
-            return true;
-        }
-
-        // something weird has happened if we've got here.
-        // default to untrusted.
-        return false;
-    }
-
-    /**
-     * Gets the last trusted IP in the proxy chain.
-     *
-     * @param string $ip      The IP address from REMOTE_ADDR
-     * @param string $proxyIp The contents of the XFF header.
-     *
-     * @return string Trusted source IP address
-     */
-    public function getTrustedClientIp($ip, $proxyIp)
-    {
-        $clientIpAddress = $ip;
-        if ($proxyIp) {
-            $ipList = explode(",", $proxyIp);
-            $ipList[] = $clientIpAddress;
-            $ipList = array_reverse($ipList);
-
-            foreach ($ipList as $ipNumber => $ipAddress) {
-                if ($this->isTrusted(trim($ipAddress)) && $ipNumber < (count($ipList) - 1)) {
-                    continue;
-                }
-
-                $clientIpAddress = $ipAddress;
-                break;
-            }
-        }
-
-        return $clientIpAddress;
-    }
-
-    /**
-     * Takes an array( "low" => "high" ) values, and returns true if $needle is in at least one of them.
-     *
-     * @param array  $haystack
-     * @param string $ip
-     *
-     * @return bool
-     */
-    public function ipInRange($haystack, $ip)
-    {
-        $needle = ip2long($ip);
-
-        foreach ($haystack as $low => $high) {
-            if (ip2long($low) <= $needle && ip2long($high) >= $needle) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Explodes a CIDR range into an array of addresses
-     *
-     * @param string $range A CIDR-format range
-     *
-     * @return array An array containing every IP address in the range
-     */
-    public function explodeCidr($range)
-    {
-        $cidrData = explode('/', $range);
-
-        if (!isset($cidrData[1])) {
-            return array($range);
-        }
-
-        $blow = (
-            str_pad(decbin(ip2long($cidrData[0])), 32, "0", STR_PAD_LEFT) &
-            str_pad(str_pad("", $cidrData[1], "1"), 32, "0")
-        );
-        $bhigh = ($blow | str_pad(str_pad("", $cidrData[1], "0"), 32, "1"));
-
-        $list = array();
-
-        $bindecBHigh = bindec($bhigh);
-        for ($x = bindec($blow); $x <= $bindecBHigh; $x++) {
-            $list[] = long2ip($x);
-        }
-
-        return $list;
-    }
+	/**
+	 * Array of IP addresses which are TRUSTED proxies
+	 * @var string[]
+	 */
+	private $trustedCache;
+	/**
+	 * Array of IP addresses which are UNTRUSTED proxies
+	 * @var string[]
+	 */
+	private $untrustedCache = array();
+	/** @var PDOStatement */
+	private $trustedQuery;
+	/**
+	 * @var PdoDatabase
+	 */
+	private $database;
+
+	/**
+	 * Creates a new instance of the trust provider
+	 *
+	 * @param string[]    $squidIpList List of IP addresses to pre-approve
+	 * @param PdoDatabase $database
+	 */
+	public function __construct($squidIpList, PdoDatabase $database)
+	{
+		$this->trustedCache = $squidIpList;
+		$this->database = $database;
+	}
+
+	/**
+	 * Returns a value if the IP address is a trusted proxy
+	 *
+	 * @param string $ip
+	 *
+	 * @return bool
+	 */
+	public function isTrusted($ip)
+	{
+		if (in_array($ip, $this->trustedCache)) {
+			return true;
+		}
+
+		if (in_array($ip, $this->untrustedCache)) {
+			return false;
+		}
+
+		if ($this->trustedQuery === null) {
+			$query = "SELECT COUNT(id) FROM xfftrustcache WHERE ip = :ip;";
+			$this->trustedQuery = $this->database->prepare($query);
+		}
+
+		$this->trustedQuery->execute(array(":ip" => $ip));
+		$result = $this->trustedQuery->fetchColumn();
+		$this->trustedQuery->closeCursor();
+
+		if ($result == 0) {
+			$this->untrustedCache[] = $ip;
+
+			return false;
+		}
+
+		if ($result >= 1) {
+			$this->trustedCache[] = $ip;
+
+			return true;
+		}
+
+		// something weird has happened if we've got here.
+		// default to untrusted.
+		return false;
+	}
+
+	/**
+	 * Gets the last trusted IP in the proxy chain.
+	 *
+	 * @param string $ip      The IP address from REMOTE_ADDR
+	 * @param string $proxyIp The contents of the XFF header.
+	 *
+	 * @return string Trusted source IP address
+	 */
+	public function getTrustedClientIp($ip, $proxyIp)
+	{
+		$clientIpAddress = $ip;
+		if ($proxyIp) {
+			$ipList = explode(",", $proxyIp);
+			$ipList[] = $clientIpAddress;
+			$ipList = array_reverse($ipList);
+
+			foreach ($ipList as $ipNumber => $ipAddress) {
+				if ($this->isTrusted(trim($ipAddress)) && $ipNumber < (count($ipList) - 1)) {
+					continue;
+				}
+
+				$clientIpAddress = $ipAddress;
+				break;
+			}
+		}
+
+		return $clientIpAddress;
+	}
+
+	/**
+	 * Takes an array( "low" => "high" ) values, and returns true if $needle is in at least one of them.
+	 *
+	 * @param array  $haystack
+	 * @param string $ip
+	 *
+	 * @return bool
+	 */
+	public function ipInRange($haystack, $ip)
+	{
+		$needle = ip2long($ip);
+
+		foreach ($haystack as $low => $high) {
+			if (ip2long($low) <= $needle && ip2long($high) >= $needle) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Explodes a CIDR range into an array of addresses
+	 *
+	 * @param string $range A CIDR-format range
+	 *
+	 * @return array An array containing every IP address in the range
+	 */
+	public function explodeCidr($range)
+	{
+		$cidrData = explode('/', $range);
+
+		if (!isset($cidrData[1])) {
+			return array($range);
+		}
+
+		$blow = (
+			str_pad(decbin(ip2long($cidrData[0])), 32, "0", STR_PAD_LEFT) &
+			str_pad(str_pad("", $cidrData[1], "1"), 32, "0")
+		);
+		$bhigh = ($blow | str_pad(str_pad("", $cidrData[1], "0"), 32, "1"));
+
+		$list = array();
+
+		$bindecBHigh = bindec($bhigh);
+		for ($x = bindec($blow); $x <= $bindecBHigh; $x++) {
+			$list[] = long2ip($x);
+		}
+
+		return $list;
+	}
 }

includes/Providers/IpLocationProvider.php

Indentation +103 added lines, -103 removed lines

@@ -21,107 +21,107 @@
  */
 class IpLocationProvider implements ILocationProvider
 {
-    /** @var string */
-    private $apiKey;
-    /** @var PdoDatabase */
-    private $database;
-    /** @var HttpHelper */
-    private $httpHelper;
-
-    /**
-     * IpLocationProvider constructor.
-     *
-     * @param PdoDatabase $database
-     * @param string      $apiKey
-     * @param HttpHelper  $httpHelper
-     */
-    public function __construct(PdoDatabase $database, $apiKey, HttpHelper $httpHelper)
-    {
-        $this->database = $database;
-        $this->apiKey = $apiKey;
-        $this->httpHelper = $httpHelper;
-    }
-
-    /**
-     * @param string $address
-     *
-     * @return array|null
-     * @throws Exception
-     * @throws OptimisticLockFailedException
-     */
-    public function getIpLocation($address)
-    {
-        $address = trim($address);
-
-        // lets look in our database first.
-        $location = GeoLocation::getByAddress($address, $this->database, true);
-
-        if ($location != null) {
-            // touch cache timer
-            $location->save();
-
-            return $location->getData();
-        }
-
-        // OK, it's not there, let's do an IP2Location lookup.
-        $result = $this->getResult($address);
-
-        if ($result != null) {
-            $location = new GeoLocation();
-            $location->setDatabase($this->database);
-            $location->setAddress($address);
-            $location->setData($result);
-            $location->save();
-
-            return $result;
-        }
-
-        return null;
-    }
-
-    // adapted from http://www.ipinfodb.com/ip_location_api.php
-
-    /**
-     * @param string $ip
-     *
-     * @return array|null
-     */
-    private function getResult($ip)
-    {
-        try {
-            if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-                $xml = $this->httpHelper->get($this->getApiBase(), array(
-                    'key'    => $this->apiKey,
-                    'ip'     => $ip,
-                    'format' => 'xml',
-                ));
-
-                $response = @new SimpleXMLElement($xml);
-
-                $result = array();
-
-                foreach ($response as $field => $value) {
-                    $result[(string)$field] = (string)$value;
-                }
-
-                return $result;
-            }
-        }
-        catch (Exception $ex) {
-            return null;
-
-            // LOGME: do something smart here, or wherever we use this value.
-            // This is just a temp hack to squash errors on the UI for now.
-        }
-
-        return null;
-    }
-
-    /**
-     * @return string
-     */
-    protected function getApiBase()
-    {
-        return "http://api.ipinfodb.com/v3/ip-city/";
-    }
+	/** @var string */
+	private $apiKey;
+	/** @var PdoDatabase */
+	private $database;
+	/** @var HttpHelper */
+	private $httpHelper;
+
+	/**
+	 * IpLocationProvider constructor.
+	 *
+	 * @param PdoDatabase $database
+	 * @param string      $apiKey
+	 * @param HttpHelper  $httpHelper
+	 */
+	public function __construct(PdoDatabase $database, $apiKey, HttpHelper $httpHelper)
+	{
+		$this->database = $database;
+		$this->apiKey = $apiKey;
+		$this->httpHelper = $httpHelper;
+	}
+
+	/**
+	 * @param string $address
+	 *
+	 * @return array|null
+	 * @throws Exception
+	 * @throws OptimisticLockFailedException
+	 */
+	public function getIpLocation($address)
+	{
+		$address = trim($address);
+
+		// lets look in our database first.
+		$location = GeoLocation::getByAddress($address, $this->database, true);
+
+		if ($location != null) {
+			// touch cache timer
+			$location->save();
+
+			return $location->getData();
+		}
+
+		// OK, it's not there, let's do an IP2Location lookup.
+		$result = $this->getResult($address);
+
+		if ($result != null) {
+			$location = new GeoLocation();
+			$location->setDatabase($this->database);
+			$location->setAddress($address);
+			$location->setData($result);
+			$location->save();
+
+			return $result;
+		}
+
+		return null;
+	}
+
+	// adapted from http://www.ipinfodb.com/ip_location_api.php
+
+	/**
+	 * @param string $ip
+	 *
+	 * @return array|null
+	 */
+	private function getResult($ip)
+	{
+		try {
+			if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+				$xml = $this->httpHelper->get($this->getApiBase(), array(
+					'key'    => $this->apiKey,
+					'ip'     => $ip,
+					'format' => 'xml',
+				));
+
+				$response = @new SimpleXMLElement($xml);
+
+				$result = array();
+
+				foreach ($response as $field => $value) {
+					$result[(string)$field] = (string)$value;
+				}
+
+				return $result;
+			}
+		}
+		catch (Exception $ex) {
+			return null;
+
+			// LOGME: do something smart here, or wherever we use this value.
+			// This is just a temp hack to squash errors on the UI for now.
+		}
+
+		return null;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getApiBase()
+	{
+		return "http://api.ipinfodb.com/v3/ip-city/";
+	}
 }

includes/IdentificationVerifier.php

Indentation +160 added lines, -160 removed lines

@@ -26,133 +26,133 @@ 
  */
 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',
-        // Populated from SiteConfiguration->getIdentificationNoticeboardPage
-        'titles'   => '',
-        // 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
-     * @throws EnvironmentException
-     */
-    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',
+		// Populated from SiteConfiguration->getIdentificationNoticeboardPage
+		'titles'   => '',
+		// 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
+	 * @throws EnvironmentException
+	 */
+	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
@@ -161,45 +161,45 @@ 
 				`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->upperCaseFirst($onWikiName);
-
-        $parameters = self::$apiQueryParameters;
-        $parameters['pltitles'] = "User:" . $onWikiName;
-        $parameters['titles'] = $this->siteConfiguration->getIdentificationNoticeboardPage();
-
-        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.
-            $message = 'Could not contact metawiki API to determine user\' identification status. '
-                . 'This is probably a transient error, so please try again.';
-
-            throw new EnvironmentException($message);
-        }
-
-        $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->upperCaseFirst($onWikiName);
+
+		$parameters = self::$apiQueryParameters;
+		$parameters['pltitles'] = "User:" . $onWikiName;
+		$parameters['titles'] = $this->siteConfiguration->getIdentificationNoticeboardPage();
+
+		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.
+			$message = 'Could not contact metawiki API to determine user\' identification status. '
+				. 'This is probably a transient error, so please try again.';
+
+			throw new EnvironmentException($message);
+		}
+
+		$page = @array_pop($response['query']['pages']);
+
+		return @$page['links'][0]['title'] === "User:" . $onWikiName;
+	}
 }

Braces +4 added lines, -5 removed lines

@@ -77,14 +77,12 @@ 
     {
         if ($this->checkIdentificationCache($onWikiName)) {
             return true;
-        }
-        else {
+        } else {
             if ($this->isIdentifiedOnWiki($onWikiName)) {
                 $this->cacheIdentificationStatus($onWikiName);
 
                 return true;
-            }
-            else {
+            } else {
                 return false;
             }
         }
@@ -190,7 +188,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.
             $message = 'Could not contact metawiki API to determine user\' identification status. '
                 . 'This is probably a transient error, so please try again.';

includes/SessionAlert.php

Indentation +137 added lines, -137 removed lines

@@ -21,141 +21,141 @@
  */
 class SessionAlert
 {
-    private $message;
-    private $title;
-    private $type;
-    private $closable;
-    private $block;
-
-    /**
-     * @param string $message
-     * @param string $title
-     * @param string $type
-     * @param bool   $closable
-     * @param bool   $block
-     */
-    public function __construct($message, $title, $type = "alert-info", $closable = true, $block = true)
-    {
-        $this->message = $message;
-        $this->title = $title;
-        $this->type = $type;
-        $this->closable = $closable;
-        $this->block = $block;
-    }
-
-    /**
-     * Shows a quick one-liner message
-     *
-     * @param string $message
-     * @param string $type
-     */
-    public static function quick($message, $type = "alert-info")
-    {
-        self::append(new SessionAlert($message, "", $type, true, false));
-    }
-
-    /**
-     * @param SessionAlert $alert
-     */
-    public static function append(SessionAlert $alert)
-    {
-        $data = WebRequest::getSessionAlertData();
-        $data[] = serialize($alert);
-        WebRequest::setSessionAlertData($data);
-    }
-
-    /**
-     * Shows a quick one-liner success message
-     *
-     * @param string $message
-     */
-    public static function success($message)
-    {
-        self::append(new SessionAlert($message, "", "alert-success", true, true));
-    }
-
-    /**
-     * Shows a quick one-liner warning message
-     *
-     * @param string $message
-     * @param string $title
-     */
-    public static function warning($message, $title = "Warning!")
-    {
-        self::append(new SessionAlert($message, $title, "alert-warning", true, true));
-    }
-
-    /**
-     * Shows a quick one-liner error message
-     *
-     * @param string $message
-     * @param string $title
-     */
-    public static function error($message, $title = "Error!")
-    {
-        self::append(new SessionAlert($message, $title, "alert-danger", true, true));
-    }
-
-    /**
-     * Retrieves the alerts which have been saved to the session
-     * @return array
-     */
-    public static function getAlerts()
-    {
-        $alertData = array();
-
-        foreach (WebRequest::getSessionAlertData() as $a) {
-            $alertData[] = unserialize($a);
-        }
-
-        return $alertData;
-    }
-
-    /**
-     * Clears the alerts from the session
-     */
-    public static function clearAlerts()
-    {
-        WebRequest::clearSessionAlertData();
-    }
-
-    /**
-     * @return boolean
-     */
-    public function isBlock()
-    {
-        return $this->block;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function isClosable()
-    {
-        return $this->closable;
-    }
-
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->title;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
+	private $message;
+	private $title;
+	private $type;
+	private $closable;
+	private $block;
+
+	/**
+	 * @param string $message
+	 * @param string $title
+	 * @param string $type
+	 * @param bool   $closable
+	 * @param bool   $block
+	 */
+	public function __construct($message, $title, $type = "alert-info", $closable = true, $block = true)
+	{
+		$this->message = $message;
+		$this->title = $title;
+		$this->type = $type;
+		$this->closable = $closable;
+		$this->block = $block;
+	}
+
+	/**
+	 * Shows a quick one-liner message
+	 *
+	 * @param string $message
+	 * @param string $type
+	 */
+	public static function quick($message, $type = "alert-info")
+	{
+		self::append(new SessionAlert($message, "", $type, true, false));
+	}
+
+	/**
+	 * @param SessionAlert $alert
+	 */
+	public static function append(SessionAlert $alert)
+	{
+		$data = WebRequest::getSessionAlertData();
+		$data[] = serialize($alert);
+		WebRequest::setSessionAlertData($data);
+	}
+
+	/**
+	 * Shows a quick one-liner success message
+	 *
+	 * @param string $message
+	 */
+	public static function success($message)
+	{
+		self::append(new SessionAlert($message, "", "alert-success", true, true));
+	}
+
+	/**
+	 * Shows a quick one-liner warning message
+	 *
+	 * @param string $message
+	 * @param string $title
+	 */
+	public static function warning($message, $title = "Warning!")
+	{
+		self::append(new SessionAlert($message, $title, "alert-warning", true, true));
+	}
+
+	/**
+	 * Shows a quick one-liner error message
+	 *
+	 * @param string $message
+	 * @param string $title
+	 */
+	public static function error($message, $title = "Error!")
+	{
+		self::append(new SessionAlert($message, $title, "alert-danger", true, true));
+	}
+
+	/**
+	 * Retrieves the alerts which have been saved to the session
+	 * @return array
+	 */
+	public static function getAlerts()
+	{
+		$alertData = array();
+
+		foreach (WebRequest::getSessionAlertData() as $a) {
+			$alertData[] = unserialize($a);
+		}
+
+		return $alertData;
+	}
+
+	/**
+	 * Clears the alerts from the session
+	 */
+	public static function clearAlerts()
+	{
+		WebRequest::clearSessionAlertData();
+	}
+
+	/**
+	 * @return boolean
+	 */
+	public function isBlock()
+	{
+		return $this->block;
+	}
+
+	/**
+	 * @return boolean
+	 */
+	public function isClosable()
+	{
+		return $this->closable;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getType()
+	{
+		return $this->type;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getTitle()
+	{
+		return $this->title;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getMessage()
+	{
+		return $this->message;
+	}
 }

includes/RequestList.php

Indentation +10 added lines, -10 removed lines

@@ -16,14 +16,14 @@
  */
 class RequestList
 {
-    public $requests;
-    public $showPrivateData;
-    public $dataClearEmail;
-    public $dataClearIp;
-    public $relatedEmailRequests;
-    public $relatedIpRequests;
-    public $requestTrustedIp;
-    public $canBan;
-    public $canBreakReservation;
-    public $userList;
+	public $requests;
+	public $showPrivateData;
+	public $dataClearEmail;
+	public $dataClearIp;
+	public $relatedEmailRequests;
+	public $relatedIpRequests;
+	public $requestTrustedIp;
+	public $canBan;
+	public $canBreakReservation;
+	public $userList;
 }

includes/Router/ApiRequestRouter.php

Indentation +42 added lines, -42 removed lines

@@ -22,49 +22,49 @@
 
 class ApiRequestRouter implements IRequestRouter
 {
-    /**
-     * @return string[]
-     */
-    public static function getActionList()
-    {
-        return array("count", "status", "stats", "help", "monitor");
-    }
+	/**
+	 * @return string[]
+	 */
+	public static function getActionList()
+	{
+		return array("count", "status", "stats", "help", "monitor");
+	}
 
-    /**
-     * @return IRoutedTask
-     * @throws Exception
-     */
-    public function route()
-    {
-        $requestAction = WebRequest::getString('action');
+	/**
+	 * @return IRoutedTask
+	 * @throws Exception
+	 */
+	public function route()
+	{
+		$requestAction = WebRequest::getString('action');
 
-        switch ($requestAction) {
-            case "count":
-                $result = new CountAction();
-                break;
-            case "status":
-                $result = new StatusAction();
-                break;
-            case "stats":
-                $result = new StatsAction();
-                break;
-            case "help":
-                $result = new HelpAction();
-                break;
-            case "monitor":
-                $result = new MonitorAction();
-                break;
-            case "users":
-                $result = new JsUsersAction();
-                break;
-            case "templates":
-                $result = new JsTemplateConfirmsAction();
-                break;
-            default:
-                $result = new UnknownAction();
-                break;
-        }
+		switch ($requestAction) {
+			case "count":
+				$result = new CountAction();
+				break;
+			case "status":
+				$result = new StatusAction();
+				break;
+			case "stats":
+				$result = new StatsAction();
+				break;
+			case "help":
+				$result = new HelpAction();
+				break;
+			case "monitor":
+				$result = new MonitorAction();
+				break;
+			case "users":
+				$result = new JsUsersAction();
+				break;
+			case "templates":
+				$result = new JsTemplateConfirmsAction();
+				break;
+			default:
+				$result = new UnknownAction();
+				break;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 }

includes/Router/OAuthRequestRouter.php

Indentation +5 added lines, -5 removed lines

@@ -17,9 +17,9 @@
  */
 class OAuthRequestRouter extends RequestRouter
 {
-    protected function getRouteFromPath($pathInfo)
-    {
-        // Hardcode the route for this entry point
-        return array(PageOAuthCallback::class, 'authorise');
-    }
+	protected function getRouteFromPath($pathInfo)
+	{
+		// Hardcode the route for this entry point
+		return array(PageOAuthCallback::class, 'authorise');
+	}
 }
\ No newline at end of file

includes/DataObjects/OAuthIdentity.php

Indentation +284 added lines, -284 removed lines

@@ -16,51 +16,51 @@ 
 
 class OAuthIdentity extends DataObject
 {
-    #region Fields
-    /** @var int */
-    private $user;
-    /** @var string */
-    private $iss;
-    /** @var int */
-    private $sub;
-    /** @var string */
-    private $aud;
-    /** @var int */
-    private $exp;
-    /** @var int */
-    private $iat;
-    /** @var string */
-    private $username;
-    /** @var int */
-    private $editcount;
-    /** @var int */
-    private $confirmed_email;
-    /** @var int */
-    private $blocked;
-    /** @var string */
-    private $registered;
-    /** @var int */
-    private $checkuser;
-    /** @var int */
-    private $grantbasic;
-    /** @var int */
-    private $grantcreateaccount;
-    /** @var int */
-    private $granthighvolume;
-    /** @var int */
-    private $grantcreateeditmovepage;
-    #endregion
-
-    /**
-     * Saves a data object to the database, either updating or inserting a record.
-     * @return void
-     * @throws Exception
-     * @throws OptimisticLockFailedException
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            $statement = $this->dbObject->prepare(<<<SQL
+	#region Fields
+	/** @var int */
+	private $user;
+	/** @var string */
+	private $iss;
+	/** @var int */
+	private $sub;
+	/** @var string */
+	private $aud;
+	/** @var int */
+	private $exp;
+	/** @var int */
+	private $iat;
+	/** @var string */
+	private $username;
+	/** @var int */
+	private $editcount;
+	/** @var int */
+	private $confirmed_email;
+	/** @var int */
+	private $blocked;
+	/** @var string */
+	private $registered;
+	/** @var int */
+	private $checkuser;
+	/** @var int */
+	private $grantbasic;
+	/** @var int */
+	private $grantcreateaccount;
+	/** @var int */
+	private $granthighvolume;
+	/** @var int */
+	private $grantcreateeditmovepage;
+	#endregion
+
+	/**
+	 * Saves a data object to the database, either updating or inserting a record.
+	 * @return void
+	 * @throws Exception
+	 * @throws OptimisticLockFailedException
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			$statement = $this->dbObject->prepare(<<<SQL
                 INSERT INTO oauthidentity (
                     user, iss, sub, aud, exp, iat, username, editcount, confirmed_email, blocked, registered, checkuser, 
                     grantbasic, grantcreateaccount, granthighvolume, grantcreateeditmovepage
@@ -69,34 +69,34 @@ 
                     :checkuser, :grantbasic, :grantcreateaccount, :granthighvolume, :grantcreateeditmovepage
                 )
 SQL
-            );
-
-            $statement->bindValue(':user', $this->user);
-            $statement->bindValue(':iss', $this->iss);
-            $statement->bindValue(':sub', $this->sub);
-            $statement->bindValue(':aud', $this->aud);
-            $statement->bindValue(':exp', $this->exp);
-            $statement->bindValue(':iat', $this->iat);
-            $statement->bindValue(':username', $this->username);
-            $statement->bindValue(':editcount', $this->editcount);
-            $statement->bindValue(':confirmed_email', $this->confirmed_email);
-            $statement->bindValue(':blocked', $this->blocked);
-            $statement->bindValue(':registered', $this->registered);
-            $statement->bindValue(':checkuser', $this->checkuser);
-            $statement->bindValue(':grantbasic', $this->grantbasic);
-            $statement->bindValue(':grantcreateaccount', $this->grantcreateaccount);
-            $statement->bindValue(':granthighvolume', $this->granthighvolume);
-            $statement->bindValue(':grantcreateeditmovepage', $this->grantcreateeditmovepage);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            $statement = $this->dbObject->prepare(<<<SQL
+			);
+
+			$statement->bindValue(':user', $this->user);
+			$statement->bindValue(':iss', $this->iss);
+			$statement->bindValue(':sub', $this->sub);
+			$statement->bindValue(':aud', $this->aud);
+			$statement->bindValue(':exp', $this->exp);
+			$statement->bindValue(':iat', $this->iat);
+			$statement->bindValue(':username', $this->username);
+			$statement->bindValue(':editcount', $this->editcount);
+			$statement->bindValue(':confirmed_email', $this->confirmed_email);
+			$statement->bindValue(':blocked', $this->blocked);
+			$statement->bindValue(':registered', $this->registered);
+			$statement->bindValue(':checkuser', $this->checkuser);
+			$statement->bindValue(':grantbasic', $this->grantbasic);
+			$statement->bindValue(':grantcreateaccount', $this->grantcreateaccount);
+			$statement->bindValue(':granthighvolume', $this->granthighvolume);
+			$statement->bindValue(':grantcreateeditmovepage', $this->grantcreateeditmovepage);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			$statement = $this->dbObject->prepare(<<<SQL
                 UPDATE oauthidentity SET
                       iss                     = :iss
                     , sub                     = :sub
@@ -116,211 +116,211 @@ 
                     , updateversion           = updateversion + 1
                 WHERE  id = :id AND updateversion = :updateversion
 SQL
-            );
-
-            $statement->bindValue(':iss', $this->iss);
-            $statement->bindValue(':sub', $this->sub);
-            $statement->bindValue(':aud', $this->aud);
-            $statement->bindValue(':exp', $this->exp);
-            $statement->bindValue(':iat', $this->iat);
-            $statement->bindValue(':username', $this->username);
-            $statement->bindValue(':editcount', $this->editcount);
-            $statement->bindValue(':confirmed_email', $this->confirmed_email);
-            $statement->bindValue(':blocked', $this->blocked);
-            $statement->bindValue(':registered', $this->registered);
-            $statement->bindValue(':checkuser', $this->checkuser);
-            $statement->bindValue(':grantbasic', $this->grantbasic);
-            $statement->bindValue(':grantcreateaccount', $this->grantcreateaccount);
-            $statement->bindValue(':granthighvolume', $this->granthighvolume);
-            $statement->bindValue(':grantcreateeditmovepage', $this->grantcreateeditmovepage);
-
-            $statement->bindValue(':id', $this->id);
-            $statement->bindValue(':updateversion', $this->updateversion);
-
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
-
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
-
-            $this->updateversion++;
-        }
-    }
-
-    #region Properties
-
-    /**
-     * @return int
-     */
-    public function getUserId()
-    {
-        return $this->user;
-    }
-
-    /**
-     * @param int $user
-     */
-    public function setUserId($user)
-    {
-        $this->user = $user;
-    }
-
-    /**
-     * @return string
-     */
-    public function getIssuer()
-    {
-        return $this->iss;
-    }
-
-    /**
-     * @return int
-     */
-    public function getSubject()
-    {
-        return $this->sub;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAudience()
-    {
-        return $this->aud;
-    }
-
-    /**
-     * @return int
-     */
-    public function getExpirationTime()
-    {
-        return $this->exp;
-    }
-
-    /**
-     * @return int
-     */
-    public function getIssuedAtTime()
-    {
-        return $this->iat;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUsername()
-    {
-        return $this->username;
-    }
-
-    /**
-     * @return int
-     */
-    public function getEditCount()
-    {
-        return $this->editcount;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getConfirmedEmail()
-    {
-        return $this->confirmed_email == 1;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getBlocked()
-    {
-        return $this->blocked == 1;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRegistered()
-    {
-        return $this->registered;
-    }
-
-    public function getRegistrationDate()
-    {
-        return DateTimeImmutable::createFromFormat('YmdHis', $this->registered)->format('r');
-    }
-
-    public function getAccountAge()
-    {
-        $regDate = DateTimeImmutable::createFromFormat('YmdHis', $this->registered);
-        $interval = $regDate->diff(new DateTimeImmutable(), true);
-
-        return $interval->days;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getCheckuser()
-    {
-        return $this->checkuser == 1;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getGrantBasic()
-    {
-        return $this->grantbasic == 1;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getGrantCreateAccount()
-    {
-        return $this->grantcreateaccount == 1;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getGrantHighVolume()
-    {
-        return $this->granthighvolume == 1;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getGrantCreateEditMovePage()
-    {
-        return $this->grantcreateeditmovepage == 1;
-    }
-
-    #endregion Properties
-
-    /**
-     * Populates the fields of this instance from a provided JSON Web Token
-     *
-     * @param stdClass $jwt
-     */
-    public function populate($jwt)
-    {
-        $this->iss = $jwt->iss;
-        $this->sub = $jwt->sub;
-        $this->aud = $jwt->aud;
-        $this->exp = $jwt->exp;
-        $this->iat = $jwt->iat;
-        $this->username = $jwt->username;
-        $this->editcount = $jwt->editcount;
-        $this->confirmed_email = $jwt->confirmed_email ? 1 : 0;
-        $this->blocked = $jwt->blocked ? 1 : 0;
-        $this->registered = $jwt->registered;
-
-        /*
+			);
+
+			$statement->bindValue(':iss', $this->iss);
+			$statement->bindValue(':sub', $this->sub);
+			$statement->bindValue(':aud', $this->aud);
+			$statement->bindValue(':exp', $this->exp);
+			$statement->bindValue(':iat', $this->iat);
+			$statement->bindValue(':username', $this->username);
+			$statement->bindValue(':editcount', $this->editcount);
+			$statement->bindValue(':confirmed_email', $this->confirmed_email);
+			$statement->bindValue(':blocked', $this->blocked);
+			$statement->bindValue(':registered', $this->registered);
+			$statement->bindValue(':checkuser', $this->checkuser);
+			$statement->bindValue(':grantbasic', $this->grantbasic);
+			$statement->bindValue(':grantcreateaccount', $this->grantcreateaccount);
+			$statement->bindValue(':granthighvolume', $this->granthighvolume);
+			$statement->bindValue(':grantcreateeditmovepage', $this->grantcreateeditmovepage);
+
+			$statement->bindValue(':id', $this->id);
+			$statement->bindValue(':updateversion', $this->updateversion);
+
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
+
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
+
+			$this->updateversion++;
+		}
+	}
+
+	#region Properties
+
+	/**
+	 * @return int
+	 */
+	public function getUserId()
+	{
+		return $this->user;
+	}
+
+	/**
+	 * @param int $user
+	 */
+	public function setUserId($user)
+	{
+		$this->user = $user;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getIssuer()
+	{
+		return $this->iss;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getSubject()
+	{
+		return $this->sub;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getAudience()
+	{
+		return $this->aud;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getExpirationTime()
+	{
+		return $this->exp;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getIssuedAtTime()
+	{
+		return $this->iat;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUsername()
+	{
+		return $this->username;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getEditCount()
+	{
+		return $this->editcount;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getConfirmedEmail()
+	{
+		return $this->confirmed_email == 1;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getBlocked()
+	{
+		return $this->blocked == 1;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getRegistered()
+	{
+		return $this->registered;
+	}
+
+	public function getRegistrationDate()
+	{
+		return DateTimeImmutable::createFromFormat('YmdHis', $this->registered)->format('r');
+	}
+
+	public function getAccountAge()
+	{
+		$regDate = DateTimeImmutable::createFromFormat('YmdHis', $this->registered);
+		$interval = $regDate->diff(new DateTimeImmutable(), true);
+
+		return $interval->days;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getCheckuser()
+	{
+		return $this->checkuser == 1;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getGrantBasic()
+	{
+		return $this->grantbasic == 1;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getGrantCreateAccount()
+	{
+		return $this->grantcreateaccount == 1;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getGrantHighVolume()
+	{
+		return $this->granthighvolume == 1;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getGrantCreateEditMovePage()
+	{
+		return $this->grantcreateeditmovepage == 1;
+	}
+
+	#endregion Properties
+
+	/**
+	 * Populates the fields of this instance from a provided JSON Web Token
+	 *
+	 * @param stdClass $jwt
+	 */
+	public function populate($jwt)
+	{
+		$this->iss = $jwt->iss;
+		$this->sub = $jwt->sub;
+		$this->aud = $jwt->aud;
+		$this->exp = $jwt->exp;
+		$this->iat = $jwt->iat;
+		$this->username = $jwt->username;
+		$this->editcount = $jwt->editcount;
+		$this->confirmed_email = $jwt->confirmed_email ? 1 : 0;
+		$this->blocked = $jwt->blocked ? 1 : 0;
+		$this->registered = $jwt->registered;
+
+		/*
          * Rights we need:
          *  Account creation
          *      createaccount      => createaccount
@@ -342,11 +342,11 @@ 
          * Any antispoof conflicts will still have to be resolved manually using the normal creation form.
          */
 
-        $this->grantbasic = in_array('basic', $jwt->grants) ? 1 : 0;
-        $this->grantcreateaccount = in_array('createaccount', $jwt->grants) ? 1 : 0;
-        $this->grantcreateeditmovepage = in_array('createeditmovepage', $jwt->grants) ? 1 : 0;
-        $this->granthighvolume = in_array('highvolume', $jwt->grants) ? 1 : 0;
+		$this->grantbasic = in_array('basic', $jwt->grants) ? 1 : 0;
+		$this->grantcreateaccount = in_array('createaccount', $jwt->grants) ? 1 : 0;
+		$this->grantcreateeditmovepage = in_array('createeditmovepage', $jwt->grants) ? 1 : 0;
+		$this->granthighvolume = in_array('highvolume', $jwt->grants) ? 1 : 0;
 
-        $this->checkuser = in_array('checkuser-log', $jwt->rights) ? 1 : 0;
-    }
+		$this->checkuser = in_array('checkuser-log', $jwt->rights) ? 1 : 0;
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -90,12 +90,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             $statement = $this->dbObject->prepare(<<<SQL
                 UPDATE oauthidentity SET
                       iss                     = :iss