mdaniels5757 / waca

includes/Helpers/SearchHelpers/UserSearchHelper.php

Indentation +89 added lines, -89 removed lines

@@ -15,73 +15,73 @@ 
 
 class UserSearchHelper extends SearchHelperBase
 {
-    /**
-     * UserSearchHelper constructor.
-     *
-     * @param PdoDatabase $database
-     */
-    public function __construct(PdoDatabase $database)
-    {
-        parent::__construct($database, 'user', User::class);
-    }
-
-    /**
-     * Initiates a search for requests
-     *
-     * @param PdoDatabase $database
-     *
-     * @return UserSearchHelper
-     */
-    public static function get(PdoDatabase $database)
-    {
-        $helper = new UserSearchHelper($database);
-
-        return $helper;
-    }
-
-    /**
-     * @param string $status
-     *
-     * @return $this
-     */
-    public function byStatus($status)
-    {
-        $this->whereClause .= ' AND status = ?';
-        $this->parameterList[] = $status;
-
-        return $this;
-    }
-
-    public function statusIn($statuses)
-    {
-        $this->inClause('status', $statuses);
-
-        return $this;
-    }
-
-    /**
-     * @param string $role
-     *
-     * @return $this
-     */
-    public function byRole($role)
-    {
-        $this->joinClause .= ' INNER JOIN userrole r on origin.id = r.user';
-        $this->whereClause .= ' AND r.role = ?';
-        $this->parameterList[] = $role;
-
-        return $this;
-    }
-
-    /**
-     * @param DateTime $instant
-     *
-     * @return $this
-     */
-    public function lastActiveBefore(DateTime $instant)
-    {
-        $this->whereClause .= ' AND origin.lastactive < ? AND approvaldate.timestamp < ?';
-        $this->joinClause .= <<<'SQLFRAG'
+	/**
+	 * UserSearchHelper constructor.
+	 *
+	 * @param PdoDatabase $database
+	 */
+	public function __construct(PdoDatabase $database)
+	{
+		parent::__construct($database, 'user', User::class);
+	}
+
+	/**
+	 * Initiates a search for requests
+	 *
+	 * @param PdoDatabase $database
+	 *
+	 * @return UserSearchHelper
+	 */
+	public static function get(PdoDatabase $database)
+	{
+		$helper = new UserSearchHelper($database);
+
+		return $helper;
+	}
+
+	/**
+	 * @param string $status
+	 *
+	 * @return $this
+	 */
+	public function byStatus($status)
+	{
+		$this->whereClause .= ' AND status = ?';
+		$this->parameterList[] = $status;
+
+		return $this;
+	}
+
+	public function statusIn($statuses)
+	{
+		$this->inClause('status', $statuses);
+
+		return $this;
+	}
+
+	/**
+	 * @param string $role
+	 *
+	 * @return $this
+	 */
+	public function byRole($role)
+	{
+		$this->joinClause .= ' INNER JOIN userrole r on origin.id = r.user';
+		$this->whereClause .= ' AND r.role = ?';
+		$this->parameterList[] = $role;
+
+		return $this;
+	}
+
+	/**
+	 * @param DateTime $instant
+	 *
+	 * @return $this
+	 */
+	public function lastActiveBefore(DateTime $instant)
+	{
+		$this->whereClause .= ' AND origin.lastactive < ? AND approvaldate.timestamp < ?';
+		$this->joinClause .= <<<'SQLFRAG'
  LEFT JOIN (
     SELECT objectid, MAX(timestamp) timestamp 
     FROM log
@@ -89,16 +89,16 @@ 
     GROUP BY objectid
     ) approvaldate ON approvaldate.objectid = origin.id
 SQLFRAG;
-        $formattedDate = $instant->format("Y-m-d H:i:s");
-        $this->parameterList[] = $formattedDate;
-        $this->parameterList[] = $formattedDate;
+		$formattedDate = $instant->format("Y-m-d H:i:s");
+		$this->parameterList[] = $formattedDate;
+		$this->parameterList[] = $formattedDate;
 
-        return $this;
-    }
+		return $this;
+	}
 
-    public function getRoleMap(&$roleMap)
-    {
-        $query = <<<SQL
+	public function getRoleMap(&$roleMap)
+	{
+		$query = <<<SQL
             SELECT /* UserSearchHelper/roleMap */ 
                   r.user user
                 , group_concat(r.role SEPARATOR ', ') roles 
@@ -107,22 +107,22 @@ 
             GROUP BY r.user
 SQL;
 
-        $statement = $this->database->prepare($query);
-        $statement->execute($this->parameterList);
+		$statement = $this->database->prepare($query);
+		$statement->execute($this->parameterList);
 
-        $roleMap = array();
-        foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {
-            $roleMap[$row['user']] = $row['roles'];
-        }
+		$roleMap = array();
+		foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {
+			$roleMap[$row['user']] = $row['roles'];
+		}
 
-        return $this;
-    }
+		return $this;
+	}
 
-    public function withReservedRequest()
-    {
-        $this->joinClause = ' INNER JOIN request req ON req.reserved = origin.id';
-        $this->groupByClause = ' GROUP BY origin.id, origin.username';
+	public function withReservedRequest()
+	{
+		$this->joinClause = ' INNER JOIN request req ON req.reserved = origin.id';
+		$this->groupByClause = ' GROUP BY origin.id, origin.username';
 
-        return $this->fetchMap('username');
-    }
+		return $this->fetchMap('username');
+	}
 }

includes/Helpers/Interfaces/IMediaWikiClient.php

Indentation +1 added lines, -1 removed lines

@@ -10,5 +10,5 @@
 
 interface IMediaWikiClient
 {
-    function doApiCall($params, $method);
+	function doApiCall($params, $method);
 }
\ No newline at end of file

includes/Tasks/ApiPageBase.php

Indentation +18 added lines, -18 removed lines

@@ -12,24 +12,24 @@
 
 abstract class ApiPageBase extends TaskBase implements IRoutedTask, IApiAction
 {
-    final public function execute()
-    {
-        $this->main();
-    }
+	final public function execute()
+	{
+		$this->main();
+	}
 
-    /**
-     * @param string $routeName
-     */
-    public function setRoute($routeName)
-    {
-        // no-op
-    }
+	/**
+	 * @param string $routeName
+	 */
+	public function setRoute($routeName)
+	{
+		// no-op
+	}
 
-    /**
-     * @return string
-     */
-    public function getRouteName()
-    {
-        return 'main';
-    }
+	/**
+	 * @return string
+	 */
+	public function getRouteName()
+	{
+		return 'main';
+	}
 }

includes/Tasks/XmlApiPageBase.php

Indentation +73 added lines, -73 removed lines

@@ -17,77 +17,77 @@
 
 abstract class XmlApiPageBase extends ApiPageBase implements IXmlApiAction
 {
-    /**
-     * API result document
-     * @var DOMDocument
-     */
-    protected $document;
-
-    public function __construct()
-    {
-        $this->document = new DOMDocument('1.0');
-    }
-
-    /**
-     * Main function for this page, when no specific actions are called.
-     *
-     * @throws ApiException
-     * @return void
-     */
-    final protected function main()
-    {
-        if (headers_sent()) {
-            throw new ApiException('Headers have already been sent - this indicates a bug in the application!');
-        }
-
-        header("Content-Type: text/xml");
-
-        // javascript access control
-        $httpOrigin = WebRequest::origin();
-
-        if ($httpOrigin !== null) {
-            $CORSallowed = $this->getSiteConfiguration()->getCrossOriginResourceSharingHosts();
-
-            if (in_array($httpOrigin, $CORSallowed)) {
-                header("Access-Control-Allow-Origin: " . $httpOrigin);
-            }
-        }
-
-        $responseData = $this->runApiPage();
-
-        ob_end_clean();
-        print($responseData);
-        ob_start();
-    }
-
-    /**
-     * Method that runs API action
-     *
-     * @param DOMElement $apiDocument
-     *
-     * @return DOMElement
-     */
-    abstract public function executeApiAction(DOMElement $apiDocument);
-
-    /**
-     * @return string
-     */
-    final public function runApiPage()
-    {
-        $apiDocument = $this->document->createElement("api");
-
-        try {
-            $apiDocument = $this->executeApiAction($apiDocument);
-        }
-            /** @noinspection PhpRedundantCatchClauseInspection */
-        catch (ApiException $ex) {
-            $exception = $this->document->createElement("error");
-            $exception->setAttribute("message", $ex->getMessage());
-            $apiDocument->appendChild($exception);
-        }
-
-        $this->document->appendChild($apiDocument);
-
-        return $this->document->saveXML();
-    }
+	/**
+	 * API result document
+	 * @var DOMDocument
+	 */
+	protected $document;
+
+	public function __construct()
+	{
+		$this->document = new DOMDocument('1.0');
+	}
+
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 *
+	 * @throws ApiException
+	 * @return void
+	 */
+	final protected function main()
+	{
+		if (headers_sent()) {
+			throw new ApiException('Headers have already been sent - this indicates a bug in the application!');
+		}
+
+		header("Content-Type: text/xml");
+
+		// javascript access control
+		$httpOrigin = WebRequest::origin();
+
+		if ($httpOrigin !== null) {
+			$CORSallowed = $this->getSiteConfiguration()->getCrossOriginResourceSharingHosts();
+
+			if (in_array($httpOrigin, $CORSallowed)) {
+				header("Access-Control-Allow-Origin: " . $httpOrigin);
+			}
+		}
+
+		$responseData = $this->runApiPage();
+
+		ob_end_clean();
+		print($responseData);
+		ob_start();
+	}
+
+	/**
+	 * Method that runs API action
+	 *
+	 * @param DOMElement $apiDocument
+	 *
+	 * @return DOMElement
+	 */
+	abstract public function executeApiAction(DOMElement $apiDocument);
+
+	/**
+	 * @return string
+	 */
+	final public function runApiPage()
+	{
+		$apiDocument = $this->document->createElement("api");
+
+		try {
+			$apiDocument = $this->executeApiAction($apiDocument);
+		}
+			/** @noinspection PhpRedundantCatchClauseInspection */
+		catch (ApiException $ex) {
+			$exception = $this->document->createElement("error");
+			$exception->setAttribute("message", $ex->getMessage());
+			$apiDocument->appendChild($exception);
+		}
+
+		$this->document->appendChild($apiDocument);
+
+		return $this->document->saveXML();
+	}
 }

includes/ConsoleTasks/PrecacheGeolocationTask.php

Indentation +53 added lines, -53 removed lines

@@ -14,30 +14,30 @@ 
 
 class PrecacheGeolocationTask extends ConsoleTaskBase
 {
-    public function execute()
-    {
-        $database = $this->getDatabase();
-        $locationProvider = $this->getLocationProvider();
+	public function execute()
+	{
+		$database = $this->getDatabase();
+		$locationProvider = $this->getLocationProvider();
 
-        while (true) {
-            echo "Beginning txn\n";
-            $database->beginTransaction();
+		while (true) {
+			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 /* PrecacheGeolocationTask */ p.prox
                     FROM (
                       SELECT trim(substring_index(substring_index(r.forwardedip, ',', n.n), ',', -1)) prox
@@ -54,42 +54,42 @@ 
                     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";
-    }
+		echo "Done.\n";
+	}
 }
\ No newline at end of file

includes/Helpers/Interfaces/IOAuthProtocolHelper.php

Indentation +45 added lines, -45 removed lines

@@ -15,53 +15,53 @@
 
 interface IOAuthProtocolHelper
 {
-    /**
-     * @return stdClass
-     *
-     * @throws Exception
-     * @throws CurlException
-     */
-    public function getRequestToken();
+	/**
+	 * @return stdClass
+	 *
+	 * @throws Exception
+	 * @throws CurlException
+	 */
+	public function getRequestToken();
 
-    /**
-     * @param string $requestToken
-     *
-     * @return string
-     */
-    public function getAuthoriseUrl($requestToken);
+	/**
+	 * @param string $requestToken
+	 *
+	 * @return string
+	 */
+	public function getAuthoriseUrl($requestToken);
 
-    /**
-     * @param string $oauthRequestToken
-     * @param string $oauthRequestSecret
-     * @param string $oauthVerifier
-     *
-     * @return stdClass
-     * @throws CurlException
-     * @throws Exception
-     */
-    public function callbackCompleted($oauthRequestToken, $oauthRequestSecret, $oauthVerifier);
+	/**
+	 * @param string $oauthRequestToken
+	 * @param string $oauthRequestSecret
+	 * @param string $oauthVerifier
+	 *
+	 * @return stdClass
+	 * @throws CurlException
+	 * @throws Exception
+	 */
+	public function callbackCompleted($oauthRequestToken, $oauthRequestSecret, $oauthVerifier);
 
-    /**
-     * @param string $oauthAccessToken
-     * @param string $oauthAccessSecret
-     *
-     * @return stdClass
-     * @throws CurlException
-     * @throws Exception
-     * @throws \MediaWiki\OAuthClient\Exception
-     */
-    public function getIdentityTicket($oauthAccessToken, $oauthAccessSecret);
+	/**
+	 * @param string $oauthAccessToken
+	 * @param string $oauthAccessSecret
+	 *
+	 * @return stdClass
+	 * @throws CurlException
+	 * @throws Exception
+	 * @throws \MediaWiki\OAuthClient\Exception
+	 */
+	public function getIdentityTicket($oauthAccessToken, $oauthAccessSecret);
 
-    /**
-     * @param array  $apiParams    array of parameters to send to the API
-     * @param string $accessToken  user's access token
-     * @param string $accessSecret user's secret
-     * @param string $method       HTTP method
-     *
-     * @return stdClass
-     * @throws ApplicationLogicException
-     * @throws CurlException
-     * @throws Exception
-     */
-    public function apiCall($apiParams, $accessToken, $accessSecret, $method = 'GET');
+	/**
+	 * @param array  $apiParams    array of parameters to send to the API
+	 * @param string $accessToken  user's access token
+	 * @param string $accessSecret user's secret
+	 * @param string $method       HTTP method
+	 *
+	 * @return stdClass
+	 * @throws ApplicationLogicException
+	 * @throws CurlException
+	 * @throws Exception
+	 */
+	public function apiCall($apiParams, $accessToken, $accessSecret, $method = 'GET');
 }
\ 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 trim($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 trim($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;
+	}
 }

smarty-plugins/modifier.timespan.php

Indentation +55 added lines, -55 removed lines

@@ -16,78 +16,78 @@
  */
 function smarty_modifier_timespan($input)
 {
-    $remaining = abs(floor($input));
+	$remaining = abs(floor($input));
 
-    $seconds = $remaining % 60;
-    $remaining = $remaining - $seconds;
+	$seconds = $remaining % 60;
+	$remaining = $remaining - $seconds;
 
-    $minutes = $remaining % (60 * 60);
-    $remaining = $remaining - $minutes;
-    $minutes /= 60;
+	$minutes = $remaining % (60 * 60);
+	$remaining = $remaining - $minutes;
+	$minutes /= 60;
 
-    $hours = $remaining % (60 * 60 * 24);
-    $remaining = $remaining - $hours;
-    $hours /= (60 * 60);
+	$hours = $remaining % (60 * 60 * 24);
+	$remaining = $remaining - $hours;
+	$hours /= (60 * 60);
 
-    $days = $remaining % (60 * 60 * 24 * 7);
-    $weeks = $remaining - $days;
-    $days /= (60 * 60 * 24);
-    $weeks /= (60 * 60 * 24 * 7);
+	$days = $remaining % (60 * 60 * 24 * 7);
+	$weeks = $remaining - $days;
+	$days /= (60 * 60 * 24);
+	$weeks /= (60 * 60 * 24 * 7);
 
-    $stringval = '';
-    $trip = false;
+	$stringval = '';
+	$trip = false;
 
-    if ($weeks > 0) {
-        $stringval .= "${weeks}w ";
-    }
+	if ($weeks > 0) {
+		$stringval .= "${weeks}w ";
+	}
 
-    if ($days > 0) {
-        if ($stringval !== '') {
-            $trip = true;
-        }
+	if ($days > 0) {
+		if ($stringval !== '') {
+			$trip = true;
+		}
 
-        $stringval .= "${days}d ";
+		$stringval .= "${days}d ";
 
-        if ($trip) {
-            return trim($stringval);
-        }
-    }
+		if ($trip) {
+			return trim($stringval);
+		}
+	}
 
-    if ($hours > 0) {
-        if ($stringval !== '') {
-            $trip = true;
-        }
+	if ($hours > 0) {
+		if ($stringval !== '') {
+			$trip = true;
+		}
 
-        $stringval .= "${hours}h ";
+		$stringval .= "${hours}h ";
 
-        if ($trip) {
-            return trim($stringval);
-        }
-    }
+		if ($trip) {
+			return trim($stringval);
+		}
+	}
 
-    if ($minutes > 0) {
-        if ($stringval !== '') {
-            $trip = true;
-        }
+	if ($minutes > 0) {
+		if ($stringval !== '') {
+			$trip = true;
+		}
 
-        $stringval .= "${minutes}m ";
+		$stringval .= "${minutes}m ";
 
-        if ($trip) {
-            return trim($stringval);
-        }
-    }
+		if ($trip) {
+			return trim($stringval);
+		}
+	}
 
-    if ($seconds > 0) {
-        if ($stringval !== '') {
-            $trip = true;
-        }
+	if ($seconds > 0) {
+		if ($stringval !== '') {
+			$trip = true;
+		}
 
-        $stringval .= "${seconds}s ";
+		$stringval .= "${seconds}s ";
 
-        if ($trip) {
-            return trim($stringval);
-        }
-    }
+		if ($trip) {
+			return trim($stringval);
+		}
+	}
 
-    return trim($stringval);
+	return trim($stringval);
 }
\ No newline at end of file

includes/Validation/ValidationError.php

Indentation +92 added lines, -92 removed lines

@@ -12,102 +12,102 @@
 
 class ValidationError
 {
-    const NAME_EMPTY = "name_empty";
-    const NAME_TOO_LONG = "name_too_long";
-    const NAME_EXISTS = "name_exists";
-    const NAME_EXISTS_SUL = "name_exists_sul";
-    const NAME_NUMONLY = "name_numonly";
-    const NAME_INVALIDCHAR = "name_invalidchar";
-    const NAME_SANITISED = "name_sanitised";
-    const NAME_IP = "name_ip";
-    const EMAIL_EMPTY = "email_empty";
-    const EMAIL_WIKIMEDIA = "email_wikimedia";
-    const EMAIL_INVALID = "email_invalid";
-    const EMAIL_MISMATCH = "email_mismatch";
-    const OPEN_REQUEST_NAME = "open_request_name";
-    const BANNED = "banned";
-    const BANNED_TOR = "banned_tor";
-    /**
-     * @var array Error text for the above
-     */
-    private static $errorText = array(
-        self::NAME_EMPTY        => 'You\'ve not chosen a username!',
-        self::NAME_TOO_LONG     => 'Your chosen username is too long. Please choose a shorter one.',
-        self::NAME_EXISTS       => 'I\'m sorry, but the username you selected is already taken. Please try another. '
-            . 'Please note that Wikipedia automatically capitalizes the first letter of any user name, therefore '
-            . '[[User:example]] would become [[User:Example]].',
-        self::NAME_EXISTS_SUL   => 'I\'m sorry, but the username you selected is already taken. Please try another. '
-            . 'Please note that Wikipedia automatically capitalizes the first letter of any user name, therefore '
-            . '[[User:example]] would become [[User:Example]].',
-        self::NAME_NUMONLY      => 'The username you chose is invalid: it consists entirely of numbers. Please retry '
-            . 'with a valid username.',
-        self::NAME_INVALIDCHAR  => 'There appears to be an invalid character in your username. Please note that the '
-            . 'following characters are not allowed: <code># @ / &lt; &gt; [ ] | { }</code>',
-        self::NAME_SANITISED    => 'Your requested username has been automatically adjusted due to technical '
-            . 'restrictions. Underscores have been replaced with spaces, and the first character has been capitalised.',
-        self::NAME_IP           => 'The username you chose is invalid: it cannot be an IP address',
-        self::EMAIL_EMPTY       => 'You need to supply an email address.',
-        self::EMAIL_WIKIMEDIA   => 'Please provide your email address here.',
-        self::EMAIL_INVALID     => 'Invalid E-mail address supplied. Please check you entered it correctly.',
-        self::EMAIL_MISMATCH    => 'The email addresses you entered do not match. Please try again.',
-        self::OPEN_REQUEST_NAME => 'There is already an open request with this name in this system.',
-        self::BANNED            => 'Sorry, you are currently banned from requesting accounts using this tool.',
-        self::BANNED_TOR        => 'Tor exit nodes are currently banned from using this tool due to excessive abuse. '
-            . 'Please note that Tor is also currently banned from editing Wikipedia.',
-    );
-    /**
-     * Summary of $errorCode
-     * @var string
-     */
-    private $errorCode;
-    /**
-     * Summary of $isError
-     * @var bool
-     */
-    private $isError;
+	const NAME_EMPTY = "name_empty";
+	const NAME_TOO_LONG = "name_too_long";
+	const NAME_EXISTS = "name_exists";
+	const NAME_EXISTS_SUL = "name_exists_sul";
+	const NAME_NUMONLY = "name_numonly";
+	const NAME_INVALIDCHAR = "name_invalidchar";
+	const NAME_SANITISED = "name_sanitised";
+	const NAME_IP = "name_ip";
+	const EMAIL_EMPTY = "email_empty";
+	const EMAIL_WIKIMEDIA = "email_wikimedia";
+	const EMAIL_INVALID = "email_invalid";
+	const EMAIL_MISMATCH = "email_mismatch";
+	const OPEN_REQUEST_NAME = "open_request_name";
+	const BANNED = "banned";
+	const BANNED_TOR = "banned_tor";
+	/**
+	 * @var array Error text for the above
+	 */
+	private static $errorText = array(
+		self::NAME_EMPTY        => 'You\'ve not chosen a username!',
+		self::NAME_TOO_LONG     => 'Your chosen username is too long. Please choose a shorter one.',
+		self::NAME_EXISTS       => 'I\'m sorry, but the username you selected is already taken. Please try another. '
+			. 'Please note that Wikipedia automatically capitalizes the first letter of any user name, therefore '
+			. '[[User:example]] would become [[User:Example]].',
+		self::NAME_EXISTS_SUL   => 'I\'m sorry, but the username you selected is already taken. Please try another. '
+			. 'Please note that Wikipedia automatically capitalizes the first letter of any user name, therefore '
+			. '[[User:example]] would become [[User:Example]].',
+		self::NAME_NUMONLY      => 'The username you chose is invalid: it consists entirely of numbers. Please retry '
+			. 'with a valid username.',
+		self::NAME_INVALIDCHAR  => 'There appears to be an invalid character in your username. Please note that the '
+			. 'following characters are not allowed: <code># @ / &lt; &gt; [ ] | { }</code>',
+		self::NAME_SANITISED    => 'Your requested username has been automatically adjusted due to technical '
+			. 'restrictions. Underscores have been replaced with spaces, and the first character has been capitalised.',
+		self::NAME_IP           => 'The username you chose is invalid: it cannot be an IP address',
+		self::EMAIL_EMPTY       => 'You need to supply an email address.',
+		self::EMAIL_WIKIMEDIA   => 'Please provide your email address here.',
+		self::EMAIL_INVALID     => 'Invalid E-mail address supplied. Please check you entered it correctly.',
+		self::EMAIL_MISMATCH    => 'The email addresses you entered do not match. Please try again.',
+		self::OPEN_REQUEST_NAME => 'There is already an open request with this name in this system.',
+		self::BANNED            => 'Sorry, you are currently banned from requesting accounts using this tool.',
+		self::BANNED_TOR        => 'Tor exit nodes are currently banned from using this tool due to excessive abuse. '
+			. 'Please note that Tor is also currently banned from editing Wikipedia.',
+	);
+	/**
+	 * Summary of $errorCode
+	 * @var string
+	 */
+	private $errorCode;
+	/**
+	 * Summary of $isError
+	 * @var bool
+	 */
+	private $isError;
 
-    /**
-     * Summary of __construct
-     *
-     * @param string $errorCode
-     * @param bool   $isError
-     */
-    public function __construct($errorCode, $isError = true)
-    {
-        $this->errorCode = $errorCode;
-        $this->isError = $isError;
-    }
+	/**
+	 * Summary of __construct
+	 *
+	 * @param string $errorCode
+	 * @param bool   $isError
+	 */
+	public function __construct($errorCode, $isError = true)
+	{
+		$this->errorCode = $errorCode;
+		$this->isError = $isError;
+	}
 
-    /**
-     * Summary of getErrorCode
-     * @return string
-     */
-    public function getErrorCode()
-    {
-        return $this->errorCode;
-    }
+	/**
+	 * Summary of getErrorCode
+	 * @return string
+	 */
+	public function getErrorCode()
+	{
+		return $this->errorCode;
+	}
 
-    /**
-     * @return string
-     * @throws Exception
-     */
-    public function getErrorMessage()
-    {
-        $text = self::$errorText[$this->errorCode];
+	/**
+	 * @return string
+	 * @throws Exception
+	 */
+	public function getErrorMessage()
+	{
+		$text = self::$errorText[$this->errorCode];
 
-        if ($text == null) {
-            throw new Exception('Unknown validation error');
-        }
+		if ($text == null) {
+			throw new Exception('Unknown validation error');
+		}
 
-        return $text;
-    }
+		return $text;
+	}
 
-    /**
-     * Summary of isError
-     * @return bool
-     */
-    public function isError()
-    {
-        return $this->isError;
-    }
+	/**
+	 * Summary of isError
+	 * @return bool
+	 */
+	public function isError()
+	{
+		return $this->isError;
+	}
 }