mdaniels5757 / waca

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

includes/Validation/RequestValidationHelper.php

Indentation +425 added lines, -425 removed lines

@@ -31,429 +31,429 @@
  */
 class RequestValidationHelper
 {
-    /** @var IBanHelper */
-    private $banHelper;
-    /** @var PdoDatabase */
-    private $database;
-    /** @var IAntiSpoofProvider */
-    private $antiSpoofProvider;
-    /** @var IXffTrustProvider */
-    private $xffTrustProvider;
-    /** @var HttpHelper */
-    private $httpHelper;
-    /**
-     * @var string
-     */
-    private $mediawikiApiEndpoint;
-    private $titleBlacklistEnabled;
-    /**
-     * @var TorExitProvider
-     */
-    private $torExitProvider;
-    /**
-     * @var SiteConfiguration
-     */
-    private $siteConfiguration;
-
-    private $validationRemoteTimeout = 5000;
-
-    /**
-     * Summary of __construct
-     *
-     * @param IBanHelper         $banHelper
-     * @param PdoDatabase        $database
-     * @param IAntiSpoofProvider $antiSpoofProvider
-     * @param IXffTrustProvider  $xffTrustProvider
-     * @param HttpHelper         $httpHelper
-     * @param TorExitProvider    $torExitProvider
-     * @param SiteConfiguration  $siteConfiguration
-     */
-    public function __construct(
-        IBanHelper $banHelper,
-        PdoDatabase $database,
-        IAntiSpoofProvider $antiSpoofProvider,
-        IXffTrustProvider $xffTrustProvider,
-        HttpHelper $httpHelper,
-        TorExitProvider $torExitProvider,
-        SiteConfiguration $siteConfiguration
-    ) {
-        $this->banHelper = $banHelper;
-        $this->database = $database;
-        $this->antiSpoofProvider = $antiSpoofProvider;
-        $this->xffTrustProvider = $xffTrustProvider;
-        $this->httpHelper = $httpHelper;
-
-        // FIXME: domains!
-        /** @var Domain $domain */
-        $domain = Domain::getById(1, $database);
-
-        $this->mediawikiApiEndpoint = $domain->getWikiApiPath();
-        $this->titleBlacklistEnabled = $siteConfiguration->getTitleBlacklistEnabled();
-        $this->torExitProvider = $torExitProvider;
-        $this->siteConfiguration = $siteConfiguration;
-    }
-
-    /**
-     * Summary of validateName
-     *
-     * @param Request $request
-     *
-     * @return ValidationError[]
-     */
-    public function validateName(Request $request)
-    {
-        $errorList = array();
-
-        // ERRORS
-        // name is empty
-        if (trim($request->getName()) == "") {
-            $errorList[ValidationError::NAME_EMPTY] = new ValidationError(ValidationError::NAME_EMPTY);
-        }
-
-        // name is too long
-        if (mb_strlen(trim($request->getName())) > 500) {
-            $errorList[ValidationError::NAME_EMPTY] = new ValidationError(ValidationError::NAME_TOO_LONG);
-        }
-
-        // username already exists
-        if ($this->userExists($request)) {
-            $errorList[ValidationError::NAME_EXISTS] = new ValidationError(ValidationError::NAME_EXISTS);
-        }
-
-        // username part of SUL account
-        if ($this->userSulExists($request)) {
-            // using same error slot as name exists - it's the same sort of error, and we probably only want to show one.
-            $errorList[ValidationError::NAME_EXISTS] = new ValidationError(ValidationError::NAME_EXISTS_SUL);
-        }
-
-        // username is numbers
-        if (preg_match("/^[0-9]+$/", $request->getName()) === 1) {
-            $errorList[ValidationError::NAME_NUMONLY] = new ValidationError(ValidationError::NAME_NUMONLY);
-        }
-
-        // username can't contain #@/<>[]|{}
-        if (preg_match("/[" . preg_quote("#@/<>[]|{}", "/") . "]/", $request->getName()) === 1) {
-            $errorList[ValidationError::NAME_INVALIDCHAR] = new ValidationError(ValidationError::NAME_INVALIDCHAR);
-        }
-
-        // username is an IP
-        if (filter_var($request->getName(), FILTER_VALIDATE_IP)) {
-            $errorList[ValidationError::NAME_IP] = new ValidationError(ValidationError::NAME_IP);
-        }
-
-        // existing non-closed request for this name
-        if ($this->nameRequestExists($request)) {
-            $errorList[ValidationError::OPEN_REQUEST_NAME] = new ValidationError(ValidationError::OPEN_REQUEST_NAME);
-        }
-
-        return $errorList;
-    }
-
-    /**
-     * Summary of validateEmail
-     *
-     * @param Request $request
-     * @param string  $emailConfirmation
-     *
-     * @return ValidationError[]
-     */
-    public function validateEmail(Request $request, $emailConfirmation)
-    {
-        $errorList = array();
-
-        // ERRORS
-
-        // email addresses must match
-        if ($request->getEmail() != $emailConfirmation) {
-            $errorList[ValidationError::EMAIL_MISMATCH] = new ValidationError(ValidationError::EMAIL_MISMATCH);
-        }
-
-        // email address must be validly formed
-        if (trim($request->getEmail()) == "") {
-            $errorList[ValidationError::EMAIL_EMPTY] = new ValidationError(ValidationError::EMAIL_EMPTY);
-        }
-
-        // email address must be validly formed
-        if (!filter_var($request->getEmail(), FILTER_VALIDATE_EMAIL)) {
-            if (trim($request->getEmail()) != "") {
-                $errorList[ValidationError::EMAIL_INVALID] = new ValidationError(ValidationError::EMAIL_INVALID);
-            }
-        }
-
-        // email address can't be wikimedia/wikipedia .com/org
-        if (preg_match('/.*@.*wiki(m.dia|p.dia)\.(org|com)/i', $request->getEmail()) === 1) {
-            $errorList[ValidationError::EMAIL_WIKIMEDIA] = new ValidationError(ValidationError::EMAIL_WIKIMEDIA);
-        }
-
-        return $errorList;
-    }
-
-    /**
-     * Summary of validateOther
-     *
-     * @param Request $request
-     *
-     * @return ValidationError[]
-     */
-    public function validateOther(Request $request)
-    {
-        $errorList = array();
-
-        $trustedIp = $this->xffTrustProvider->getTrustedClientIp($request->getIp(),
-            $request->getForwardedIp());
-
-        // ERRORS
-
-        // TOR nodes
-        if ($this->torExitProvider->isTorExit($trustedIp)) {
-            $errorList[ValidationError::BANNED] = new ValidationError(ValidationError::BANNED_TOR);
-        }
-
-        // Bans
-        if ($this->banHelper->isBlockBanned($request)) {
-            $errorList[ValidationError::BANNED] = new ValidationError(ValidationError::BANNED);
-        }
-
-        return $errorList;
-    }
-
-    public function postSaveValidations(Request $request)
-    {
-        // Antispoof check
-        $this->checkAntiSpoof($request);
-
-        // Blacklist check
-        $this->checkTitleBlacklist($request);
-
-        // Add comment for form override
-        $this->formOverride($request);
-
-        $bans = $this->banHelper->getBans($request);
-
-        foreach ($bans as $ban) {
-            if ($ban->getAction() == Ban::ACTION_DROP) {
-                $request->setStatus(RequestStatus::CLOSED);
-                $request->save();
-
-                Logger::closeRequest($request->getDatabase(), $request, 0, null);
-
-                $comment = new Comment();
-                $comment->setDatabase($this->database);
-                $comment->setRequest($request->getId());
-                $comment->setVisibility('user');
-                $comment->setUser(null);
-
-                $comment->setComment('Request dropped automatically due to matching rule.');
-                $comment->save();
-            }
-
-            if ($ban->getAction() == Ban::ACTION_DEFER) {
-                /** @var RequestQueue|false $targetQueue */
-                $targetQueue = RequestQueue::getById($ban->getTargetQueue(), $this->database);
-
-                if ($targetQueue === false ) {
-                    $comment = new Comment();
-                    $comment->setDatabase($this->database);
-                    $comment->setRequest($request->getId());
-                    $comment->setVisibility('user');
-                    $comment->setUser(null);
-
-                    $comment->setComment("This request would have been deferred automatically due to a matching rule, but the queue to defer to could not be found.");
-                    $comment->save();
-                }
-                else {
-                    $this->deferRequest($request, $targetQueue, 'Request deferred automatically due to matching rule.');
-                }
-            }
-        }
-    }
-
-    private function checkAntiSpoof(Request $request)
-    {
-        try {
-            if (count($this->antiSpoofProvider->getSpoofs($request->getName())) > 0) {
-                // If there were spoofs an Admin should handle the request.
-                // FIXME: domains!
-                $defaultQueue = RequestQueue::getDefaultQueue($this->database, 1, RequestQueue::DEFAULT_ANTISPOOF);
-                $this->deferRequest($request, $defaultQueue,
-                    'Request automatically deferred due to AntiSpoof hit');
-            }
-        }
-        catch (Exception $ex) {
-            $skippable = [
-                'Contains unassigned character',
-                'Contains incompatible mixed scripts',
-                'Does not contain any letters',
-                'Usernames must contain one or more characters',
-                'Usernames cannot contain characters from different writing systems',
-                'Usernames cannot contain the character'
-            ];
-
-            $skip = false;
-
-            foreach ($skippable as $s) {
-                if (strpos($ex->getMessage(), 'Encountered error while getting result: ' . $s) !== false) {
-                    $skip = true;
-                    break;
-                }
-            }
-
-            // Only log to disk if this *isn't* a "skippable" error.
-            if (!$skip) {
-                ExceptionHandler::logExceptionToDisk($ex, $this->siteConfiguration);
-            }
-        }
-    }
-
-    private function checkTitleBlacklist(Request $request)
-    {
-        if ($this->titleBlacklistEnabled == 1) {
-            try {
-                $apiResult = $this->httpHelper->get(
-                    $this->mediawikiApiEndpoint,
-                    array(
-                        'action'       => 'titleblacklist',
-                        'tbtitle'      => $request->getName(),
-                        'tbaction'     => 'new-account',
-                        'tbnooverride' => true,
-                        'format'       => 'php',
-                    ),
-                    [],
-                    $this->validationRemoteTimeout
-                );
-
-                $data = unserialize($apiResult);
-
-                $requestIsOk = $data['titleblacklist']['result'] == "ok";
-            }
-            catch (CurlException $ex) {
-                ExceptionHandler::logExceptionToDisk($ex, $this->siteConfiguration);
-
-                // Don't kill the request, just assume it's fine. Humans can deal with it later.
-                return;
-            }
-
-            if (!$requestIsOk) {
-                // FIXME: domains!
-                $defaultQueue = RequestQueue::getDefaultQueue($this->database, 1, RequestQueue::DEFAULT_TITLEBLACKLIST);
-
-                $this->deferRequest($request, $defaultQueue,
-                    'Request automatically deferred due to title blacklist hit');
-            }
-        }
-    }
-
-    private function userExists(Request $request)
-    {
-        try {
-            $userExists = $this->httpHelper->get(
-                $this->mediawikiApiEndpoint,
-                array(
-                    'action'  => 'query',
-                    'list'    => 'users',
-                    'ususers' => $request->getName(),
-                    'format'  => 'php',
-                ),
-                [],
-                $this->validationRemoteTimeout
-            );
-
-            $ue = unserialize($userExists);
-            if (!isset ($ue['query']['users']['0']['missing']) && isset ($ue['query']['users']['0']['userid'])) {
-                return true;
-            }
-        }
-        catch (CurlException $ex) {
-            ExceptionHandler::logExceptionToDisk($ex, $this->siteConfiguration);
-
-            // Don't kill the request, just assume it's fine. Humans can deal with it later.
-            return false;
-        }
-
-        return false;
-    }
-
-    private function userSulExists(Request $request)
-    {
-        $requestName = $request->getName();
-
-        try {
-            $userExists = $this->httpHelper->get(
-                $this->mediawikiApiEndpoint,
-                array(
-                    'action'  => 'query',
-                    'meta'    => 'globaluserinfo',
-                    'guiuser' => $requestName,
-                    'format'  => 'php',
-                ),
-                [],
-                $this->validationRemoteTimeout
-            );
-
-            $ue = unserialize($userExists);
-            if (isset ($ue['query']['globaluserinfo']['id'])) {
-                return true;
-            }
-        }
-        catch (CurlException $ex) {
-            ExceptionHandler::logExceptionToDisk($ex, $this->siteConfiguration);
-
-            // Don't kill the request, just assume it's fine. Humans can deal with it later.
-            return false;
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks if a request with this name is currently open
-     *
-     * @param Request $request
-     *
-     * @return bool
-     */
-    private function nameRequestExists(Request $request)
-    {
-        $query = "SELECT COUNT(id) FROM request WHERE status != 'Closed' AND name = :name;";
-        $statement = $this->database->prepare($query);
-        $statement->execute(array(':name' => $request->getName()));
-
-        if (!$statement) {
-            return false;
-        }
-
-        return $statement->fetchColumn() > 0;
-    }
-
-    private function deferRequest(Request $request, RequestQueue $targetQueue, $deferComment): void
-    {
-        $request->setQueue($targetQueue->getId());
-        $request->save();
-
-        $logTarget = $targetQueue->getLogName();
-
-        Logger::deferRequest($this->database, $request, $logTarget);
-
-        $comment = new Comment();
-        $comment->setDatabase($this->database);
-        $comment->setRequest($request->getId());
-        $comment->setVisibility('user');
-        $comment->setUser(null);
-
-        $comment->setComment($deferComment);
-        $comment->save();
-    }
-
-    private function formOverride(Request $request)
-    {
-        $form = $request->getOriginFormObject();
-        if($form === null || $form->getOverrideQueue() === null) {
-            return;
-        }
-
-        /** @var RequestQueue $targetQueue */
-        $targetQueue = RequestQueue::getById($form->getOverrideQueue(), $request->getDatabase());
-
-        $this->deferRequest($request, $targetQueue, 'Request deferred automatically due to request submission through a request form with a default queue set.');
-    }
+	/** @var IBanHelper */
+	private $banHelper;
+	/** @var PdoDatabase */
+	private $database;
+	/** @var IAntiSpoofProvider */
+	private $antiSpoofProvider;
+	/** @var IXffTrustProvider */
+	private $xffTrustProvider;
+	/** @var HttpHelper */
+	private $httpHelper;
+	/**
+	 * @var string
+	 */
+	private $mediawikiApiEndpoint;
+	private $titleBlacklistEnabled;
+	/**
+	 * @var TorExitProvider
+	 */
+	private $torExitProvider;
+	/**
+	 * @var SiteConfiguration
+	 */
+	private $siteConfiguration;
+
+	private $validationRemoteTimeout = 5000;
+
+	/**
+	 * Summary of __construct
+	 *
+	 * @param IBanHelper         $banHelper
+	 * @param PdoDatabase        $database
+	 * @param IAntiSpoofProvider $antiSpoofProvider
+	 * @param IXffTrustProvider  $xffTrustProvider
+	 * @param HttpHelper         $httpHelper
+	 * @param TorExitProvider    $torExitProvider
+	 * @param SiteConfiguration  $siteConfiguration
+	 */
+	public function __construct(
+		IBanHelper $banHelper,
+		PdoDatabase $database,
+		IAntiSpoofProvider $antiSpoofProvider,
+		IXffTrustProvider $xffTrustProvider,
+		HttpHelper $httpHelper,
+		TorExitProvider $torExitProvider,
+		SiteConfiguration $siteConfiguration
+	) {
+		$this->banHelper = $banHelper;
+		$this->database = $database;
+		$this->antiSpoofProvider = $antiSpoofProvider;
+		$this->xffTrustProvider = $xffTrustProvider;
+		$this->httpHelper = $httpHelper;
+
+		// FIXME: domains!
+		/** @var Domain $domain */
+		$domain = Domain::getById(1, $database);
+
+		$this->mediawikiApiEndpoint = $domain->getWikiApiPath();
+		$this->titleBlacklistEnabled = $siteConfiguration->getTitleBlacklistEnabled();
+		$this->torExitProvider = $torExitProvider;
+		$this->siteConfiguration = $siteConfiguration;
+	}
+
+	/**
+	 * Summary of validateName
+	 *
+	 * @param Request $request
+	 *
+	 * @return ValidationError[]
+	 */
+	public function validateName(Request $request)
+	{
+		$errorList = array();
+
+		// ERRORS
+		// name is empty
+		if (trim($request->getName()) == "") {
+			$errorList[ValidationError::NAME_EMPTY] = new ValidationError(ValidationError::NAME_EMPTY);
+		}
+
+		// name is too long
+		if (mb_strlen(trim($request->getName())) > 500) {
+			$errorList[ValidationError::NAME_EMPTY] = new ValidationError(ValidationError::NAME_TOO_LONG);
+		}
+
+		// username already exists
+		if ($this->userExists($request)) {
+			$errorList[ValidationError::NAME_EXISTS] = new ValidationError(ValidationError::NAME_EXISTS);
+		}
+
+		// username part of SUL account
+		if ($this->userSulExists($request)) {
+			// using same error slot as name exists - it's the same sort of error, and we probably only want to show one.
+			$errorList[ValidationError::NAME_EXISTS] = new ValidationError(ValidationError::NAME_EXISTS_SUL);
+		}
+
+		// username is numbers
+		if (preg_match("/^[0-9]+$/", $request->getName()) === 1) {
+			$errorList[ValidationError::NAME_NUMONLY] = new ValidationError(ValidationError::NAME_NUMONLY);
+		}
+
+		// username can't contain #@/<>[]|{}
+		if (preg_match("/[" . preg_quote("#@/<>[]|{}", "/") . "]/", $request->getName()) === 1) {
+			$errorList[ValidationError::NAME_INVALIDCHAR] = new ValidationError(ValidationError::NAME_INVALIDCHAR);
+		}
+
+		// username is an IP
+		if (filter_var($request->getName(), FILTER_VALIDATE_IP)) {
+			$errorList[ValidationError::NAME_IP] = new ValidationError(ValidationError::NAME_IP);
+		}
+
+		// existing non-closed request for this name
+		if ($this->nameRequestExists($request)) {
+			$errorList[ValidationError::OPEN_REQUEST_NAME] = new ValidationError(ValidationError::OPEN_REQUEST_NAME);
+		}
+
+		return $errorList;
+	}
+
+	/**
+	 * Summary of validateEmail
+	 *
+	 * @param Request $request
+	 * @param string  $emailConfirmation
+	 *
+	 * @return ValidationError[]
+	 */
+	public function validateEmail(Request $request, $emailConfirmation)
+	{
+		$errorList = array();
+
+		// ERRORS
+
+		// email addresses must match
+		if ($request->getEmail() != $emailConfirmation) {
+			$errorList[ValidationError::EMAIL_MISMATCH] = new ValidationError(ValidationError::EMAIL_MISMATCH);
+		}
+
+		// email address must be validly formed
+		if (trim($request->getEmail()) == "") {
+			$errorList[ValidationError::EMAIL_EMPTY] = new ValidationError(ValidationError::EMAIL_EMPTY);
+		}
+
+		// email address must be validly formed
+		if (!filter_var($request->getEmail(), FILTER_VALIDATE_EMAIL)) {
+			if (trim($request->getEmail()) != "") {
+				$errorList[ValidationError::EMAIL_INVALID] = new ValidationError(ValidationError::EMAIL_INVALID);
+			}
+		}
+
+		// email address can't be wikimedia/wikipedia .com/org
+		if (preg_match('/.*@.*wiki(m.dia|p.dia)\.(org|com)/i', $request->getEmail()) === 1) {
+			$errorList[ValidationError::EMAIL_WIKIMEDIA] = new ValidationError(ValidationError::EMAIL_WIKIMEDIA);
+		}
+
+		return $errorList;
+	}
+
+	/**
+	 * Summary of validateOther
+	 *
+	 * @param Request $request
+	 *
+	 * @return ValidationError[]
+	 */
+	public function validateOther(Request $request)
+	{
+		$errorList = array();
+
+		$trustedIp = $this->xffTrustProvider->getTrustedClientIp($request->getIp(),
+			$request->getForwardedIp());
+
+		// ERRORS
+
+		// TOR nodes
+		if ($this->torExitProvider->isTorExit($trustedIp)) {
+			$errorList[ValidationError::BANNED] = new ValidationError(ValidationError::BANNED_TOR);
+		}
+
+		// Bans
+		if ($this->banHelper->isBlockBanned($request)) {
+			$errorList[ValidationError::BANNED] = new ValidationError(ValidationError::BANNED);
+		}
+
+		return $errorList;
+	}
+
+	public function postSaveValidations(Request $request)
+	{
+		// Antispoof check
+		$this->checkAntiSpoof($request);
+
+		// Blacklist check
+		$this->checkTitleBlacklist($request);
+
+		// Add comment for form override
+		$this->formOverride($request);
+
+		$bans = $this->banHelper->getBans($request);
+
+		foreach ($bans as $ban) {
+			if ($ban->getAction() == Ban::ACTION_DROP) {
+				$request->setStatus(RequestStatus::CLOSED);
+				$request->save();
+
+				Logger::closeRequest($request->getDatabase(), $request, 0, null);
+
+				$comment = new Comment();
+				$comment->setDatabase($this->database);
+				$comment->setRequest($request->getId());
+				$comment->setVisibility('user');
+				$comment->setUser(null);
+
+				$comment->setComment('Request dropped automatically due to matching rule.');
+				$comment->save();
+			}
+
+			if ($ban->getAction() == Ban::ACTION_DEFER) {
+				/** @var RequestQueue|false $targetQueue */
+				$targetQueue = RequestQueue::getById($ban->getTargetQueue(), $this->database);
+
+				if ($targetQueue === false ) {
+					$comment = new Comment();
+					$comment->setDatabase($this->database);
+					$comment->setRequest($request->getId());
+					$comment->setVisibility('user');
+					$comment->setUser(null);
+
+					$comment->setComment("This request would have been deferred automatically due to a matching rule, but the queue to defer to could not be found.");
+					$comment->save();
+				}
+				else {
+					$this->deferRequest($request, $targetQueue, 'Request deferred automatically due to matching rule.');
+				}
+			}
+		}
+	}
+
+	private function checkAntiSpoof(Request $request)
+	{
+		try {
+			if (count($this->antiSpoofProvider->getSpoofs($request->getName())) > 0) {
+				// If there were spoofs an Admin should handle the request.
+				// FIXME: domains!
+				$defaultQueue = RequestQueue::getDefaultQueue($this->database, 1, RequestQueue::DEFAULT_ANTISPOOF);
+				$this->deferRequest($request, $defaultQueue,
+					'Request automatically deferred due to AntiSpoof hit');
+			}
+		}
+		catch (Exception $ex) {
+			$skippable = [
+				'Contains unassigned character',
+				'Contains incompatible mixed scripts',
+				'Does not contain any letters',
+				'Usernames must contain one or more characters',
+				'Usernames cannot contain characters from different writing systems',
+				'Usernames cannot contain the character'
+			];
+
+			$skip = false;
+
+			foreach ($skippable as $s) {
+				if (strpos($ex->getMessage(), 'Encountered error while getting result: ' . $s) !== false) {
+					$skip = true;
+					break;
+				}
+			}
+
+			// Only log to disk if this *isn't* a "skippable" error.
+			if (!$skip) {
+				ExceptionHandler::logExceptionToDisk($ex, $this->siteConfiguration);
+			}
+		}
+	}
+
+	private function checkTitleBlacklist(Request $request)
+	{
+		if ($this->titleBlacklistEnabled == 1) {
+			try {
+				$apiResult = $this->httpHelper->get(
+					$this->mediawikiApiEndpoint,
+					array(
+						'action'       => 'titleblacklist',
+						'tbtitle'      => $request->getName(),
+						'tbaction'     => 'new-account',
+						'tbnooverride' => true,
+						'format'       => 'php',
+					),
+					[],
+					$this->validationRemoteTimeout
+				);
+
+				$data = unserialize($apiResult);
+
+				$requestIsOk = $data['titleblacklist']['result'] == "ok";
+			}
+			catch (CurlException $ex) {
+				ExceptionHandler::logExceptionToDisk($ex, $this->siteConfiguration);
+
+				// Don't kill the request, just assume it's fine. Humans can deal with it later.
+				return;
+			}
+
+			if (!$requestIsOk) {
+				// FIXME: domains!
+				$defaultQueue = RequestQueue::getDefaultQueue($this->database, 1, RequestQueue::DEFAULT_TITLEBLACKLIST);
+
+				$this->deferRequest($request, $defaultQueue,
+					'Request automatically deferred due to title blacklist hit');
+			}
+		}
+	}
+
+	private function userExists(Request $request)
+	{
+		try {
+			$userExists = $this->httpHelper->get(
+				$this->mediawikiApiEndpoint,
+				array(
+					'action'  => 'query',
+					'list'    => 'users',
+					'ususers' => $request->getName(),
+					'format'  => 'php',
+				),
+				[],
+				$this->validationRemoteTimeout
+			);
+
+			$ue = unserialize($userExists);
+			if (!isset ($ue['query']['users']['0']['missing']) && isset ($ue['query']['users']['0']['userid'])) {
+				return true;
+			}
+		}
+		catch (CurlException $ex) {
+			ExceptionHandler::logExceptionToDisk($ex, $this->siteConfiguration);
+
+			// Don't kill the request, just assume it's fine. Humans can deal with it later.
+			return false;
+		}
+
+		return false;
+	}
+
+	private function userSulExists(Request $request)
+	{
+		$requestName = $request->getName();
+
+		try {
+			$userExists = $this->httpHelper->get(
+				$this->mediawikiApiEndpoint,
+				array(
+					'action'  => 'query',
+					'meta'    => 'globaluserinfo',
+					'guiuser' => $requestName,
+					'format'  => 'php',
+				),
+				[],
+				$this->validationRemoteTimeout
+			);
+
+			$ue = unserialize($userExists);
+			if (isset ($ue['query']['globaluserinfo']['id'])) {
+				return true;
+			}
+		}
+		catch (CurlException $ex) {
+			ExceptionHandler::logExceptionToDisk($ex, $this->siteConfiguration);
+
+			// Don't kill the request, just assume it's fine. Humans can deal with it later.
+			return false;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Checks if a request with this name is currently open
+	 *
+	 * @param Request $request
+	 *
+	 * @return bool
+	 */
+	private function nameRequestExists(Request $request)
+	{
+		$query = "SELECT COUNT(id) FROM request WHERE status != 'Closed' AND name = :name;";
+		$statement = $this->database->prepare($query);
+		$statement->execute(array(':name' => $request->getName()));
+
+		if (!$statement) {
+			return false;
+		}
+
+		return $statement->fetchColumn() > 0;
+	}
+
+	private function deferRequest(Request $request, RequestQueue $targetQueue, $deferComment): void
+	{
+		$request->setQueue($targetQueue->getId());
+		$request->save();
+
+		$logTarget = $targetQueue->getLogName();
+
+		Logger::deferRequest($this->database, $request, $logTarget);
+
+		$comment = new Comment();
+		$comment->setDatabase($this->database);
+		$comment->setRequest($request->getId());
+		$comment->setVisibility('user');
+		$comment->setUser(null);
+
+		$comment->setComment($deferComment);
+		$comment->save();
+	}
+
+	private function formOverride(Request $request)
+	{
+		$form = $request->getOriginFormObject();
+		if($form === null || $form->getOverrideQueue() === null) {
+			return;
+		}
+
+		/** @var RequestQueue $targetQueue */
+		$targetQueue = RequestQueue::getById($form->getOverrideQueue(), $request->getDatabase());
+
+		$this->deferRequest($request, $targetQueue, 'Request deferred automatically due to request submission through a request form with a default queue set.');
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -251,7 +251,7 @@ 
                 /** @var RequestQueue|false $targetQueue */
                 $targetQueue = RequestQueue::getById($ban->getTargetQueue(), $this->database);
 
-                if ($targetQueue === false ) {
+                if ($targetQueue === false) {
                     $comment = new Comment();
                     $comment->setDatabase($this->database);
                     $comment->setRequest($request->getId());
@@ -447,7 +447,7 @@ 
     private function formOverride(Request $request)
     {
         $form = $request->getOriginFormObject();
-        if($form === null || $form->getOverrideQueue() === null) {
+        if ($form === null || $form->getOverrideQueue() === null) {
             return;
         }
 

Braces +1 added lines, -2 removed lines

@@ -260,8 +260,7 @@
 
                     $comment->setComment("This request would have been deferred automatically due to a matching rule, but the queue to defer to could not be found.");
                     $comment->save();
-                }
-                else {
+                } else {
                     $this->deferRequest($request, $targetQueue, 'Request deferred automatically due to matching rule.');
                 }
             }

includes/WebStart.php

Braces +1 added lines, -2 removed lines

@@ -82,8 +82,7 @@
 
                 if ($siteConfiguration->getTitleBlacklistEnabled()) {
                     $page->setBlacklistHelper(new BlacklistHelper($page->getHttpHelper(), $database, $siteConfiguration));
-                }
-                else {
+                } else {
                     $page->setBlacklistHelper(new FakeBlacklistHelper());
                 }
 

Indentation +204 added lines, -204 removed lines

@@ -33,208 +33,208 @@
  */
 class WebStart extends ApplicationBase
 {
-    /**
-     * @var IRequestRouter $requestRouter The request router to use. Note that different entry points have different
-     *                                    routers and hence different URL mappings
-     */
-    private $requestRouter;
-    /**
-     * @var bool $isPublic Determines whether to use public interface objects or internal interface objects
-     */
-    private bool $isPublic = false;
-
-    /**
-     * WebStart constructor.
-     *
-     * @param SiteConfiguration $configuration The site configuration
-     * @param IRequestRouter    $router        The request router to use
-     */
-    public function __construct(SiteConfiguration $configuration, IRequestRouter $router)
-    {
-        parent::__construct($configuration);
-
-        $this->requestRouter = $router;
-    }
-
-    /**
-     * @param ITask             $page
-     * @param SiteConfiguration $siteConfiguration
-     * @param PdoDatabase       $database
-     *
-     * @return void
-     */
-    protected function setupHelpers(
-        ITask $page,
-        SiteConfiguration $siteConfiguration,
-        PdoDatabase $database
-    ) {
-        parent::setupHelpers($page, $siteConfiguration, $database);
-
-        if ($page instanceof PageBase) {
-            $page->setTokenManager(new TokenManager());
-            $page->setCspManager(new ContentSecurityPolicyManager($siteConfiguration));
-
-            if ($page instanceof InternalPageBase) {
-                $page->setTypeAheadHelper(new TypeAheadHelper());
-
-                $identificationVerifier = new IdentificationVerifier($page->getHttpHelper(), $siteConfiguration, $database);
-                $page->setSecurityManager(new SecurityManager($identificationVerifier, new RoleConfiguration()));
-
-                if ($siteConfiguration->getTitleBlacklistEnabled()) {
-                    $page->setBlacklistHelper(new BlacklistHelper($page->getHttpHelper(), $database, $siteConfiguration));
-                }
-                else {
-                    $page->setBlacklistHelper(new FakeBlacklistHelper());
-                }
-
-                $page->setDomainAccessManager(new DomainAccessManager($page->getSecurityManager()));
-            }
-        }
-    }
-
-    /**
-     * Application entry point.
-     *
-     * Sets up the environment and runs the application, performing any global cleanup operations when done.
-     */
-    public function run()
-    {
-        try {
-            if ($this->setupEnvironment()) {
-                $this->main();
-            }
-        }
-        catch (EnvironmentException $ex) {
-            ob_end_clean();
-            print Offline::getOfflineMessage($this->isPublic(), $this->getConfiguration(), $ex->getMessage());
-        }
-            /** @noinspection PhpRedundantCatchClauseInspection */
-        catch (ReadableException $ex) {
-            ob_end_clean();
-            print $ex->getReadableError();
-        }
-        finally {
-            $this->cleanupEnvironment();
-        }
-    }
-
-    /**
-     * Environment setup
-     *
-     * This method initialises the tool environment. If the tool cannot be initialised correctly, it will return false
-     * and shut down prematurely.
-     *
-     * @return bool
-     * @throws EnvironmentException
-     */
-    protected function setupEnvironment()
-    {
-        // initialise global exception handler
-        set_exception_handler(array(ExceptionHandler::class, 'exceptionHandler'));
-        set_error_handler(array(ExceptionHandler::class, 'errorHandler'), E_RECOVERABLE_ERROR);
-
-        // start output buffering if necessary
-        if (ob_get_level() === 0) {
-            ob_start();
-        }
-
-        // initialise super-global providers
-        WebRequest::setGlobalStateProvider(new GlobalStateProvider());
-
-        if (Offline::isOffline($this->getConfiguration())) {
-            print Offline::getOfflineMessage($this->isPublic(), $this->getConfiguration());
-            ob_end_flush();
-
-            return false;
-        }
-
-        // Call parent setup
-        if (!parent::setupEnvironment()) {
-            return false;
-        }
-
-        // Start up sessions
-        ini_set('session.cookie_path', $this->getConfiguration()->getCookiePath());
-        ini_set('session.name', $this->getConfiguration()->getCookieSessionName());
-        Session::start();
-
-        // Check the user is allowed to be logged in still. This must be before we call any user-loading functions and
-        // get the current user cached.
-        // I'm not sure if this function call being here is particularly a good thing, but it's part of starting up a
-        // session I suppose.
-        $this->checkForceLogout();
-
-        // environment initialised!
-        return true;
-    }
-
-    /**
-     * Main application logic
-     */
-    protected function main()
-    {
-        // Get the right route for the request
-        $page = $this->requestRouter->route();
-
-        $siteConfiguration = $this->getConfiguration();
-        $database = PdoDatabase::getDatabaseConnection($this->getConfiguration());
-
-        $this->setupHelpers($page, $siteConfiguration, $database);
-
-        // run the route code for the request.
-        $page->execute();
-    }
-
-    /**
-     * Any cleanup tasks should go here
-     *
-     * Note that we need to be very careful here, as exceptions may have been thrown and handled.
-     * This should *only* be for cleaning up, no logic should go here.
-     */
-    protected function cleanupEnvironment()
-    {
-        // Clean up anything we splurged after sending the page.
-        if (ob_get_level() > 0) {
-            for ($i = ob_get_level(); $i > 0; $i--) {
-                ob_end_clean();
-            }
-        }
-    }
-
-    private function checkForceLogout()
-    {
-        $database = PdoDatabase::getDatabaseConnection($this->getConfiguration());
-
-        $sessionUserId = WebRequest::getSessionUserId();
-        iF ($sessionUserId === null) {
-            return;
-        }
-
-        // Note, User::getCurrent() caches it's result, which we *really* don't want to trigger.
-        $currentUser = User::getById($sessionUserId, $database);
-
-        if ($currentUser === false) {
-            // Umm... this user has a session cookie with a userId set, but no user exists...
-            Session::restart();
-
-            $currentUser = User::getCurrent($database);
-        }
-
-        if ($currentUser->getForceLogout()) {
-            Session::restart();
-
-            $currentUser->setForceLogout(false);
-            $currentUser->save();
-        }
-    }
-
-    public function isPublic(): bool
-    {
-        return $this->isPublic;
-    }
-
-    public function setPublic(bool $isPublic): void
-    {
-        $this->isPublic = $isPublic;
-    }
+	/**
+	 * @var IRequestRouter $requestRouter The request router to use. Note that different entry points have different
+	 *                                    routers and hence different URL mappings
+	 */
+	private $requestRouter;
+	/**
+	 * @var bool $isPublic Determines whether to use public interface objects or internal interface objects
+	 */
+	private bool $isPublic = false;
+
+	/**
+	 * WebStart constructor.
+	 *
+	 * @param SiteConfiguration $configuration The site configuration
+	 * @param IRequestRouter    $router        The request router to use
+	 */
+	public function __construct(SiteConfiguration $configuration, IRequestRouter $router)
+	{
+		parent::__construct($configuration);
+
+		$this->requestRouter = $router;
+	}
+
+	/**
+	 * @param ITask             $page
+	 * @param SiteConfiguration $siteConfiguration
+	 * @param PdoDatabase       $database
+	 *
+	 * @return void
+	 */
+	protected function setupHelpers(
+		ITask $page,
+		SiteConfiguration $siteConfiguration,
+		PdoDatabase $database
+	) {
+		parent::setupHelpers($page, $siteConfiguration, $database);
+
+		if ($page instanceof PageBase) {
+			$page->setTokenManager(new TokenManager());
+			$page->setCspManager(new ContentSecurityPolicyManager($siteConfiguration));
+
+			if ($page instanceof InternalPageBase) {
+				$page->setTypeAheadHelper(new TypeAheadHelper());
+
+				$identificationVerifier = new IdentificationVerifier($page->getHttpHelper(), $siteConfiguration, $database);
+				$page->setSecurityManager(new SecurityManager($identificationVerifier, new RoleConfiguration()));
+
+				if ($siteConfiguration->getTitleBlacklistEnabled()) {
+					$page->setBlacklistHelper(new BlacklistHelper($page->getHttpHelper(), $database, $siteConfiguration));
+				}
+				else {
+					$page->setBlacklistHelper(new FakeBlacklistHelper());
+				}
+
+				$page->setDomainAccessManager(new DomainAccessManager($page->getSecurityManager()));
+			}
+		}
+	}
+
+	/**
+	 * Application entry point.
+	 *
+	 * Sets up the environment and runs the application, performing any global cleanup operations when done.
+	 */
+	public function run()
+	{
+		try {
+			if ($this->setupEnvironment()) {
+				$this->main();
+			}
+		}
+		catch (EnvironmentException $ex) {
+			ob_end_clean();
+			print Offline::getOfflineMessage($this->isPublic(), $this->getConfiguration(), $ex->getMessage());
+		}
+			/** @noinspection PhpRedundantCatchClauseInspection */
+		catch (ReadableException $ex) {
+			ob_end_clean();
+			print $ex->getReadableError();
+		}
+		finally {
+			$this->cleanupEnvironment();
+		}
+	}
+
+	/**
+	 * Environment setup
+	 *
+	 * This method initialises the tool environment. If the tool cannot be initialised correctly, it will return false
+	 * and shut down prematurely.
+	 *
+	 * @return bool
+	 * @throws EnvironmentException
+	 */
+	protected function setupEnvironment()
+	{
+		// initialise global exception handler
+		set_exception_handler(array(ExceptionHandler::class, 'exceptionHandler'));
+		set_error_handler(array(ExceptionHandler::class, 'errorHandler'), E_RECOVERABLE_ERROR);
+
+		// start output buffering if necessary
+		if (ob_get_level() === 0) {
+			ob_start();
+		}
+
+		// initialise super-global providers
+		WebRequest::setGlobalStateProvider(new GlobalStateProvider());
+
+		if (Offline::isOffline($this->getConfiguration())) {
+			print Offline::getOfflineMessage($this->isPublic(), $this->getConfiguration());
+			ob_end_flush();
+
+			return false;
+		}
+
+		// Call parent setup
+		if (!parent::setupEnvironment()) {
+			return false;
+		}
+
+		// Start up sessions
+		ini_set('session.cookie_path', $this->getConfiguration()->getCookiePath());
+		ini_set('session.name', $this->getConfiguration()->getCookieSessionName());
+		Session::start();
+
+		// Check the user is allowed to be logged in still. This must be before we call any user-loading functions and
+		// get the current user cached.
+		// I'm not sure if this function call being here is particularly a good thing, but it's part of starting up a
+		// session I suppose.
+		$this->checkForceLogout();
+
+		// environment initialised!
+		return true;
+	}
+
+	/**
+	 * Main application logic
+	 */
+	protected function main()
+	{
+		// Get the right route for the request
+		$page = $this->requestRouter->route();
+
+		$siteConfiguration = $this->getConfiguration();
+		$database = PdoDatabase::getDatabaseConnection($this->getConfiguration());
+
+		$this->setupHelpers($page, $siteConfiguration, $database);
+
+		// run the route code for the request.
+		$page->execute();
+	}
+
+	/**
+	 * Any cleanup tasks should go here
+	 *
+	 * Note that we need to be very careful here, as exceptions may have been thrown and handled.
+	 * This should *only* be for cleaning up, no logic should go here.
+	 */
+	protected function cleanupEnvironment()
+	{
+		// Clean up anything we splurged after sending the page.
+		if (ob_get_level() > 0) {
+			for ($i = ob_get_level(); $i > 0; $i--) {
+				ob_end_clean();
+			}
+		}
+	}
+
+	private function checkForceLogout()
+	{
+		$database = PdoDatabase::getDatabaseConnection($this->getConfiguration());
+
+		$sessionUserId = WebRequest::getSessionUserId();
+		iF ($sessionUserId === null) {
+			return;
+		}
+
+		// Note, User::getCurrent() caches it's result, which we *really* don't want to trigger.
+		$currentUser = User::getById($sessionUserId, $database);
+
+		if ($currentUser === false) {
+			// Umm... this user has a session cookie with a userId set, but no user exists...
+			Session::restart();
+
+			$currentUser = User::getCurrent($database);
+		}
+
+		if ($currentUser->getForceLogout()) {
+			Session::restart();
+
+			$currentUser->setForceLogout(false);
+			$currentUser->save();
+		}
+	}
+
+	public function isPublic(): bool
+	{
+		return $this->isPublic;
+	}
+
+	public function setPublic(bool $isPublic): void
+	{
+		$this->isPublic = $isPublic;
+	}
 }

includes/Pages/PageWelcomeTemplateManagement.php

Indentation +191 added lines, -191 removed lines

@@ -22,258 +22,258 @@
 
 class PageWelcomeTemplateManagement extends InternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        $database = $this->getDatabase();
-        $templateList = WelcomeTemplate::getAll($database, 1); // FIXME: domains
-        $preferenceManager = PreferenceManager::getForCurrent($database);
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		$database = $this->getDatabase();
+		$templateList = WelcomeTemplate::getAll($database, 1); // FIXME: domains
+		$preferenceManager = PreferenceManager::getForCurrent($database);
 
-        $this->setHtmlTitle('Welcome Templates');
+		$this->setHtmlTitle('Welcome Templates');
 
-        $this->assignCSRFToken();
+		$this->assignCSRFToken();
 
-        $user = User::getCurrent($database);
+		$user = User::getCurrent($database);
 
-        $currentTemplate = $preferenceManager->getPreference(PreferenceManager::PREF_WELCOMETEMPLATE);
-        $this->assign('currentTemplate', $currentTemplate);
+		$currentTemplate = $preferenceManager->getPreference(PreferenceManager::PREF_WELCOMETEMPLATE);
+		$this->assign('currentTemplate', $currentTemplate);
 
-        $this->assign('canEdit', $this->barrierTest('edit', $user));
-        $this->assign('canAdd', $this->barrierTest('add', $user));
-        $this->assign('canSelect', $this->barrierTest('select', $user));
+		$this->assign('canEdit', $this->barrierTest('edit', $user));
+		$this->assign('canAdd', $this->barrierTest('add', $user));
+		$this->assign('canSelect', $this->barrierTest('select', $user));
 
-        $this->assign('templateList', $templateList);
-        $this->setTemplate('welcome-template/list.tpl');
-    }
+		$this->assign('templateList', $templateList);
+		$this->setTemplate('welcome-template/list.tpl');
+	}
 
-    /**
-     * Handles the requests for selecting a template to use.
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function select()
-    {
-        // get rid of GETs
-        if (!WebRequest::wasPosted()) {
-            $this->redirect('welcomeTemplates');
-        }
+	/**
+	 * Handles the requests for selecting a template to use.
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function select()
+	{
+		// get rid of GETs
+		if (!WebRequest::wasPosted()) {
+			$this->redirect('welcomeTemplates');
+		}
 
-        $this->validateCSRFToken();
+		$this->validateCSRFToken();
 
-        $database = $this->getDatabase();
-        $user = User::getCurrent($database);
-        $preferenceManager = PreferenceManager::getForCurrent($database);
+		$database = $this->getDatabase();
+		$user = User::getCurrent($database);
+		$preferenceManager = PreferenceManager::getForCurrent($database);
 
-        if (WebRequest::postBoolean('disable')) {
-            $preferenceManager->setLocalPreference(PreferenceManager::PREF_WELCOMETEMPLATE, null);
+		if (WebRequest::postBoolean('disable')) {
+			$preferenceManager->setLocalPreference(PreferenceManager::PREF_WELCOMETEMPLATE, null);
 
-            SessionAlert::success('Disabled automatic user welcoming.');
-            $this->redirect('welcomeTemplates');
+			SessionAlert::success('Disabled automatic user welcoming.');
+			$this->redirect('welcomeTemplates');
 
-            return;
-        }
+			return;
+		}
 
-        $templateId = WebRequest::postInt('template');
-        /** @var false|WelcomeTemplate $template */
-        $template = WelcomeTemplate::getById($templateId, $database);
+		$templateId = WebRequest::postInt('template');
+		/** @var false|WelcomeTemplate $template */
+		$template = WelcomeTemplate::getById($templateId, $database);
 
-        if ($template === false || $template->isDeleted()) {
-            throw new ApplicationLogicException('Unknown template');
-        }
+		if ($template === false || $template->isDeleted()) {
+			throw new ApplicationLogicException('Unknown template');
+		}
 
-        $preferenceManager->setLocalPreference(PreferenceManager::PREF_WELCOMETEMPLATE, $template->getId());
+		$preferenceManager->setLocalPreference(PreferenceManager::PREF_WELCOMETEMPLATE, $template->getId());
 
-        SessionAlert::success("Updated selected welcome template for automatic welcoming.");
+		SessionAlert::success("Updated selected welcome template for automatic welcoming.");
 
-        $this->redirect('welcomeTemplates');
-    }
+		$this->redirect('welcomeTemplates');
+	}
 
-    /**
-     * Handles the requests for viewing a template.
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function view()
-    {
-        $this->setHtmlTitle('View Welcome Template');
+	/**
+	 * Handles the requests for viewing a template.
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function view()
+	{
+		$this->setHtmlTitle('View Welcome Template');
 
-        $database = $this->getDatabase();
+		$database = $this->getDatabase();
 
-        $templateId = WebRequest::getInt('template');
+		$templateId = WebRequest::getInt('template');
 
-        /** @var false|WelcomeTemplate $template */
-        $template = WelcomeTemplate::getById($templateId, $database);
+		/** @var false|WelcomeTemplate $template */
+		$template = WelcomeTemplate::getById($templateId, $database);
 
-        if ($template === false) {
-            throw new ApplicationLogicException('Cannot find requested template');
-        }
+		if ($template === false) {
+			throw new ApplicationLogicException('Cannot find requested template');
+		}
 
-        $currentUser = User::getCurrent($database);
+		$currentUser = User::getCurrent($database);
 
-        // This includes a section header, because we use the "new section" API call.
-        $wikiText = "== " . $template->getSectionHeader() . "==\n" . $template->getBotCodeForWikiSave('Example User', $currentUser->getOnWikiName());
+		// This includes a section header, because we use the "new section" API call.
+		$wikiText = "== " . $template->getSectionHeader() . "==\n" . $template->getBotCodeForWikiSave('Example User', $currentUser->getOnWikiName());
 
-        $oauth = new OAuthUserHelper($currentUser, $database, $this->getOauthProtocolHelper(),
-            $this->getSiteConfiguration());
-        $mediaWikiHelper = new MediaWikiHelper($oauth, $this->getSiteConfiguration());
+		$oauth = new OAuthUserHelper($currentUser, $database, $this->getOauthProtocolHelper(),
+			$this->getSiteConfiguration());
+		$mediaWikiHelper = new MediaWikiHelper($oauth, $this->getSiteConfiguration());
 
-        $templateHtml = $mediaWikiHelper->getHtmlForWikiText($wikiText);
+		$templateHtml = $mediaWikiHelper->getHtmlForWikiText($wikiText);
         
-        // Add site to relevant links, since the MediaWiki parser returns, eg, `/wiki/Help:Introduction`
-        // and we want to link to <https://en.wikipedia.org/wiki/Help:Introduction> rather than
-        // <https://accounts.wmflabs.org/wiki/Help:Introduction>
-        // The code currently assumes that the template was parsed for enwiki, and will need to be
-        // updated once other wikis are supported.
-        $templateHtml = preg_replace('/(<a href=")(\/wiki\/)/', '$1//en.wikipedia.org$2', $templateHtml);
-
-        $this->assign('templateHtml', $templateHtml);
-        $this->assign('template', $template);
-        $this->setTemplate('welcome-template/view.tpl');
-    }
-
-    /**
-     * Handler for the add action to create a new welcome template
-     *
-     * @throws Exception
-     */
-    protected function add()
-    {
-        $this->assign('createmode', true);
+		// Add site to relevant links, since the MediaWiki parser returns, eg, `/wiki/Help:Introduction`
+		// and we want to link to <https://en.wikipedia.org/wiki/Help:Introduction> rather than
+		// <https://accounts.wmflabs.org/wiki/Help:Introduction>
+		// The code currently assumes that the template was parsed for enwiki, and will need to be
+		// updated once other wikis are supported.
+		$templateHtml = preg_replace('/(<a href=")(\/wiki\/)/', '$1//en.wikipedia.org$2', $templateHtml);
+
+		$this->assign('templateHtml', $templateHtml);
+		$this->assign('template', $template);
+		$this->setTemplate('welcome-template/view.tpl');
+	}
+
+	/**
+	 * Handler for the add action to create a new welcome template
+	 *
+	 * @throws Exception
+	 */
+	protected function add()
+	{
+		$this->assign('createmode', true);
 
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-            $database = $this->getDatabase();
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+			$database = $this->getDatabase();
 
-            $userCode = WebRequest::postString('usercode');
-            $botCode = WebRequest::postString('botcode');
+			$userCode = WebRequest::postString('usercode');
+			$botCode = WebRequest::postString('botcode');
 
-            $this->validate($userCode, $botCode);
+			$this->validate($userCode, $botCode);
 
-            $template = new WelcomeTemplate();
-            $template->setDatabase($database);
-            $template->setUserCode($userCode);
-            $template->setBotCode($botCode);
-            $template->setDomain(1); // FIXME: domains!
-            $template->save();
+			$template = new WelcomeTemplate();
+			$template->setDatabase($database);
+			$template->setUserCode($userCode);
+			$template->setBotCode($botCode);
+			$template->setDomain(1); // FIXME: domains!
+			$template->save();
 
-            Logger::welcomeTemplateCreated($database, $template);
+			Logger::welcomeTemplateCreated($database, $template);
 
-            $this->getNotificationHelper()->welcomeTemplateCreated($template);
+			$this->getNotificationHelper()->welcomeTemplateCreated($template);
 
-            SessionAlert::success("Template successfully created.");
+			SessionAlert::success("Template successfully created.");
 
-            $this->redirect('welcomeTemplates');
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->assign('template', new WelcomeTemplate());
-            $this->setTemplate("welcome-template/edit.tpl");
-        }
-    }
+			$this->redirect('welcomeTemplates');
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->assign('template', new WelcomeTemplate());
+			$this->setTemplate("welcome-template/edit.tpl");
+		}
+	}
 
-    /**
-     * Handler for editing templates
-     */
-    protected function edit()
-    {
-        $database = $this->getDatabase();
+	/**
+	 * Handler for editing templates
+	 */
+	protected function edit()
+	{
+		$database = $this->getDatabase();
 
-        $templateId = WebRequest::getInt('template');
+		$templateId = WebRequest::getInt('template');
 
-        /** @var false|WelcomeTemplate $template */
-        $template = WelcomeTemplate::getById($templateId, $database);
+		/** @var false|WelcomeTemplate $template */
+		$template = WelcomeTemplate::getById($templateId, $database);
 
-        if ($template === false) {
-            throw new ApplicationLogicException('Cannot find requested template');
-        }
+		if ($template === false) {
+			throw new ApplicationLogicException('Cannot find requested template');
+		}
 
-        if ($template->isDeleted()) {
-            throw new ApplicationLogicException('The specified template has been deleted');
-        }
+		if ($template->isDeleted()) {
+			throw new ApplicationLogicException('The specified template has been deleted');
+		}
 
-        $this->assign('createmode', false);
+		$this->assign('createmode', false);
 
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
 
-            $userCode = WebRequest::postString('usercode');
-            $botCode = WebRequest::postString('botcode');
+			$userCode = WebRequest::postString('usercode');
+			$botCode = WebRequest::postString('botcode');
 
-            $this->validate($userCode, $botCode);
+			$this->validate($userCode, $botCode);
 
-            $template->setUserCode($userCode);
-            $template->setBotCode($botCode);
-            $template->setUpdateVersion(WebRequest::postInt('updateversion'));
-            $template->save();
+			$template->setUserCode($userCode);
+			$template->setBotCode($botCode);
+			$template->setUpdateVersion(WebRequest::postInt('updateversion'));
+			$template->save();
 
-            Logger::welcomeTemplateEdited($database, $template);
+			Logger::welcomeTemplateEdited($database, $template);
 
-            SessionAlert::success("Template updated.");
+			SessionAlert::success("Template updated.");
 
-            $this->getNotificationHelper()->welcomeTemplateEdited($template);
+			$this->getNotificationHelper()->welcomeTemplateEdited($template);
 
-            $this->redirect('welcomeTemplates');
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->assign('template', $template);
-            $this->setTemplate('welcome-template/edit.tpl');
-        }
-    }
+			$this->redirect('welcomeTemplates');
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->assign('template', $template);
+			$this->setTemplate('welcome-template/edit.tpl');
+		}
+	}
 
-    protected function delete()
-    {
-        if (!WebRequest::wasPosted()) {
-            $this->redirect('welcomeTemplates');
-            return;
-        }
+	protected function delete()
+	{
+		if (!WebRequest::wasPosted()) {
+			$this->redirect('welcomeTemplates');
+			return;
+		}
 
-        $this->validateCSRFToken();
+		$this->validateCSRFToken();
 
-        $database = $this->getDatabase();
+		$database = $this->getDatabase();
 
-        $templateId = WebRequest::postInt('template');
-        $updateVersion = WebRequest::postInt('updateversion');
+		$templateId = WebRequest::postInt('template');
+		$updateVersion = WebRequest::postInt('updateversion');
 
-        /** @var false|WelcomeTemplate $template */
-        $template = WelcomeTemplate::getById($templateId, $database);
+		/** @var false|WelcomeTemplate $template */
+		$template = WelcomeTemplate::getById($templateId, $database);
 
-        if ($template === false || $template->isDeleted()) {
-            throw new ApplicationLogicException('Cannot find requested template');
-        }
+		if ($template === false || $template->isDeleted()) {
+			throw new ApplicationLogicException('Cannot find requested template');
+		}
 
-        // set the update version to the version sent by the client (optimisticly lock from initial page load)
-        $template->setUpdateVersion($updateVersion);
+		// set the update version to the version sent by the client (optimisticly lock from initial page load)
+		$template->setUpdateVersion($updateVersion);
 
-        $database
-            ->prepare("UPDATE userpreference SET value = NULL, updateversion = updateversion + 1 WHERE preference = :pref and value = :id;")
-            ->execute([
-                ':id'   => $templateId,
-                ':pref' => PreferenceManager::PREF_WELCOMETEMPLATE
-            ]);
+		$database
+			->prepare("UPDATE userpreference SET value = NULL, updateversion = updateversion + 1 WHERE preference = :pref and value = :id;")
+			->execute([
+				':id'   => $templateId,
+				':pref' => PreferenceManager::PREF_WELCOMETEMPLATE
+			]);
 
-        Logger::welcomeTemplateDeleted($database, $template);
+		Logger::welcomeTemplateDeleted($database, $template);
 
-        $template->delete();
+		$template->delete();
 
-        $this->redirect('welcomeTemplates');
+		$this->redirect('welcomeTemplates');
 
-        SessionAlert::success(
-            "Template deleted. Any users who were using this template have had automatic welcoming disabled.");
-        $this->getNotificationHelper()->welcomeTemplateDeleted($templateId);
-    }
+		SessionAlert::success(
+			"Template deleted. Any users who were using this template have had automatic welcoming disabled.");
+		$this->getNotificationHelper()->welcomeTemplateDeleted($templateId);
+	}
 
-    private function validate($userCode, $botCode)
-    {
-        if ($userCode === null) {
-            throw new ApplicationLogicException('User code cannot be null');
-        }
+	private function validate($userCode, $botCode)
+	{
+		if ($userCode === null) {
+			throw new ApplicationLogicException('User code cannot be null');
+		}
 
-        if ($botCode === null) {
-            throw new ApplicationLogicException('Bot code cannot be null');
-        }
-    }
+		if ($botCode === null) {
+			throw new ApplicationLogicException('Bot code cannot be null');
+		}
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -166,8 +166,7 @@ 
             SessionAlert::success("Template successfully created.");
 
             $this->redirect('welcomeTemplates');
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->assign('template', new WelcomeTemplate());
             $this->setTemplate("welcome-template/edit.tpl");
@@ -216,8 +215,7 @@ 
             $this->getNotificationHelper()->welcomeTemplateEdited($template);
 
             $this->redirect('welcomeTemplates');
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->assign('template', $template);
             $this->setTemplate('welcome-template/edit.tpl');

includes/Pages/PageXffDemo.php

Indentation +132 added lines, -132 removed lines

@@ -13,136 +13,136 @@
 
 class PageXffDemo extends InternalPageBase
 {
-    use RequestData;
-
-    /**
-     * @inheritDoc
-     */
-    protected function main()
-    {
-        $this->setTemplate('xffdemo.tpl');
-
-        // requestHasForwardedIp == false
-        // requestProxyData
-        // requestRealIp == proxy
-        // requestForwardedIp == xff header
-        // forwardedOrigin  == top of the chain, assuming xff is trusted
-
-
-        $this->assign('demo2', [
-            [
-                'trust' => true,
-                'trustedlink' => true,
-                'ip' => '172.16.0.164',
-                'routable' => false,
-
-            ], [
-                'trust' => true,
-                'ip' => '198.51.100.123',
-                'routable' => true,
-                'rdns' => 'trustedproxy.example.com',
-
-            ], [
-                'trust' => true,
-                'ip' => '192.0.2.1',
-                'routable' => true,
-                'rdns' => 'client.users.example.org',
-                'location' => [
-                    'cityName' => 'San Francisco',
-                    'regionName' => 'California',
-                    'countryName' => 'United States'
-                ],
-                'showlinks' => true
-            ]
-        ]);
-
-        $this->assign('demo3', [
-            [
-                'trust' => true,
-                'trustedlink' => true,
-                'ip' => '172.16.0.164',
-                'routable' => false,
-
-            ], [
-                'trust' => false,
-                'ip' => '198.51.100.234',
-                'routable' => true,
-                'rdns' => 'sketchyproxy.example.com',
-                'showlinks' => true
-
-            ], [
-                'trust' => false,
-                'ip' => '192.0.2.1',
-                'routable' => true,
-                'rdns' => 'client.users.example.org',
-                'location' => [
-                    'cityName' => 'San Francisco',
-                    'regionName' => 'California',
-                    'countryName' => 'United States'
-                ],
-                'showlinks' => true
-            ]
-        ]);
-
-        $this->assign('demo4', [
-            [
-                'trust' => true,
-                'trustedlink' => true,
-                'ip' => '172.16.0.164',
-                'routable' => false,
-
-            ], [
-                'trust' => true,
-                'ip' => '198.51.100.123',
-                'routable' => true,
-                'rdns' => 'trustedproxy.example.com',
-            ], [
-                'trust' => false,
-                'ip' => '198.51.100.234',
-                'routable' => true,
-                'rdns' => 'sketchyproxy.example.com',
-                'showlinks' => true
-            ], [
-                'trust' => false,
-                'trustedlink' => true,
-                'ip' => '198.51.100.124',
-                'routable' => true,
-                'rdns' => 'trustedproxy2.example.com',
-                'showlinks' => true
-            ], [
-                'trust' => false,
-                'ip' => '192.0.2.1',
-                'routable' => true,
-                'rdns' => 'client.users.example.org',
-                'location' => [
-                    'cityName' => 'San Francisco',
-                    'regionName' => 'California',
-                    'countryName' => 'United States'
-                ],
-                'showlinks' => true
-            ]
-        ]);
-
-        $this->assign('demo1', [
-            [
-                'trust' => true,
-                'trustedlink' => true,
-                'ip' => '172.16.0.164',
-                'routable' => false,
-
-            ], [
-                'trust' => true,
-                'trustedlink' => true,
-                'ip' => '192.0.2.1',
-                'routable' => true,
-                'rdns' => 'client.users.example.org',
-                'location' => [
-                    'cityName' => 'San Francisco',
-                    'regionName' => 'California',
-                    'countryName' => 'United States'
-                ],
-                'showlinks' => true
-            ]
-        ]);
-    }
+	use RequestData;
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function main()
+	{
+		$this->setTemplate('xffdemo.tpl');
+
+		// requestHasForwardedIp == false
+		// requestProxyData
+		// requestRealIp == proxy
+		// requestForwardedIp == xff header
+		// forwardedOrigin  == top of the chain, assuming xff is trusted
+
+
+		$this->assign('demo2', [
+			[
+				'trust' => true,
+				'trustedlink' => true,
+				'ip' => '172.16.0.164',
+				'routable' => false,
+
+			], [
+				'trust' => true,
+				'ip' => '198.51.100.123',
+				'routable' => true,
+				'rdns' => 'trustedproxy.example.com',
+
+			], [
+				'trust' => true,
+				'ip' => '192.0.2.1',
+				'routable' => true,
+				'rdns' => 'client.users.example.org',
+				'location' => [
+					'cityName' => 'San Francisco',
+					'regionName' => 'California',
+					'countryName' => 'United States'
+				],
+				'showlinks' => true
+			]
+		]);
+
+		$this->assign('demo3', [
+			[
+				'trust' => true,
+				'trustedlink' => true,
+				'ip' => '172.16.0.164',
+				'routable' => false,
+
+			], [
+				'trust' => false,
+				'ip' => '198.51.100.234',
+				'routable' => true,
+				'rdns' => 'sketchyproxy.example.com',
+				'showlinks' => true
+
+			], [
+				'trust' => false,
+				'ip' => '192.0.2.1',
+				'routable' => true,
+				'rdns' => 'client.users.example.org',
+				'location' => [
+					'cityName' => 'San Francisco',
+					'regionName' => 'California',
+					'countryName' => 'United States'
+				],
+				'showlinks' => true
+			]
+		]);
+
+		$this->assign('demo4', [
+			[
+				'trust' => true,
+				'trustedlink' => true,
+				'ip' => '172.16.0.164',
+				'routable' => false,
+
+			], [
+				'trust' => true,
+				'ip' => '198.51.100.123',
+				'routable' => true,
+				'rdns' => 'trustedproxy.example.com',
+			], [
+				'trust' => false,
+				'ip' => '198.51.100.234',
+				'routable' => true,
+				'rdns' => 'sketchyproxy.example.com',
+				'showlinks' => true
+			], [
+				'trust' => false,
+				'trustedlink' => true,
+				'ip' => '198.51.100.124',
+				'routable' => true,
+				'rdns' => 'trustedproxy2.example.com',
+				'showlinks' => true
+			], [
+				'trust' => false,
+				'ip' => '192.0.2.1',
+				'routable' => true,
+				'rdns' => 'client.users.example.org',
+				'location' => [
+					'cityName' => 'San Francisco',
+					'regionName' => 'California',
+					'countryName' => 'United States'
+				],
+				'showlinks' => true
+			]
+		]);
+
+		$this->assign('demo1', [
+			[
+				'trust' => true,
+				'trustedlink' => true,
+				'ip' => '172.16.0.164',
+				'routable' => false,
+
+			], [
+				'trust' => true,
+				'trustedlink' => true,
+				'ip' => '192.0.2.1',
+				'routable' => true,
+				'rdns' => 'client.users.example.org',
+				'location' => [
+					'cityName' => 'San Francisco',
+					'regionName' => 'California',
+					'countryName' => 'United States'
+				],
+				'showlinks' => true
+			]
+		]);
+	}
 }

includes/Pages/PageErrorLogViewer.php

Indentation +123 added lines, -123 removed lines

@@ -14,127 +14,127 @@
 
 class PageErrorLogViewer extends InternalPageBase
 {
-    /**
-     * @inheritDoc
-     */
-    protected function main()
-    {
-        $this->setHtmlTitle('Exception viewer');
-
-        $user = User::getCurrent($this->getDatabase());
-        $this->assign('canView', $this->barrierTest('view', $user));
-        $this->assign('canRemove', $this->barrierTest('remove', $user));
-
-        // Get the list of exception logs from the error log directory
-        $errorLogDirectory = $this->getSiteConfiguration()->getErrorLog();
-        $files = scandir($errorLogDirectory);
-
-        // Exclude the files we know should be there
-        $filteredFiles = array_filter($files, function($file) {
-            return !in_array($file, ['.', '..', 'README.md']);
-        });
-
-        $exceptionDetails = array_map(function($item) use ($errorLogDirectory) {
-            $filename = realpath($errorLogDirectory) . DIRECTORY_SEPARATOR . $item;
-
-            return [
-                'id'   => str_replace('.log', '', $item),
-                'date' => date('Y-m-d H:i:s', filemtime($filename)),
-                'data' => str_replace($this->getSiteConfiguration()->getFilePath(), '.',
-                    unserialize(file_get_contents($filename))),
-            ];
-        }, $filteredFiles);
-
-        $this->assign('exceptionEntries', $exceptionDetails);
-        $this->setTemplate('errorlog/main.tpl');
-    }
-
-    protected function view()
-    {
-        $this->setHtmlTitle('Exception viewer');
-
-        $requestedErrorId = WebRequest::getString('id');
-        $safeFilename = $this->safetyCheck($requestedErrorId);
-
-        if ($safeFilename === false) {
-            $this->redirect('errorLog');
-
-            return;
-        }
-
-        // note: at this point we've done sufficient sanity checks that we can be confident this value is safe to echo
-        // back to the user.
-        $this->assign('id', $requestedErrorId);
-        $this->assign('date', date('Y-m-d H:i:s', filemtime($safeFilename)));
-
-        $data = unserialize(file_get_contents($safeFilename));
-        $this->assign('server', $data['server']);
-        $this->assign('get', $data['get']);
-        $this->assign('post', $data['post']);
-
-        $this->assign('globalHandler', $data['globalHandler']);
-
-        $exceptionList = [];
-        $current = $data;
-        do {
-            $ex = [
-                'exception' => $current['exception'],
-                'message'   => str_replace($this->getSiteConfiguration()->getFilePath(), '.', $current['message']),
-                'stack'     => str_replace($this->getSiteConfiguration()->getFilePath(), '.', $current['stack']),
-            ];
-            $exceptionList[] = $ex;
-
-            $current = $current['previous'];
-        }
-        while ($current !== null);
-
-        $this->assign('exceptionList', $exceptionList);
-
-        $this->setTemplate('errorlog/details.tpl');
-    }
-
-    public function remove()
-    {
-        $safeFilename = $this->safetyCheck(WebRequest::getString('id'));
-
-        if ($safeFilename === false) {
-            $this->redirect('errorLog');
-
-            return;
-        }
-
-        unlink($safeFilename);
-
-        $this->redirect('errorLog');
-
-        return;
-    }
-
-    /**
-     * @param string|null $requestedErrorId
-     *
-     * @return bool|string
-     */
-    protected function safetyCheck(?string $requestedErrorId)
-    {
-        if ($requestedErrorId === null) {
-            return false;
-        }
-
-        // security - only allow hex-encoded filenames, as this is what is generated.
-        // This is prefixed with the configured directory. Path traversal is protected against due to . and / not being
-        // part of the hex character set.
-        if (!preg_match('/^[a-f0-9]{40}$/', $requestedErrorId)) {
-            return false;
-        }
-
-        $errorLogDirectory = $this->getSiteConfiguration()->getErrorLog();
-        $filename = realpath($errorLogDirectory) . DIRECTORY_SEPARATOR . $requestedErrorId . '.log';
-
-        if (!file_exists($filename)) {
-            return false;
-        }
-
-        return $filename;
-    }
+	/**
+	 * @inheritDoc
+	 */
+	protected function main()
+	{
+		$this->setHtmlTitle('Exception viewer');
+
+		$user = User::getCurrent($this->getDatabase());
+		$this->assign('canView', $this->barrierTest('view', $user));
+		$this->assign('canRemove', $this->barrierTest('remove', $user));
+
+		// Get the list of exception logs from the error log directory
+		$errorLogDirectory = $this->getSiteConfiguration()->getErrorLog();
+		$files = scandir($errorLogDirectory);
+
+		// Exclude the files we know should be there
+		$filteredFiles = array_filter($files, function($file) {
+			return !in_array($file, ['.', '..', 'README.md']);
+		});
+
+		$exceptionDetails = array_map(function($item) use ($errorLogDirectory) {
+			$filename = realpath($errorLogDirectory) . DIRECTORY_SEPARATOR . $item;
+
+			return [
+				'id'   => str_replace('.log', '', $item),
+				'date' => date('Y-m-d H:i:s', filemtime($filename)),
+				'data' => str_replace($this->getSiteConfiguration()->getFilePath(), '.',
+					unserialize(file_get_contents($filename))),
+			];
+		}, $filteredFiles);
+
+		$this->assign('exceptionEntries', $exceptionDetails);
+		$this->setTemplate('errorlog/main.tpl');
+	}
+
+	protected function view()
+	{
+		$this->setHtmlTitle('Exception viewer');
+
+		$requestedErrorId = WebRequest::getString('id');
+		$safeFilename = $this->safetyCheck($requestedErrorId);
+
+		if ($safeFilename === false) {
+			$this->redirect('errorLog');
+
+			return;
+		}
+
+		// note: at this point we've done sufficient sanity checks that we can be confident this value is safe to echo
+		// back to the user.
+		$this->assign('id', $requestedErrorId);
+		$this->assign('date', date('Y-m-d H:i:s', filemtime($safeFilename)));
+
+		$data = unserialize(file_get_contents($safeFilename));
+		$this->assign('server', $data['server']);
+		$this->assign('get', $data['get']);
+		$this->assign('post', $data['post']);
+
+		$this->assign('globalHandler', $data['globalHandler']);
+
+		$exceptionList = [];
+		$current = $data;
+		do {
+			$ex = [
+				'exception' => $current['exception'],
+				'message'   => str_replace($this->getSiteConfiguration()->getFilePath(), '.', $current['message']),
+				'stack'     => str_replace($this->getSiteConfiguration()->getFilePath(), '.', $current['stack']),
+			];
+			$exceptionList[] = $ex;
+
+			$current = $current['previous'];
+		}
+		while ($current !== null);
+
+		$this->assign('exceptionList', $exceptionList);
+
+		$this->setTemplate('errorlog/details.tpl');
+	}
+
+	public function remove()
+	{
+		$safeFilename = $this->safetyCheck(WebRequest::getString('id'));
+
+		if ($safeFilename === false) {
+			$this->redirect('errorLog');
+
+			return;
+		}
+
+		unlink($safeFilename);
+
+		$this->redirect('errorLog');
+
+		return;
+	}
+
+	/**
+	 * @param string|null $requestedErrorId
+	 *
+	 * @return bool|string
+	 */
+	protected function safetyCheck(?string $requestedErrorId)
+	{
+		if ($requestedErrorId === null) {
+			return false;
+		}
+
+		// security - only allow hex-encoded filenames, as this is what is generated.
+		// This is prefixed with the configured directory. Path traversal is protected against due to . and / not being
+		// part of the hex character set.
+		if (!preg_match('/^[a-f0-9]{40}$/', $requestedErrorId)) {
+			return false;
+		}
+
+		$errorLogDirectory = $this->getSiteConfiguration()->getErrorLog();
+		$filename = realpath($errorLogDirectory) . DIRECTORY_SEPARATOR . $requestedErrorId . '.log';
+
+		if (!file_exists($filename)) {
+			return false;
+		}
+
+		return $filename;
+	}
 }
\ No newline at end of file

Braces +4 added lines, -2 removed lines

@@ -30,11 +30,13 @@
         $files = scandir($errorLogDirectory);
 
         // Exclude the files we know should be there
-        $filteredFiles = array_filter($files, function($file) {
+        $filteredFiles = array_filter($files, function($file)
+        {
             return !in_array($file, ['.', '..', 'README.md']);
         });
 
-        $exceptionDetails = array_map(function($item) use ($errorLogDirectory) {
+        $exceptionDetails = array_map(function($item) use ($errorLogDirectory)
+        {
             $filename = realpath($errorLogDirectory) . DIRECTORY_SEPARATOR . $item;
 
             return [