enwikipedia-acc / waca

includes/API/IApiAction.php

Indentation +12 added lines, -12 removed lines

@@ -17,17 +17,17 @@
  */
 interface IApiAction extends IRoutedTask
 {
-    /**
-     * Method that runs API action
-     *
-     * @param DOMElement $apiDocument
-     *
-     * @return DOMElement The modified API document
-     */
-    public function executeApiAction(DOMElement $apiDocument);
+	/**
+	 * Method that runs API action
+	 *
+	 * @param DOMElement $apiDocument
+	 *
+	 * @return DOMElement The modified API document
+	 */
+	public function executeApiAction(DOMElement $apiDocument);
 
-    /**
-     * @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/API/Actions/HelpAction.php

Indentation +30 added lines, -30 removed lines

@@ -18,34 +18,34 @@
  */
 class HelpAction extends ApiPageBase implements IApiAction
 {
-    public function executeApiAction(DOMElement $apiDocument)
-    {
-        $helpElement = $this->getHelpElement();
-        $apiDocument->appendChild($helpElement);
-
-        return $apiDocument;
-    }
-
-    /**
-     * Gets the help information
-     * @return DOMElement
-     */
-    protected function getHelpElement()
-    {
-        $helpInfo = "Help info goes here!";
-
-        $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 = "Help info goes here!";
+
+		$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/CountAction.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 
         $statement = $this->getDatabase()->prepare($query);
         $statement->bindValue(":username", $this->user->getUsername());
-        $statement->bindValue(":date", date('Y-m-d') . "%");
+        $statement->bindValue(":date", date('Y-m-d')."%");
         $statement->execute();
         $today = $statement->fetchColumn();
         $statement->closeCursor();

Indentation +121 added lines, -121 removed lines

@@ -20,47 +20,47 @@ 
  */
 class CountAction extends ApiPageBase implements IApiAction
 {
-    /**
-     * 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/Actions/StatusAction.php

Indentation +39 added lines, -39 removed lines

@@ -17,67 +17,67 @@
  */
 class StatusAction extends ApiPageBase implements IApiAction
 {
-    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/StatsAction.php

Indentation +42 added lines, -42 removed lines

@@ -19,55 +19,55 @@
  */
 class StatsAction extends ApiPageBase implements IApiAction
 {
-    /**
-     * The target user
-     * @var User $user
-     */
-    private $user;
+	/**
+	 * The target user
+	 * @var User $user
+	 */
+	private $user;
 
-    /**
-     * Summary of execute
-     *
-     * @param \DOMElement $apiDocument
-     *
-     * @return \DOMElement
-     * @throws ApiException
-     * @throws \Exception
-     */
-    public function executeApiAction(\DOMElement $apiDocument)
-    {
-        $username = WebRequest::getString('user');
-        $wikiusername = WebRequest::getString('wikiuser');
+	/**
+	 * Summary of execute
+	 *
+	 * @param \DOMElement $apiDocument
+	 *
+	 * @return \DOMElement
+	 * @throws ApiException
+	 * @throws \Exception
+	 */
+	public function executeApiAction(\DOMElement $apiDocument)
+	{
+		$username = WebRequest::getString('user');
+		$wikiusername = WebRequest::getString('wikiuser');
 
-        if ($username === null && $wikiusername === null) {
-            throw new ApiException("Please specify a username using either user or wikiuser parameters.");
-        }
+		if ($username === null && $wikiusername === null) {
+			throw new ApiException("Please specify a username using either user or wikiuser parameters.");
+		}
 
-        $userElement = $this->document->createElement("user");
-        $apiDocument->appendChild($userElement);
+		$userElement = $this->document->createElement("user");
+		$apiDocument->appendChild($userElement);
 
-        if ($username !== null) {
-            $user = User::getByUsername($username, $this->getDatabase());
-        }
-        else {
-            $user = User::getByOnWikiUsername($wikiusername, $this->getDatabase());
-        }
+		if ($username !== null) {
+			$user = User::getByUsername($username, $this->getDatabase());
+		}
+		else {
+			$user = User::getByOnWikiUsername($wikiusername, $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("username", $this->user->getUsername());
-        $userElement->setAttribute("status", $this->user->getStatus());
-        $userElement->setAttribute("lastactive", $this->user->getLastActive());
-        $userElement->setAttribute("welcome_template", $this->user->getWelcomeTemplate());
-        $userElement->setAttribute("onwikiname", $this->user->getOnWikiName());
-        $userElement->setAttribute("oauth", $this->user->isOAuthLinked() ? "true" : "false");
+		$userElement->setAttribute("username", $this->user->getUsername());
+		$userElement->setAttribute("status", $this->user->getStatus());
+		$userElement->setAttribute("lastactive", $this->user->getLastActive());
+		$userElement->setAttribute("welcome_template", $this->user->getWelcomeTemplate());
+		$userElement->setAttribute("onwikiname", $this->user->getOnWikiName());
+		$userElement->setAttribute("oauth", $this->user->isOAuthLinked() ? "true" : "false");
 
-        return $apiDocument;
-    }
+		return $apiDocument;
+	}
 }

includes/API/Actions/MonitorAction.php

Indentation +50 added lines, -50 removed lines

@@ -23,65 +23,65 @@
  */
 class MonitorAction extends ApiPageBase implements IApiAction
 {
-    /**
-     * @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/UnknownAction.php

Indentation +9 added lines, -9 removed lines

@@ -16,15 +16,15 @@
  */
 class UnknownAction extends HelpAction implements IApiAction
 {
-    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/ApiException.php

Indentation +7 added lines, -7 removed lines

@@ -15,11 +15,11 @@
  */
 class ApiException extends Exception
 {
-    /**
-     * @param string $message
-     */
-    public function __construct($message)
-    {
-        $this->message = $message;
-    }
+	/**
+	 * @param string $message
+	 */
+	public function __construct($message)
+	{
+		$this->message = $message;
+	}
 }

includes/AuthUtility.php

Indentation +80 added lines, -80 removed lines

@@ -10,96 +10,96 @@
 
 class AuthUtility
 {
-    /**
-     * Test the specified data against the specified credentials
-     *
-     * @param string $password
-     * @param string $credentials
-     *
-     * @return bool
-     */
-    public static function testCredentials($password, $credentials)
-    {
-        global $minimumPasswordVersion;
+	/**
+	 * Test the specified data against the specified credentials
+	 *
+	 * @param string $password
+	 * @param string $credentials
+	 *
+	 * @return bool
+	 */
+	public static function testCredentials($password, $credentials)
+	{
+		global $minimumPasswordVersion;
 
-        if (substr($credentials, 0, 1) != ":") {
-            return false;
-        }
+		if (substr($credentials, 0, 1) != ":") {
+			return false;
+		}
 
-        // determine password version
-        $data = explode(':', substr($credentials, 1));
+		// determine password version
+		$data = explode(':', substr($credentials, 1));
 
-        // call the encryptVersion function for the version that this password actually is.
-        // syntax: :1:SALT:HASH
-        // syntax: :2:x:HASH
+		// call the encryptVersion function for the version that this password actually is.
+		// syntax: :1:SALT:HASH
+		// syntax: :2:x:HASH
 
-        // check the version is one of the allowed ones:
-        if ($minimumPasswordVersion > $data[0]) {
-            return false;
-        }
+		// check the version is one of the allowed ones:
+		if ($minimumPasswordVersion > $data[0]) {
+			return false;
+		}
 
-        if ($data[0] == 1) {
-            return $credentials == self::encryptVersion1($password, $data[1]);
-        }
+		if ($data[0] == 1) {
+			return $credentials == self::encryptVersion1($password, $data[1]);
+		}
 
-        if ($data[0] == 2) {
-            return self::verifyVersion2($password, $data[2]);
-        }
+		if ($data[0] == 2) {
+			return self::verifyVersion2($password, $data[2]);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * @param string $credentials
-     *
-     * @return bool
-     */
-    public static function isCredentialVersionLatest($credentials)
-    {
-        return substr($credentials, 0, 3) === ":2:";
-    }
+	/**
+	 * @param string $credentials
+	 *
+	 * @return bool
+	 */
+	public static function isCredentialVersionLatest($credentials)
+	{
+		return substr($credentials, 0, 3) === ":2:";
+	}
 
-    /**
-     * Encrypts a user's password with the latest version of the hash algorithm
-     *
-     * @param string $password
-     *
-     * @return string
-     */
-    public static function encryptPassword($password)
-    {
-        return self::encryptVersion2($password);
-    }
+	/**
+	 * Encrypts a user's password with the latest version of the hash algorithm
+	 *
+	 * @param string $password
+	 *
+	 * @return string
+	 */
+	public static function encryptPassword($password)
+	{
+		return self::encryptVersion2($password);
+	}
 
-    /**
-     * @param string $password
-     * @param string $salt
-     *
-     * @return string
-     */
-    private static function encryptVersion1($password, $salt)
-    {
-        return ':1:' . $salt . ':' . md5($salt . '-' . md5($password));
-    }
+	/**
+	 * @param string $password
+	 * @param string $salt
+	 *
+	 * @return string
+	 */
+	private static function encryptVersion1($password, $salt)
+	{
+		return ':1:' . $salt . ':' . md5($salt . '-' . md5($password));
+	}
 
-    /**
-     * @param string $password
-     *
-     * @return string
-     */
-    private static function encryptVersion2($password)
-    {
-        return ':2:x:' . password_hash($password, PASSWORD_BCRYPT);
-    }
+	/**
+	 * @param string $password
+	 *
+	 * @return string
+	 */
+	private static function encryptVersion2($password)
+	{
+		return ':2:x:' . password_hash($password, PASSWORD_BCRYPT);
+	}
 
-    /**
-     * @param string $password
-     * @param string $hash
-     *
-     * @return bool
-     */
-    private static function verifyVersion2($password, $hash)
-    {
-        return password_verify($password, $hash);
-    }
+	/**
+	 * @param string $password
+	 * @param string $hash
+	 *
+	 * @return bool
+	 */
+	private static function verifyVersion2($password, $hash)
+	{
+		return password_verify($password, $hash);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
      */
     private static function encryptVersion1($password, $salt)
     {
-        return ':1:' . $salt . ':' . md5($salt . '-' . md5($password));
+        return ':1:'.$salt.':'.md5($salt.'-'.md5($password));
     }
 
     /**
@@ -89,7 +89,7 @@ 
      */
     private static function encryptVersion2($password)
     {
-        return ':2:x:' . password_hash($password, PASSWORD_BCRYPT);
+        return ':2:x:'.password_hash($password, PASSWORD_BCRYPT);
     }
 
     /**