enwikipedia-acc / waca

includes/Pages/Registration/PageRegisterBase.php

Indentation +200 added lines, -200 removed lines

@@ -21,204 +21,204 @@
 
 abstract class PageRegisterBase extends InternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @throws AccessDeniedException
-     */
-    protected function main()
-    {
-        $useOAuthSignup = $this->getSiteConfiguration()->getUseOAuthSignup();
-        if (! $this->getSiteConfiguration()->isRegistrationAllowed()) {
-           throw new AccessDeniedException();
-        }
-
-        // Dual-mode page
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-
-            try {
-                $this->handlePost($useOAuthSignup);
-            }
-            catch (ApplicationLogicException $ex) {
-                SessionAlert::error($ex->getMessage());
-                $this->redirect('register');
-            }
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->assign("useOAuthSignup", $useOAuthSignup);
-            $this->setTemplate($this->getRegistrationTemplate());
-        }
-    }
-
-    protected abstract function getRegistrationTemplate();
-
-    protected function isProtectedPage()
-    {
-        return false;
-    }
-
-    /**
-     * @param string $emailAddress
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function validateUniqueEmail($emailAddress)
-    {
-        $query = 'SELECT COUNT(id) FROM user WHERE email = :email';
-        $statement = $this->getDatabase()->prepare($query);
-        $statement->execute(array(':email' => $emailAddress));
-
-        if ($statement->fetchColumn() > 0) {
-            throw new ApplicationLogicException('That email address is already in use on this system.');
-        }
-
-        $statement->closeCursor();
-    }
-
-    /**
-     * @param $emailAddress
-     * @param $password
-     * @param $username
-     * @param $useOAuthSignup
-     * @param $confirmationId
-     * @param $onwikiUsername
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function validateRequest(
-        $emailAddress,
-        $password,
-        $username,
-        $useOAuthSignup,
-        $confirmationId,
-        $onwikiUsername
-    ) {
-        if (!WebRequest::postBoolean('guidelines')) {
-            throw new ApplicationLogicException('You must read the interface guidelines before your request may be submitted.');
-        }
-
-        $this->validateGeneralInformation($emailAddress, $password, $username);
-        $this->validateUniqueEmail($emailAddress);
-        $this->validateNonOAuthFields($useOAuthSignup, $confirmationId, $onwikiUsername);
-    }
-
-    /**
-     * @param $useOAuthSignup
-     * @param $confirmationId
-     * @param $onwikiUsername
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function validateNonOAuthFields($useOAuthSignup, $confirmationId, $onwikiUsername)
-    {
-        if (!$useOAuthSignup) {
-            if ($confirmationId === null || $confirmationId <= 0) {
-                throw new ApplicationLogicException('Please enter the revision id of your confirmation edit.');
-            }
-
-            if ($onwikiUsername === null) {
-                throw new ApplicationLogicException('Please specify your on-wiki username.');
-            }
-        }
-    }
-
-    /**
-     * @param $emailAddress
-     * @param $password
-     * @param $username
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function validateGeneralInformation($emailAddress, $password, $username)
-    {
-        if ($emailAddress === null) {
-            throw new ApplicationLogicException('Your email address appears to be invalid!');
-        }
-
-        if ($password !== WebRequest::postString('pass2')) {
-            throw new ApplicationLogicException('Your passwords did not match, please try again.');
-        }
-
-        if (User::getByUsername($username, $this->getDatabase()) !== false) {
-            throw new ApplicationLogicException('That username is already in use on this system.');
-        }
-    }
-
-    /**
-     * @param $useOAuthSignup
-     *
-     * @throws ApplicationLogicException
-     * @throws \Exception
-     */
-    protected function handlePost($useOAuthSignup)
-    {
-        // Get the data
-        $emailAddress = WebRequest::postEmail('email');
-        $password = WebRequest::postString('pass');
-        $username = WebRequest::postString('name');
-
-        // Only set if OAuth is disabled
-        $confirmationId = WebRequest::postInt('conf_revid');
-        $onwikiUsername = WebRequest::postString('wname');
-
-        // Do some validation
-        $this->validateRequest($emailAddress, $password, $username, $useOAuthSignup, $confirmationId,
-            $onwikiUsername);
-
-        $database = $this->getDatabase();
-
-        $user = new User();
-        $user->setDatabase($database);
-
-        $user->setUsername($username);
-        $user->setEmail($emailAddress);
-
-        if (!$useOAuthSignup) {
-            $user->setOnWikiName($onwikiUsername);
-            $user->setConfirmationDiff($confirmationId);
-        }
-
-        $user->save();
-
-        $passwordCredentialProvider = new PasswordCredentialProvider($database, $this->getSiteConfiguration());
-        $passwordCredentialProvider->setCredential($user, 1, $password);
-
-        $defaultRole = $this->getDefaultRole();
-
-        $role = new UserRole();
-        $role->setDatabase($database);
-        $role->setUser($user->getId());
-        $role->setRole($defaultRole);
-        $role->save();
-
-        // Log now to get the signup date.
-        Logger::newUser($database, $user);
-        Logger::userRolesEdited($database, $user, 'Registration', array($defaultRole), array());
-
-        if ($useOAuthSignup) {
-            $oauthProtocolHelper = $this->getOAuthProtocolHelper();
-            $oauth = new OAuthUserHelper($user, $database, $oauthProtocolHelper, $this->getSiteConfiguration());
-
-            $authoriseUrl = $oauth->getRequestToken();
-            WebRequest::setOAuthPartialLogin($user);
-            $this->redirectUrl($authoriseUrl);
-        }
-        else {
-            // only notify if we're not using the oauth signup.
-            $this->getNotificationHelper()->userNew($user);
-            WebRequest::setLoggedInUser($user);
-            $this->redirect('preferences');
-        }
-    }
-
-    protected abstract function getDefaultRole();
-
-    /**
-     * Entry point for registration complete
-     */
-    protected function done()
-    {
-        $this->setTemplate('registration/alert-registrationcomplete.tpl');
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @throws AccessDeniedException
+	 */
+	protected function main()
+	{
+		$useOAuthSignup = $this->getSiteConfiguration()->getUseOAuthSignup();
+		if (! $this->getSiteConfiguration()->isRegistrationAllowed()) {
+		   throw new AccessDeniedException();
+		}
+
+		// Dual-mode page
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+
+			try {
+				$this->handlePost($useOAuthSignup);
+			}
+			catch (ApplicationLogicException $ex) {
+				SessionAlert::error($ex->getMessage());
+				$this->redirect('register');
+			}
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->assign("useOAuthSignup", $useOAuthSignup);
+			$this->setTemplate($this->getRegistrationTemplate());
+		}
+	}
+
+	protected abstract function getRegistrationTemplate();
+
+	protected function isProtectedPage()
+	{
+		return false;
+	}
+
+	/**
+	 * @param string $emailAddress
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function validateUniqueEmail($emailAddress)
+	{
+		$query = 'SELECT COUNT(id) FROM user WHERE email = :email';
+		$statement = $this->getDatabase()->prepare($query);
+		$statement->execute(array(':email' => $emailAddress));
+
+		if ($statement->fetchColumn() > 0) {
+			throw new ApplicationLogicException('That email address is already in use on this system.');
+		}
+
+		$statement->closeCursor();
+	}
+
+	/**
+	 * @param $emailAddress
+	 * @param $password
+	 * @param $username
+	 * @param $useOAuthSignup
+	 * @param $confirmationId
+	 * @param $onwikiUsername
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function validateRequest(
+		$emailAddress,
+		$password,
+		$username,
+		$useOAuthSignup,
+		$confirmationId,
+		$onwikiUsername
+	) {
+		if (!WebRequest::postBoolean('guidelines')) {
+			throw new ApplicationLogicException('You must read the interface guidelines before your request may be submitted.');
+		}
+
+		$this->validateGeneralInformation($emailAddress, $password, $username);
+		$this->validateUniqueEmail($emailAddress);
+		$this->validateNonOAuthFields($useOAuthSignup, $confirmationId, $onwikiUsername);
+	}
+
+	/**
+	 * @param $useOAuthSignup
+	 * @param $confirmationId
+	 * @param $onwikiUsername
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function validateNonOAuthFields($useOAuthSignup, $confirmationId, $onwikiUsername)
+	{
+		if (!$useOAuthSignup) {
+			if ($confirmationId === null || $confirmationId <= 0) {
+				throw new ApplicationLogicException('Please enter the revision id of your confirmation edit.');
+			}
+
+			if ($onwikiUsername === null) {
+				throw new ApplicationLogicException('Please specify your on-wiki username.');
+			}
+		}
+	}
+
+	/**
+	 * @param $emailAddress
+	 * @param $password
+	 * @param $username
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function validateGeneralInformation($emailAddress, $password, $username)
+	{
+		if ($emailAddress === null) {
+			throw new ApplicationLogicException('Your email address appears to be invalid!');
+		}
+
+		if ($password !== WebRequest::postString('pass2')) {
+			throw new ApplicationLogicException('Your passwords did not match, please try again.');
+		}
+
+		if (User::getByUsername($username, $this->getDatabase()) !== false) {
+			throw new ApplicationLogicException('That username is already in use on this system.');
+		}
+	}
+
+	/**
+	 * @param $useOAuthSignup
+	 *
+	 * @throws ApplicationLogicException
+	 * @throws \Exception
+	 */
+	protected function handlePost($useOAuthSignup)
+	{
+		// Get the data
+		$emailAddress = WebRequest::postEmail('email');
+		$password = WebRequest::postString('pass');
+		$username = WebRequest::postString('name');
+
+		// Only set if OAuth is disabled
+		$confirmationId = WebRequest::postInt('conf_revid');
+		$onwikiUsername = WebRequest::postString('wname');
+
+		// Do some validation
+		$this->validateRequest($emailAddress, $password, $username, $useOAuthSignup, $confirmationId,
+			$onwikiUsername);
+
+		$database = $this->getDatabase();
+
+		$user = new User();
+		$user->setDatabase($database);
+
+		$user->setUsername($username);
+		$user->setEmail($emailAddress);
+
+		if (!$useOAuthSignup) {
+			$user->setOnWikiName($onwikiUsername);
+			$user->setConfirmationDiff($confirmationId);
+		}
+
+		$user->save();
+
+		$passwordCredentialProvider = new PasswordCredentialProvider($database, $this->getSiteConfiguration());
+		$passwordCredentialProvider->setCredential($user, 1, $password);
+
+		$defaultRole = $this->getDefaultRole();
+
+		$role = new UserRole();
+		$role->setDatabase($database);
+		$role->setUser($user->getId());
+		$role->setRole($defaultRole);
+		$role->save();
+
+		// Log now to get the signup date.
+		Logger::newUser($database, $user);
+		Logger::userRolesEdited($database, $user, 'Registration', array($defaultRole), array());
+
+		if ($useOAuthSignup) {
+			$oauthProtocolHelper = $this->getOAuthProtocolHelper();
+			$oauth = new OAuthUserHelper($user, $database, $oauthProtocolHelper, $this->getSiteConfiguration());
+
+			$authoriseUrl = $oauth->getRequestToken();
+			WebRequest::setOAuthPartialLogin($user);
+			$this->redirectUrl($authoriseUrl);
+		}
+		else {
+			// only notify if we're not using the oauth signup.
+			$this->getNotificationHelper()->userNew($user);
+			WebRequest::setLoggedInUser($user);
+			$this->redirect('preferences');
+		}
+	}
+
+	protected abstract function getDefaultRole();
+
+	/**
+	 * Entry point for registration complete
+	 */
+	protected function done()
+	{
+		$this->setTemplate('registration/alert-registrationcomplete.tpl');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     protected function main()
     {
         $useOAuthSignup = $this->getSiteConfiguration()->getUseOAuthSignup();
-        if (! $this->getSiteConfiguration()->isRegistrationAllowed()) {
+        if (!$this->getSiteConfiguration()->isRegistrationAllowed()) {
            throw new AccessDeniedException();
         }
 

includes/Helpers/SearchHelpers/UserSearchHelper.php

Indentation +89 added lines, -89 removed lines

@@ -15,73 +15,73 @@ 
 
 class UserSearchHelper extends SearchHelperBase
 {
-    /**
-     * UserSearchHelper constructor.
-     *
-     * @param PdoDatabase $database
-     */
-    public function __construct(PdoDatabase $database)
-    {
-        parent::__construct($database, 'user', User::class);
-    }
-
-    /**
-     * Initiates a search for requests
-     *
-     * @param PdoDatabase $database
-     *
-     * @return UserSearchHelper
-     */
-    public static function get(PdoDatabase $database)
-    {
-        $helper = new UserSearchHelper($database);
-
-        return $helper;
-    }
-
-    /**
-     * @param string $status
-     *
-     * @return $this
-     */
-    public function byStatus($status)
-    {
-        $this->whereClause .= ' AND status = ?';
-        $this->parameterList[] = $status;
-
-        return $this;
-    }
-
-    public function statusIn($statuses)
-    {
-        $this->inClause('status', $statuses);
-
-        return $this;
-    }
-
-    /**
-     * @param string $role
-     *
-     * @return $this
-     */
-    public function byRole($role)
-    {
-        $this->joinClause .= ' INNER JOIN userrole r on origin.id = r.user';
-        $this->whereClause .= ' AND r.role = ?';
-        $this->parameterList[] = $role;
-
-        return $this;
-    }
-
-    /**
-     * @param DateTime $instant
-     *
-     * @return $this
-     */
-    public function lastActiveBefore(DateTime $instant)
-    {
-        $this->whereClause .= ' AND origin.lastactive < ? AND approvaldate.timestamp < ?';
-        $this->joinClause .= <<<'SQLFRAG'
+	/**
+	 * UserSearchHelper constructor.
+	 *
+	 * @param PdoDatabase $database
+	 */
+	public function __construct(PdoDatabase $database)
+	{
+		parent::__construct($database, 'user', User::class);
+	}
+
+	/**
+	 * Initiates a search for requests
+	 *
+	 * @param PdoDatabase $database
+	 *
+	 * @return UserSearchHelper
+	 */
+	public static function get(PdoDatabase $database)
+	{
+		$helper = new UserSearchHelper($database);
+
+		return $helper;
+	}
+
+	/**
+	 * @param string $status
+	 *
+	 * @return $this
+	 */
+	public function byStatus($status)
+	{
+		$this->whereClause .= ' AND status = ?';
+		$this->parameterList[] = $status;
+
+		return $this;
+	}
+
+	public function statusIn($statuses)
+	{
+		$this->inClause('status', $statuses);
+
+		return $this;
+	}
+
+	/**
+	 * @param string $role
+	 *
+	 * @return $this
+	 */
+	public function byRole($role)
+	{
+		$this->joinClause .= ' INNER JOIN userrole r on origin.id = r.user';
+		$this->whereClause .= ' AND r.role = ?';
+		$this->parameterList[] = $role;
+
+		return $this;
+	}
+
+	/**
+	 * @param DateTime $instant
+	 *
+	 * @return $this
+	 */
+	public function lastActiveBefore(DateTime $instant)
+	{
+		$this->whereClause .= ' AND origin.lastactive < ? AND approvaldate.timestamp < ?';
+		$this->joinClause .= <<<'SQLFRAG'
  LEFT JOIN (
     SELECT objectid, MAX(timestamp) timestamp 
     FROM log
@@ -89,16 +89,16 @@ 
     GROUP BY objectid
     ) approvaldate ON approvaldate.objectid = origin.id
 SQLFRAG;
-        $formattedDate = $instant->format("Y-m-d H:i:s");
-        $this->parameterList[] = $formattedDate;
-        $this->parameterList[] = $formattedDate;
+		$formattedDate = $instant->format("Y-m-d H:i:s");
+		$this->parameterList[] = $formattedDate;
+		$this->parameterList[] = $formattedDate;
 
-        return $this;
-    }
+		return $this;
+	}
 
-    public function getRoleMap(&$roleMap)
-    {
-        $query = <<<SQL
+	public function getRoleMap(&$roleMap)
+	{
+		$query = <<<SQL
             SELECT /* UserSearchHelper/roleMap */ 
                   r.user user
                 , group_concat(r.role SEPARATOR ', ') roles 
@@ -107,22 +107,22 @@ 
             GROUP BY r.user
 SQL;
 
-        $statement = $this->database->prepare($query);
-        $statement->execute($this->parameterList);
+		$statement = $this->database->prepare($query);
+		$statement->execute($this->parameterList);
 
-        $roleMap = array();
-        foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {
-            $roleMap[$row['user']] = $row['roles'];
-        }
+		$roleMap = array();
+		foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {
+			$roleMap[$row['user']] = $row['roles'];
+		}
 
-        return $this;
-    }
+		return $this;
+	}
 
-    public function withReservedRequest()
-    {
-        $this->joinClause = ' INNER JOIN request req ON req.reserved = origin.id';
-        $this->groupByClause = ' GROUP BY origin.id, origin.username';
+	public function withReservedRequest()
+	{
+		$this->joinClause = ' INNER JOIN request req ON req.reserved = origin.id';
+		$this->groupByClause = ' GROUP BY origin.id, origin.username';
 
-        return $this->fetchMap('username');
-    }
+		return $this->fetchMap('username');
+	}
 }

includes/ConsoleTasks/PrecacheGeolocationTask.php

Indentation +53 added lines, -53 removed lines

@@ -14,30 +14,30 @@ 
 
 class PrecacheGeolocationTask extends ConsoleTaskBase
 {
-    public function execute()
-    {
-        $database = $this->getDatabase();
-        $locationProvider = $this->getLocationProvider();
+	public function execute()
+	{
+		$database = $this->getDatabase();
+		$locationProvider = $this->getLocationProvider();
 
-        while (true) {
-            echo "Beginning txn\n";
-            $database->beginTransaction();
+		while (true) {
+			echo "Beginning txn\n";
+			$database->beginTransaction();
 
-            try {
-                echo ". Fetching data...\n";
+			try {
+				echo ". Fetching data...\n";
 
-                // fetch a bunch of un-geolocated IPs from the database.
-                // Note we have to parse the forwardedip field in the database so we can test against the geolocation
-                // table.
-                //
-                // This guarantees we get ten unlocated IPs back, unless there actually aren't 10 available.
-                //
-                // Alternatives include downloading a small set of forwarded IPs, splitting it in PHP, constructing an
-                // IN() clause dynamically, sending that back to the database to check if there are geolocation entries,
-                // then repeating until we have 10 to process - and the fact that we'd have to potentially retrieve all
-                // IPs from the database before we find any at all. This way keeps all of that legwork in the database,
-                // at the cost of a more complex query.
-                $statement = $database->query(<<<SQL
+				// fetch a bunch of un-geolocated IPs from the database.
+				// Note we have to parse the forwardedip field in the database so we can test against the geolocation
+				// table.
+				//
+				// This guarantees we get ten unlocated IPs back, unless there actually aren't 10 available.
+				//
+				// Alternatives include downloading a small set of forwarded IPs, splitting it in PHP, constructing an
+				// IN() clause dynamically, sending that back to the database to check if there are geolocation entries,
+				// then repeating until we have 10 to process - and the fact that we'd have to potentially retrieve all
+				// IPs from the database before we find any at all. This way keeps all of that legwork in the database,
+				// at the cost of a more complex query.
+				$statement = $database->query(<<<SQL
                     SELECT /* PrecacheGeolocationTask */ p.prox
                     FROM (
                       SELECT trim(substring_index(substring_index(r.forwardedip, ',', n.n), ',', -1)) prox
@@ -54,42 +54,42 @@ 
                     WHERE NOT EXISTS (SELECT 1 FROM geolocation g WHERE g.address = p.prox FOR UPDATE)
                     LIMIT 10;
 SQL
-                );
+				);
 
-                $missingIps = $statement->fetchAll(PDO::FETCH_COLUMN);
+				$missingIps = $statement->fetchAll(PDO::FETCH_COLUMN);
 
-                $count = count($missingIps);
-                if ($count === 0) {
-                    echo ". Found nothing to do.\n";
-                    break;
-                }
+				$count = count($missingIps);
+				if ($count === 0) {
+					echo ". Found nothing to do.\n";
+					break;
+				}
 
-                echo ". Picked {$count} IP addresses\n";
+				echo ". Picked {$count} IP addresses\n";
 
-                foreach ($missingIps as $ip) {
-                    echo ". . Getting location for {$ip}...\n";
-                    $data = json_encode($locationProvider->getIpLocation($ip));
-                    echo ". . . {$data}\n";
-                }
+				foreach ($missingIps as $ip) {
+					echo ". . Getting location for {$ip}...\n";
+					$data = json_encode($locationProvider->getIpLocation($ip));
+					echo ". . . {$data}\n";
+				}
 
-                echo ". IP location fetch complete.\n";
-                $database->commit();
-                echo ". Committed txn.\n";
-            }
-            catch (Exception $ex) {
-                echo ". Encountered exception: " . $ex->getMessage() . "\n";
-                $database->rollBack();
-                echo ". Rolled back txn\n";
-                throw $ex;
-            }
-            finally {
-                if ($database->hasActiveTransaction()) {
-                    $database->rollBack();
-                    echo ". Rolled back txn\n";
-                }
-            }
-        }
+				echo ". IP location fetch complete.\n";
+				$database->commit();
+				echo ". Committed txn.\n";
+			}
+			catch (Exception $ex) {
+				echo ". Encountered exception: " . $ex->getMessage() . "\n";
+				$database->rollBack();
+				echo ". Rolled back txn\n";
+				throw $ex;
+			}
+			finally {
+				if ($database->hasActiveTransaction()) {
+					$database->rollBack();
+					echo ". Rolled back txn\n";
+				}
+			}
+		}
 
-        echo "Done.\n";
-    }
+		echo "Done.\n";
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
                 echo ". Committed txn.\n";
             }
             catch (Exception $ex) {
-                echo ". Encountered exception: " . $ex->getMessage() . "\n";
+                echo ". Encountered exception: ".$ex->getMessage()."\n";
                 $database->rollBack();
                 echo ". Rolled back txn\n";
                 throw $ex;

config.inc.php

Spacing +9 added lines, -9 removed lines

@@ -132,7 +132,7 @@ 
 
 $BUbasefile = "backup"; // The basefile's name.
 $BUdir = "/home/project/a/c/c/acc/backups"; // The directory where backups should be stored.
-$BUmonthdir = $BUdir . "/monthly"; // The directory where monthly backups should be stored.
+$BUmonthdir = $BUdir."/monthly"; // The directory where monthly backups should be stored.
 $BUdumper = "/opt/ts/mysql/5.1/bin/mysqldump --defaults-file=~/.my.cnf p_acc_live"; // Add parameters here if they are needed.
 $BUgzip = "/usr/bin/gzip"; // Add the gzip parameters here if needed.
 $BUtar = "/bin/tar -cvf"; // Add the tar parameters here if needed.
@@ -248,7 +248,7 @@ 
 $curlDisableSSLVerifyPeer = false;
 
 // Change this to be outside the web directory.
-$curlCookieJar = __DIR__ . '/../cookies.txt';
+$curlCookieJar = __DIR__.'/../cookies.txt';
 
 $yubicoApiId = 0;
 $yubicoApiKey = "";
@@ -267,19 +267,19 @@ 
 
 $cDatabaseConfig = array(
     "acc"           => array(
-        "dsrcname" => "mysql:host=" . $toolserver_host . ";dbname=" . $toolserver_database,
+        "dsrcname" => "mysql:host=".$toolserver_host.";dbname=".$toolserver_database,
         "username" => $toolserver_username,
         "password" => $toolserver_password,
 		"options"  => array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4'),
     ),
     "wikipedia"     => array(
-        "dsrcname" => "mysql:host=" . $antispoof_host . ";dbname=" . $antispoof_db,
+        "dsrcname" => "mysql:host=".$antispoof_host.";dbname=".$antispoof_db,
         "username" => $toolserver_username,
         "password" => $toolserver_password,
         "options"  => array(),
     ),
     "notifications" => array(
-        "dsrcname" => "mysql:host=" . $toolserver_notification_dbhost . ";dbname=" . $toolserver_notification_database,
+        "dsrcname" => "mysql:host=".$toolserver_notification_dbhost.";dbname=".$toolserver_notification_database,
         "username" => $notifications_username,
         "password" => $notifications_password,
         "options"  => array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4'),
@@ -310,13 +310,13 @@ 
 }
 
 // Set up the AutoLoader
-require_once(__DIR__ . "/includes/AutoLoader.php");
+require_once(__DIR__."/includes/AutoLoader.php");
 spl_autoload_register('Waca\\AutoLoader::load');
-require_once(__DIR__ . '/vendor/autoload.php');
+require_once(__DIR__.'/vendor/autoload.php');
 
 // Extra includes which are just plain awkward wherever they are.
-require_once(__DIR__ . '/lib/mediawiki-extensions-OAuth/lib/OAuth.php');
-require_once(__DIR__ . '/lib/mediawiki-extensions-OAuth/lib/JWT.php');
+require_once(__DIR__.'/lib/mediawiki-extensions-OAuth/lib/OAuth.php');
+require_once(__DIR__.'/lib/mediawiki-extensions-OAuth/lib/JWT.php');
 
 // Crap that's needed for libraries. >:(
 /**

Indentation +87 added lines, -87 removed lines

@@ -202,27 +202,27 @@ 
 
 // request states
 $availableRequestStates = array(
-    'Open'          => array(
-        'defertolog' => 'users', // don't change or you'll break old logs
-        'deferto'    => 'users',
-        'header'     => 'Open requests',
-        'api'        => "open",
-        'queuehelp'  => null
-    ),
-    'Flagged users' => array(
-        'defertolog' => 'flagged users', // don't change or you'll break old logs
-        'deferto'    => 'flagged users',
-        'header'     => 'Flagged user needed',
-        'api'        => "admin",
-        'queuehelp'  => 'This queue lists the requests which require a user with the <code>accountcreator</code> flag to create.<br />If creation is determined to be the correct course of action, requests here will require the overriding the AntiSpoof checks or the title blacklist in order to create. It is recommended to try to create the account <em>without</em> checking the flags to validate the results of the AntiSpoof and/or title blacklist hits.'
-    ),
-    'Checkuser'     => array(
-        'defertolog' => 'checkusers', // don't change or you'll break old logs
-        'deferto'    => 'checkusers',
-        'header'     => 'Checkuser needed',
-        'api'        => "checkuser",
-        'queuehelp'  => null
-    ),
+	'Open'          => array(
+		'defertolog' => 'users', // don't change or you'll break old logs
+		'deferto'    => 'users',
+		'header'     => 'Open requests',
+		'api'        => "open",
+		'queuehelp'  => null
+	),
+	'Flagged users' => array(
+		'defertolog' => 'flagged users', // don't change or you'll break old logs
+		'deferto'    => 'flagged users',
+		'header'     => 'Flagged user needed',
+		'api'        => "admin",
+		'queuehelp'  => 'This queue lists the requests which require a user with the <code>accountcreator</code> flag to create.<br />If creation is determined to be the correct course of action, requests here will require the overriding the AntiSpoof checks or the title blacklist in order to create. It is recommended to try to create the account <em>without</em> checking the flags to validate the results of the AntiSpoof and/or title blacklist hits.'
+	),
+	'Checkuser'     => array(
+		'defertolog' => 'checkusers', // don't change or you'll break old logs
+		'deferto'    => 'checkusers',
+		'header'     => 'Checkuser needed',
+		'api'        => "checkuser",
+		'queuehelp'  => null
+	),
 );
 
 $defaultRequestStateKey = 'Open';
@@ -272,24 +272,24 @@ 
 require_once('config.local.inc.php');
 
 $cDatabaseConfig = array(
-    "acc"           => array(
-        "dsrcname" => "mysql:host=" . $toolserver_host . ";dbname=" . $toolserver_database,
-        "username" => $toolserver_username,
-        "password" => $toolserver_password,
+	"acc"           => array(
+		"dsrcname" => "mysql:host=" . $toolserver_host . ";dbname=" . $toolserver_database,
+		"username" => $toolserver_username,
+		"password" => $toolserver_password,
 		"options"  => array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4'),
-    ),
-    "wikipedia"     => array(
-        "dsrcname" => "mysql:host=" . $antispoof_host . ";dbname=" . $antispoof_db,
-        "username" => $toolserver_username,
-        "password" => $toolserver_password,
-        "options"  => array(),
-    ),
-    "notifications" => array(
-        "dsrcname" => "mysql:host=" . $toolserver_notification_dbhost . ";dbname=" . $toolserver_notification_database,
-        "username" => $notifications_username,
-        "password" => $notifications_password,
-        "options"  => array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4'),
-    ),
+	),
+	"wikipedia"     => array(
+		"dsrcname" => "mysql:host=" . $antispoof_host . ";dbname=" . $antispoof_db,
+		"username" => $toolserver_username,
+		"password" => $toolserver_password,
+		"options"  => array(),
+	),
+	"notifications" => array(
+		"dsrcname" => "mysql:host=" . $toolserver_notification_dbhost . ";dbname=" . $toolserver_notification_database,
+		"username" => $notifications_username,
+		"password" => $notifications_password,
+		"options"  => array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4'),
+	),
 );
 
 // //Keep the included files from being executed.
@@ -301,18 +301,18 @@ 
 ini_set('user_agent', $toolUserAgent);
 
 foreach (array(
-    "mbstring", // unicode and stuff
-    "pdo",
-    "pdo_mysql", // new database module
-    "session",
-    "date",
-    "pcre", // core stuff
-    "curl", // mediawiki api access etc
-    "openssl", // token generation
+	"mbstring", // unicode and stuff
+	"pdo",
+	"pdo_mysql", // new database module
+	"session",
+	"date",
+	"pcre", // core stuff
+	"curl", // mediawiki api access etc
+	"openssl", // token generation
 ) as $x) {
-    if (!extension_loaded($x)) {
-        die("extension $x is required.");
-    }
+	if (!extension_loaded($x)) {
+		die("extension $x is required.");
+	}
 }
 
 // Set up the AutoLoader
@@ -339,41 +339,41 @@ 
 $siteConfiguration = new \Waca\SiteConfiguration();
 
 $siteConfiguration->setBaseUrl($baseurl)
-    ->setFilePath(__DIR__)
-    ->setDebuggingTraceEnabled($enableErrorTrace)
-    ->setForceIdentification($forceIdentification)
-    ->setIdentificationCacheExpiry($identificationCacheExpiry)
-    ->setMediawikiScriptPath($mediawikiScriptPath)
-    ->setMediawikiWebServiceEndpoint($mediawikiWebServiceEndpoint)
-    ->setMetaWikimediaWebServiceEndpoint($metaWikimediaWebServiceEndpoint)
-    ->setEnforceOAuth($enforceOAuth)
-    ->setEmailConfirmationEnabled($enableEmailConfirm == 1)
-    ->setEmailConfirmationExpiryDays($emailConfirmationExpiryDays)
-    ->setMiserModeLimit($requestLimitShowOnly)
-    ->setRequestStates($availableRequestStates)
-    ->setSquidList($squidIpList)
-    ->setDefaultCreatedTemplateId($createdid)
-    ->setDefaultRequestStateKey($defaultRequestStateKey)
-    ->setUseStrictTransportSecurity($strictTransportSecurityExpiry)
-    ->setUserAgent($toolUserAgent)
-    ->setCurlDisableVerifyPeer($curlDisableSSLVerifyPeer)
-    ->setUseOAuthSignup($useOauthSignup)
-    ->setOAuthBaseUrl($oauthBaseUrl)
-    ->setOAuthConsumerToken($oauthConsumerToken)
-    ->setOAuthConsumerSecret($oauthSecretToken)
-    ->setOauthMediaWikiCanonicalServer($oauthMediaWikiCanonicalServer)
-    ->setDataClearInterval($dataclear_interval)
-    ->setXffTrustedHostsFile($xff_trusted_hosts_file)
-    ->setIrcNotificationsEnabled($ircBotNotificationsEnabled == 1)
-    ->setIrcNotificationType($ircBotNotificationType)
-    ->setIrcNotificationsInstance($whichami)
-    ->setTitleBlacklistEnabled($enableTitleblacklist == 1)
-    ->setTorExitPaths(array_merge(gethostbynamel('en.wikipedia.org'), gethostbynamel('accounts.wmflabs.org')))
-    ->setCreationBotUsername($creationBotUsername)
-    ->setCreationBotPassword($creationBotPassword)
-    ->setCurlCookieJar($curlCookieJar)
-    ->setYubicoApiId($yubicoApiId)
-    ->setYubicoApiKey($yubicoApiKey)
-    ->setTotpEncryptionKey($totpEncryptionKey)
-    ->setRegistrationAllowed($allowRegistration)
-    ->setCspReportUri($cspReportUri);
+	->setFilePath(__DIR__)
+	->setDebuggingTraceEnabled($enableErrorTrace)
+	->setForceIdentification($forceIdentification)
+	->setIdentificationCacheExpiry($identificationCacheExpiry)
+	->setMediawikiScriptPath($mediawikiScriptPath)
+	->setMediawikiWebServiceEndpoint($mediawikiWebServiceEndpoint)
+	->setMetaWikimediaWebServiceEndpoint($metaWikimediaWebServiceEndpoint)
+	->setEnforceOAuth($enforceOAuth)
+	->setEmailConfirmationEnabled($enableEmailConfirm == 1)
+	->setEmailConfirmationExpiryDays($emailConfirmationExpiryDays)
+	->setMiserModeLimit($requestLimitShowOnly)
+	->setRequestStates($availableRequestStates)
+	->setSquidList($squidIpList)
+	->setDefaultCreatedTemplateId($createdid)
+	->setDefaultRequestStateKey($defaultRequestStateKey)
+	->setUseStrictTransportSecurity($strictTransportSecurityExpiry)
+	->setUserAgent($toolUserAgent)
+	->setCurlDisableVerifyPeer($curlDisableSSLVerifyPeer)
+	->setUseOAuthSignup($useOauthSignup)
+	->setOAuthBaseUrl($oauthBaseUrl)
+	->setOAuthConsumerToken($oauthConsumerToken)
+	->setOAuthConsumerSecret($oauthSecretToken)
+	->setOauthMediaWikiCanonicalServer($oauthMediaWikiCanonicalServer)
+	->setDataClearInterval($dataclear_interval)
+	->setXffTrustedHostsFile($xff_trusted_hosts_file)
+	->setIrcNotificationsEnabled($ircBotNotificationsEnabled == 1)
+	->setIrcNotificationType($ircBotNotificationType)
+	->setIrcNotificationsInstance($whichami)
+	->setTitleBlacklistEnabled($enableTitleblacklist == 1)
+	->setTorExitPaths(array_merge(gethostbynamel('en.wikipedia.org'), gethostbynamel('accounts.wmflabs.org')))
+	->setCreationBotUsername($creationBotUsername)
+	->setCreationBotPassword($creationBotPassword)
+	->setCurlCookieJar($curlCookieJar)
+	->setYubicoApiId($yubicoApiId)
+	->setYubicoApiKey($yubicoApiKey)
+	->setTotpEncryptionKey($totpEncryptionKey)
+	->setRegistrationAllowed($allowRegistration)
+	->setCspReportUri($cspReportUri);

includes/Pages/PageEmailManagement.php

Indentation +175 added lines, -175 removed lines

@@ -19,179 +19,179 @@
 
 class PageEmailManagement extends InternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        $this->setHtmlTitle('Close Emails');
-
-        // Get all active email templates
-        $activeTemplates = EmailTemplate::getAllActiveTemplates(null, $this->getDatabase());
-        $inactiveTemplates = EmailTemplate::getAllInactiveTemplates($this->getDatabase());
-
-        $this->assign('activeTemplates', $activeTemplates);
-        $this->assign('inactiveTemplates', $inactiveTemplates);
-
-        $user = User::getCurrent($this->getDatabase());
-        $this->assign('canCreate', $this->barrierTest('create', $user));
-        $this->assign('canEdit', $this->barrierTest('edit', $user));
-
-        $this->setTemplate('email-management/main.tpl');
-    }
-
-    protected function view()
-    {
-        $this->setHtmlTitle('Close Emails');
-
-        $database = $this->getDatabase();
-        $template = $this->getTemplate($database);
-
-        $createdId = $this->getSiteConfiguration()->getDefaultCreatedTemplateId();
-        $requestStates = $this->getSiteConfiguration()->getRequestStates();
-
-        $this->assign('id', $template->getId());
-        $this->assign('emailTemplate', $template);
-        $this->assign('createdid', $createdId);
-        $this->assign('requeststates', $requestStates);
-
-        $this->setTemplate('email-management/view.tpl');
-    }
-
-    /**
-     * @param PdoDatabase $database
-     *
-     * @return EmailTemplate
-     * @throws ApplicationLogicException
-     */
-    protected function getTemplate(PdoDatabase $database)
-    {
-        $templateId = WebRequest::getInt('id');
-        if ($templateId === null) {
-            throw new ApplicationLogicException('Template not specified');
-        }
-        $template = EmailTemplate::getById($templateId, $database);
-        if ($template === false || !is_a($template, EmailTemplate::class)) {
-            throw new ApplicationLogicException('Template not found');
-        }
-
-        return $template;
-    }
-
-    protected function edit()
-    {
-        $this->setHtmlTitle('Close Emails');
-
-        $database = $this->getDatabase();
-        $template = $this->getTemplate($database);
-
-        $createdId = $this->getSiteConfiguration()->getDefaultCreatedTemplateId();
-        $requestStates = $this->getSiteConfiguration()->getRequestStates();
-
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-
-            $this->modifyTemplateData($template);
-
-            $other = EmailTemplate::getByName($template->getName(), $database);
-            if ($other !== false && $other->getId() !== $template->getId()) {
-                throw new ApplicationLogicException('A template with this name already exists');
-            }
-
-            if ($template->getId() === $createdId) {
-                $template->setDefaultAction(EmailTemplate::CREATED);
-                $template->setActive(true);
-                $template->setPreloadOnly(false);
-            }
-
-            // optimistically lock on load of edit form
-            $updateVersion = WebRequest::postInt('updateversion');
-            $template->setUpdateVersion($updateVersion);
-
-            $template->save();
-            Logger::editedEmail($database, $template);
-            $this->getNotificationHelper()->emailEdited($template);
-            SessionAlert::success("Email template has been saved successfully.");
-
-            $this->redirect('emailManagement');
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->assign('id', $template->getId());
-            $this->assign('emailTemplate', $template);
-            $this->assign('createdid', $createdId);
-            $this->assign('requeststates', $requestStates);
-
-            $this->setTemplate('email-management/edit.tpl');
-        }
-    }
-
-    /**
-     * @param EmailTemplate $template
-     *
-     * @throws ApplicationLogicException
-     */
-    private function modifyTemplateData(EmailTemplate $template)
-    {
-        $name = WebRequest::postString('name');
-        if ($name === null || $name === '') {
-            throw new ApplicationLogicException('Name not specified');
-        }
-
-        $template->setName($name);
-
-        $text = WebRequest::postString('text');
-        if ($text === null || $text === '') {
-            throw new ApplicationLogicException('Text not specified');
-        }
-
-        $template->setText($text);
-
-        $template->setJsquestion(WebRequest::postString('jsquestion'));
-
-        $template->setDefaultAction(WebRequest::postString('defaultaction'));
-        $template->setActive(WebRequest::postBoolean('active'));
-        $template->setPreloadOnly(WebRequest::postBoolean('preloadonly'));
-    }
-
-    protected function create()
-    {
-        $this->setHtmlTitle('Close Emails');
-
-        $database = $this->getDatabase();
-
-        $requestStates = $this->getSiteConfiguration()->getRequestStates();
-
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-            $template = new EmailTemplate();
-            $template->setDatabase($database);
-
-            $this->modifyTemplateData($template);
-
-            $other = EmailTemplate::getByName($template->getName(), $database);
-            if ($other !== false) {
-                throw new ApplicationLogicException('A template with this name already exists');
-            }
-
-            $template->save();
-
-            Logger::createEmail($database, $template);
-            $this->getNotificationHelper()->emailCreated($template);
-
-            SessionAlert::success("Email template has been saved successfully.");
-
-            $this->redirect('emailManagement');
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->assign('id', -1);
-            $this->assign('emailTemplate', new EmailTemplate());
-            $this->assign('createdid', -2);
-
-            $this->assign('requeststates', $requestStates);
-            $this->setTemplate('email-management/edit.tpl');
-        }
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		$this->setHtmlTitle('Close Emails');
+
+		// Get all active email templates
+		$activeTemplates = EmailTemplate::getAllActiveTemplates(null, $this->getDatabase());
+		$inactiveTemplates = EmailTemplate::getAllInactiveTemplates($this->getDatabase());
+
+		$this->assign('activeTemplates', $activeTemplates);
+		$this->assign('inactiveTemplates', $inactiveTemplates);
+
+		$user = User::getCurrent($this->getDatabase());
+		$this->assign('canCreate', $this->barrierTest('create', $user));
+		$this->assign('canEdit', $this->barrierTest('edit', $user));
+
+		$this->setTemplate('email-management/main.tpl');
+	}
+
+	protected function view()
+	{
+		$this->setHtmlTitle('Close Emails');
+
+		$database = $this->getDatabase();
+		$template = $this->getTemplate($database);
+
+		$createdId = $this->getSiteConfiguration()->getDefaultCreatedTemplateId();
+		$requestStates = $this->getSiteConfiguration()->getRequestStates();
+
+		$this->assign('id', $template->getId());
+		$this->assign('emailTemplate', $template);
+		$this->assign('createdid', $createdId);
+		$this->assign('requeststates', $requestStates);
+
+		$this->setTemplate('email-management/view.tpl');
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 *
+	 * @return EmailTemplate
+	 * @throws ApplicationLogicException
+	 */
+	protected function getTemplate(PdoDatabase $database)
+	{
+		$templateId = WebRequest::getInt('id');
+		if ($templateId === null) {
+			throw new ApplicationLogicException('Template not specified');
+		}
+		$template = EmailTemplate::getById($templateId, $database);
+		if ($template === false || !is_a($template, EmailTemplate::class)) {
+			throw new ApplicationLogicException('Template not found');
+		}
+
+		return $template;
+	}
+
+	protected function edit()
+	{
+		$this->setHtmlTitle('Close Emails');
+
+		$database = $this->getDatabase();
+		$template = $this->getTemplate($database);
+
+		$createdId = $this->getSiteConfiguration()->getDefaultCreatedTemplateId();
+		$requestStates = $this->getSiteConfiguration()->getRequestStates();
+
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+
+			$this->modifyTemplateData($template);
+
+			$other = EmailTemplate::getByName($template->getName(), $database);
+			if ($other !== false && $other->getId() !== $template->getId()) {
+				throw new ApplicationLogicException('A template with this name already exists');
+			}
+
+			if ($template->getId() === $createdId) {
+				$template->setDefaultAction(EmailTemplate::CREATED);
+				$template->setActive(true);
+				$template->setPreloadOnly(false);
+			}
+
+			// optimistically lock on load of edit form
+			$updateVersion = WebRequest::postInt('updateversion');
+			$template->setUpdateVersion($updateVersion);
+
+			$template->save();
+			Logger::editedEmail($database, $template);
+			$this->getNotificationHelper()->emailEdited($template);
+			SessionAlert::success("Email template has been saved successfully.");
+
+			$this->redirect('emailManagement');
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->assign('id', $template->getId());
+			$this->assign('emailTemplate', $template);
+			$this->assign('createdid', $createdId);
+			$this->assign('requeststates', $requestStates);
+
+			$this->setTemplate('email-management/edit.tpl');
+		}
+	}
+
+	/**
+	 * @param EmailTemplate $template
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	private function modifyTemplateData(EmailTemplate $template)
+	{
+		$name = WebRequest::postString('name');
+		if ($name === null || $name === '') {
+			throw new ApplicationLogicException('Name not specified');
+		}
+
+		$template->setName($name);
+
+		$text = WebRequest::postString('text');
+		if ($text === null || $text === '') {
+			throw new ApplicationLogicException('Text not specified');
+		}
+
+		$template->setText($text);
+
+		$template->setJsquestion(WebRequest::postString('jsquestion'));
+
+		$template->setDefaultAction(WebRequest::postString('defaultaction'));
+		$template->setActive(WebRequest::postBoolean('active'));
+		$template->setPreloadOnly(WebRequest::postBoolean('preloadonly'));
+	}
+
+	protected function create()
+	{
+		$this->setHtmlTitle('Close Emails');
+
+		$database = $this->getDatabase();
+
+		$requestStates = $this->getSiteConfiguration()->getRequestStates();
+
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+			$template = new EmailTemplate();
+			$template->setDatabase($database);
+
+			$this->modifyTemplateData($template);
+
+			$other = EmailTemplate::getByName($template->getName(), $database);
+			if ($other !== false) {
+				throw new ApplicationLogicException('A template with this name already exists');
+			}
+
+			$template->save();
+
+			Logger::createEmail($database, $template);
+			$this->getNotificationHelper()->emailCreated($template);
+
+			SessionAlert::success("Email template has been saved successfully.");
+
+			$this->redirect('emailManagement');
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->assign('id', -1);
+			$this->assign('emailTemplate', new EmailTemplate());
+			$this->assign('createdid', -2);
+
+			$this->assign('requeststates', $requestStates);
+			$this->setTemplate('email-management/edit.tpl');
+		}
+	}
 }

includes/API/IXmlApiAction.php

Indentation +8 added lines, -8 removed lines

@@ -16,12 +16,12 @@
  */
 interface IXmlApiAction extends IRoutedTask, IApiAction
 {
-    /**
-     * 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);
 }

includes/API/IJsonApiAction.php

Indentation +6 added lines, -6 removed lines

@@ -15,10 +15,10 @@
  */
 interface IJsonApiAction extends IRoutedTask, IApiAction
 {
-    /**
-     * Method that runs API action
-     *
-     * @return object|array The modified API document
-     */
-    public function executeApiAction();
+	/**
+	 * Method that runs API action
+	 *
+	 * @return object|array The modified API document
+	 */
+	public function executeApiAction();
 }

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