mdaniels5757 / waca

includes/API/Actions/UnknownAction.php

Indentation +9 added lines, -9 removed lines

@@ -16,15 +16,15 @@
  */
 class UnknownAction extends HelpAction implements IXmlApiAction
 {
-    public function executeApiAction(DOMElement $apiDocument)
-    {
-        $errorText = "Unknown API action specified.";
-        $errorNode = $this->document->createElement("error", $errorText);
-        $apiDocument->appendChild($errorNode);
+	public function executeApiAction(DOMElement $apiDocument)
+	{
+		$errorText = "Unknown API action specified.";
+		$errorNode = $this->document->createElement("error", $errorText);
+		$apiDocument->appendChild($errorNode);
 
-        $helpElement = $this->getHelpElement();
-        $apiDocument->appendChild($helpElement);
+		$helpElement = $this->getHelpElement();
+		$apiDocument->appendChild($helpElement);
 
-        return $apiDocument;
-    }
+		return $apiDocument;
+	}
 }

includes/API/Actions/JsUsersAction.php

Indentation +10 added lines, -10 removed lines

@@ -16,18 +16,18 @@
 
 class JsUsersAction extends JsonApiPageBase implements IJsonApiAction
 {
-    public function executeApiAction()
-    {
-        $this->getDatabase();
+	public function executeApiAction()
+	{
+		$this->getDatabase();
 
-        $userSearchHelper = UserSearchHelper::get($this->getDatabase());
+		$userSearchHelper = UserSearchHelper::get($this->getDatabase());
 
-        if (WebRequest::getString('all') === null) {
-           $userSearchHelper->byStatus(User::STATUS_ACTIVE);
+		if (WebRequest::getString('all') === null) {
+		   $userSearchHelper->byStatus(User::STATUS_ACTIVE);
 
-        }
+		}
 
-        $dataset = $userSearchHelper->fetchColumn('username');
-        return $dataset;
-    }
+		$dataset = $userSearchHelper->fetchColumn('username');
+		return $dataset;
+	}
 }

includes/API/Actions/HelpAction.php

Indentation +30 added lines, -30 removed lines

@@ -18,34 +18,34 @@
  */
 class HelpAction extends XmlApiPageBase implements IXmlApiAction
 {
-    public function executeApiAction(DOMElement $apiDocument)
-    {
-        $helpElement = $this->getHelpElement();
-        $apiDocument->appendChild($helpElement);
-
-        return $apiDocument;
-    }
-
-    /**
-     * Gets the help information
-     * @return DOMElement
-     */
-    protected function getHelpElement()
-    {
-        $helpInfo = "API help can be found at https://github.com/enwikipedia-acc/waca/wiki/API";
-
-        $help = $this->document->createElement("help");
-        $helptext = $this->document->createElement("info", $helpInfo);
-        $helpactions = $this->document->createElement("actions");
-
-        foreach (ApiRequestRouter::getActionList() as $action) {
-            $actionElement = $this->document->createElement("action", $action);
-            $helpactions->appendChild($actionElement);
-        }
-
-        $help->appendChild($helptext);
-        $help->appendChild($helpactions);
-
-        return $help;
-    }
+	public function executeApiAction(DOMElement $apiDocument)
+	{
+		$helpElement = $this->getHelpElement();
+		$apiDocument->appendChild($helpElement);
+
+		return $apiDocument;
+	}
+
+	/**
+	 * Gets the help information
+	 * @return DOMElement
+	 */
+	protected function getHelpElement()
+	{
+		$helpInfo = "API help can be found at https://github.com/enwikipedia-acc/waca/wiki/API";
+
+		$help = $this->document->createElement("help");
+		$helptext = $this->document->createElement("info", $helpInfo);
+		$helpactions = $this->document->createElement("actions");
+
+		foreach (ApiRequestRouter::getActionList() as $action) {
+			$actionElement = $this->document->createElement("action", $action);
+			$helpactions->appendChild($actionElement);
+		}
+
+		$help->appendChild($helptext);
+		$help->appendChild($helpactions);
+
+		return $help;
+	}
 }

includes/API/Actions/JsTemplateConfirmsAction.php

Indentation +13 added lines, -13 removed lines

@@ -14,20 +14,20 @@
 
 class JsTemplateConfirmsAction extends JsonApiPageBase implements IJsonApiAction
 {
-    public function executeApiAction()
-    {
-        $this->getDatabase();
+	public function executeApiAction()
+	{
+		$this->getDatabase();
 
-        /** @var EmailTemplate[] $templates */
-        $templates = EmailTemplate::getAllActiveTemplates(null, $this->getDatabase());
+		/** @var EmailTemplate[] $templates */
+		$templates = EmailTemplate::getAllActiveTemplates(null, $this->getDatabase());
 
-        $dataset = [];
-        foreach ($templates as $tpl) {
-            if ($tpl->getJsquestion() != "") {
-                $dataset[$tpl->getId()] = $tpl->getJsquestion();
-            }
-        }
+		$dataset = [];
+		foreach ($templates as $tpl) {
+			if ($tpl->getJsquestion() != "") {
+				$dataset[$tpl->getId()] = $tpl->getJsquestion();
+			}
+		}
 
-        return $dataset;
-    }
+		return $dataset;
+	}
 }

includes/API/Actions/MonitorAction.php

Indentation +50 added lines, -50 removed lines

@@ -23,65 +23,65 @@
  */
 class MonitorAction extends XmlApiPageBase implements IXmlApiAction
 {
-    /**
-     * @param DOMElement $apiDocument
-     *
-     * @return DOMElement
-     */
-    public function executeApiAction(DOMElement $apiDocument)
-    {
-        $now = new DateTime();
+	/**
+	 * @param DOMElement $apiDocument
+	 *
+	 * @return DOMElement
+	 */
+	public function executeApiAction(DOMElement $apiDocument)
+	{
+		$now = new DateTime();
 
-        $old = $this->getOldest();
-        $oldest = new DateTime($old);
+		$old = $this->getOldest();
+		$oldest = new DateTime($old);
 
-        $new = $this->getNewest();
-        $newest = new DateTime($new);
+		$new = $this->getNewest();
+		$newest = new DateTime($new);
 
-        $monitoringElement = $this->document->createElement("data");
-        $monitoringElement->setAttribute("date", $now->format('c'));
-        $monitoringElement->setAttribute("oldest", $old === null ? null : $oldest->format('c'));
-        $monitoringElement->setAttribute("newest", $new === null ? null : $newest->format('c'));
-        $apiDocument->appendChild($monitoringElement);
+		$monitoringElement = $this->document->createElement("data");
+		$monitoringElement->setAttribute("date", $now->format('c'));
+		$monitoringElement->setAttribute("oldest", $old === null ? null : $oldest->format('c'));
+		$monitoringElement->setAttribute("newest", $new === null ? null : $newest->format('c'));
+		$apiDocument->appendChild($monitoringElement);
 
-        return $apiDocument;
-    }
+		return $apiDocument;
+	}
 
-    /**
-     * @return string|null
-     */
-    private function getOldest()
-    {
-        $statement = $this->getDatabase()
-            ->prepare("SELECT min(date) FROM request WHERE email != :email AND ip != :ip;");
-        $successful = $statement->execute(array(
-            ':email' => $this->getSiteConfiguration()->getDataClearEmail(),
-            ':ip'    => $this->getSiteConfiguration()->getDataClearIp(),
-        ));
+	/**
+	 * @return string|null
+	 */
+	private function getOldest()
+	{
+		$statement = $this->getDatabase()
+			->prepare("SELECT min(date) FROM request WHERE email != :email AND ip != :ip;");
+		$successful = $statement->execute(array(
+			':email' => $this->getSiteConfiguration()->getDataClearEmail(),
+			':ip'    => $this->getSiteConfiguration()->getDataClearIp(),
+		));
 
-        if (!$successful) {
-            return null;
-        }
+		if (!$successful) {
+			return null;
+		}
 
-        $result = $statement->fetchColumn();
+		$result = $statement->fetchColumn();
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * @return string
-     */
-    private function getNewest()
-    {
-        $statement = $this->getDatabase()
-            ->prepare("SELECT max(date) FROM request WHERE email != :email AND ip != :ip;");
-        $statement->execute(array(
-            ':email' => $this->getSiteConfiguration()->getDataClearEmail(),
-            ':ip'    => $this->getSiteConfiguration()->getDataClearIp(),
-        ));
+	/**
+	 * @return string
+	 */
+	private function getNewest()
+	{
+		$statement = $this->getDatabase()
+			->prepare("SELECT max(date) FROM request WHERE email != :email AND ip != :ip;");
+		$statement->execute(array(
+			':email' => $this->getSiteConfiguration()->getDataClearEmail(),
+			':ip'    => $this->getSiteConfiguration()->getDataClearIp(),
+		));
 
-        $result = $statement->fetchColumn(0);
+		$result = $statement->fetchColumn(0);
 
-        return $result;
-    }
+		return $result;
+	}
 }

includes/API/Actions/StatusAction.php

Indentation +39 added lines, -39 removed lines

@@ -17,67 +17,67 @@
  */
 class StatusAction extends XmlApiPageBase implements IXmlApiAction
 {
-    public function executeApiAction(DOMElement $apiDocument)
-    {
-        $statusElement = $this->document->createElement("status");
-        $apiDocument->appendChild($statusElement);
+	public function executeApiAction(DOMElement $apiDocument)
+	{
+		$statusElement = $this->document->createElement("status");
+		$apiDocument->appendChild($statusElement);
 
-        $query = $this->getDatabase()->prepare(<<<SQL
+		$query = $this->getDatabase()->prepare(<<<SQL
             SELECT /* Api/StatusAction */ COUNT(*) AS count
             FROM request
             WHERE
                 status = :pstatus
                 AND emailconfirm = 'Confirmed';
 SQL
-        );
+		);
 
-        $availableRequestStates = $this->getSiteConfiguration()->getRequestStates();
+		$availableRequestStates = $this->getSiteConfiguration()->getRequestStates();
 
-        foreach ($availableRequestStates as $key => $value) {
-            $query->bindValue(":pstatus", $key);
-            $query->execute();
-            $sus = $query->fetchColumn();
-            $statusElement->setAttribute($value['api'], $sus);
-            $query->closeCursor();
-        }
+		foreach ($availableRequestStates as $key => $value) {
+			$query->bindValue(":pstatus", $key);
+			$query->execute();
+			$sus = $query->fetchColumn();
+			$statusElement->setAttribute($value['api'], $sus);
+			$query->closeCursor();
+		}
 
-        $query = $this->getDatabase()->prepare(<<<SQL
+		$query = $this->getDatabase()->prepare(<<<SQL
             SELECT /* Api/StatusAction */ COUNT(*) AS count
             FROM ban
             WHERE
                 (duration > UNIX_TIMESTAMP() OR duration = -1)
                 AND active = 1;
 SQL
-        );
+		);
 
-        $query->execute();
-        $sus = $query->fetchColumn();
-        $statusElement->setAttribute("bans", $sus);
-        $query->closeCursor();
+		$query->execute();
+		$sus = $query->fetchColumn();
+		$statusElement->setAttribute("bans", $sus);
+		$query->closeCursor();
 
-        $query = $this->getDatabase()->prepare(<<<SQL
+		$query = $this->getDatabase()->prepare(<<<SQL
 SELECT /* Api/StatusAction */ COUNT(*) AS count
 FROM user WHERE status = :ulevel;
 SQL
-        );
-        $query->bindValue(":ulevel", "Admin");
-        $query->execute();
-        $sus = $query->fetchColumn();
-        $statusElement->setAttribute("useradmin", $sus);
-        $query->closeCursor();
+		);
+		$query->bindValue(":ulevel", "Admin");
+		$query->execute();
+		$sus = $query->fetchColumn();
+		$statusElement->setAttribute("useradmin", $sus);
+		$query->closeCursor();
 
-        $query->bindValue(":ulevel", "User");
-        $query->execute();
-        $sus = $query->fetchColumn();
-        $statusElement->setAttribute("user", $sus);
-        $query->closeCursor();
+		$query->bindValue(":ulevel", "User");
+		$query->execute();
+		$sus = $query->fetchColumn();
+		$statusElement->setAttribute("user", $sus);
+		$query->closeCursor();
 
-        $query->bindValue(":ulevel", "New");
-        $query->execute();
-        $sus = $query->fetchColumn();
-        $statusElement->setAttribute("usernew", $sus);
-        $query->closeCursor();
+		$query->bindValue(":ulevel", "New");
+		$query->execute();
+		$sus = $query->fetchColumn();
+		$statusElement->setAttribute("usernew", $sus);
+		$query->closeCursor();
 
-        return $apiDocument;
-    }
+		return $apiDocument;
+	}
 }

includes/API/Actions/CountAction.php

Indentation +121 added lines, -121 removed lines

@@ -20,47 +20,47 @@ 
  */
 class CountAction extends XmlApiPageBase implements IXmlApiAction
 {
-    /**
-     * The target user
-     * @var User $user
-     */
-    private $user;
+	/**
+	 * The target user
+	 * @var User $user
+	 */
+	private $user;
 
-    public function executeApiAction(DOMElement $apiDocument)
-    {
-        $username = WebRequest::getString('user');
-        if ($username === null) {
-            throw new ApiException("Please specify a username");
-        }
+	public function executeApiAction(DOMElement $apiDocument)
+	{
+		$username = WebRequest::getString('user');
+		if ($username === null) {
+			throw new ApiException("Please specify a username");
+		}
 
-        $userElement = $this->document->createElement("user");
-        $userElement->setAttribute("name", $username);
-        $apiDocument->appendChild($userElement);
+		$userElement = $this->document->createElement("user");
+		$userElement->setAttribute("name", $username);
+		$apiDocument->appendChild($userElement);
 
-        $user = User::getByUsername($username, $this->getDatabase());
+		$user = User::getByUsername($username, $this->getDatabase());
 
-        if ($user === false) {
-            $userElement->setAttribute("missing", "true");
+		if ($user === false) {
+			$userElement->setAttribute("missing", "true");
 
-            return $apiDocument;
-        }
+			return $apiDocument;
+		}
 
-        $this->user = $user;
+		$this->user = $user;
 
-        $userElement->setAttribute("level", $this->user->getStatus());
-        $userElement->setAttribute("created", $this->getAccountsCreated());
+		$userElement->setAttribute("level", $this->user->getStatus());
+		$userElement->setAttribute("created", $this->getAccountsCreated());
 
-        $userElement->setAttribute("today", $this->getToday());
+		$userElement->setAttribute("today", $this->getToday());
 
-        // Let the IRC bot handle the result of this.
-        $this->fetchAdminData($userElement);
+		// Let the IRC bot handle the result of this.
+		$this->fetchAdminData($userElement);
 
-        return $apiDocument;
-    }
+		return $apiDocument;
+	}
 
-    private function getAccountsCreated()
-    {
-        $query = <<<QUERY
+	private function getAccountsCreated()
+	{
+		$query = <<<QUERY
         SELECT COUNT(*) AS count
         FROM log
             LEFT JOIN emailtemplate ON concat('Closed ', emailtemplate.id) = log.action
@@ -71,17 +71,17 @@ 
             AND user.username = :username;
 QUERY;
 
-        $statement = $this->getDatabase()->prepare($query);
-        $statement->execute(array(":username" => $this->user->getUsername()));
-        $result = $statement->fetchColumn();
-        $statement->closeCursor();
+		$statement = $this->getDatabase()->prepare($query);
+		$statement->execute(array(":username" => $this->user->getUsername()));
+		$result = $statement->fetchColumn();
+		$statement->closeCursor();
 
-        return $result;
-    }
+		return $result;
+	}
 
-    private function getToday()
-    {
-        $query = <<<QUERY
+	private function getToday()
+	{
+		$query = <<<QUERY
         SELECT
             COUNT(*) AS count
         FROM log
@@ -93,99 +93,99 @@ 
             AND user.username = :username;
 QUERY;
 
-        $statement = $this->getDatabase()->prepare($query);
-        $statement->bindValue(":username", $this->user->getUsername());
-        $statement->bindValue(":date", date('Y-m-d') . "%");
-        $statement->execute();
-        $today = $statement->fetchColumn();
-        $statement->closeCursor();
-
-        return $today;
-    }
-
-    private function fetchAdminData(DOMElement $userElement)
-    {
-        $query = "SELECT COUNT(*) AS count FROM log WHERE log.user = :userid AND log.action = :action;";
-
-        $statement = $this->getDatabase()->prepare($query);
-        $statement->bindValue(":userid", $this->user->getId());
-        $statement->bindValue(":action", "Suspended");
-        $statement->execute();
-        $sus = $statement->fetchColumn();
-        $userElement->setAttribute("suspended", $sus);
-        $statement->closeCursor();
-
-        $statement->bindValue(":action", "Promoted");
-        $statement->execute();
-        $pro = $statement->fetchColumn();
-        $userElement->setAttribute("promoted", $pro);
-        $statement->closeCursor();
-
-        $statement->bindValue(":action", "Approved");
-        $statement->execute();
-        $app = $statement->fetchColumn();
-        $userElement->setAttribute("approved", $app);
-        $statement->closeCursor();
-
-        $statement->bindValue(":action", "Demoted");
-        $statement->execute();
-        $dem = $statement->fetchColumn();
-        $userElement->setAttribute("demoted", $dem);
-        $statement->closeCursor();
-
-        $statement->bindValue(":action", "Declined");
-        $statement->execute();
-        $dec = $statement->fetchColumn();
-        $userElement->setAttribute("declined", $dec);
-        $statement->closeCursor();
-
-        $statement->bindValue(":action", "Renamed");
-        $statement->execute();
-        $rnc = $statement->fetchColumn();
-        $userElement->setAttribute("renamed", $rnc);
-        $statement->closeCursor();
-
-        $statement->bindValue(":action", "Edited");
-        $statement->execute();
-        $mec = $statement->fetchColumn();
-        $userElement->setAttribute("edited", $mec);
-        $statement->closeCursor();
-
-        $statement->bindValue(":action", "Prefchange");
-        $statement->execute();
-        $pcc = $statement->fetchColumn();
-        $userElement->setAttribute("prefchange", $pcc);
-        $statement->closeCursor();
-
-        // Combine all three actions affecting Welcome templates into one count.
-        $combinedquery = $this->getDatabase()->prepare(<<<SQL
+		$statement = $this->getDatabase()->prepare($query);
+		$statement->bindValue(":username", $this->user->getUsername());
+		$statement->bindValue(":date", date('Y-m-d') . "%");
+		$statement->execute();
+		$today = $statement->fetchColumn();
+		$statement->closeCursor();
+
+		return $today;
+	}
+
+	private function fetchAdminData(DOMElement $userElement)
+	{
+		$query = "SELECT COUNT(*) AS count FROM log WHERE log.user = :userid AND log.action = :action;";
+
+		$statement = $this->getDatabase()->prepare($query);
+		$statement->bindValue(":userid", $this->user->getId());
+		$statement->bindValue(":action", "Suspended");
+		$statement->execute();
+		$sus = $statement->fetchColumn();
+		$userElement->setAttribute("suspended", $sus);
+		$statement->closeCursor();
+
+		$statement->bindValue(":action", "Promoted");
+		$statement->execute();
+		$pro = $statement->fetchColumn();
+		$userElement->setAttribute("promoted", $pro);
+		$statement->closeCursor();
+
+		$statement->bindValue(":action", "Approved");
+		$statement->execute();
+		$app = $statement->fetchColumn();
+		$userElement->setAttribute("approved", $app);
+		$statement->closeCursor();
+
+		$statement->bindValue(":action", "Demoted");
+		$statement->execute();
+		$dem = $statement->fetchColumn();
+		$userElement->setAttribute("demoted", $dem);
+		$statement->closeCursor();
+
+		$statement->bindValue(":action", "Declined");
+		$statement->execute();
+		$dec = $statement->fetchColumn();
+		$userElement->setAttribute("declined", $dec);
+		$statement->closeCursor();
+
+		$statement->bindValue(":action", "Renamed");
+		$statement->execute();
+		$rnc = $statement->fetchColumn();
+		$userElement->setAttribute("renamed", $rnc);
+		$statement->closeCursor();
+
+		$statement->bindValue(":action", "Edited");
+		$statement->execute();
+		$mec = $statement->fetchColumn();
+		$userElement->setAttribute("edited", $mec);
+		$statement->closeCursor();
+
+		$statement->bindValue(":action", "Prefchange");
+		$statement->execute();
+		$pcc = $statement->fetchColumn();
+		$userElement->setAttribute("prefchange", $pcc);
+		$statement->closeCursor();
+
+		// Combine all three actions affecting Welcome templates into one count.
+		$combinedquery = $this->getDatabase()->prepare(<<<SQL
             SELECT
                 COUNT(*) AS count
             FROM log
             WHERE log.user = :userid
                 AND log.action IN ('CreatedTemplate', 'EditedTemplate', 'DeletedTemplate');
 SQL
-        );
+		);
 
-        $combinedquery->bindValue(":userid", $this->user->getId());
-        $combinedquery->execute();
-        $dtc = $combinedquery->fetchColumn();
-        $userElement->setAttribute("welctempchange", $dtc);
-        $combinedquery->closeCursor();
+		$combinedquery->bindValue(":userid", $this->user->getId());
+		$combinedquery->execute();
+		$dtc = $combinedquery->fetchColumn();
+		$userElement->setAttribute("welctempchange", $dtc);
+		$combinedquery->closeCursor();
 
-        // Combine both actions affecting Email templates into one count.
-        $combinedquery = $this->getDatabase()->prepare(<<<SQL
+		// Combine both actions affecting Email templates into one count.
+		$combinedquery = $this->getDatabase()->prepare(<<<SQL
             SELECT COUNT(*) AS count
             FROM log
             WHERE log.user = :userid
                 AND log.action IN ('CreatedEmail', 'EditedEmail');
 SQL
-        );
-
-        $combinedquery->bindValue(":userid", $this->user->getId());
-        $combinedquery->execute();
-        $cec = $combinedquery->fetchColumn();
-        $userElement->setAttribute("emailtempchange", $cec);
-        $combinedquery->closeCursor();
-    }
+		);
+
+		$combinedquery->bindValue(":userid", $this->user->getId());
+		$combinedquery->execute();
+		$cec = $combinedquery->fetchColumn();
+		$userElement->setAttribute("emailtempchange", $cec);
+		$combinedquery->closeCursor();
+	}
 }

includes/API/IApiAction.php

Indentation +4 added lines, -4 removed lines

@@ -15,8 +15,8 @@
  */
 interface IApiAction extends IRoutedTask
 {
-    /**
-     * @return string the XML, or false if an error occurred.
-     */
-    public function runApiPage();
+	/**
+	 * @return string the XML, or false if an error occurred.
+	 */
+	public function runApiPage();
 }

includes/Exceptions/AccessDeniedException.php

Indentation +84 added lines, -84 removed lines

@@ -24,88 +24,88 @@
  */
 class AccessDeniedException extends ReadableException
 {
-    use NavigationMenuAccessControl;
-
-    /**
-     * @var SecurityManager
-     */
-    private $securityManager;
-
-    /**
-     * AccessDeniedException constructor.
-     *
-     * @param SecurityManager $securityManager
-     */
-    public function __construct(SecurityManager $securityManager = null)
-    {
-        $this->securityManager = $securityManager;
-    }
-
-    public function getReadableError()
-    {
-        if (!headers_sent()) {
-            header("HTTP/1.1 403 Forbidden");
-        }
-
-        $this->setUpSmarty();
-
-        // uck. We should still be able to access the database in this situation though.
-        $database = PdoDatabase::getDatabaseConnection('acc');
-        $currentUser = User::getCurrent($database);
-        $this->assign('currentUser', $currentUser);
-
-        if($this->securityManager !== null) {
-            $this->setupNavMenuAccess($currentUser);
-        }
-
-        if ($currentUser->isDeclined()) {
-            $this->assign('htmlTitle', 'Account Declined');
-            $this->assign('declineReason', $this->getLogEntry('Declined', $currentUser, $database));
-
-            return $this->fetchTemplate("exception/account-declined.tpl");
-        }
-
-        if ($currentUser->isSuspended()) {
-            $this->assign('htmlTitle', 'Account Suspended');
-            $this->assign('suspendReason', $this->getLogEntry('Suspended', $currentUser, $database));
-
-            return $this->fetchTemplate("exception/account-suspended.tpl");
-        }
-
-        if ($currentUser->isNewUser()) {
-            $this->assign('htmlTitle', 'Account Pending');
-
-            return $this->fetchTemplate("exception/account-new.tpl");
-        }
-
-        return $this->fetchTemplate("exception/access-denied.tpl");
-    }
-
-    /**
-     * @param string      $action
-     * @param User        $user
-     * @param PdoDatabase $database
-     *
-     * @return null|string
-     */
-    private function getLogEntry($action, User $user, PdoDatabase $database)
-    {
-        /** @var Log[] $logs */
-        $logs = LogSearchHelper::get($database)
-            ->byAction($action)
-            ->byObjectType('User')
-            ->byObjectId($user->getId())
-            ->limit(1)
-            ->fetch();
-
-        return $logs[0]->getComment();
-    }
-
-    /**
-     * @return SecurityManager
-     */
-    protected function getSecurityManager()
-    {
-        return $this->securityManager;
-    }
+	use NavigationMenuAccessControl;
+
+	/**
+	 * @var SecurityManager
+	 */
+	private $securityManager;
+
+	/**
+	 * AccessDeniedException constructor.
+	 *
+	 * @param SecurityManager $securityManager
+	 */
+	public function __construct(SecurityManager $securityManager = null)
+	{
+		$this->securityManager = $securityManager;
+	}
+
+	public function getReadableError()
+	{
+		if (!headers_sent()) {
+			header("HTTP/1.1 403 Forbidden");
+		}
+
+		$this->setUpSmarty();
+
+		// uck. We should still be able to access the database in this situation though.
+		$database = PdoDatabase::getDatabaseConnection('acc');
+		$currentUser = User::getCurrent($database);
+		$this->assign('currentUser', $currentUser);
+
+		if($this->securityManager !== null) {
+			$this->setupNavMenuAccess($currentUser);
+		}
+
+		if ($currentUser->isDeclined()) {
+			$this->assign('htmlTitle', 'Account Declined');
+			$this->assign('declineReason', $this->getLogEntry('Declined', $currentUser, $database));
+
+			return $this->fetchTemplate("exception/account-declined.tpl");
+		}
+
+		if ($currentUser->isSuspended()) {
+			$this->assign('htmlTitle', 'Account Suspended');
+			$this->assign('suspendReason', $this->getLogEntry('Suspended', $currentUser, $database));
+
+			return $this->fetchTemplate("exception/account-suspended.tpl");
+		}
+
+		if ($currentUser->isNewUser()) {
+			$this->assign('htmlTitle', 'Account Pending');
+
+			return $this->fetchTemplate("exception/account-new.tpl");
+		}
+
+		return $this->fetchTemplate("exception/access-denied.tpl");
+	}
+
+	/**
+	 * @param string      $action
+	 * @param User        $user
+	 * @param PdoDatabase $database
+	 *
+	 * @return null|string
+	 */
+	private function getLogEntry($action, User $user, PdoDatabase $database)
+	{
+		/** @var Log[] $logs */
+		$logs = LogSearchHelper::get($database)
+			->byAction($action)
+			->byObjectType('User')
+			->byObjectId($user->getId())
+			->limit(1)
+			->fetch();
+
+		return $logs[0]->getComment();
+	}
+
+	/**
+	 * @return SecurityManager
+	 */
+	protected function getSecurityManager()
+	{
+		return $this->securityManager;
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
         $currentUser = User::getCurrent($database);
         $this->assign('currentUser', $currentUser);
 
-        if($this->securityManager !== null) {
+        if ($this->securityManager !== null) {
             $this->setupNavMenuAccess($currentUser);
         }