mdaniels5757 / waca

smarty-plugins/modifier.date.php

Indentation +11 added lines, -11 removed lines

@@ -16,16 +16,16 @@
  */
 function smarty_modifier_date($input)
 {
-    if (gettype($input) === 'object'
-        && (get_class($input) === DateTime::class || get_class($input) === DateTimeImmutable::class)
-    ) {
-        /** @var $date DateTime|DateTimeImmutable */
-        $date = $input;
-        $dateString = $date->format('Y-m-d H:i:s');
+	if (gettype($input) === 'object'
+		&& (get_class($input) === DateTime::class || get_class($input) === DateTimeImmutable::class)
+	) {
+		/** @var $date DateTime|DateTimeImmutable */
+		$date = $input;
+		$dateString = $date->format('Y-m-d H:i:s');
 
-        return $dateString;
-    }
-    else {
-        return $input;
-    }
+		return $dateString;
+	}
+	else {
+		return $input;
+	}
 }
\ No newline at end of file

includes/Validation/RequestValidationHelper.php

Indentation +284 added lines, -284 removed lines

@@ -22,288 +22,288 @@
  */
 class RequestValidationHelper
 {
-    /** @var IBanHelper */
-    private $banHelper;
-    /** @var Request */
-    private $request;
-    private $emailConfirmation;
-    /** @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;
-
-    /**
-     * Summary of __construct
-     *
-     * @param IBanHelper         $banHelper
-     * @param Request            $request
-     * @param string             $emailConfirmation
-     * @param PdoDatabase        $database
-     * @param IAntiSpoofProvider $antiSpoofProvider
-     * @param IXffTrustProvider  $xffTrustProvider
-     * @param HttpHelper         $httpHelper
-     * @param string             $mediawikiApiEndpoint
-     * @param boolean            $titleBlacklistEnabled
-     * @param TorExitProvider    $torExitProvider
-     */
-    public function __construct(
-        IBanHelper $banHelper,
-        Request $request,
-        $emailConfirmation,
-        PdoDatabase $database,
-        IAntiSpoofProvider $antiSpoofProvider,
-        IXffTrustProvider $xffTrustProvider,
-        HttpHelper $httpHelper,
-        $mediawikiApiEndpoint,
-        $titleBlacklistEnabled,
-        TorExitProvider $torExitProvider
-    ) {
-        $this->banHelper = $banHelper;
-        $this->request = $request;
-        $this->emailConfirmation = $emailConfirmation;
-        $this->database = $database;
-        $this->antiSpoofProvider = $antiSpoofProvider;
-        $this->xffTrustProvider = $xffTrustProvider;
-        $this->httpHelper = $httpHelper;
-        $this->mediawikiApiEndpoint = $mediawikiApiEndpoint;
-        $this->titleBlacklistEnabled = $titleBlacklistEnabled;
-        $this->torExitProvider = $torExitProvider;
-    }
-
-    /**
-     * Summary of validateName
-     * @return ValidationError[]
-     */
-    public function validateName()
-    {
-        $errorList = array();
-
-        // ERRORS
-        // name is empty
-        if (trim($this->request->getName()) == "") {
-            $errorList[ValidationError::NAME_EMPTY] = new ValidationError(ValidationError::NAME_EMPTY);
-        }
-
-        // name is banned
-        $ban = $this->banHelper->nameIsBanned($this->request->getName());
-        if ($ban != false) {
-            $errorList[ValidationError::BANNED] = new ValidationError(ValidationError::BANNED);
-        }
-
-        // username already exists
-        if ($this->userExists()) {
-            $errorList[ValidationError::NAME_EXISTS] = new ValidationError(ValidationError::NAME_EXISTS);
-        }
-
-        // username part of SUL account
-        if ($this->userSulExists()) {
-            // 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]+$/", $this->request->getName()) === 1) {
-            $errorList[ValidationError::NAME_NUMONLY] = new ValidationError(ValidationError::NAME_NUMONLY);
-        }
-
-        // username can't contain #@/<>[]|{}
-        if (preg_match("/[" . preg_quote("#@/<>[]|{}", "/") . "]/", $this->request->getName()) === 1) {
-            $errorList[ValidationError::NAME_INVALIDCHAR] = new ValidationError(ValidationError::NAME_INVALIDCHAR);
-        }
-
-        // existing non-closed request for this name
-        if ($this->nameRequestExists()) {
-            $errorList[ValidationError::OPEN_REQUEST_NAME] = new ValidationError(ValidationError::OPEN_REQUEST_NAME);
-        }
-
-        return $errorList;
-    }
-
-    /**
-     * Summary of validateEmail
-     * @return ValidationError[]
-     */
-    public function validateEmail()
-    {
-        $errorList = array();
-
-        // ERRORS
-
-        // Email is banned
-        $ban = $this->banHelper->emailIsBanned($this->request->getEmail());
-        if ($ban != false) {
-            $errorList[ValidationError::BANNED] = new ValidationError(ValidationError::BANNED);
-        }
-
-        // email addresses must match
-        if ($this->request->getEmail() != $this->emailConfirmation) {
-            $errorList[ValidationError::EMAIL_MISMATCH] = new ValidationError(ValidationError::EMAIL_MISMATCH);
-        }
-
-        // email address must be validly formed
-        if (trim($this->request->getEmail()) == "") {
-            $errorList[ValidationError::EMAIL_EMPTY] = new ValidationError(ValidationError::EMAIL_EMPTY);
-        }
-
-        // email address must be validly formed
-        if (!filter_var($this->request->getEmail(), FILTER_VALIDATE_EMAIL)) {
-            if (trim($this->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', $this->request->getEmail()) === 1) {
-            $errorList[ValidationError::EMAIL_WIKIMEDIA] = new ValidationError(ValidationError::EMAIL_WIKIMEDIA);
-        }
-
-        // WARNINGS
-
-        return $errorList;
-    }
-
-    /**
-     * Summary of validateOther
-     * @return ValidationError[]
-     */
-    public function validateOther()
-    {
-        $errorList = array();
-
-        $trustedIp = $this->xffTrustProvider->getTrustedClientIp($this->request->getIp(),
-            $this->request->getForwardedIp());
-
-        // ERRORS
-
-        // TOR nodes
-        if ($this->torExitProvider->isTorExit($trustedIp)) {
-            $errorList[ValidationError::BANNED] = new ValidationError(ValidationError::BANNED_TOR);
-        }
-
-        // IP banned
-        $ban = $this->banHelper->ipIsBanned($trustedIp);
-        if ($ban != false) {
-            $errorList[ValidationError::BANNED] = new ValidationError(ValidationError::BANNED);
-        }
-
-        // WARNINGS
-
-        // Antispoof check
-        $this->checkAntiSpoof();
-
-        // Blacklist check
-        $this->checkTitleBlacklist();
-
-        return $errorList;
-    }
-
-    private function checkAntiSpoof()
-    {
-        try {
-            if (count($this->antiSpoofProvider->getSpoofs($this->request->getName())) > 0) {
-                // If there were spoofs an Admin should handle the request.
-                $this->request->setStatus("Flagged users");
-            }
-        }
-        catch (Exception $ex) {
-            // logme
-        }
-    }
-
-    private function checkTitleBlacklist()
-    {
-        if ($this->titleBlacklistEnabled == 1) {
-            $apiResult = $this->httpHelper->get(
-                $this->mediawikiApiEndpoint,
-                array(
-                    'action'       => 'titleblacklist',
-                    'tbtitle'      => $this->request->getName(),
-                    'tbaction'     => 'new-account',
-                    'tbnooverride' => true,
-                    'format'       => 'php',
-                )
-            );
-
-            $data = unserialize($apiResult);
-
-            $requestIsOk = $data['titleblacklist']['result'] == "ok";
-
-            if (!$requestIsOk) {
-                $this->request->setStatus("Flagged users");
-            }
-        }
-    }
-
-    private function userExists()
-    {
-        $userExists = $this->httpHelper->get(
-            $this->mediawikiApiEndpoint,
-            array(
-                'action'  => 'query',
-                'list'    => 'users',
-                'ususers' => $this->request->getName(),
-                'format'  => 'php',
-            )
-        );
-
-        $ue = unserialize($userExists);
-        if (!isset ($ue['query']['users']['0']['missing']) && isset ($ue['query']['users']['0']['userid'])) {
-            return true;
-        }
-
-        return false;
-    }
-
-    private function userSulExists()
-    {
-        $requestName = $this->request->getName();
-
-        $userExists = $this->httpHelper->get(
-            $this->mediawikiApiEndpoint,
-            array(
-                'action'  => 'query',
-                'meta'    => 'globaluserinfo',
-                'guiuser' => $requestName,
-                'format'  => 'php',
-            )
-        );
-
-        $ue = unserialize($userExists);
-        if (isset ($ue['query']['globaluserinfo']['id'])) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks if a request with this name is currently open
-     *
-     * @return bool
-     */
-    private function nameRequestExists()
-    {
-        $query = "SELECT COUNT(id) FROM request WHERE status != 'Closed' AND name = :name;";
-        $statement = $this->database->prepare($query);
-        $statement->execute(array(':name' => $this->request->getName()));
-
-        if (!$statement) {
-            return false;
-        }
-
-        return $statement->fetchColumn() > 0;
-    }
+	/** @var IBanHelper */
+	private $banHelper;
+	/** @var Request */
+	private $request;
+	private $emailConfirmation;
+	/** @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;
+
+	/**
+	 * Summary of __construct
+	 *
+	 * @param IBanHelper         $banHelper
+	 * @param Request            $request
+	 * @param string             $emailConfirmation
+	 * @param PdoDatabase        $database
+	 * @param IAntiSpoofProvider $antiSpoofProvider
+	 * @param IXffTrustProvider  $xffTrustProvider
+	 * @param HttpHelper         $httpHelper
+	 * @param string             $mediawikiApiEndpoint
+	 * @param boolean            $titleBlacklistEnabled
+	 * @param TorExitProvider    $torExitProvider
+	 */
+	public function __construct(
+		IBanHelper $banHelper,
+		Request $request,
+		$emailConfirmation,
+		PdoDatabase $database,
+		IAntiSpoofProvider $antiSpoofProvider,
+		IXffTrustProvider $xffTrustProvider,
+		HttpHelper $httpHelper,
+		$mediawikiApiEndpoint,
+		$titleBlacklistEnabled,
+		TorExitProvider $torExitProvider
+	) {
+		$this->banHelper = $banHelper;
+		$this->request = $request;
+		$this->emailConfirmation = $emailConfirmation;
+		$this->database = $database;
+		$this->antiSpoofProvider = $antiSpoofProvider;
+		$this->xffTrustProvider = $xffTrustProvider;
+		$this->httpHelper = $httpHelper;
+		$this->mediawikiApiEndpoint = $mediawikiApiEndpoint;
+		$this->titleBlacklistEnabled = $titleBlacklistEnabled;
+		$this->torExitProvider = $torExitProvider;
+	}
+
+	/**
+	 * Summary of validateName
+	 * @return ValidationError[]
+	 */
+	public function validateName()
+	{
+		$errorList = array();
+
+		// ERRORS
+		// name is empty
+		if (trim($this->request->getName()) == "") {
+			$errorList[ValidationError::NAME_EMPTY] = new ValidationError(ValidationError::NAME_EMPTY);
+		}
+
+		// name is banned
+		$ban = $this->banHelper->nameIsBanned($this->request->getName());
+		if ($ban != false) {
+			$errorList[ValidationError::BANNED] = new ValidationError(ValidationError::BANNED);
+		}
+
+		// username already exists
+		if ($this->userExists()) {
+			$errorList[ValidationError::NAME_EXISTS] = new ValidationError(ValidationError::NAME_EXISTS);
+		}
+
+		// username part of SUL account
+		if ($this->userSulExists()) {
+			// 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]+$/", $this->request->getName()) === 1) {
+			$errorList[ValidationError::NAME_NUMONLY] = new ValidationError(ValidationError::NAME_NUMONLY);
+		}
+
+		// username can't contain #@/<>[]|{}
+		if (preg_match("/[" . preg_quote("#@/<>[]|{}", "/") . "]/", $this->request->getName()) === 1) {
+			$errorList[ValidationError::NAME_INVALIDCHAR] = new ValidationError(ValidationError::NAME_INVALIDCHAR);
+		}
+
+		// existing non-closed request for this name
+		if ($this->nameRequestExists()) {
+			$errorList[ValidationError::OPEN_REQUEST_NAME] = new ValidationError(ValidationError::OPEN_REQUEST_NAME);
+		}
+
+		return $errorList;
+	}
+
+	/**
+	 * Summary of validateEmail
+	 * @return ValidationError[]
+	 */
+	public function validateEmail()
+	{
+		$errorList = array();
+
+		// ERRORS
+
+		// Email is banned
+		$ban = $this->banHelper->emailIsBanned($this->request->getEmail());
+		if ($ban != false) {
+			$errorList[ValidationError::BANNED] = new ValidationError(ValidationError::BANNED);
+		}
+
+		// email addresses must match
+		if ($this->request->getEmail() != $this->emailConfirmation) {
+			$errorList[ValidationError::EMAIL_MISMATCH] = new ValidationError(ValidationError::EMAIL_MISMATCH);
+		}
+
+		// email address must be validly formed
+		if (trim($this->request->getEmail()) == "") {
+			$errorList[ValidationError::EMAIL_EMPTY] = new ValidationError(ValidationError::EMAIL_EMPTY);
+		}
+
+		// email address must be validly formed
+		if (!filter_var($this->request->getEmail(), FILTER_VALIDATE_EMAIL)) {
+			if (trim($this->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', $this->request->getEmail()) === 1) {
+			$errorList[ValidationError::EMAIL_WIKIMEDIA] = new ValidationError(ValidationError::EMAIL_WIKIMEDIA);
+		}
+
+		// WARNINGS
+
+		return $errorList;
+	}
+
+	/**
+	 * Summary of validateOther
+	 * @return ValidationError[]
+	 */
+	public function validateOther()
+	{
+		$errorList = array();
+
+		$trustedIp = $this->xffTrustProvider->getTrustedClientIp($this->request->getIp(),
+			$this->request->getForwardedIp());
+
+		// ERRORS
+
+		// TOR nodes
+		if ($this->torExitProvider->isTorExit($trustedIp)) {
+			$errorList[ValidationError::BANNED] = new ValidationError(ValidationError::BANNED_TOR);
+		}
+
+		// IP banned
+		$ban = $this->banHelper->ipIsBanned($trustedIp);
+		if ($ban != false) {
+			$errorList[ValidationError::BANNED] = new ValidationError(ValidationError::BANNED);
+		}
+
+		// WARNINGS
+
+		// Antispoof check
+		$this->checkAntiSpoof();
+
+		// Blacklist check
+		$this->checkTitleBlacklist();
+
+		return $errorList;
+	}
+
+	private function checkAntiSpoof()
+	{
+		try {
+			if (count($this->antiSpoofProvider->getSpoofs($this->request->getName())) > 0) {
+				// If there were spoofs an Admin should handle the request.
+				$this->request->setStatus("Flagged users");
+			}
+		}
+		catch (Exception $ex) {
+			// logme
+		}
+	}
+
+	private function checkTitleBlacklist()
+	{
+		if ($this->titleBlacklistEnabled == 1) {
+			$apiResult = $this->httpHelper->get(
+				$this->mediawikiApiEndpoint,
+				array(
+					'action'       => 'titleblacklist',
+					'tbtitle'      => $this->request->getName(),
+					'tbaction'     => 'new-account',
+					'tbnooverride' => true,
+					'format'       => 'php',
+				)
+			);
+
+			$data = unserialize($apiResult);
+
+			$requestIsOk = $data['titleblacklist']['result'] == "ok";
+
+			if (!$requestIsOk) {
+				$this->request->setStatus("Flagged users");
+			}
+		}
+	}
+
+	private function userExists()
+	{
+		$userExists = $this->httpHelper->get(
+			$this->mediawikiApiEndpoint,
+			array(
+				'action'  => 'query',
+				'list'    => 'users',
+				'ususers' => $this->request->getName(),
+				'format'  => 'php',
+			)
+		);
+
+		$ue = unserialize($userExists);
+		if (!isset ($ue['query']['users']['0']['missing']) && isset ($ue['query']['users']['0']['userid'])) {
+			return true;
+		}
+
+		return false;
+	}
+
+	private function userSulExists()
+	{
+		$requestName = $this->request->getName();
+
+		$userExists = $this->httpHelper->get(
+			$this->mediawikiApiEndpoint,
+			array(
+				'action'  => 'query',
+				'meta'    => 'globaluserinfo',
+				'guiuser' => $requestName,
+				'format'  => 'php',
+			)
+		);
+
+		$ue = unserialize($userExists);
+		if (isset ($ue['query']['globaluserinfo']['id'])) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Checks if a request with this name is currently open
+	 *
+	 * @return bool
+	 */
+	private function nameRequestExists()
+	{
+		$query = "SELECT COUNT(id) FROM request WHERE status != 'Closed' AND name = :name;";
+		$statement = $this->database->prepare($query);
+		$statement->execute(array(':name' => $this->request->getName()));
+
+		if (!$statement) {
+			return false;
+		}
+
+		return $statement->fetchColumn() > 0;
+	}
 }

includes/IrcColourCode.php

Indentation +23 added lines, -23 removed lines

@@ -10,27 +10,27 @@
 
 class IrcColourCode
 {
-    const BOLD = "\x02";
-    const ITALIC = "\x09";
-    const STRIKE = "\x13";
-    const UNDERLINE = "\x15";
-    const UNDERLINE2 = "\x1f";
-    const REVERSE = "\x16";
-    const RESET = "\x0f";
-    const WHITE = "\x0300";
-    const BLACK = "\x0301";
-    const DARK_BLUE = "\x0302";
-    const DARK_GREEN = "\x0303";
-    const RED = "\x0304";
-    const DARK_RED = "\x0305";
-    const DARK_VIOLET = "\x0306";
-    const ORANGE = "\x0307";
-    const YELLOW = "\x0308";
-    const LIGHT_GREEN = "\x0309";
-    const CYAN = "\x0310";
-    const LIGHT_CYAN = "\x0311";
-    const BLUE = "\x0312";
-    const VIOLET = "\x0313";
-    const DARK_GREY = "\x0314";
-    const LIGHT_GREY = "\x0315";
+	const BOLD = "\x02";
+	const ITALIC = "\x09";
+	const STRIKE = "\x13";
+	const UNDERLINE = "\x15";
+	const UNDERLINE2 = "\x1f";
+	const REVERSE = "\x16";
+	const RESET = "\x0f";
+	const WHITE = "\x0300";
+	const BLACK = "\x0301";
+	const DARK_BLUE = "\x0302";
+	const DARK_GREEN = "\x0303";
+	const RED = "\x0304";
+	const DARK_RED = "\x0305";
+	const DARK_VIOLET = "\x0306";
+	const ORANGE = "\x0307";
+	const YELLOW = "\x0308";
+	const LIGHT_GREEN = "\x0309";
+	const CYAN = "\x0310";
+	const LIGHT_CYAN = "\x0311";
+	const BLUE = "\x0312";
+	const VIOLET = "\x0313";
+	const DARK_GREY = "\x0314";
+	const LIGHT_GREY = "\x0315";
 }

includes/Session.php

Indentation +17 added lines, -17 removed lines

@@ -17,25 +17,25 @@
  */
 class Session
 {
-    public static function start()
-    {
-        ini_set('session.cookie_httponly', 1);
+	public static function start()
+	{
+		ini_set('session.cookie_httponly', 1);
 
-        if (WebRequest::isHttps()) {
-            ini_set('session.cookie_secure', 1);
-        }
+		if (WebRequest::isHttps()) {
+			ini_set('session.cookie_secure', 1);
+		}
 
-        session_start();
-    }
+		session_start();
+	}
 
-    public static function destroy()
-    {
-        session_destroy();
-    }
+	public static function destroy()
+	{
+		session_destroy();
+	}
 
-    public static function restart()
-    {
-        self::destroy();
-        self::start();
-    }
+	public static function restart()
+	{
+		self::destroy();
+		self::start();
+	}
 }

includes/Helpers/DebugHelper.php

Indentation +41 added lines, -41 removed lines

@@ -13,53 +13,53 @@
  */
 class DebugHelper
 {
-    /**
-     * Internal mockable method wrapper for debug_backtrace.
-     *
-     * As mocking out debug_backtrace uses debug_backtrace internally, we need this in order to not cause a recursive
-     * cascade until the runtime explodes.
-     *
-     * Instead, we mock this method, which allows debug_backtrace to still be called correctly.
-     *
-     * @return array
-     */
-    public function get_debug_backtrace()
-    {
-        return debug_backtrace();
-    }
+	/**
+	 * Internal mockable method wrapper for debug_backtrace.
+	 *
+	 * As mocking out debug_backtrace uses debug_backtrace internally, we need this in order to not cause a recursive
+	 * cascade until the runtime explodes.
+	 *
+	 * Instead, we mock this method, which allows debug_backtrace to still be called correctly.
+	 *
+	 * @return array
+	 */
+	public function get_debug_backtrace()
+	{
+		return debug_backtrace();
+	}
 
-    /**
-     * Returns a string representation of the current backtrace for display.
-     *
-     * Note that this explicitly excludes the top two frames, which will be methods from this class.
-     *
-     * @return string
-     */
-    public function getBacktrace()
-    {
-        $backtrace = $this->get_debug_backtrace();
+	/**
+	 * Returns a string representation of the current backtrace for display.
+	 *
+	 * Note that this explicitly excludes the top two frames, which will be methods from this class.
+	 *
+	 * @return string
+	 */
+	public function getBacktrace()
+	{
+		$backtrace = $this->get_debug_backtrace();
 
-        $output = "";
+		$output = "";
 
-        $count = 0;
-        foreach ($backtrace as $line) {
-            if ($count <= 1) {
-                $count++;
-                continue;
-            }
+		$count = 0;
+		foreach ($backtrace as $line) {
+			if ($count <= 1) {
+				$count++;
+				continue;
+			}
 
-            $output .= "#{$count}: ";
+			$output .= "#{$count}: ";
 
-            if (isset($line['type']) && $line['type'] != "") {
-                $output .= $line['class'] . $line['type'];
-            }
+			if (isset($line['type']) && $line['type'] != "") {
+				$output .= $line['class'] . $line['type'];
+			}
 
-            $output .= $line['function'] . "(...)";
-            $output .= " [{$line['file']}#{$line['line']}\r\n";
+			$output .= $line['function'] . "(...)";
+			$output .= " [{$line['file']}#{$line['line']}\r\n";
 
-            $count++;
-        }
+			$count++;
+		}
 
-        return $output;
-    }
+		return $output;
+	}
 }

includes/Helpers/FakeBlacklistHelper.php

Indentation +12 added lines, -12 removed lines

@@ -12,16 +12,16 @@
 
 class FakeBlacklistHelper implements IBlacklistHelper
 {
-    /**
-     * Returns a value indicating whether the provided username is blacklisted by the on-wiki title blacklist
-     *
-     * @param string $username
-     *
-     * @return bool
-     */
-    public function isBlacklisted($username)
-    {
-        // Short-circuit
-        return false;
-    }
+	/**
+	 * Returns a value indicating whether the provided username is blacklisted by the on-wiki title blacklist
+	 *
+	 * @param string $username
+	 *
+	 * @return bool
+	 */
+	public function isBlacklisted($username)
+	{
+		// Short-circuit
+		return false;
+	}
 }
\ No newline at end of file

includes/Helpers/BanHelper.php

Indentation +41 added lines, -41 removed lines

@@ -14,49 +14,49 @@
 
 class BanHelper implements IBanHelper
 {
-    /**
-     * @var PdoDatabase
-     */
-    private $database;
+	/**
+	 * @var PdoDatabase
+	 */
+	private $database;
 
-    public function __construct(PdoDatabase $database)
-    {
-        $this->database = $database;
-    }
+	public function __construct(PdoDatabase $database)
+	{
+		$this->database = $database;
+	}
 
-    /**
-     * Summary of nameIsBanned
-     *
-     * @param string $name The name to test if is banned.
-     *
-     * @return Ban
-     */
-    public function nameIsBanned($name)
-    {
-        return Ban::getBanByTarget($name, "Name", $this->database);
-    }
+	/**
+	 * Summary of nameIsBanned
+	 *
+	 * @param string $name The name to test if is banned.
+	 *
+	 * @return Ban
+	 */
+	public function nameIsBanned($name)
+	{
+		return Ban::getBanByTarget($name, "Name", $this->database);
+	}
 
-    /**
-     * Summary of emailIsBanned
-     *
-     * @param string $email
-     *
-     * @return Ban
-     */
-    public function emailIsBanned($email)
-    {
-        return Ban::getBanByTarget($email, "EMail", $this->database);
-    }
+	/**
+	 * Summary of emailIsBanned
+	 *
+	 * @param string $email
+	 *
+	 * @return Ban
+	 */
+	public function emailIsBanned($email)
+	{
+		return Ban::getBanByTarget($email, "EMail", $this->database);
+	}
 
-    /**
-     * Summary of ipIsBanned
-     *
-     * @param string $ip
-     *
-     * @return Ban
-     */
-    public function ipIsBanned($ip)
-    {
-        return Ban::getBanByTarget($ip, "IP", $this->database);
-    }
+	/**
+	 * Summary of ipIsBanned
+	 *
+	 * @param string $ip
+	 *
+	 * @return Ban
+	 */
+	public function ipIsBanned($ip)
+	{
+		return Ban::getBanByTarget($ip, "IP", $this->database);
+	}
 }

includes/Helpers/BlacklistHelper.php

Indentation +75 added lines, -75 removed lines

@@ -13,91 +13,91 @@
 
 class BlacklistHelper implements IBlacklistHelper
 {
-    /** @var HttpHelper */
-    private $httpHelper;
-    /**
-     * Cache of previously requested usernames
-     * @var array
-     */
-    private $cache = array();
-    /** @var string */
-    private $mediawikiWebServiceEndpoint;
+	/** @var HttpHelper */
+	private $httpHelper;
+	/**
+	 * Cache of previously requested usernames
+	 * @var array
+	 */
+	private $cache = array();
+	/** @var string */
+	private $mediawikiWebServiceEndpoint;
 
-    /**
-     * BlacklistHelper constructor.
-     *
-     * @param HttpHelper $httpHelper
-     * @param string     $mediawikiWebServiceEndpoint
-     */
-    public function __construct(HttpHelper $httpHelper, $mediawikiWebServiceEndpoint)
-    {
-        $this->httpHelper = $httpHelper;
-        $this->mediawikiWebServiceEndpoint = $mediawikiWebServiceEndpoint;
-    }
+	/**
+	 * BlacklistHelper constructor.
+	 *
+	 * @param HttpHelper $httpHelper
+	 * @param string     $mediawikiWebServiceEndpoint
+	 */
+	public function __construct(HttpHelper $httpHelper, $mediawikiWebServiceEndpoint)
+	{
+		$this->httpHelper = $httpHelper;
+		$this->mediawikiWebServiceEndpoint = $mediawikiWebServiceEndpoint;
+	}
 
-    /**
-     * Returns a value indicating whether the provided username is blacklisted by the on-wiki title blacklist
-     *
-     * @param string $username
-     *
-     * @return false|string False if the username is not blacklisted, else the blacklist entry.
-     */
-    public function isBlacklisted($username)
-    {
-        if (isset($this->cache[$username])) {
-            $result = $this->cache[$username];
-            if ($result === false) {
-                return false;
-            }
+	/**
+	 * Returns a value indicating whether the provided username is blacklisted by the on-wiki title blacklist
+	 *
+	 * @param string $username
+	 *
+	 * @return false|string False if the username is not blacklisted, else the blacklist entry.
+	 */
+	public function isBlacklisted($username)
+	{
+		if (isset($this->cache[$username])) {
+			$result = $this->cache[$username];
+			if ($result === false) {
+				return false;
+			}
 
-            return $result['line'];
-        }
+			return $result['line'];
+		}
 
-        try {
-            $result = $this->performWikiLookup($username);
-        }
-        catch (CurlException $ex) {
-            // LOGME log this, but fail gracefully.
-            return false;
-        }
+		try {
+			$result = $this->performWikiLookup($username);
+		}
+		catch (CurlException $ex) {
+			// LOGME log this, but fail gracefully.
+			return false;
+		}
 
-        if ($result['result'] === 'ok') {
-            // not blacklisted
-            $this->cache[$username] = false;
+		if ($result['result'] === 'ok') {
+			// not blacklisted
+			$this->cache[$username] = false;
 
-            return false;
-        }
-        else {
-            $this->cache[$username] = $result;
+			return false;
+		}
+		else {
+			$this->cache[$username] = $result;
 
-            return $result['line'];
-        }
-    }
+			return $result['line'];
+		}
+	}
 
-    /**
-     * Performs a fetch to MediaWiki for the relevant title blacklist entry
-     *
-     * @param string $username The username to look up
-     *
-     * @return array
-     * @throws CurlException
-     */
-    private function performWikiLookup($username)
-    {
-        $endpoint = $this->mediawikiWebServiceEndpoint;
+	/**
+	 * Performs a fetch to MediaWiki for the relevant title blacklist entry
+	 *
+	 * @param string $username The username to look up
+	 *
+	 * @return array
+	 * @throws CurlException
+	 */
+	private function performWikiLookup($username)
+	{
+		$endpoint = $this->mediawikiWebServiceEndpoint;
 
-        $parameters = array(
-            'action'       => 'titleblacklist',
-            'format'       => 'php',
-            'tbtitle'      => $username,
-            'tbaction'     => 'new-account',
-            'tbnooverride' => true,
-        );
+		$parameters = array(
+			'action'       => 'titleblacklist',
+			'format'       => 'php',
+			'tbtitle'      => $username,
+			'tbaction'     => 'new-account',
+			'tbnooverride' => true,
+		);
 
-        $apiResult = $this->httpHelper->get($endpoint, $parameters);
+		$apiResult = $this->httpHelper->get($endpoint, $parameters);
 
-        $data = unserialize($apiResult);
+		$data = unserialize($apiResult);
 
-        return $data['titleblacklist'];
-    }
+		return $data['titleblacklist'];
+	}
 }
\ No newline at end of file

includes/Helpers/Interfaces/ITypeAheadHelper.php

Indentation +11 added lines, -11 removed lines

@@ -10,16 +10,16 @@
 
 interface ITypeAheadHelper
 {
-    /**
-     * @param string   $class     CSS class to apply this typeahead to.
-     * @param callable $generator Generator function taking no arguments to return an array of strings.
-     *
-     * @return void
-     */
-    public function defineTypeAheadSource($class, callable $generator);
+	/**
+	 * @param string   $class     CSS class to apply this typeahead to.
+	 * @param callable $generator Generator function taking no arguments to return an array of strings.
+	 *
+	 * @return void
+	 */
+	public function defineTypeAheadSource($class, callable $generator);
 
-    /**
-     * @return string HTML fragment containing a JS block for typeaheads.
-     */
-    public function getTypeAheadScriptBlock();
+	/**
+	 * @return string HTML fragment containing a JS block for typeaheads.
+	 */
+	public function getTypeAheadScriptBlock();
 }
\ No newline at end of file