mdaniels5757 / waca

includes/Tasks/PublicInterfacePageBase.php

Indentation +15 added lines, -15 removed lines

@@ -10,21 +10,21 @@
 
 abstract class PublicInterfacePageBase extends PageBase
 {
-    /**
-     * PublicInterfaceInternalPageBase constructor.
-     */
-    public function __construct()
-    {
-        $this->template = 'publicbase.tpl';
-    }
+	/**
+	 * PublicInterfaceInternalPageBase constructor.
+	 */
+	public function __construct()
+	{
+		$this->template = 'publicbase.tpl';
+	}
 
-    final public function execute()
-    {
-        parent::execute();
-    }
+	final public function execute()
+	{
+		parent::execute();
+	}
 
-    final public function finalisePage()
-    {
-        parent::finalisePage();
-    }
+	final public function finalisePage()
+	{
+		parent::finalisePage();
+	}
 }
\ No newline at end of file

includes/Tasks/IRoutedTask.php

Indentation +16 added lines, -16 removed lines

@@ -12,21 +12,21 @@
 
 interface IRoutedTask extends ITask
 {
-    /**
-     * Sets the route the request will take. Only should be called from the request router.
-     *
-     * @param $routeName string
-     *
-     * @return void
-     *
-     * @throws Exception
-     * @category Security-Critical
-     */
-    public function setRoute($routeName);
+	/**
+	 * Sets the route the request will take. Only should be called from the request router.
+	 *
+	 * @param $routeName string
+	 *
+	 * @return void
+	 *
+	 * @throws Exception
+	 * @category Security-Critical
+	 */
+	public function setRoute($routeName);
 
-    /**
-     * Gets the name of the route that has been passed from the request router.
-     * @return string
-     */
-    public function getRouteName();
+	/**
+	 * Gets the name of the route that has been passed from the request router.
+	 * @return string
+	 */
+	public function getRouteName();
 }
\ No newline at end of file

includes/RegexConstants.php

Indentation +4 added lines, -4 removed lines

@@ -10,8 +10,8 @@
 
 class RegexConstants
 {
-    const IPV6_CIDR = '(?:/(?:12[0-8]|1[01][0-9]|[0-9]{1,2}))?';
-    const IPV4_CIDR = '(?:/(?:32|3[01]|[0-2]?[0-9]))?';
-    const IPV4 = '(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';
-    const IPV6 = '(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))';
+	const IPV6_CIDR = '(?:/(?:12[0-8]|1[01][0-9]|[0-9]{1,2}))?';
+	const IPV4_CIDR = '(?:/(?:32|3[01]|[0-2]?[0-9]))?';
+	const IPV4 = '(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';
+	const IPV6 = '(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))';
 }
\ No newline at end of file

includes/Exceptions/ReadableException.php

Indentation +15 added lines, -15 removed lines

@@ -21,22 +21,22 @@
  */
 abstract class ReadableException extends Exception
 {
-    use TemplateOutput;
+	use TemplateOutput;
 
-    /**
-     * Returns a readable HTML error message that's displayable to the user using templates.
-     * @return string
-     */
-    abstract public function getReadableError();
+	/**
+	 * Returns a readable HTML error message that's displayable to the user using templates.
+	 * @return string
+	 */
+	abstract public function getReadableError();
 
-    /**
-     * @return SiteConfiguration
-     */
-    protected function getSiteConfiguration()
-    {
-        // Uck. However, we have encountered an exception.
-        global $siteConfiguration;
+	/**
+	 * @return SiteConfiguration
+	 */
+	protected function getSiteConfiguration()
+	{
+		// Uck. However, we have encountered an exception.
+		global $siteConfiguration;
 
-        return $siteConfiguration;
-    }
+		return $siteConfiguration;
+	}
 }
\ No newline at end of file

includes/Exceptions/EnvironmentException.php

Indentation +9 added lines, -9 removed lines

@@ -21,13 +21,13 @@
  */
 class EnvironmentException extends Exception
 {
-    /**
-     * EnvironmentException constructor.
-     *
-     * @param string $friendlyMessage
-     */
-    public function __construct($friendlyMessage)
-    {
-        parent::__construct($friendlyMessage);
-    }
+	/**
+	 * EnvironmentException constructor.
+	 *
+	 * @param string $friendlyMessage
+	 */
+	public function __construct($friendlyMessage)
+	{
+		parent::__construct($friendlyMessage);
+	}
 }
\ No newline at end of file

includes/DataObjects/AntiSpoofCache.php

Indentation +92 added lines, -92 removed lines

@@ -18,101 +18,101 @@
  */
 class AntiSpoofCache extends DataObject
 {
-    /** @var string */
-    protected $username;
-    /** @var string */
-    protected $data;
-    /** @var string */
-    protected $timestamp;
-
-    /**
-     * @param   string    $username
-     * @param PdoDatabase $database
-     *
-     * @return AntiSpoofCache|false
-     */
-    public static function getByUsername($username, PdoDatabase $database)
-    {
-        $statement = $database->prepare(<<<SQL
+	/** @var string */
+	protected $username;
+	/** @var string */
+	protected $data;
+	/** @var string */
+	protected $timestamp;
+
+	/**
+	 * @param   string    $username
+	 * @param PdoDatabase $database
+	 *
+	 * @return AntiSpoofCache|false
+	 */
+	public static function getByUsername($username, PdoDatabase $database)
+	{
+		$statement = $database->prepare(<<<SQL
 SELECT *
 FROM antispoofcache
 WHERE username = :id AND timestamp > date_sub(now(), INTERVAL 3 HOUR)
 LIMIT 1
 SQL
-        );
-        $statement->bindValue(":id", $username);
-
-        $statement->execute();
-
-        $resultObject = $statement->fetchObject(get_called_class());
-
-        if ($resultObject != false) {
-            $resultObject->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUsername()
-    {
-        return $this->username;
-    }
-
-    /**
-     * @param string $username
-     */
-    public function setUsername($username)
-    {
-        $this->username = $username;
-    }
-
-    /**
-     * @return string
-     */
-    public function getData()
-    {
-        return $this->data;
-    }
-
-    /**
-     * @param string $data
-     */
-    public function setData($data)
-    {
-        $this->data = $data;
-    }
-
-    /**
-     * @return DateTimeImmutable
-     */
-    public function getTimestamp()
-    {
-        return new DateTimeImmutable($this->timestamp);
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            // clear old data first
-            $this->dbObject->exec("DELETE FROM antispoofcache WHERE timestamp < date_sub(now(), INTERVAL 3 HOUR);");
-
-            $statement = $this->dbObject->prepare("INSERT INTO antispoofcache (username, data) VALUES (:username, :data);");
-            $statement->bindValue(":username", $this->username);
-            $statement->bindValue(":data", $this->data);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-    }
+		);
+		$statement->bindValue(":id", $username);
+
+		$statement->execute();
+
+		$resultObject = $statement->fetchObject(get_called_class());
+
+		if ($resultObject != false) {
+			$resultObject->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUsername()
+	{
+		return $this->username;
+	}
+
+	/**
+	 * @param string $username
+	 */
+	public function setUsername($username)
+	{
+		$this->username = $username;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getData()
+	{
+		return $this->data;
+	}
+
+	/**
+	 * @param string $data
+	 */
+	public function setData($data)
+	{
+		$this->data = $data;
+	}
+
+	/**
+	 * @return DateTimeImmutable
+	 */
+	public function getTimestamp()
+	{
+		return new DateTimeImmutable($this->timestamp);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			// clear old data first
+			$this->dbObject->exec("DELETE FROM antispoofcache WHERE timestamp < date_sub(now(), INTERVAL 3 HOUR);");
+
+			$statement = $this->dbObject->prepare("INSERT INTO antispoofcache (username, data) VALUES (:username, :data);");
+			$statement->bindValue(":username", $this->username);
+			$statement->bindValue(":data", $this->data);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+	}
 }

includes/Pages/Registration/PageRegisterStandard.php

Indentation +14 added lines, -14 removed lines

@@ -10,19 +10,19 @@
 
 class PageRegisterStandard extends PageRegisterBase
 {
-    /**
-     * @return string
-     */
-    protected function getRegistrationTemplate()
-    {
-        return "registration/register.tpl";
-    }
+	/**
+	 * @return string
+	 */
+	protected function getRegistrationTemplate()
+	{
+		return "registration/register.tpl";
+	}
 
-    /**
-     * @return string
-     */
-    protected function getDefaultRole()
-    {
-        return 'user';
-    }
+	/**
+	 * @return string
+	 */
+	protected function getDefaultRole()
+	{
+		return 'user';
+	}
 }

includes/Pages/PageSiteNotice.php

Indentation +33 added lines, -33 removed lines

@@ -15,37 +15,37 @@
 
 class PageSiteNotice extends InternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        $this->setHtmlTitle('Site Notice');
-
-        $database = $this->getDatabase();
-
-        /** @var SiteNotice $siteNoticeMessage */
-        $siteNoticeMessage = SiteNotice::getById(1, $database);
-
-        // Dual-mode
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-
-            $siteNoticeMessage->setContent(WebRequest::postString('mailtext'));
-            $siteNoticeMessage->setUpdateVersion(WebRequest::postInt('updateversion'));
-            $siteNoticeMessage->save();
-
-            Logger::siteNoticeEdited($database, $siteNoticeMessage);
-            $this->getNotificationHelper()->siteNoticeEdited();
-
-            $this->redirect();
-        }
-        else {
-            $this->assignCSRFToken();
-
-            $this->setTemplate('site-notice/edit-form.tpl');
-            $this->assign('message', $siteNoticeMessage);
-        }
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		$this->setHtmlTitle('Site Notice');
+
+		$database = $this->getDatabase();
+
+		/** @var SiteNotice $siteNoticeMessage */
+		$siteNoticeMessage = SiteNotice::getById(1, $database);
+
+		// Dual-mode
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+
+			$siteNoticeMessage->setContent(WebRequest::postString('mailtext'));
+			$siteNoticeMessage->setUpdateVersion(WebRequest::postInt('updateversion'));
+			$siteNoticeMessage->save();
+
+			Logger::siteNoticeEdited($database, $siteNoticeMessage);
+			$this->getNotificationHelper()->siteNoticeEdited();
+
+			$this->redirect();
+		}
+		else {
+			$this->assignCSRFToken();
+
+			$this->setTemplate('site-notice/edit-form.tpl');
+			$this->assign('message', $siteNoticeMessage);
+		}
+	}
 }

includes/Pages/Statistics/StatsReservedRequests.php

Indentation +11 added lines, -11 removed lines

@@ -13,11 +13,11 @@ 
 
 class StatsReservedRequests extends InternalPageBase
 {
-    public function main()
-    {
-        $this->setHtmlTitle('Reserved Requests :: Statistics');
+	public function main()
+	{
+		$this->setHtmlTitle('Reserved Requests :: Statistics');
 
-        $query = <<<sql
+		$query = <<<sql
 SELECT
     p.id AS requestid,
     p.name AS name,
@@ -29,11 +29,11 @@ 
 WHERE reserved != 0;
 sql;
 
-        $database = $this->getDatabase();
-        $statement = $database->query($query);
-        $data = $statement->fetchAll(PDO::FETCH_ASSOC);
-        $this->assign('dataTable', $data);
-        $this->assign('statsPageTitle', 'All currently reserved requests');
-        $this->setTemplate('statistics/reserved-requests.tpl');
-    }
+		$database = $this->getDatabase();
+		$statement = $database->query($query);
+		$data = $statement->fetchAll(PDO::FETCH_ASSOC);
+		$this->assign('dataTable', $data);
+		$this->assign('statsPageTitle', 'All currently reserved requests');
+		$this->setTemplate('statistics/reserved-requests.tpl');
+	}
 }