mdaniels5757 / waca

includes/WebStart.php

Indentation +220 added lines, -220 removed lines

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

Braces +2 added lines, -4 removed lines

@@ -83,8 +83,7 @@ 
 
                 if ($siteConfiguration->getTitleBlacklistEnabled()) {
                     $page->setBlacklistHelper(new FakeBlacklistHelper());
-                }
-                else {
+                } else {
                     $page->setBlacklistHelper(new BlacklistHelper($page->getHttpHelper(),
                         $siteConfiguration->getMediawikiWebServiceEndpoint()));
                 }
@@ -178,8 +177,7 @@ 
 
         if ($siteConfiguration->getIrcNotificationsEnabled()) {
             $notificationsDatabase = PdoDatabase::getDatabaseConnection('notifications');
-        }
-        else {
+        } else {
             // @todo federated table here?
             $notificationsDatabase = $database;
         }

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/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/Actions/CountAction.php

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

Braces +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
 
         if ($username !== null) {
             $user = User::getByUsername($username, $this->getDatabase());
-        }
-        else {
+        } else {
             $user = User::getByOnWikiUsername($wikiusername, $this->getDatabase());
         }
 

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