mdaniels5757 / waca

includes/DataObjects/User.php

Indentation +399 added lines, -399 removed lines

@@ -22,153 +22,153 @@ 
  */
 class User extends DataObject
 {
-    const STATUS_ACTIVE = 'Active';
-    const STATUS_DEACTIVATED = 'Deactivated';
-    const STATUS_NEW = 'New';
-
-    private static CommunityUser $community;
-
-    private $username;
-    private $email;
-    private $status = self::STATUS_NEW;
-    private $onwikiname;
-    private $lastactive = "0000-00-00 00:00:00";
-    private $forcelogout = 0;
-    private $forceidentified = null;
-    private $confirmationdiff = 0;
-    /** @var User Cache variable of the current user - it's never going to change in the middle of a request. */
-    private static $currentUser;
-    #region Object load methods
-
-    /**
-     * Gets the currently logged in user
-     *
-     * @param PdoDatabase $database
-     *
-     * @return User|CommunityUser
-     */
-    public static function getCurrent(PdoDatabase $database)
-    {
-        if (self::$currentUser === null) {
-            $sessionId = WebRequest::getSessionUserId();
-
-            if ($sessionId !== null) {
-                /** @var User $user */
-                $user = self::getById($sessionId, $database);
-
-                if ($user === false) {
-                    self::$currentUser = new CommunityUser();
-                }
-                else {
-                    self::$currentUser = $user;
-                }
-            }
-            else {
-                $anonymousCoward = new CommunityUser();
-
-                self::$currentUser = $anonymousCoward;
-            }
-        }
-
-        return self::$currentUser;
-    }
-
-    /**
-     * Gets a user by their user ID
-     *
-     * Pass -1 to get the community user.
-     *
-     * @param int|null    $id
-     * @param PdoDatabase $database
-     *
-     * @return User|false
-     */
-    public static function getById($id, PdoDatabase $database)
-    {
-        if ($id === null || $id == -1) {
-            return new CommunityUser();
-        }
-
-        /** @var User|false $user */
-        $user = parent::getById($id, $database);
-
-        return $user;
-    }
-
-    public static function getCommunity(): CommunityUser
-    {
-        if (!isset(self::$community)) {
-            self::$community = new CommunityUser();
-        }
-
-        return self::$community;
-    }
-
-    /**
-     * Gets a user by their username
-     *
-     * @param  string      $username
-     * @param  PdoDatabase $database
-     *
-     * @return CommunityUser|User|false
-     */
-    public static function getByUsername($username, PdoDatabase $database)
-    {
-        if ($username === self::getCommunity()->getUsername()) {
-            return new CommunityUser();
-        }
-
-        $statement = $database->prepare("SELECT * FROM user WHERE username = :id LIMIT 1;");
-        $statement->bindValue(":id", $username);
-
-        $statement->execute();
-
-        $resultObject = $statement->fetchObject(get_called_class());
-
-        if ($resultObject != false) {
-            $resultObject->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    /**
-     * Gets a user by their on-wiki username.
-     *
-     * @param string      $username
-     * @param PdoDatabase $database
-     *
-     * @return User|false
-     */
-    public static function getByOnWikiUsername($username, PdoDatabase $database)
-    {
-        $statement = $database->prepare("SELECT * FROM user WHERE onwikiname = :id LIMIT 1;");
-        $statement->bindValue(":id", $username);
-        $statement->execute();
-
-        $resultObject = $statement->fetchObject(get_called_class());
-
-        if ($resultObject != false) {
-            $resultObject->setDatabase($database);
-
-            return $resultObject;
-        }
-
-        return false;
-    }
-
-    #endregion
-
-    /**
-     * Saves the current object
-     *
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+	const STATUS_ACTIVE = 'Active';
+	const STATUS_DEACTIVATED = 'Deactivated';
+	const STATUS_NEW = 'New';
+
+	private static CommunityUser $community;
+
+	private $username;
+	private $email;
+	private $status = self::STATUS_NEW;
+	private $onwikiname;
+	private $lastactive = "0000-00-00 00:00:00";
+	private $forcelogout = 0;
+	private $forceidentified = null;
+	private $confirmationdiff = 0;
+	/** @var User Cache variable of the current user - it's never going to change in the middle of a request. */
+	private static $currentUser;
+	#region Object load methods
+
+	/**
+	 * Gets the currently logged in user
+	 *
+	 * @param PdoDatabase $database
+	 *
+	 * @return User|CommunityUser
+	 */
+	public static function getCurrent(PdoDatabase $database)
+	{
+		if (self::$currentUser === null) {
+			$sessionId = WebRequest::getSessionUserId();
+
+			if ($sessionId !== null) {
+				/** @var User $user */
+				$user = self::getById($sessionId, $database);
+
+				if ($user === false) {
+					self::$currentUser = new CommunityUser();
+				}
+				else {
+					self::$currentUser = $user;
+				}
+			}
+			else {
+				$anonymousCoward = new CommunityUser();
+
+				self::$currentUser = $anonymousCoward;
+			}
+		}
+
+		return self::$currentUser;
+	}
+
+	/**
+	 * Gets a user by their user ID
+	 *
+	 * Pass -1 to get the community user.
+	 *
+	 * @param int|null    $id
+	 * @param PdoDatabase $database
+	 *
+	 * @return User|false
+	 */
+	public static function getById($id, PdoDatabase $database)
+	{
+		if ($id === null || $id == -1) {
+			return new CommunityUser();
+		}
+
+		/** @var User|false $user */
+		$user = parent::getById($id, $database);
+
+		return $user;
+	}
+
+	public static function getCommunity(): CommunityUser
+	{
+		if (!isset(self::$community)) {
+			self::$community = new CommunityUser();
+		}
+
+		return self::$community;
+	}
+
+	/**
+	 * Gets a user by their username
+	 *
+	 * @param  string      $username
+	 * @param  PdoDatabase $database
+	 *
+	 * @return CommunityUser|User|false
+	 */
+	public static function getByUsername($username, PdoDatabase $database)
+	{
+		if ($username === self::getCommunity()->getUsername()) {
+			return new CommunityUser();
+		}
+
+		$statement = $database->prepare("SELECT * FROM user WHERE username = :id LIMIT 1;");
+		$statement->bindValue(":id", $username);
+
+		$statement->execute();
+
+		$resultObject = $statement->fetchObject(get_called_class());
+
+		if ($resultObject != false) {
+			$resultObject->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	/**
+	 * Gets a user by their on-wiki username.
+	 *
+	 * @param string      $username
+	 * @param PdoDatabase $database
+	 *
+	 * @return User|false
+	 */
+	public static function getByOnWikiUsername($username, PdoDatabase $database)
+	{
+		$statement = $database->prepare("SELECT * FROM user WHERE onwikiname = :id LIMIT 1;");
+		$statement->bindValue(":id", $username);
+		$statement->execute();
+
+		$resultObject = $statement->fetchObject(get_called_class());
+
+		if ($resultObject != false) {
+			$resultObject->setDatabase($database);
+
+			return $resultObject;
+		}
+
+		return false;
+	}
+
+	#endregion
+
+	/**
+	 * Saves the current object
+	 *
+	 * @throws Exception
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			$statement = $this->dbObject->prepare(<<<SQL
 				INSERT INTO `user` ( 
 					username, email, status, onwikiname, 
 					lastactive, forcelogout, forceidentified,
@@ -179,25 +179,25 @@ 
 					:confirmationdiff
 				);
 SQL
-            );
-            $statement->bindValue(":username", $this->username);
-            $statement->bindValue(":email", $this->email);
-            $statement->bindValue(":status", $this->status);
-            $statement->bindValue(":onwikiname", $this->onwikiname);
-            $statement->bindValue(":lastactive", $this->lastactive);
-            $statement->bindValue(":forcelogout", $this->forcelogout);
-            $statement->bindValue(":confirmationdiff", $this->confirmationdiff);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            // update
-            $statement = $this->dbObject->prepare(<<<SQL
+			);
+			$statement->bindValue(":username", $this->username);
+			$statement->bindValue(":email", $this->email);
+			$statement->bindValue(":status", $this->status);
+			$statement->bindValue(":onwikiname", $this->onwikiname);
+			$statement->bindValue(":lastactive", $this->lastactive);
+			$statement->bindValue(":forcelogout", $this->forcelogout);
+			$statement->bindValue(":confirmationdiff", $this->confirmationdiff);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			// update
+			$statement = $this->dbObject->prepare(<<<SQL
 				UPDATE `user` SET 
 					username = :username, email = :email, 
 					status = :status,
@@ -208,233 +208,233 @@ 
                     updateversion = updateversion + 1
 				WHERE id = :id AND updateversion = :updateversion;
 SQL
-            );
-
-            $statement->bindValue(':id', $this->id);
-            $statement->bindValue(':updateversion', $this->updateversion);
-
-            $statement->bindValue(':username', $this->username);
-            $statement->bindValue(':email', $this->email);
-            $statement->bindValue(':status', $this->status);
-            $statement->bindValue(':onwikiname', $this->onwikiname);
-            $statement->bindValue(':lastactive', $this->lastactive);
-            $statement->bindValue(':forcelogout', $this->forcelogout);
-            $statement->bindValue(':confirmationdiff', $this->confirmationdiff);
-
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
-
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
-
-            $this->updateversion++;
-        }
-    }
-
-    #region properties
-
-    /**
-     * Gets the tool username
-     * @return string
-     */
-    public function getUsername()
-    {
-        return $this->username;
-    }
-
-    /**
-     * Sets the tool username
-     *
-     * @param string $username
-     */
-    public function setUsername($username)
-    {
-        $this->username = $username;
-
-        // If this isn't a brand new user, then it's a rename, force the logout
-        if (!$this->isNew()) {
-            $this->forcelogout = 1;
-        }
-    }
-
-    /**
-     * Gets the user's email address
-     * @return string
-     */
-    public function getEmail()
-    {
-        return $this->email;
-    }
-
-    /**
-     * Sets the user's email address
-     *
-     * @param string $email
-     */
-    public function setEmail($email)
-    {
-        $this->email = $email;
-    }
-
-    /**
-     * Gets the status (Active, New, Deactivated, etc) of the user.
-     * @return string
-     */
-    public function getStatus()
-    {
-        return $this->status;
-    }
-
-    /**
-     * @param string $status
-     */
-    public function setStatus($status)
-    {
-        $this->status = $status;
-    }
-
-    /**
-     * Gets the user's on-wiki name
-     * @return string
-     */
-    public function getOnWikiName()
-    {
-        return $this->onwikiname;
-    }
-
-    /**
-     * Sets the user's on-wiki name
-     *
-     * This can have interesting side-effects with OAuth.
-     *
-     * @param string $onWikiName
-     */
-    public function setOnWikiName($onWikiName)
-    {
-        $this->onwikiname = $onWikiName;
-    }
-
-    /**
-     * Gets the last activity date for the user
-     *
-     * @return string
-     * @todo This should probably return an instance of DateTime
-     */
-    public function getLastActive()
-    {
-        return $this->lastactive;
-    }
-
-    /**
-     * Gets the user's forced logout status
-     *
-     * @return bool
-     */
-    public function getForceLogout()
-    {
-        return $this->forcelogout == 1;
-    }
-
-    /**
-     * Sets the user's forced logout status
-     *
-     * @param bool $forceLogout
-     */
-    public function setForceLogout($forceLogout)
-    {
-        $this->forcelogout = $forceLogout ? 1 : 0;
-    }
-
-    /**
-     * Gets the user's confirmation diff. Unused if OAuth is in use.
-     * @return int the diff ID
-     */
-    public function getConfirmationDiff()
-    {
-        return $this->confirmationdiff;
-    }
-
-    /**
-     * Sets the user's confirmation diff.
-     *
-     * @param int $confirmationDiff
-     */
-    public function setConfirmationDiff($confirmationDiff)
-    {
-        $this->confirmationdiff = $confirmationDiff;
-    }
-
-    #endregion
-
-    #region user access checks
-
-    public function isActive()
-    {
-        return $this->status == self::STATUS_ACTIVE;
-    }
-
-    /**
-     * DO NOT USE FOR TESTING IDENTIFICATION STATUS.
-     *
-     * This only returns any overrides in the database for identification status,
-     * and is thus not suitable on its own to determine if a user is identified.
-     *
-     * Most (all?) users should have a null value here; this is only here as an
-     * emergency override in case things go horribly, horribly wrong. For
-     * example, when WMF completely change the layout of the ID noticeboard.
-     */
-    public function getForceIdentified(): ?bool
-    {
-        if ($this->forceidentified === null) {
-            return null;
-        }
-
-        return $this->forceidentified === 1;
-    }
-
-    /**
-     * Tests if the user is new
-     * @return bool
-     * @category Security-Critical
-     */
-    public function isNewUser()
-    {
-        return $this->status == self::STATUS_NEW;
-    }
-
-    /**
-     * Tests if the user has been deactivated and is unable to access the tool
-     * @return bool
-     * @category Security-Critical
-     */
-    public function isDeactivated(): bool
-    {
-        return $this->status == self::STATUS_DEACTIVATED;
-    }
-
-    /**
-     * Tests if the user is the community user
-     *
-     * @todo     decide if this means logged out. I think it usually does.
-     * @return bool
-     * @category Security-Critical
-     */
-    public function isCommunityUser()
-    {
-        return false;
-    }
-
-    #endregion 
-
-    /**
-     * Gets the approval date of the user
-     * @return DateTime|false
-     */
-    public function getApprovalDate()
-    {
-        $query = $this->dbObject->prepare(<<<SQL
+			);
+
+			$statement->bindValue(':id', $this->id);
+			$statement->bindValue(':updateversion', $this->updateversion);
+
+			$statement->bindValue(':username', $this->username);
+			$statement->bindValue(':email', $this->email);
+			$statement->bindValue(':status', $this->status);
+			$statement->bindValue(':onwikiname', $this->onwikiname);
+			$statement->bindValue(':lastactive', $this->lastactive);
+			$statement->bindValue(':forcelogout', $this->forcelogout);
+			$statement->bindValue(':confirmationdiff', $this->confirmationdiff);
+
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
+
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
+
+			$this->updateversion++;
+		}
+	}
+
+	#region properties
+
+	/**
+	 * Gets the tool username
+	 * @return string
+	 */
+	public function getUsername()
+	{
+		return $this->username;
+	}
+
+	/**
+	 * Sets the tool username
+	 *
+	 * @param string $username
+	 */
+	public function setUsername($username)
+	{
+		$this->username = $username;
+
+		// If this isn't a brand new user, then it's a rename, force the logout
+		if (!$this->isNew()) {
+			$this->forcelogout = 1;
+		}
+	}
+
+	/**
+	 * Gets the user's email address
+	 * @return string
+	 */
+	public function getEmail()
+	{
+		return $this->email;
+	}
+
+	/**
+	 * Sets the user's email address
+	 *
+	 * @param string $email
+	 */
+	public function setEmail($email)
+	{
+		$this->email = $email;
+	}
+
+	/**
+	 * Gets the status (Active, New, Deactivated, etc) of the user.
+	 * @return string
+	 */
+	public function getStatus()
+	{
+		return $this->status;
+	}
+
+	/**
+	 * @param string $status
+	 */
+	public function setStatus($status)
+	{
+		$this->status = $status;
+	}
+
+	/**
+	 * Gets the user's on-wiki name
+	 * @return string
+	 */
+	public function getOnWikiName()
+	{
+		return $this->onwikiname;
+	}
+
+	/**
+	 * Sets the user's on-wiki name
+	 *
+	 * This can have interesting side-effects with OAuth.
+	 *
+	 * @param string $onWikiName
+	 */
+	public function setOnWikiName($onWikiName)
+	{
+		$this->onwikiname = $onWikiName;
+	}
+
+	/**
+	 * Gets the last activity date for the user
+	 *
+	 * @return string
+	 * @todo This should probably return an instance of DateTime
+	 */
+	public function getLastActive()
+	{
+		return $this->lastactive;
+	}
+
+	/**
+	 * Gets the user's forced logout status
+	 *
+	 * @return bool
+	 */
+	public function getForceLogout()
+	{
+		return $this->forcelogout == 1;
+	}
+
+	/**
+	 * Sets the user's forced logout status
+	 *
+	 * @param bool $forceLogout
+	 */
+	public function setForceLogout($forceLogout)
+	{
+		$this->forcelogout = $forceLogout ? 1 : 0;
+	}
+
+	/**
+	 * Gets the user's confirmation diff. Unused if OAuth is in use.
+	 * @return int the diff ID
+	 */
+	public function getConfirmationDiff()
+	{
+		return $this->confirmationdiff;
+	}
+
+	/**
+	 * Sets the user's confirmation diff.
+	 *
+	 * @param int $confirmationDiff
+	 */
+	public function setConfirmationDiff($confirmationDiff)
+	{
+		$this->confirmationdiff = $confirmationDiff;
+	}
+
+	#endregion
+
+	#region user access checks
+
+	public function isActive()
+	{
+		return $this->status == self::STATUS_ACTIVE;
+	}
+
+	/**
+	 * DO NOT USE FOR TESTING IDENTIFICATION STATUS.
+	 *
+	 * This only returns any overrides in the database for identification status,
+	 * and is thus not suitable on its own to determine if a user is identified.
+	 *
+	 * Most (all?) users should have a null value here; this is only here as an
+	 * emergency override in case things go horribly, horribly wrong. For
+	 * example, when WMF completely change the layout of the ID noticeboard.
+	 */
+	public function getForceIdentified(): ?bool
+	{
+		if ($this->forceidentified === null) {
+			return null;
+		}
+
+		return $this->forceidentified === 1;
+	}
+
+	/**
+	 * Tests if the user is new
+	 * @return bool
+	 * @category Security-Critical
+	 */
+	public function isNewUser()
+	{
+		return $this->status == self::STATUS_NEW;
+	}
+
+	/**
+	 * Tests if the user has been deactivated and is unable to access the tool
+	 * @return bool
+	 * @category Security-Critical
+	 */
+	public function isDeactivated(): bool
+	{
+		return $this->status == self::STATUS_DEACTIVATED;
+	}
+
+	/**
+	 * Tests if the user is the community user
+	 *
+	 * @todo     decide if this means logged out. I think it usually does.
+	 * @return bool
+	 * @category Security-Critical
+	 */
+	public function isCommunityUser()
+	{
+		return false;
+	}
+
+	#endregion 
+
+	/**
+	 * Gets the approval date of the user
+	 * @return DateTime|false
+	 */
+	public function getApprovalDate()
+	{
+		$query = $this->dbObject->prepare(<<<SQL
 			SELECT timestamp 
 			FROM log 
 			WHERE objectid = :userid
@@ -443,12 +443,12 @@ 
 			ORDER BY id DESC 
 			LIMIT 1;
 SQL
-        );
-        $query->execute(array(":userid" => $this->id));
+		);
+		$query->execute(array(":userid" => $this->id));
 
-        $data = DateTime::createFromFormat("Y-m-d H:i:s", $query->fetchColumn());
-        $query->closeCursor();
+		$data = DateTime::createFromFormat("Y-m-d H:i:s", $query->fetchColumn());
+		$query->closeCursor();
 
-        return $data;
-    }
+		return $data;
+	}
 }

Braces +4 added lines, -8 removed lines

@@ -58,12 +58,10 @@ 
 
                 if ($user === false) {
                     self::$currentUser = new CommunityUser();
-                }
-                else {
+                } else {
                     self::$currentUser = $user;
                 }
-            }
-            else {
+            } else {
                 $anonymousCoward = new CommunityUser();
 
                 self::$currentUser = $anonymousCoward;
@@ -190,12 +188,10 @@ 
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // update
             $statement = $this->dbObject->prepare(<<<SQL
 				UPDATE `user` SET 

includes/DataObjects/CommunityUser.php

Indentation +115 added lines, -115 removed lines

@@ -17,120 +17,120 @@
  */
 class CommunityUser extends User
 {
-    public function getId()
-    {
-        return -1;
-    }
-
-    public function save()
-    {
-        // Do nothing
-    }
-
-    #region properties
-
-    /**
-     * @return string
-     */
-    public function getUsername()
-    {
-        return '[Community]';
-    }
-
-    public function setUsername($username)
-    {
-    }
-
-    /**
-     * @return string
-     */
-    public function getEmail()
-    {
-        global $cDataClearEmail;
-
-        return $cDataClearEmail;
-    }
-
-    public function setEmail($email)
-    {
-    }
-
-    public function getStatus()
-    {
-        return "Community";
-    }
-
-    public function getOnWikiName()
-    {
-        return "127.0.0.1";
-    }
-
-    public function setOnWikiName($onWikiName)
-    {
-    }
-
-    public function getLastActive()
-    {
-        $now = new DateTime();
-
-        return $now->format("Y-m-d H:i:s");
-    }
-
-    public function getForceLogout()
-    {
-        return true;
-    }
-
-    public function setForceLogout($forceLogout)
-    {
-    }
-
-    /**
-     * @param string $status
-     */
-    public function setStatus($status)
-    {
-    }
-
-    public function getConfirmationDiff()
-    {
-        return null;
-    }
-
-    public function setConfirmationDiff($confirmationDiff)
-    {
-    }
-
-
-    public function setUseAlternateSkin($useAlternate)
-    {
-    }
-
-    #endregion
-
-    #region user access checks
-
-    public function isNewUser()
-    {
-        return false;
-    }
-
-    public function isDeactivated(): bool
-    {
-        return false;
-    }
-
-    public function isCommunityUser()
-    {
-        return true;
-    }
-
-    #endregion
+	public function getId()
+	{
+		return -1;
+	}
+
+	public function save()
+	{
+		// Do nothing
+	}
+
+	#region properties
+
+	/**
+	 * @return string
+	 */
+	public function getUsername()
+	{
+		return '[Community]';
+	}
+
+	public function setUsername($username)
+	{
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getEmail()
+	{
+		global $cDataClearEmail;
+
+		return $cDataClearEmail;
+	}
+
+	public function setEmail($email)
+	{
+	}
+
+	public function getStatus()
+	{
+		return "Community";
+	}
+
+	public function getOnWikiName()
+	{
+		return "127.0.0.1";
+	}
+
+	public function setOnWikiName($onWikiName)
+	{
+	}
+
+	public function getLastActive()
+	{
+		$now = new DateTime();
+
+		return $now->format("Y-m-d H:i:s");
+	}
+
+	public function getForceLogout()
+	{
+		return true;
+	}
+
+	public function setForceLogout($forceLogout)
+	{
+	}
+
+	/**
+	 * @param string $status
+	 */
+	public function setStatus($status)
+	{
+	}
+
+	public function getConfirmationDiff()
+	{
+		return null;
+	}
+
+	public function setConfirmationDiff($confirmationDiff)
+	{
+	}
+
+
+	public function setUseAlternateSkin($useAlternate)
+	{
+	}
+
+	#endregion
+
+	#region user access checks
+
+	public function isNewUser()
+	{
+		return false;
+	}
+
+	public function isDeactivated(): bool
+	{
+		return false;
+	}
+
+	public function isCommunityUser()
+	{
+		return true;
+	}
+
+	#endregion
 
-    public function getApprovalDate()
-    {
-        $data = DateTime::createFromFormat("Y-m-d H:i:s", "1970-01-01 00:00:00");
-
-        return $data;
-    }
+	public function getApprovalDate()
+	{
+		$data = DateTime::createFromFormat("Y-m-d H:i:s", "1970-01-01 00:00:00");
+
+		return $data;
+	}
 }

includes/DataObjects/Domain.php

Indentation +286 added lines, -286 removed lines

@@ -18,94 +18,94 @@ 
 
 class Domain extends DataObject
 {
-    /** @var string */
-    private $shortname;
-    /** @var string */
-    private $longname;
-    /** @var string */
-    private $wikiarticlepath;
-    /** @var string */
-    private $wikiapipath;
-    /** @var int */
-    private $enabled = 0;
-    /** @var int|null */
-    private $defaultclose;
-    /** @var string */
-    private $defaultlanguage = 'en';
-    /** @var string */
-    private $emailreplyaddress;
-    /** @var string|null */
-    private $notificationtarget;
-    /** @var string */
-    private $localdocumentation;
-
-    /** @var Domain Cache variable of the current domain */
-    private static $currentDomain;
-
-    public static function getCurrent(PdoDatabase $database)
-    {
-        if (self::$currentDomain === null) {
-            $sessionDomain = WebRequest::getSessionDomain();
-
-            if ($sessionDomain !== null) {
-                /** @var Domain $domain */
-                $domain = self::getById($sessionDomain, $database);
-
-                if ($domain === false) {
-                    self::$currentDomain = self::getById(1, $database); // FIXME: #594 User::getCurrent($database)->getDefaultDomain();
-                }
-                else {
-                    self::$currentDomain = $domain;
-                }
-            }
-            else {
-                self::$currentDomain = self::getById(1, $database); // FIXME: #594 User::getCurrent($database)->getDefaultDomain();
-            }
-        }
-
-        return self::$currentDomain;
-    }
-
-    public static function getByShortName(string $shortName, PdoDatabase $database)
-    {
-        $statement = $database->prepare(<<<SQL
+	/** @var string */
+	private $shortname;
+	/** @var string */
+	private $longname;
+	/** @var string */
+	private $wikiarticlepath;
+	/** @var string */
+	private $wikiapipath;
+	/** @var int */
+	private $enabled = 0;
+	/** @var int|null */
+	private $defaultclose;
+	/** @var string */
+	private $defaultlanguage = 'en';
+	/** @var string */
+	private $emailreplyaddress;
+	/** @var string|null */
+	private $notificationtarget;
+	/** @var string */
+	private $localdocumentation;
+
+	/** @var Domain Cache variable of the current domain */
+	private static $currentDomain;
+
+	public static function getCurrent(PdoDatabase $database)
+	{
+		if (self::$currentDomain === null) {
+			$sessionDomain = WebRequest::getSessionDomain();
+
+			if ($sessionDomain !== null) {
+				/** @var Domain $domain */
+				$domain = self::getById($sessionDomain, $database);
+
+				if ($domain === false) {
+					self::$currentDomain = self::getById(1, $database); // FIXME: #594 User::getCurrent($database)->getDefaultDomain();
+				}
+				else {
+					self::$currentDomain = $domain;
+				}
+			}
+			else {
+				self::$currentDomain = self::getById(1, $database); // FIXME: #594 User::getCurrent($database)->getDefaultDomain();
+			}
+		}
+
+		return self::$currentDomain;
+	}
+
+	public static function getByShortName(string $shortName, PdoDatabase $database)
+	{
+		$statement = $database->prepare(<<<SQL
             SELECT * FROM domain WHERE shortname = :name;
 SQL
-        );
+		);
 
-        $statement->execute([
-            ':name' => $shortName,
-        ]);
+		$statement->execute([
+			':name' => $shortName,
+		]);
 
-        /** @var RequestForm|false $result */
-        $result = $statement->fetchObject(get_called_class());
+		/** @var RequestForm|false $result */
+		$result = $statement->fetchObject(get_called_class());
 
-        if ($result !== false) {
-            $result->setDatabase($database);
-        }
+		if ($result !== false) {
+			$result->setDatabase($database);
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public static function getAll(PdoDatabase $database) {
-        $statement = $database->prepare("SELECT * FROM domain;");
-        $statement->execute();
+	public static function getAll(PdoDatabase $database) {
+		$statement = $database->prepare("SELECT * FROM domain;");
+		$statement->execute();
 
-        $resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
+		$resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
 
-        /** @var Domain $t */
-        foreach ($resultObject as $t) {
-            $t->setDatabase($database);
-        }
+		/** @var Domain $t */
+		foreach ($resultObject as $t) {
+			$t->setDatabase($database);
+		}
 
-        return $resultObject;
-    }
+		return $resultObject;
+	}
 
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			$statement = $this->dbObject->prepare(<<<SQL
                 INSERT INTO domain (
                     shortname, longname, wikiarticlepath, wikiapipath, enabled, defaultclose, defaultlanguage, 
                     emailreplyaddress, notificationtarget, localdocumentation
@@ -114,29 +114,29 @@ 
                     :emailreplyaddress, :notificationtarget, :localdocumentation
                 );
 SQL
-            );
-
-            $statement->bindValue(":shortname", $this->shortname);
-            $statement->bindValue(":longname", $this->longname);
-            $statement->bindValue(":wikiarticlepath", $this->wikiarticlepath);
-            $statement->bindValue(":wikiapipath", $this->wikiapipath);
-            $statement->bindValue(":enabled", $this->enabled);
-            $statement->bindValue(":defaultclose", $this->defaultclose);
-            $statement->bindValue(":defaultlanguage", $this->defaultlanguage);
-            $statement->bindValue(":emailreplyaddress", $this->emailreplyaddress);
-            $statement->bindValue(":notificationtarget", $this->notificationtarget);
-            $statement->bindValue(":localdocumentation", $this->localdocumentation);
-
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            $statement = $this->dbObject->prepare(<<<SQL
+			);
+
+			$statement->bindValue(":shortname", $this->shortname);
+			$statement->bindValue(":longname", $this->longname);
+			$statement->bindValue(":wikiarticlepath", $this->wikiarticlepath);
+			$statement->bindValue(":wikiapipath", $this->wikiapipath);
+			$statement->bindValue(":enabled", $this->enabled);
+			$statement->bindValue(":defaultclose", $this->defaultclose);
+			$statement->bindValue(":defaultlanguage", $this->defaultlanguage);
+			$statement->bindValue(":emailreplyaddress", $this->emailreplyaddress);
+			$statement->bindValue(":notificationtarget", $this->notificationtarget);
+			$statement->bindValue(":localdocumentation", $this->localdocumentation);
+
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			$statement = $this->dbObject->prepare(<<<SQL
                 UPDATE domain SET
                     longname = :longname,
                     wikiarticlepath = :wikiarticlepath,
@@ -151,190 +151,190 @@ 
                     updateversion = updateversion + 1
 				WHERE id = :id AND updateversion = :updateversion;
 SQL
-            );
-
-            $statement->bindValue(":longname", $this->longname);
-            $statement->bindValue(":wikiarticlepath", $this->wikiarticlepath);
-            $statement->bindValue(":wikiapipath", $this->wikiapipath);
-            $statement->bindValue(":enabled", $this->enabled);
-            $statement->bindValue(":defaultclose", $this->defaultclose);
-            $statement->bindValue(":defaultlanguage", $this->defaultlanguage);
-            $statement->bindValue(":emailreplyaddress", $this->emailreplyaddress);
-            $statement->bindValue(":notificationtarget", $this->notificationtarget);
-            $statement->bindValue(":localdocumentation", $this->localdocumentation);
-
-            $statement->bindValue(':id', $this->id);
-            $statement->bindValue(':updateversion', $this->updateversion);
-
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
-
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
-
-            $this->updateversion++;
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getShortName(): string
-    {
-        return $this->shortname;
-    }
-
-    /**
-     * @param string $shortName
-     */
-    public function setShortName(string $shortName): void
-    {
-        $this->shortname = $shortName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLongName(): string
-    {
-        return $this->longname;
-    }
-
-    /**
-     * @param string $longName
-     */
-    public function setLongName(string $longName): void
-    {
-        $this->longname = $longName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getWikiArticlePath(): string
-    {
-        return $this->wikiarticlepath;
-    }
-
-    /**
-     * @param string $wikiArticlePath
-     */
-    public function setWikiArticlePath(string $wikiArticlePath): void
-    {
-        $this->wikiarticlepath = $wikiArticlePath;
-    }
-
-    /**
-     * @return string
-     */
-    public function getWikiApiPath(): string
-    {
-        return $this->wikiapipath;
-    }
-
-    /**
-     * @param string $wikiApiPath
-     */
-    public function setWikiApiPath(string $wikiApiPath): void
-    {
-        $this->wikiapipath = $wikiApiPath;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isEnabled(): bool
-    {
-        return $this->enabled == 1;
-    }
-
-    /**
-     * @param bool $enabled
-     */
-    public function setEnabled(bool $enabled): void
-    {
-        $this->enabled = $enabled ? 1 : 0;
-    }
-
-    /**
-     * @return int
-     */
-    public function getDefaultClose(): ?int
-    {
-        return $this->defaultclose;
-    }
-
-    /**
-     * @param int $defaultClose
-     */
-    public function setDefaultClose(?int $defaultClose): void
-    {
-        $this->defaultclose = $defaultClose;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDefaultLanguage(): string
-    {
-        return $this->defaultlanguage;
-    }
-
-    /**
-     * @param string $defaultLanguage
-     */
-    public function setDefaultLanguage(string $defaultLanguage): void
-    {
-        $this->defaultlanguage = $defaultLanguage;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEmailReplyAddress(): string
-    {
-        return $this->emailreplyaddress;
-    }
-
-    /**
-     * @param string $emailReplyAddress
-     */
-    public function setEmailReplyAddress(string $emailReplyAddress): void
-    {
-        $this->emailreplyaddress = $emailReplyAddress;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getNotificationTarget(): ?string
-    {
-        return $this->notificationtarget;
-    }
-
-    /**
-     * @param string|null $notificationTarget
-     */
-    public function setNotificationTarget(?string $notificationTarget): void
-    {
-        $this->notificationtarget = $notificationTarget;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLocalDocumentation(): string
-    {
-        return $this->localdocumentation;
-    }
-
-    /**
-     * @param string $localDocumentation
-     */
-    public function setLocalDocumentation(string $localDocumentation): void
-    {
-        $this->localdocumentation = $localDocumentation;
-    }
+			);
+
+			$statement->bindValue(":longname", $this->longname);
+			$statement->bindValue(":wikiarticlepath", $this->wikiarticlepath);
+			$statement->bindValue(":wikiapipath", $this->wikiapipath);
+			$statement->bindValue(":enabled", $this->enabled);
+			$statement->bindValue(":defaultclose", $this->defaultclose);
+			$statement->bindValue(":defaultlanguage", $this->defaultlanguage);
+			$statement->bindValue(":emailreplyaddress", $this->emailreplyaddress);
+			$statement->bindValue(":notificationtarget", $this->notificationtarget);
+			$statement->bindValue(":localdocumentation", $this->localdocumentation);
+
+			$statement->bindValue(':id', $this->id);
+			$statement->bindValue(':updateversion', $this->updateversion);
+
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
+
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
+
+			$this->updateversion++;
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getShortName(): string
+	{
+		return $this->shortname;
+	}
+
+	/**
+	 * @param string $shortName
+	 */
+	public function setShortName(string $shortName): void
+	{
+		$this->shortname = $shortName;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLongName(): string
+	{
+		return $this->longname;
+	}
+
+	/**
+	 * @param string $longName
+	 */
+	public function setLongName(string $longName): void
+	{
+		$this->longname = $longName;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getWikiArticlePath(): string
+	{
+		return $this->wikiarticlepath;
+	}
+
+	/**
+	 * @param string $wikiArticlePath
+	 */
+	public function setWikiArticlePath(string $wikiArticlePath): void
+	{
+		$this->wikiarticlepath = $wikiArticlePath;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getWikiApiPath(): string
+	{
+		return $this->wikiapipath;
+	}
+
+	/**
+	 * @param string $wikiApiPath
+	 */
+	public function setWikiApiPath(string $wikiApiPath): void
+	{
+		$this->wikiapipath = $wikiApiPath;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isEnabled(): bool
+	{
+		return $this->enabled == 1;
+	}
+
+	/**
+	 * @param bool $enabled
+	 */
+	public function setEnabled(bool $enabled): void
+	{
+		$this->enabled = $enabled ? 1 : 0;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getDefaultClose(): ?int
+	{
+		return $this->defaultclose;
+	}
+
+	/**
+	 * @param int $defaultClose
+	 */
+	public function setDefaultClose(?int $defaultClose): void
+	{
+		$this->defaultclose = $defaultClose;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDefaultLanguage(): string
+	{
+		return $this->defaultlanguage;
+	}
+
+	/**
+	 * @param string $defaultLanguage
+	 */
+	public function setDefaultLanguage(string $defaultLanguage): void
+	{
+		$this->defaultlanguage = $defaultLanguage;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getEmailReplyAddress(): string
+	{
+		return $this->emailreplyaddress;
+	}
+
+	/**
+	 * @param string $emailReplyAddress
+	 */
+	public function setEmailReplyAddress(string $emailReplyAddress): void
+	{
+		$this->emailreplyaddress = $emailReplyAddress;
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getNotificationTarget(): ?string
+	{
+		return $this->notificationtarget;
+	}
+
+	/**
+	 * @param string|null $notificationTarget
+	 */
+	public function setNotificationTarget(?string $notificationTarget): void
+	{
+		$this->notificationtarget = $notificationTarget;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLocalDocumentation(): string
+	{
+		return $this->localdocumentation;
+	}
+
+	/**
+	 * @param string $localDocumentation
+	 */
+	public function setLocalDocumentation(string $localDocumentation): void
+	{
+		$this->localdocumentation = $localDocumentation;
+	}
 }
\ No newline at end of file

includes/Exceptions/AccessDeniedException.php

Indentation +47 added lines, -47 removed lines

@@ -27,66 +27,66 @@
  */
 class AccessDeniedException extends ReadableException
 {
-    use NavigationMenuAccessControl;
-    use LogEntryLookup;
+	use NavigationMenuAccessControl;
+	use LogEntryLookup;
 
-    private ISecurityManager $securityManager;
-    private IDomainAccessManager $domainAccessManager;
+	private ISecurityManager $securityManager;
+	private IDomainAccessManager $domainAccessManager;
 
-    /**
-     * AccessDeniedException constructor.
-     *
-     * @param ISecurityManager     $securityManager
-     * @param IDomainAccessManager $domainAccessManager
-     */
-    public function __construct(ISecurityManager $securityManager, IDomainAccessManager $domainAccessManager)
-    {
-        $this->securityManager = $securityManager;
-        $this->domainAccessManager = $domainAccessManager;
-    }
+	/**
+	 * AccessDeniedException constructor.
+	 *
+	 * @param ISecurityManager     $securityManager
+	 * @param IDomainAccessManager $domainAccessManager
+	 */
+	public function __construct(ISecurityManager $securityManager, IDomainAccessManager $domainAccessManager)
+	{
+		$this->securityManager = $securityManager;
+		$this->domainAccessManager = $domainAccessManager;
+	}
 
-    public function getReadableError()
-    {
-        if (!headers_sent()) {
-            header("HTTP/1.1 403 Forbidden");
-        }
+	public function getReadableError()
+	{
+		if (!headers_sent()) {
+			header("HTTP/1.1 403 Forbidden");
+		}
 
-        $this->setUpSmarty();
+		$this->setUpSmarty();
 
-        // uck. We should still be able to access the database in this situation though.
-        $database = PdoDatabase::getDatabaseConnection($this->getSiteConfiguration());
-        $currentUser = User::getCurrent($database);
-        $this->assign('skin', PreferenceManager::getForCurrent($database)->getPreference(PreferenceManager::PREF_SKIN));
-        $this->assign('currentUser', $currentUser);
-        $this->assign('currentDomain', Domain::getCurrent($database));
+		// uck. We should still be able to access the database in this situation though.
+		$database = PdoDatabase::getDatabaseConnection($this->getSiteConfiguration());
+		$currentUser = User::getCurrent($database);
+		$this->assign('skin', PreferenceManager::getForCurrent($database)->getPreference(PreferenceManager::PREF_SKIN));
+		$this->assign('currentUser', $currentUser);
+		$this->assign('currentDomain', Domain::getCurrent($database));
 
-        $this->setupNavMenuAccess($currentUser);
+		$this->setupNavMenuAccess($currentUser);
 
-        if ($currentUser->isDeactivated()) {
-            $this->assign('htmlTitle', 'Account Deactivated');
-            $this->assign('deactivationReason', $this->getLogEntry('DeactivatedUser', $currentUser, $database));
+		if ($currentUser->isDeactivated()) {
+			$this->assign('htmlTitle', 'Account Deactivated');
+			$this->assign('deactivationReason', $this->getLogEntry('DeactivatedUser', $currentUser, $database));
 
-            return $this->fetchTemplate("exception/account-deactivated.tpl");
-        }
+			return $this->fetchTemplate("exception/account-deactivated.tpl");
+		}
 
-        if ($currentUser->isNewUser()) {
-            $this->assign('htmlTitle', 'Account Pending');
+		if ($currentUser->isNewUser()) {
+			$this->assign('htmlTitle', 'Account Pending');
 
-            return $this->fetchTemplate("exception/account-new.tpl");
-        }
+			return $this->fetchTemplate("exception/account-new.tpl");
+		}
 
-        return $this->fetchTemplate("exception/access-denied.tpl");
-    }
+		return $this->fetchTemplate("exception/access-denied.tpl");
+	}
 
 
 
-    protected function getSecurityManager(): ISecurityManager
-    {
-        return $this->securityManager;
-    }
+	protected function getSecurityManager(): ISecurityManager
+	{
+		return $this->securityManager;
+	}
 
-    public function getDomainAccessManager(): IDomainAccessManager
-    {
-        return $this->domainAccessManager;
-    }
+	public function getDomainAccessManager(): IDomainAccessManager
+	{
+		return $this->domainAccessManager;
+	}
 }
\ No newline at end of file

includes/Exceptions/NotIdentifiedException.php

Indentation +37 added lines, -37 removed lines

@@ -19,50 +19,50 @@
 
 class NotIdentifiedException extends ReadableException
 {
-    use NavigationMenuAccessControl;
+	use NavigationMenuAccessControl;
 
-    private ISecurityManager $securityManager;
-    private IDomainAccessManager $domainAccessManager;
+	private ISecurityManager $securityManager;
+	private IDomainAccessManager $domainAccessManager;
 
-    public function __construct(ISecurityManager $securityManager, IDomainAccessManager $domainAccessManager)
-    {
-        $this->securityManager = $securityManager;
-        $this->domainAccessManager = $domainAccessManager;
-    }
+	public function __construct(ISecurityManager $securityManager, IDomainAccessManager $domainAccessManager)
+	{
+		$this->securityManager = $securityManager;
+		$this->domainAccessManager = $domainAccessManager;
+	}
 
-    /**
-     * Returns a readable HTML error message that's displayable to the user using templates.
-     * @return string
-     */
-    public function getReadableError()
-    {
-        if (!headers_sent()) {
-            header("HTTP/1.1 403 Forbidden");
-        }
+	/**
+	 * Returns a readable HTML error message that's displayable to the user using templates.
+	 * @return string
+	 */
+	public function getReadableError()
+	{
+		if (!headers_sent()) {
+			header("HTTP/1.1 403 Forbidden");
+		}
 
-        $this->setUpSmarty();
+		$this->setUpSmarty();
 
-        // uck. We should still be able to access the database in this situation though.
-        $database = PdoDatabase::getDatabaseConnection($this->getSiteConfiguration());
-        $currentUser = User::getCurrent($database);
-        $this->assign('skin', PreferenceManager::getForCurrent($database)->getPreference(PreferenceManager::PREF_SKIN));
-        $this->assign('currentUser', $currentUser);
-        $this->assign('currentDomain', Domain::getCurrent($database));
+		// uck. We should still be able to access the database in this situation though.
+		$database = PdoDatabase::getDatabaseConnection($this->getSiteConfiguration());
+		$currentUser = User::getCurrent($database);
+		$this->assign('skin', PreferenceManager::getForCurrent($database)->getPreference(PreferenceManager::PREF_SKIN));
+		$this->assign('currentUser', $currentUser);
+		$this->assign('currentDomain', Domain::getCurrent($database));
 
-        if ($this->securityManager !== null) {
-            $this->setupNavMenuAccess($currentUser);
-        }
+		if ($this->securityManager !== null) {
+			$this->setupNavMenuAccess($currentUser);
+		}
 
-        return $this->fetchTemplate("exception/not-identified.tpl");
-    }
+		return $this->fetchTemplate("exception/not-identified.tpl");
+	}
 
-    protected function getSecurityManager(): ISecurityManager
-    {
-        return $this->securityManager;
-    }
+	protected function getSecurityManager(): ISecurityManager
+	{
+		return $this->securityManager;
+	}
 
-    public function getDomainAccessManager(): IDomainAccessManager
-    {
-        return $this->domainAccessManager;
-    }
+	public function getDomainAccessManager(): IDomainAccessManager
+	{
+		return $this->domainAccessManager;
+	}
 }
\ No newline at end of file

includes/Pages/PageLog.php

Indentation +60 added lines, -60 removed lines

@@ -18,64 +18,64 @@
 
 class PageLog extends PagedInternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     */
-    protected function main()
-    {
-        $this->setHtmlTitle('Logs');
-
-        $filterUser = WebRequest::getString('filterUser');
-        $filterAction = WebRequest::getString('filterAction');
-        $filterObjectType = WebRequest::getString('filterObjectType');
-        $filterObjectId = WebRequest::getInt('filterObjectId');
-
-        $database = $this->getDatabase();
-
-        if (!array_key_exists($filterObjectType, LogHelper::getObjectTypes())) {
-            $filterObjectType = null;
-        }
-
-        $this->addJs("/api.php?action=users&all=true&targetVariable=typeaheaddata");
-
-        // FIXME: domains
-        $logSearch = LogSearchHelper::get($database, 1);
-
-        if ($filterUser !== null) {
-            $userObj = User::getByUsername($filterUser, $database);
-            if ($userObj !== false) {
-                $logSearch->byUser($userObj->getId());
-            }
-            else {
-                $logSearch->byUser(-1);
-            }
-        }
-        if ($filterAction !== null) {
-            $logSearch->byAction($filterAction);
-        }
-        if ($filterObjectType !== null) {
-            $logSearch->byObjectType($filterObjectType);
-        }
-        if ($filterObjectId !== null) {
-            $logSearch->byObjectId($filterObjectId);
-        }
-
-        $this->setSearchHelper($logSearch);
-        $this->setupLimits();
-
-        /** @var Log[] $logs */
-        $logs = $logSearch->getRecordCount($count)->fetch();
-
-        list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration(), $this->getSecurityManager());
-
-        $this->setupPageData($count, array('filterUser' => $filterUser, 'filterAction' => $filterAction, 'filterObjectType' => $filterObjectType, 'filterObjectId' => $filterObjectId));
-
-        $this->assign("logs", $logData);
-        $this->assign("users", $users);
-
-        $this->assign('allLogActions', LogHelper::getLogActions($this->getDatabase()));
-        $this->assign('allObjectTypes', LogHelper::getObjectTypes());
-
-        $this->setTemplate("logs/main.tpl");
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 */
+	protected function main()
+	{
+		$this->setHtmlTitle('Logs');
+
+		$filterUser = WebRequest::getString('filterUser');
+		$filterAction = WebRequest::getString('filterAction');
+		$filterObjectType = WebRequest::getString('filterObjectType');
+		$filterObjectId = WebRequest::getInt('filterObjectId');
+
+		$database = $this->getDatabase();
+
+		if (!array_key_exists($filterObjectType, LogHelper::getObjectTypes())) {
+			$filterObjectType = null;
+		}
+
+		$this->addJs("/api.php?action=users&all=true&targetVariable=typeaheaddata");
+
+		// FIXME: domains
+		$logSearch = LogSearchHelper::get($database, 1);
+
+		if ($filterUser !== null) {
+			$userObj = User::getByUsername($filterUser, $database);
+			if ($userObj !== false) {
+				$logSearch->byUser($userObj->getId());
+			}
+			else {
+				$logSearch->byUser(-1);
+			}
+		}
+		if ($filterAction !== null) {
+			$logSearch->byAction($filterAction);
+		}
+		if ($filterObjectType !== null) {
+			$logSearch->byObjectType($filterObjectType);
+		}
+		if ($filterObjectId !== null) {
+			$logSearch->byObjectId($filterObjectId);
+		}
+
+		$this->setSearchHelper($logSearch);
+		$this->setupLimits();
+
+		/** @var Log[] $logs */
+		$logs = $logSearch->getRecordCount($count)->fetch();
+
+		list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration(), $this->getSecurityManager());
+
+		$this->setupPageData($count, array('filterUser' => $filterUser, 'filterAction' => $filterAction, 'filterObjectType' => $filterObjectType, 'filterObjectId' => $filterObjectId));
+
+		$this->assign("logs", $logData);
+		$this->assign("users", $users);
+
+		$this->assign('allLogActions', LogHelper::getLogActions($this->getDatabase()));
+		$this->assign('allObjectTypes', LogHelper::getObjectTypes());
+
+		$this->setTemplate("logs/main.tpl");
+	}
 }

includes/Pages/PageJobQueue.php

Indentation +269 added lines, -269 removed lines

@@ -29,309 +29,309 @@
 
 class PageJobQueue extends PagedInternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        $this->setHtmlTitle('Job Queue Management');
-
-        $this->prepareMaps();
-
-        $database = $this->getDatabase();
-
-        /** @var JobQueue[] $jobList */
-        // FIXME: domains
-        $jobList = JobQueueSearchHelper::get($database, 1)
-            ->statusIn([
-                JobQueue::STATUS_QUEUED,
-                JobQueue::STATUS_READY,
-                JobQueue::STATUS_WAITING,
-                JobQueue::STATUS_RUNNING,
-                JobQueue::STATUS_FAILED,
-            ])
-            ->notAcknowledged()
-            ->fetch();
-
-        $userIds = array();
-        $requestIds = array();
-
-        foreach ($jobList as $job) {
-            $userIds[] = $job->getTriggerUserId();
-            $requestIds[] = $job->getRequest();
-
-            $job->setDatabase($database);
-        }
-
-        $this->assign('canSeeAll', $this->barrierTest('all', User::getCurrent($database)));
-
-        $this->assign('users', UserSearchHelper::get($database)->inIds($userIds)->fetchMap('username'));
-        // FIXME: domains
-        $this->assign('requests', RequestSearchHelper::get($database, 1)->inIds($requestIds)->fetchMap('name'));
-
-        $this->assign('joblist', $jobList);
-        $this->setTemplate('jobqueue/main.tpl');
-    }
-
-    protected function all()
-    {
-        $this->setHtmlTitle('All Jobs');
-
-        $this->prepareMaps();
-
-        $database = $this->getDatabase();
-
-        // FIXME: domains
-        $searchHelper = JobQueueSearchHelper::get($database, 1);
-        $this->setSearchHelper($searchHelper);
-        $this->setupLimits();
-
-        $filterUser = WebRequest::getString('filterUser');
-        $filterTask = WebRequest::getString('filterTask');
-        $filterStatus = WebRequest::getString('filterStatus');
-        $filterRequest = WebRequest::getString('filterRequest');
-        $order = WebRequest::getString('order');
-
-        if ($filterUser !== null) {
-            $searchHelper->byUser(User::getByUsername($filterUser, $database)->getId());
-        }
-
-        if ($filterTask !== null) {
-            $searchHelper->byTask($filterTask);
-        }
-
-        if ($filterStatus !== null) {
-            $searchHelper->byStatus($filterStatus);
-        }
-
-        if ($filterRequest !== null) {
-            $searchHelper->byRequest($filterRequest);
-        }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		$this->setHtmlTitle('Job Queue Management');
+
+		$this->prepareMaps();
+
+		$database = $this->getDatabase();
+
+		/** @var JobQueue[] $jobList */
+		// FIXME: domains
+		$jobList = JobQueueSearchHelper::get($database, 1)
+			->statusIn([
+				JobQueue::STATUS_QUEUED,
+				JobQueue::STATUS_READY,
+				JobQueue::STATUS_WAITING,
+				JobQueue::STATUS_RUNNING,
+				JobQueue::STATUS_FAILED,
+			])
+			->notAcknowledged()
+			->fetch();
+
+		$userIds = array();
+		$requestIds = array();
+
+		foreach ($jobList as $job) {
+			$userIds[] = $job->getTriggerUserId();
+			$requestIds[] = $job->getRequest();
+
+			$job->setDatabase($database);
+		}
+
+		$this->assign('canSeeAll', $this->barrierTest('all', User::getCurrent($database)));
+
+		$this->assign('users', UserSearchHelper::get($database)->inIds($userIds)->fetchMap('username'));
+		// FIXME: domains
+		$this->assign('requests', RequestSearchHelper::get($database, 1)->inIds($requestIds)->fetchMap('name'));
+
+		$this->assign('joblist', $jobList);
+		$this->setTemplate('jobqueue/main.tpl');
+	}
+
+	protected function all()
+	{
+		$this->setHtmlTitle('All Jobs');
+
+		$this->prepareMaps();
+
+		$database = $this->getDatabase();
+
+		// FIXME: domains
+		$searchHelper = JobQueueSearchHelper::get($database, 1);
+		$this->setSearchHelper($searchHelper);
+		$this->setupLimits();
+
+		$filterUser = WebRequest::getString('filterUser');
+		$filterTask = WebRequest::getString('filterTask');
+		$filterStatus = WebRequest::getString('filterStatus');
+		$filterRequest = WebRequest::getString('filterRequest');
+		$order = WebRequest::getString('order');
+
+		if ($filterUser !== null) {
+			$searchHelper->byUser(User::getByUsername($filterUser, $database)->getId());
+		}
+
+		if ($filterTask !== null) {
+			$searchHelper->byTask($filterTask);
+		}
+
+		if ($filterStatus !== null) {
+			$searchHelper->byStatus($filterStatus);
+		}
+
+		if ($filterRequest !== null) {
+			$searchHelper->byRequest($filterRequest);
+		}
         
-        if ($order === null) {
-            $searchHelper->newestFirst();
-        }
-
-        /** @var JobQueue[] $jobList */
-        $jobList = $searchHelper->getRecordCount($count)->fetch();
+		if ($order === null) {
+			$searchHelper->newestFirst();
+		}
+
+		/** @var JobQueue[] $jobList */
+		$jobList = $searchHelper->getRecordCount($count)->fetch();
 
-        $this->setupPageData($count, array(
-            'filterUser' => $filterUser,
-            'filterTask' => $filterTask,
-            'filterStatus' => $filterStatus,
-            'filterRequest' => $filterRequest,
-            'order' => $order,
-        ));
+		$this->setupPageData($count, array(
+			'filterUser' => $filterUser,
+			'filterTask' => $filterTask,
+			'filterStatus' => $filterStatus,
+			'filterRequest' => $filterRequest,
+			'order' => $order,
+		));
 
-        $userIds = array();
-        $requestIds = array();
+		$userIds = array();
+		$requestIds = array();
 
-        foreach ($jobList as $job) {
-            $userIds[] = $job->getTriggerUserId();
-            $requestIds[] = $job->getRequest();
+		foreach ($jobList as $job) {
+			$userIds[] = $job->getTriggerUserId();
+			$requestIds[] = $job->getRequest();
 
-            $job->setDatabase($database);
-        }
+			$job->setDatabase($database);
+		}
 
-        $this->getTypeAheadHelper()->defineTypeAheadSource('username-typeahead', function() use ($database) {
-            return UserSearchHelper::get($database)->fetchColumn('username');
-        });
+		$this->getTypeAheadHelper()->defineTypeAheadSource('username-typeahead', function() use ($database) {
+			return UserSearchHelper::get($database)->fetchColumn('username');
+		});
 
-        $this->assign('users', UserSearchHelper::get($database)->inIds($userIds)->fetchMap('username'));
-        // FIXME: domains!
-        $this->assign('requests', RequestSearchHelper::get($database, 1)->inIds($requestIds)->fetchMap('name'));
+		$this->assign('users', UserSearchHelper::get($database)->inIds($userIds)->fetchMap('username'));
+		// FIXME: domains!
+		$this->assign('requests', RequestSearchHelper::get($database, 1)->inIds($requestIds)->fetchMap('name'));
 
-        $this->assign('joblist', $jobList);
+		$this->assign('joblist', $jobList);
 
-        $this->addJs("/api.php?action=users&all=true&targetVariable=typeaheaddata");
+		$this->addJs("/api.php?action=users&all=true&targetVariable=typeaheaddata");
 
-        $this->setTemplate('jobqueue/all.tpl');
-    }
+		$this->setTemplate('jobqueue/all.tpl');
+	}
 
-    protected function view()
-    {
-        $jobId = WebRequest::getInt('id');
-        $database = $this->getDatabase();
+	protected function view()
+	{
+		$jobId = WebRequest::getInt('id');
+		$database = $this->getDatabase();
 
-        if ($jobId === null) {
-            throw new ApplicationLogicException('No job specified');
-        }
+		if ($jobId === null) {
+			throw new ApplicationLogicException('No job specified');
+		}
 
-        /** @var JobQueue $job */
-        $job = JobQueue::getById($jobId, $database);
+		/** @var JobQueue $job */
+		$job = JobQueue::getById($jobId, $database);
 
-        if ($job === false) {
-            throw new ApplicationLogicException('Could not find requested job');
-        }
+		if ($job === false) {
+			throw new ApplicationLogicException('Could not find requested job');
+		}
 
-        $this->prepareMaps();
+		$this->prepareMaps();
 
-        $this->assign('user', User::getById($job->getTriggerUserId(), $database));
-        $this->assign('request', Request::getById($job->getRequest(), $database));
-        $this->assign('emailTemplate', EmailTemplate::getById($job->getEmailTemplate(), $database));
-        $this->assign('parent', JobQueue::getById($job->getParent(), $database));
+		$this->assign('user', User::getById($job->getTriggerUserId(), $database));
+		$this->assign('request', Request::getById($job->getRequest(), $database));
+		$this->assign('emailTemplate', EmailTemplate::getById($job->getEmailTemplate(), $database));
+		$this->assign('parent', JobQueue::getById($job->getParent(), $database));
 
-        /** @var Log[] $logs */
-        // FIXME: domains
-        $logs = LogSearchHelper::get($database, 1)->byObjectType('JobQueue')
-            ->byObjectId($job->getId())->getRecordCount($logCount)->fetch();
-        if ($logCount === 0) {
-            $this->assign('log', array());
-        }
-        else {
-            list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration(), $this->getSecurityManager());
+		/** @var Log[] $logs */
+		// FIXME: domains
+		$logs = LogSearchHelper::get($database, 1)->byObjectType('JobQueue')
+			->byObjectId($job->getId())->getRecordCount($logCount)->fetch();
+		if ($logCount === 0) {
+			$this->assign('log', array());
+		}
+		else {
+			list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration(), $this->getSecurityManager());
 
-            $this->assign("log", $logData);
-            $this->assign("users", $users);
-        }
+			$this->assign("log", $logData);
+			$this->assign("users", $users);
+		}
 
-        $this->assignCSRFToken();
+		$this->assignCSRFToken();
 
-        $this->assign('job', $job);
+		$this->assign('job', $job);
 
-        $this->assign('canAcknowledge', $this->barrierTest('acknowledge', User::getCurrent($database)));
-        $this->assign('canRequeue', $this->barrierTest('requeue', User::getCurrent($database)));
-        $this->assign('canCancel', $this->barrierTest('cancel', User::getCurrent($database)));
+		$this->assign('canAcknowledge', $this->barrierTest('acknowledge', User::getCurrent($database)));
+		$this->assign('canRequeue', $this->barrierTest('requeue', User::getCurrent($database)));
+		$this->assign('canCancel', $this->barrierTest('cancel', User::getCurrent($database)));
 
-        if ($job->getTask() === UserCreationTask::class || $job->getTask() === BotCreationTask::class) {
-            if ($job->getEmailTemplate() === null) {
-                $params = json_decode($job->getParameters());
+		if ($job->getTask() === UserCreationTask::class || $job->getTask() === BotCreationTask::class) {
+			if ($job->getEmailTemplate() === null) {
+				$params = json_decode($job->getParameters());
 
-                if (isset($params->emailText)) {
-                    $this->assign("creationEmailText", $params->emailText);
-                }
-            }
-        }
+				if (isset($params->emailText)) {
+					$this->assign("creationEmailText", $params->emailText);
+				}
+			}
+		}
 
-        $this->setHtmlTitle('Job #{$job->getId()|escape}');
-        $this->setTemplate('jobqueue/view.tpl');
-    }
+		$this->setHtmlTitle('Job #{$job->getId()|escape}');
+		$this->setTemplate('jobqueue/view.tpl');
+	}
 
-    protected function acknowledge()
-    {
-        if (!WebRequest::wasPosted()) {
-            throw new ApplicationLogicException('This page does not support GET methods.');
-        }
+	protected function acknowledge()
+	{
+		if (!WebRequest::wasPosted()) {
+			throw new ApplicationLogicException('This page does not support GET methods.');
+		}
 
-        $this->validateCSRFToken();
+		$this->validateCSRFToken();
 
-        $jobId = WebRequest::postInt('job');
-        $database = $this->getDatabase();
+		$jobId = WebRequest::postInt('job');
+		$database = $this->getDatabase();
 
-        if ($jobId === null) {
-            throw new ApplicationLogicException('No job specified');
-        }
+		if ($jobId === null) {
+			throw new ApplicationLogicException('No job specified');
+		}
 
-        /** @var JobQueue $job */
-        $job = JobQueue::getById($jobId, $database);
+		/** @var JobQueue $job */
+		$job = JobQueue::getById($jobId, $database);
 
-        if ($job === false) {
-            throw new ApplicationLogicException('Could not find requested job');
-        }
+		if ($job === false) {
+			throw new ApplicationLogicException('Could not find requested job');
+		}
 
-        $job->setUpdateVersion(WebRequest::postInt('updateVersion'));
-        $job->setAcknowledged(true);
-        $job->save();
+		$job->setUpdateVersion(WebRequest::postInt('updateVersion'));
+		$job->setAcknowledged(true);
+		$job->save();
 
-        Logger::backgroundJobAcknowledged($database, $job);
+		Logger::backgroundJobAcknowledged($database, $job);
 
-        $this->redirect('jobQueue', 'view', array('id' => $jobId));
-    }
-
-    protected function cancel()
-    {
-        if (!WebRequest::wasPosted()) {
-            throw new ApplicationLogicException('This page does not support GET methods.');
-        }
-
-        $this->validateCSRFToken();
-
-        $jobId = WebRequest::postInt('job');
-        $database = $this->getDatabase();
-
-        if ($jobId === null) {
-            throw new ApplicationLogicException('No job specified');
-        }
-
-        /** @var JobQueue $job */
-        $job = JobQueue::getById($jobId, $database);
-
-        if ($job === false) {
-            throw new ApplicationLogicException('Could not find requested job');
-        }
-
-        if ($job->getStatus() !== JobQueue::STATUS_READY
-            && $job->getStatus() !== JobQueue::STATUS_QUEUED
-            && $job->getStatus() === JobQueue::STATUS_WAITING) {
-            throw new ApplicationLogicException('Cannot cancel job not queued for execution');
-        }
-
-        $job->setUpdateVersion(WebRequest::postInt('updateVersion'));
-        $job->setStatus(JobQueue::STATUS_CANCELLED);
-        $job->setError("Manually cancelled");
-        $job->setAcknowledged(null);
-        $job->save();
-
-        Logger::backgroundJobCancelled($this->getDatabase(), $job);
-
-        $this->redirect('jobQueue', 'view', array('id' => $jobId));
-    }
-
-    protected function requeue()
-    {
-        if (!WebRequest::wasPosted()) {
-            throw new ApplicationLogicException('This page does not support GET methods.');
-        }
+		$this->redirect('jobQueue', 'view', array('id' => $jobId));
+	}
+
+	protected function cancel()
+	{
+		if (!WebRequest::wasPosted()) {
+			throw new ApplicationLogicException('This page does not support GET methods.');
+		}
+
+		$this->validateCSRFToken();
+
+		$jobId = WebRequest::postInt('job');
+		$database = $this->getDatabase();
+
+		if ($jobId === null) {
+			throw new ApplicationLogicException('No job specified');
+		}
+
+		/** @var JobQueue $job */
+		$job = JobQueue::getById($jobId, $database);
+
+		if ($job === false) {
+			throw new ApplicationLogicException('Could not find requested job');
+		}
+
+		if ($job->getStatus() !== JobQueue::STATUS_READY
+			&& $job->getStatus() !== JobQueue::STATUS_QUEUED
+			&& $job->getStatus() === JobQueue::STATUS_WAITING) {
+			throw new ApplicationLogicException('Cannot cancel job not queued for execution');
+		}
+
+		$job->setUpdateVersion(WebRequest::postInt('updateVersion'));
+		$job->setStatus(JobQueue::STATUS_CANCELLED);
+		$job->setError("Manually cancelled");
+		$job->setAcknowledged(null);
+		$job->save();
+
+		Logger::backgroundJobCancelled($this->getDatabase(), $job);
+
+		$this->redirect('jobQueue', 'view', array('id' => $jobId));
+	}
+
+	protected function requeue()
+	{
+		if (!WebRequest::wasPosted()) {
+			throw new ApplicationLogicException('This page does not support GET methods.');
+		}
 
-        $this->validateCSRFToken();
+		$this->validateCSRFToken();
 
-        $jobId = WebRequest::postInt('job');
-        $database = $this->getDatabase();
-
-        if ($jobId === null) {
-            throw new ApplicationLogicException('No job specified');
-        }
-
-        /** @var JobQueue|false $job */
-        $job = JobQueue::getById($jobId, $database);
-
-        if ($job === false) {
-            throw new ApplicationLogicException('Could not find requested job');
-        }
-
-        $job->setStatus(JobQueue::STATUS_QUEUED);
-        $job->setUpdateVersion(WebRequest::postInt('updateVersion'));
-        $job->setAcknowledged(null);
-        $job->setError(null);
-        $job->save();
-
-        /** @var Request $request */
-        $request = Request::getById($job->getRequest(), $database);
-        $request->setStatus(RequestStatus::JOBQUEUE);
-        $request->save();
-
-        Logger::enqueuedJobQueue($database, $request);
-        Logger::backgroundJobRequeued($database, $job);
+		$jobId = WebRequest::postInt('job');
+		$database = $this->getDatabase();
+
+		if ($jobId === null) {
+			throw new ApplicationLogicException('No job specified');
+		}
+
+		/** @var JobQueue|false $job */
+		$job = JobQueue::getById($jobId, $database);
+
+		if ($job === false) {
+			throw new ApplicationLogicException('Could not find requested job');
+		}
+
+		$job->setStatus(JobQueue::STATUS_QUEUED);
+		$job->setUpdateVersion(WebRequest::postInt('updateVersion'));
+		$job->setAcknowledged(null);
+		$job->setError(null);
+		$job->save();
+
+		/** @var Request $request */
+		$request = Request::getById($job->getRequest(), $database);
+		$request->setStatus(RequestStatus::JOBQUEUE);
+		$request->save();
+
+		Logger::enqueuedJobQueue($database, $request);
+		Logger::backgroundJobRequeued($database, $job);
 
-        $this->redirect('jobQueue', 'view', array('id' => $jobId));
-    }
-
-    protected function prepareMaps()
-    {
-        $taskNameMap = JobQueue::getTaskDescriptions();
-
-        $statusDecriptionMap = array(
-            JobQueue::STATUS_CANCELLED => 'The job was cancelled',
-            JobQueue::STATUS_COMPLETE  => 'The job completed successfully',
-            JobQueue::STATUS_FAILED    => 'The job encountered an error',
-            JobQueue::STATUS_QUEUED    => 'The job is in the queue',
-            JobQueue::STATUS_READY     => 'The job is ready to be picked up by the next job runner execution',
-            JobQueue::STATUS_RUNNING   => 'The job is being run right now by the job runner',
-            JobQueue::STATUS_WAITING   => 'The job has been picked up by a job runner',
-            JobQueue::STATUS_HELD      => 'The job has manually held from processing',
-        );
-        $this->assign('taskNameMap', $taskNameMap);
-        $this->assign('statusDescriptionMap', $statusDecriptionMap);
-    }
+		$this->redirect('jobQueue', 'view', array('id' => $jobId));
+	}
+
+	protected function prepareMaps()
+	{
+		$taskNameMap = JobQueue::getTaskDescriptions();
+
+		$statusDecriptionMap = array(
+			JobQueue::STATUS_CANCELLED => 'The job was cancelled',
+			JobQueue::STATUS_COMPLETE  => 'The job completed successfully',
+			JobQueue::STATUS_FAILED    => 'The job encountered an error',
+			JobQueue::STATUS_QUEUED    => 'The job is in the queue',
+			JobQueue::STATUS_READY     => 'The job is ready to be picked up by the next job runner execution',
+			JobQueue::STATUS_RUNNING   => 'The job is being run right now by the job runner',
+			JobQueue::STATUS_WAITING   => 'The job has been picked up by a job runner',
+			JobQueue::STATUS_HELD      => 'The job has manually held from processing',
+		);
+		$this->assign('taskNameMap', $taskNameMap);
+		$this->assign('statusDescriptionMap', $statusDecriptionMap);
+	}
 }

Braces +3 added lines, -3 removed lines

@@ -134,7 +134,8 @@ 
             $job->setDatabase($database);
         }
 
-        $this->getTypeAheadHelper()->defineTypeAheadSource('username-typeahead', function() use ($database) {
+        $this->getTypeAheadHelper()->defineTypeAheadSource('username-typeahead', function() use ($database)
+        {
             return UserSearchHelper::get($database)->fetchColumn('username');
         });
 
@@ -178,8 +179,7 @@ 
             ->byObjectId($job->getId())->getRecordCount($logCount)->fetch();
         if ($logCount === 0) {
             $this->assign('log', array());
-        }
-        else {
+        } else {
             list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration(), $this->getSecurityManager());
 
             $this->assign("log", $logData);

includes/Pages/PageUserManagement.php

Braces +8 added lines, -16 removed lines

@@ -64,8 +64,7 @@ 
             $this->assign('deactivatedUsers', $deactivatedUsers);
 
             UserSearchHelper::get($database)->getRoleMap($roleMap);
-        }
-        else {
+        } else {
             $this->assign("showAll", false);
             $this->assign('deactivatedUsers', array());
 
@@ -159,8 +158,7 @@ 
                     if ($newValue === 0) {
                         if ($r['globalOnly']) {
                             $globalDelete[] = $r['object'];
-                        }
-                        else {
+                        } else {
                             $delete[] = $r['object'];
                         }
                     }
@@ -168,8 +166,7 @@ 
                     if ($newValue === 1) {
                         if ($r['globalOnly']) {
                             $globalAdd[] = $name;
-                        }
-                        else {
+                        } else {
                             $add[] = $name;
                         }
                     }
@@ -231,8 +228,7 @@ 
             SessionAlert::quick('Roles changed for user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
 
             $this->redirect('statistics/users', 'detail', array('user' => $user->getId()));
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('usermanagement/roleedit.tpl');
             $this->assign('user', $user);
@@ -293,8 +289,7 @@ 
             $this->redirect('userManagement');
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('usermanagement/changelevel-reason.tpl');
             $this->assign('user', $user);
@@ -352,8 +347,7 @@ 
             $this->redirect("userManagement");
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate("usermanagement/changelevel-reason.tpl");
             $this->assign("user", $user);
@@ -436,8 +430,7 @@ 
             $this->redirect("userManagement");
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('usermanagement/renameuser.tpl');
             $this->assign('user', $user);
@@ -505,8 +498,7 @@ 
             $this->redirect("userManagement");
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(),
                 $this->getSiteConfiguration());

Indentation +600 added lines, -600 removed lines

@@ -32,18 +32,18 @@ 
  */
 class PageUserManagement extends InternalPageBase
 {
-    const OAUTH_STATE_NONE = 'none';
-    const OAUTH_STATE_PARTIAL = 'partial';
-    const OAUTH_STATE_FULL = 'full';
-
-    // FIXME: domains
-    /** @var string */
-    private $adminMailingList = 'enwiki-acc-admins@googlegroups.com';
-
-    private function getOAuthStatusMap(PdoDatabase $database): array
-    {
-        $oauthStatusQuery = $database->prepare(
-            <<<SQL
+	const OAUTH_STATE_NONE = 'none';
+	const OAUTH_STATE_PARTIAL = 'partial';
+	const OAUTH_STATE_FULL = 'full';
+
+	// FIXME: domains
+	/** @var string */
+	private $adminMailingList = 'enwiki-acc-admins@googlegroups.com';
+
+	private function getOAuthStatusMap(PdoDatabase $database): array
+	{
+		$oauthStatusQuery = $database->prepare(
+			<<<SQL
     SELECT u.id,
            CASE
                WHEN SUM(IF(ot.type = :access, 1, 0)) OVER (PARTITION BY ot.user) > 0 THEN :full
@@ -53,592 +53,592 @@ 
     FROM user u 
     LEFT JOIN oauthtoken ot ON u.id = ot.user;
 SQL
-        );
-
-        $oauthStatusQuery->execute([
-            ':access' => OAuthUserHelper::TOKEN_ACCESS,
-            ':request' => OAuthUserHelper::TOKEN_REQUEST,
-            ':full' => self::OAUTH_STATE_FULL,
-            ':partial' => self::OAUTH_STATE_PARTIAL,
-            ':none' => self::OAUTH_STATE_NONE,
-        ]);
-        $oauthStatusRawData = $oauthStatusQuery->fetchAll(PDO::FETCH_ASSOC);
-        $oauthStatusQuery->closeCursor();
-        $oauthStatusMap = [];
-
-        foreach ($oauthStatusRawData as $row) {
-            $oauthStatusMap[(int)$row['id']] = $row['status'];
-        }
-
-        return $oauthStatusMap;
-    }
-
-    /**
-     * Main function for this page, when no specific actions are called.
-     */
-    protected function main()
-    {
-        $this->setHtmlTitle('User Management');
-
-        $database = $this->getDatabase();
-        $currentUser = User::getCurrent($database);
-
-        $userSearchRequest = WebRequest::getString('usersearch');
-        if ($userSearchRequest !== null) {
-            $searchedUser = User::getByUsername($userSearchRequest, $database);
-            if ($searchedUser !== false) {
-                $this->redirect('statistics/users', 'detail', ['user' => $searchedUser->getId()]);
-                return;
-            }
-        }
-
-        $this->assign('oauthStatusMap', $this->getOAuthStatusMap($database));
-
-        if (WebRequest::getBoolean("showAll")) {
-            $this->assign("showAll", true);
-
-            $deactivatedUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_DEACTIVATED)->fetch();
-            $this->assign('deactivatedUsers', $deactivatedUsers);
-
-            UserSearchHelper::get($database)->getRoleMap($roleMap);
-        }
-        else {
-            $this->assign("showAll", false);
-            $this->assign('deactivatedUsers', array());
-
-            UserSearchHelper::get($database)->statusIn(array('New', 'Active'))->getRoleMap($roleMap);
-        }
-
-        $newUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_NEW)->fetch();
-        $normalUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('user')->fetch();
-        $adminUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('admin')->fetch();
-        $checkUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('checkuser')->fetch();
-        $stewards = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('steward')->fetch();
-        $toolRoots = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('toolRoot')->fetch();
-        $this->assign('newUsers', $newUsers);
-        $this->assign('normalUsers', $normalUsers);
-        $this->assign('adminUsers', $adminUsers);
-        $this->assign('checkUsers', $checkUsers);
-        $this->assign('stewards', $stewards);
-        $this->assign('toolRoots', $toolRoots);
-
-        $this->assign('roles', $roleMap);
-
-        $this->addJs("/api.php?action=users&all=true&targetVariable=typeaheaddata");
-
-        $this->assign('canApprove', $this->barrierTest('approve', $currentUser));
-        $this->assign('canDeactivate', $this->barrierTest('deactivate', $currentUser));
-        $this->assign('canRename', $this->barrierTest('rename', $currentUser));
-        $this->assign('canEditUser', $this->barrierTest('editUser', $currentUser));
-        $this->assign('canEditRoles', $this->barrierTest('editRoles', $currentUser));
-
-        // FIXME: domains!
-        /** @var Domain $domain */
-        $domain = Domain::getById(1, $this->getDatabase());
-        $this->assign('mediawikiScriptPath', $domain->getWikiArticlePath());
-
-        $this->setTemplate("usermanagement/main.tpl");
-    }
-
-    #region Access control
-
-    /**
-     * Action target for editing the roles assigned to a user
-     *
-     * @throws ApplicationLogicException
-     * @throws SmartyException
-     * @throws OptimisticLockFailedException
-     * @throws Exception
-     */
-    protected function editRoles(): void
-    {
-        $this->setHtmlTitle('User Management');
-        $database = $this->getDatabase();
-        $domain = Domain::getCurrent($database);
-        $userId = WebRequest::getInt('user');
-
-        /** @var User|false $user */
-        $user = User::getById($userId, $database);
-
-        if ($user === false || $user->isCommunityUser()) {
-            throw new ApplicationLogicException('Sorry, the user you are trying to edit could not be found.');
-        }
-
-        $roleData = $this->getRoleData(UserRole::getForUser($user->getId(), $database, $domain->getId()));
-
-        // Dual-mode action
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-
-            $reason = WebRequest::postString('reason');
-            if ($reason === false || trim($reason) === '') {
-                throw new ApplicationLogicException('No reason specified for roles change');
-            }
-
-            /** @var UserRole[] $delete */
-            $delete = array();
-            /** @var string[] $add */
-            $add = array();
-
-            /** @var UserRole[] $globalDelete */
-            $globalDelete = array();
-            /** @var string[] $globalAdd */
-            $globalAdd = array();
-
-            foreach ($roleData as $name => $r) {
-                if ($r['allowEdit'] !== 1) {
-                    // not allowed, to touch this, so ignore it
-                    continue;
-                }
-
-                $newValue = WebRequest::postBoolean('role-' . $name) ? 1 : 0;
-                if ($newValue !== $r['active']) {
-                    if ($newValue === 0) {
-                        if ($r['globalOnly']) {
-                            $globalDelete[] = $r['object'];
-                        }
-                        else {
-                            $delete[] = $r['object'];
-                        }
-                    }
-
-                    if ($newValue === 1) {
-                        if ($r['globalOnly']) {
-                            $globalAdd[] = $name;
-                        }
-                        else {
-                            $add[] = $name;
-                        }
-                    }
-                }
-            }
-
-            // Check there's something to do
-            if ((count($add) + count($delete) + count($globalAdd) + count($globalDelete)) === 0) {
-                $this->redirect('statistics/users', 'detail', array('user' => $user->getId()));
-                SessionAlert::warning('No changes made to roles.');
-
-                return;
-            }
-
-            $removed = array();
-            $globalRemoved = array();
-
-            foreach ($delete as $d) {
-                $removed[] = $d->getRole();
-                $d->delete();
-            }
-
-            foreach ($globalDelete as $d) {
-                $globalRemoved[] = $d->getRole();
-                $d->delete();
-            }
-
-            foreach ($add as $x) {
-                $a = new UserRole();
-                $a->setUser($user->getId());
-                $a->setRole($x);
-                $a->setDomain($domain->getId());
-                $a->setDatabase($database);
-                $a->save();
-            }
-
-            foreach ($globalAdd as $x) {
-                $a = new UserRole();
-                $a->setUser($user->getId());
-                $a->setRole($x);
-                $a->setDomain(null);
-                $a->setDatabase($database);
-                $a->save();
-            }
-
-            if ((count($add) + count($delete)) > 0) {
-                Logger::userRolesEdited($database, $user, $reason, $add, $removed, $domain->getId());
-            }
-
-            if ((count($globalAdd) + count($globalDelete)) > 0) {
-                Logger::userGlobalRolesEdited($database, $user, $reason, $globalAdd, $globalRemoved);
-            }
-
-            // dummy save for optimistic locking. If this fails, the entire txn will roll back.
-            $user->setUpdateVersion(WebRequest::postInt('updateversion'));
-            $user->save();
-
-            $this->getNotificationHelper()->userRolesEdited($user, $reason);
-            SessionAlert::quick('Roles changed for user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
-
-            $this->redirect('statistics/users', 'detail', array('user' => $user->getId()));
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->setTemplate('usermanagement/roleedit.tpl');
-            $this->assign('user', $user);
-            $this->assign('roleData', $roleData);
-        }
-    }
-
-    /**
-     * Action target for deactivating users
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function deactivate()
-    {
-        $this->setHtmlTitle('User Management');
-
-        $database = $this->getDatabase();
-
-        $userId = WebRequest::getInt('user');
-
-        /** @var User $user */
-        $user = User::getById($userId, $database);
-
-        if ($user === false || $user->isCommunityUser()) {
-            throw new ApplicationLogicException('Sorry, the user you are trying to deactivate could not be found.');
-        }
-
-        if ($user->isDeactivated()) {
-            throw new ApplicationLogicException('Sorry, the user you are trying to deactivate is already deactivated.');
-        }
-
-        // Dual-mode action
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-            $reason = WebRequest::postString('reason');
-
-            if ($reason === null || trim($reason) === '') {
-                throw new ApplicationLogicException('No reason provided');
-            }
-
-            $user->setStatus(User::STATUS_DEACTIVATED);
-            $user->setUpdateVersion(WebRequest::postInt('updateversion'));
-            $user->save();
-            Logger::deactivatedUser($database, $user, $reason);
-
-            $this->getNotificationHelper()->userDeactivated($user);
-            SessionAlert::quick('Deactivated user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
-
-            // send email
-            $this->sendStatusChangeEmail(
-                'Your WP:ACC account has been deactivated',
-                'usermanagement/emails/deactivated.tpl',
-                $reason,
-                $user,
-                User::getCurrent($database)->getUsername()
-            );
-
-            $this->redirect('userManagement');
-
-            return;
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->setTemplate('usermanagement/changelevel-reason.tpl');
-            $this->assign('user', $user);
-            $this->assign('status', User::STATUS_DEACTIVATED);
-            $this->assign("showReason", true);
-
-            if (WebRequest::getString('preload')) {
-                $this->assign('preload', WebRequest::getString('preload'));
-            }
-        }
-    }
-
-    /**
-     * Entry point for the approve action
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function approve()
-    {
-        $this->setHtmlTitle('User Management');
-
-        $database = $this->getDatabase();
-
-        $userId = WebRequest::getInt('user');
-        $user = User::getById($userId, $database);
-
-        if ($user === false || $user->isCommunityUser()) {
-            throw new ApplicationLogicException('Sorry, the user you are trying to approve could not be found.');
-        }
-
-        if ($user->isActive()) {
-            throw new ApplicationLogicException('Sorry, the user you are trying to approve is already an active user.');
-        }
-
-        // Dual-mode action
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-            $user->setStatus(User::STATUS_ACTIVE);
-            $user->setUpdateVersion(WebRequest::postInt('updateversion'));
-            $user->save();
-            Logger::approvedUser($database, $user);
-
-            $this->getNotificationHelper()->userApproved($user);
-            SessionAlert::quick('Approved user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
-
-            // send email
-            $this->sendStatusChangeEmail(
-                'Your WP:ACC account has been approved',
-                'usermanagement/emails/approved.tpl',
-                null,
-                $user,
-                User::getCurrent($database)->getUsername()
-            );
-
-            $this->redirect("userManagement");
-
-            return;
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->setTemplate("usermanagement/changelevel-reason.tpl");
-            $this->assign("user", $user);
-            $this->assign("status", "Active");
-            $this->assign("showReason", false);
-        }
-    }
-
-    #endregion
-
-    #region Renaming / Editing
-
-    /**
-     * Entry point for the rename action
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function rename()
-    {
-        $this->setHtmlTitle('User Management');
-
-        $database = $this->getDatabase();
-
-        $userId = WebRequest::getInt('user');
-        $user = User::getById($userId, $database);
-
-        if ($user === false || $user->isCommunityUser()) {
-            throw new ApplicationLogicException('Sorry, the user you are trying to rename could not be found.');
-        }
-
-        // Dual-mode action
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-            $newUsername = WebRequest::postString('newname');
-
-            if ($newUsername === null || trim($newUsername) === "") {
-                throw new ApplicationLogicException('The new username cannot be empty');
-            }
-
-            if (User::getByUsername($newUsername, $database) != false) {
-                throw new ApplicationLogicException('The new username already exists');
-            }
-
-            $oldUsername = $user->getUsername();
-            $user->setUsername($newUsername);
-            $user->setUpdateVersion(WebRequest::postInt('updateversion'));
-
-            $user->save();
-
-            $logEntryData = serialize(array(
-                'old' => $oldUsername,
-                'new' => $newUsername,
-            ));
-
-            Logger::renamedUser($database, $user, $logEntryData);
-
-            SessionAlert::quick("Changed User "
-                . htmlentities($oldUsername, ENT_COMPAT, 'UTF-8')
-                . " name to "
-                . htmlentities($newUsername, ENT_COMPAT, 'UTF-8'));
-
-            $this->getNotificationHelper()->userRenamed($user, $oldUsername);
-
-            // send an email to the user.
-            $this->assign('targetUsername', $user->getUsername());
-            $this->assign('toolAdmin', User::getCurrent($database)->getUsername());
-            $this->assign('oldUsername', $oldUsername);
-            $this->assign('mailingList', $this->adminMailingList);
-
-            // FIXME: domains!
-            /** @var Domain $domain */
-            $domain = Domain::getById(1, $database);
-            $this->getEmailHelper()->sendMail(
-                $this->adminMailingList,
-                $user->getEmail(),
-                'Your username on WP:ACC has been changed',
-                $this->fetchTemplate('usermanagement/emails/renamed.tpl')
-            );
-
-            $this->redirect("userManagement");
-
-            return;
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->setTemplate('usermanagement/renameuser.tpl');
-            $this->assign('user', $user);
-        }
-    }
-
-    /**
-     * Entry point for the edit action
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function editUser()
-    {
-        $this->setHtmlTitle('User Management');
-
-        $database = $this->getDatabase();
-
-        $userId = WebRequest::getInt('user');
-        $user = User::getById($userId, $database);
-        $oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
-
-        if ($user === false || $user->isCommunityUser()) {
-            throw new ApplicationLogicException('Sorry, the user you are trying to edit could not be found.');
-        }
-
-        // FIXME: domains
-        $prefs = new PreferenceManager($database, $user->getId(), 1);
-
-        // Dual-mode action
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-            $newEmail = WebRequest::postEmail('user_email');
-            $newOnWikiName = WebRequest::postString('user_onwikiname');
-
-            if ($newEmail === null) {
-                throw new ApplicationLogicException('Invalid email address');
-            }
-
-            if ($this->validateUnusedEmail($newEmail, $userId)) {
-                throw new ApplicationLogicException('The specified email address is already in use.');
-            }
-
-            if (!($oauth->isFullyLinked() || $oauth->isPartiallyLinked())) {
-                if (trim($newOnWikiName) == "") {
-                    throw new ApplicationLogicException('New on-wiki username cannot be blank');
-                }
-
-                $user->setOnWikiName($newOnWikiName);
-            }
-
-            $user->setEmail($newEmail);
-
-            $prefs->setLocalPreference(PreferenceManager::PREF_CREATION_MODE, WebRequest::postInt('creationmode'));
-
-            $prefs->setLocalPreference(PreferenceManager::ADMIN_PREF_PREVENT_REACTIVATION, WebRequest::postBoolean('preventReactivation'));
-
-            $user->setUpdateVersion(WebRequest::postInt('updateversion'));
-
-            $user->save();
-
-            Logger::userPreferencesChange($database, $user);
-            $this->getNotificationHelper()->userPrefChange($user);
-            SessionAlert::quick('Changes to user\'s preferences have been saved');
-
-            $this->redirect("userManagement");
-
-            return;
-        }
-        else {
-            $this->assignCSRFToken();
-            $oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(),
-                $this->getSiteConfiguration());
-            $this->setTemplate('usermanagement/edituser.tpl');
-            $this->assign('user', $user);
-            $this->assign('oauth', $oauth);
-
-            $this->assign('preferredCreationMode', (int)$prefs->getPreference(PreferenceManager::PREF_CREATION_MODE));
-            $this->assign('emailSignature', $prefs->getPreference(PreferenceManager::PREF_EMAIL_SIGNATURE));
-
-            $this->assign('preventReactivation', $prefs->getPreference(PreferenceManager::ADMIN_PREF_PREVENT_REACTIVATION) ?? false);
-
-            $this->assign('canManualCreate',
-                $this->barrierTest(PreferenceManager::CREATION_MANUAL, $user, 'RequestCreation'));
-            $this->assign('canOauthCreate',
-                $this->barrierTest(PreferenceManager::CREATION_OAUTH, $user, 'RequestCreation'));
-            $this->assign('canBotCreate',
-                $this->barrierTest(PreferenceManager::CREATION_BOT, $user, 'RequestCreation'));
-        }
-    }
-
-    #endregion
-
-    private function validateUnusedEmail(string $email, int $userId) : bool {
-        $query = 'SELECT COUNT(id) FROM user WHERE email = :email AND id <> :uid';
-        $statement = $this->getDatabase()->prepare($query);
-        $statement->execute(array(':email' => $email, ':uid' => $userId));
-        $inUse = $statement->fetchColumn() > 0;
-        $statement->closeCursor();
-
-        return $inUse;
-    }
-
-    /**
-     * Sends a status change email to the user.
-     *
-     * @param string      $subject           The subject of the email
-     * @param string      $template          The smarty template to use
-     * @param string|null $reason            The reason for performing the status change
-     * @param User        $user              The user affected
-     * @param string      $toolAdminUsername The tool admin's username who is making the edit
-     */
-    private function sendStatusChangeEmail($subject, $template, $reason, $user, $toolAdminUsername)
-    {
-        $this->assign('targetUsername', $user->getUsername());
-        $this->assign('toolAdmin', $toolAdminUsername);
-        $this->assign('actionReason', $reason);
-        $this->assign('mailingList', $this->adminMailingList);
-
-        // FIXME: domains!
-        /** @var Domain $domain */
-        $domain = Domain::getById(1, $this->getDatabase());
-        $this->getEmailHelper()->sendMail(
-            $this->adminMailingList,
-            $user->getEmail(),
-            $subject,
-            $this->fetchTemplate($template)
-        );
-    }
-
-    /**
-     * @param UserRole[] $activeRoles
-     *
-     * @return array
-     */
-    private function getRoleData($activeRoles)
-    {
-        $availableRoles = $this->getSecurityManager()->getAvailableRoles();
-
-        $currentUser = User::getCurrent($this->getDatabase());
-        $this->getSecurityManager()->getActiveRoles($currentUser, $userRoles, $inactiveRoles);
-
-        $initialValue = array('active' => 0, 'allowEdit' => 0, 'description' => '???', 'object' => null);
-
-        $roleData = array();
-        foreach ($availableRoles as $role => $data) {
-            $intersection = array_intersect($data['editableBy'], $userRoles);
-
-            $roleData[$role] = $initialValue;
-            $roleData[$role]['allowEdit'] = count($intersection) > 0 ? 1 : 0;
-            $roleData[$role]['description'] = $data['description'];
-            $roleData[$role]['globalOnly'] = $data['globalOnly'];
-        }
-
-        foreach ($activeRoles as $role) {
-            if (!isset($roleData[$role->getRole()])) {
-                // This value is no longer available in the configuration, allow changing (aka removing) it.
-                $roleData[$role->getRole()] = $initialValue;
-                $roleData[$role->getRole()]['allowEdit'] = 1;
-            }
-
-            $roleData[$role->getRole()]['object'] = $role;
-            $roleData[$role->getRole()]['active'] = 1;
-        }
-
-        return $roleData;
-    }
+		);
+
+		$oauthStatusQuery->execute([
+			':access' => OAuthUserHelper::TOKEN_ACCESS,
+			':request' => OAuthUserHelper::TOKEN_REQUEST,
+			':full' => self::OAUTH_STATE_FULL,
+			':partial' => self::OAUTH_STATE_PARTIAL,
+			':none' => self::OAUTH_STATE_NONE,
+		]);
+		$oauthStatusRawData = $oauthStatusQuery->fetchAll(PDO::FETCH_ASSOC);
+		$oauthStatusQuery->closeCursor();
+		$oauthStatusMap = [];
+
+		foreach ($oauthStatusRawData as $row) {
+			$oauthStatusMap[(int)$row['id']] = $row['status'];
+		}
+
+		return $oauthStatusMap;
+	}
+
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 */
+	protected function main()
+	{
+		$this->setHtmlTitle('User Management');
+
+		$database = $this->getDatabase();
+		$currentUser = User::getCurrent($database);
+
+		$userSearchRequest = WebRequest::getString('usersearch');
+		if ($userSearchRequest !== null) {
+			$searchedUser = User::getByUsername($userSearchRequest, $database);
+			if ($searchedUser !== false) {
+				$this->redirect('statistics/users', 'detail', ['user' => $searchedUser->getId()]);
+				return;
+			}
+		}
+
+		$this->assign('oauthStatusMap', $this->getOAuthStatusMap($database));
+
+		if (WebRequest::getBoolean("showAll")) {
+			$this->assign("showAll", true);
+
+			$deactivatedUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_DEACTIVATED)->fetch();
+			$this->assign('deactivatedUsers', $deactivatedUsers);
+
+			UserSearchHelper::get($database)->getRoleMap($roleMap);
+		}
+		else {
+			$this->assign("showAll", false);
+			$this->assign('deactivatedUsers', array());
+
+			UserSearchHelper::get($database)->statusIn(array('New', 'Active'))->getRoleMap($roleMap);
+		}
+
+		$newUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_NEW)->fetch();
+		$normalUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('user')->fetch();
+		$adminUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('admin')->fetch();
+		$checkUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('checkuser')->fetch();
+		$stewards = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('steward')->fetch();
+		$toolRoots = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('toolRoot')->fetch();
+		$this->assign('newUsers', $newUsers);
+		$this->assign('normalUsers', $normalUsers);
+		$this->assign('adminUsers', $adminUsers);
+		$this->assign('checkUsers', $checkUsers);
+		$this->assign('stewards', $stewards);
+		$this->assign('toolRoots', $toolRoots);
+
+		$this->assign('roles', $roleMap);
+
+		$this->addJs("/api.php?action=users&all=true&targetVariable=typeaheaddata");
+
+		$this->assign('canApprove', $this->barrierTest('approve', $currentUser));
+		$this->assign('canDeactivate', $this->barrierTest('deactivate', $currentUser));
+		$this->assign('canRename', $this->barrierTest('rename', $currentUser));
+		$this->assign('canEditUser', $this->barrierTest('editUser', $currentUser));
+		$this->assign('canEditRoles', $this->barrierTest('editRoles', $currentUser));
+
+		// FIXME: domains!
+		/** @var Domain $domain */
+		$domain = Domain::getById(1, $this->getDatabase());
+		$this->assign('mediawikiScriptPath', $domain->getWikiArticlePath());
+
+		$this->setTemplate("usermanagement/main.tpl");
+	}
+
+	#region Access control
+
+	/**
+	 * Action target for editing the roles assigned to a user
+	 *
+	 * @throws ApplicationLogicException
+	 * @throws SmartyException
+	 * @throws OptimisticLockFailedException
+	 * @throws Exception
+	 */
+	protected function editRoles(): void
+	{
+		$this->setHtmlTitle('User Management');
+		$database = $this->getDatabase();
+		$domain = Domain::getCurrent($database);
+		$userId = WebRequest::getInt('user');
+
+		/** @var User|false $user */
+		$user = User::getById($userId, $database);
+
+		if ($user === false || $user->isCommunityUser()) {
+			throw new ApplicationLogicException('Sorry, the user you are trying to edit could not be found.');
+		}
+
+		$roleData = $this->getRoleData(UserRole::getForUser($user->getId(), $database, $domain->getId()));
+
+		// Dual-mode action
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+
+			$reason = WebRequest::postString('reason');
+			if ($reason === false || trim($reason) === '') {
+				throw new ApplicationLogicException('No reason specified for roles change');
+			}
+
+			/** @var UserRole[] $delete */
+			$delete = array();
+			/** @var string[] $add */
+			$add = array();
+
+			/** @var UserRole[] $globalDelete */
+			$globalDelete = array();
+			/** @var string[] $globalAdd */
+			$globalAdd = array();
+
+			foreach ($roleData as $name => $r) {
+				if ($r['allowEdit'] !== 1) {
+					// not allowed, to touch this, so ignore it
+					continue;
+				}
+
+				$newValue = WebRequest::postBoolean('role-' . $name) ? 1 : 0;
+				if ($newValue !== $r['active']) {
+					if ($newValue === 0) {
+						if ($r['globalOnly']) {
+							$globalDelete[] = $r['object'];
+						}
+						else {
+							$delete[] = $r['object'];
+						}
+					}
+
+					if ($newValue === 1) {
+						if ($r['globalOnly']) {
+							$globalAdd[] = $name;
+						}
+						else {
+							$add[] = $name;
+						}
+					}
+				}
+			}
+
+			// Check there's something to do
+			if ((count($add) + count($delete) + count($globalAdd) + count($globalDelete)) === 0) {
+				$this->redirect('statistics/users', 'detail', array('user' => $user->getId()));
+				SessionAlert::warning('No changes made to roles.');
+
+				return;
+			}
+
+			$removed = array();
+			$globalRemoved = array();
+
+			foreach ($delete as $d) {
+				$removed[] = $d->getRole();
+				$d->delete();
+			}
+
+			foreach ($globalDelete as $d) {
+				$globalRemoved[] = $d->getRole();
+				$d->delete();
+			}
+
+			foreach ($add as $x) {
+				$a = new UserRole();
+				$a->setUser($user->getId());
+				$a->setRole($x);
+				$a->setDomain($domain->getId());
+				$a->setDatabase($database);
+				$a->save();
+			}
+
+			foreach ($globalAdd as $x) {
+				$a = new UserRole();
+				$a->setUser($user->getId());
+				$a->setRole($x);
+				$a->setDomain(null);
+				$a->setDatabase($database);
+				$a->save();
+			}
+
+			if ((count($add) + count($delete)) > 0) {
+				Logger::userRolesEdited($database, $user, $reason, $add, $removed, $domain->getId());
+			}
+
+			if ((count($globalAdd) + count($globalDelete)) > 0) {
+				Logger::userGlobalRolesEdited($database, $user, $reason, $globalAdd, $globalRemoved);
+			}
+
+			// dummy save for optimistic locking. If this fails, the entire txn will roll back.
+			$user->setUpdateVersion(WebRequest::postInt('updateversion'));
+			$user->save();
+
+			$this->getNotificationHelper()->userRolesEdited($user, $reason);
+			SessionAlert::quick('Roles changed for user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
+
+			$this->redirect('statistics/users', 'detail', array('user' => $user->getId()));
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->setTemplate('usermanagement/roleedit.tpl');
+			$this->assign('user', $user);
+			$this->assign('roleData', $roleData);
+		}
+	}
+
+	/**
+	 * Action target for deactivating users
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function deactivate()
+	{
+		$this->setHtmlTitle('User Management');
+
+		$database = $this->getDatabase();
+
+		$userId = WebRequest::getInt('user');
+
+		/** @var User $user */
+		$user = User::getById($userId, $database);
+
+		if ($user === false || $user->isCommunityUser()) {
+			throw new ApplicationLogicException('Sorry, the user you are trying to deactivate could not be found.');
+		}
+
+		if ($user->isDeactivated()) {
+			throw new ApplicationLogicException('Sorry, the user you are trying to deactivate is already deactivated.');
+		}
+
+		// Dual-mode action
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+			$reason = WebRequest::postString('reason');
+
+			if ($reason === null || trim($reason) === '') {
+				throw new ApplicationLogicException('No reason provided');
+			}
+
+			$user->setStatus(User::STATUS_DEACTIVATED);
+			$user->setUpdateVersion(WebRequest::postInt('updateversion'));
+			$user->save();
+			Logger::deactivatedUser($database, $user, $reason);
+
+			$this->getNotificationHelper()->userDeactivated($user);
+			SessionAlert::quick('Deactivated user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
+
+			// send email
+			$this->sendStatusChangeEmail(
+				'Your WP:ACC account has been deactivated',
+				'usermanagement/emails/deactivated.tpl',
+				$reason,
+				$user,
+				User::getCurrent($database)->getUsername()
+			);
+
+			$this->redirect('userManagement');
+
+			return;
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->setTemplate('usermanagement/changelevel-reason.tpl');
+			$this->assign('user', $user);
+			$this->assign('status', User::STATUS_DEACTIVATED);
+			$this->assign("showReason", true);
+
+			if (WebRequest::getString('preload')) {
+				$this->assign('preload', WebRequest::getString('preload'));
+			}
+		}
+	}
+
+	/**
+	 * Entry point for the approve action
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function approve()
+	{
+		$this->setHtmlTitle('User Management');
+
+		$database = $this->getDatabase();
+
+		$userId = WebRequest::getInt('user');
+		$user = User::getById($userId, $database);
+
+		if ($user === false || $user->isCommunityUser()) {
+			throw new ApplicationLogicException('Sorry, the user you are trying to approve could not be found.');
+		}
+
+		if ($user->isActive()) {
+			throw new ApplicationLogicException('Sorry, the user you are trying to approve is already an active user.');
+		}
+
+		// Dual-mode action
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+			$user->setStatus(User::STATUS_ACTIVE);
+			$user->setUpdateVersion(WebRequest::postInt('updateversion'));
+			$user->save();
+			Logger::approvedUser($database, $user);
+
+			$this->getNotificationHelper()->userApproved($user);
+			SessionAlert::quick('Approved user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
+
+			// send email
+			$this->sendStatusChangeEmail(
+				'Your WP:ACC account has been approved',
+				'usermanagement/emails/approved.tpl',
+				null,
+				$user,
+				User::getCurrent($database)->getUsername()
+			);
+
+			$this->redirect("userManagement");
+
+			return;
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->setTemplate("usermanagement/changelevel-reason.tpl");
+			$this->assign("user", $user);
+			$this->assign("status", "Active");
+			$this->assign("showReason", false);
+		}
+	}
+
+	#endregion
+
+	#region Renaming / Editing
+
+	/**
+	 * Entry point for the rename action
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function rename()
+	{
+		$this->setHtmlTitle('User Management');
+
+		$database = $this->getDatabase();
+
+		$userId = WebRequest::getInt('user');
+		$user = User::getById($userId, $database);
+
+		if ($user === false || $user->isCommunityUser()) {
+			throw new ApplicationLogicException('Sorry, the user you are trying to rename could not be found.');
+		}
+
+		// Dual-mode action
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+			$newUsername = WebRequest::postString('newname');
+
+			if ($newUsername === null || trim($newUsername) === "") {
+				throw new ApplicationLogicException('The new username cannot be empty');
+			}
+
+			if (User::getByUsername($newUsername, $database) != false) {
+				throw new ApplicationLogicException('The new username already exists');
+			}
+
+			$oldUsername = $user->getUsername();
+			$user->setUsername($newUsername);
+			$user->setUpdateVersion(WebRequest::postInt('updateversion'));
+
+			$user->save();
+
+			$logEntryData = serialize(array(
+				'old' => $oldUsername,
+				'new' => $newUsername,
+			));
+
+			Logger::renamedUser($database, $user, $logEntryData);
+
+			SessionAlert::quick("Changed User "
+				. htmlentities($oldUsername, ENT_COMPAT, 'UTF-8')
+				. " name to "
+				. htmlentities($newUsername, ENT_COMPAT, 'UTF-8'));
+
+			$this->getNotificationHelper()->userRenamed($user, $oldUsername);
+
+			// send an email to the user.
+			$this->assign('targetUsername', $user->getUsername());
+			$this->assign('toolAdmin', User::getCurrent($database)->getUsername());
+			$this->assign('oldUsername', $oldUsername);
+			$this->assign('mailingList', $this->adminMailingList);
+
+			// FIXME: domains!
+			/** @var Domain $domain */
+			$domain = Domain::getById(1, $database);
+			$this->getEmailHelper()->sendMail(
+				$this->adminMailingList,
+				$user->getEmail(),
+				'Your username on WP:ACC has been changed',
+				$this->fetchTemplate('usermanagement/emails/renamed.tpl')
+			);
+
+			$this->redirect("userManagement");
+
+			return;
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->setTemplate('usermanagement/renameuser.tpl');
+			$this->assign('user', $user);
+		}
+	}
+
+	/**
+	 * Entry point for the edit action
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function editUser()
+	{
+		$this->setHtmlTitle('User Management');
+
+		$database = $this->getDatabase();
+
+		$userId = WebRequest::getInt('user');
+		$user = User::getById($userId, $database);
+		$oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
+
+		if ($user === false || $user->isCommunityUser()) {
+			throw new ApplicationLogicException('Sorry, the user you are trying to edit could not be found.');
+		}
+
+		// FIXME: domains
+		$prefs = new PreferenceManager($database, $user->getId(), 1);
+
+		// Dual-mode action
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+			$newEmail = WebRequest::postEmail('user_email');
+			$newOnWikiName = WebRequest::postString('user_onwikiname');
+
+			if ($newEmail === null) {
+				throw new ApplicationLogicException('Invalid email address');
+			}
+
+			if ($this->validateUnusedEmail($newEmail, $userId)) {
+				throw new ApplicationLogicException('The specified email address is already in use.');
+			}
+
+			if (!($oauth->isFullyLinked() || $oauth->isPartiallyLinked())) {
+				if (trim($newOnWikiName) == "") {
+					throw new ApplicationLogicException('New on-wiki username cannot be blank');
+				}
+
+				$user->setOnWikiName($newOnWikiName);
+			}
+
+			$user->setEmail($newEmail);
+
+			$prefs->setLocalPreference(PreferenceManager::PREF_CREATION_MODE, WebRequest::postInt('creationmode'));
+
+			$prefs->setLocalPreference(PreferenceManager::ADMIN_PREF_PREVENT_REACTIVATION, WebRequest::postBoolean('preventReactivation'));
+
+			$user->setUpdateVersion(WebRequest::postInt('updateversion'));
+
+			$user->save();
+
+			Logger::userPreferencesChange($database, $user);
+			$this->getNotificationHelper()->userPrefChange($user);
+			SessionAlert::quick('Changes to user\'s preferences have been saved');
+
+			$this->redirect("userManagement");
+
+			return;
+		}
+		else {
+			$this->assignCSRFToken();
+			$oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(),
+				$this->getSiteConfiguration());
+			$this->setTemplate('usermanagement/edituser.tpl');
+			$this->assign('user', $user);
+			$this->assign('oauth', $oauth);
+
+			$this->assign('preferredCreationMode', (int)$prefs->getPreference(PreferenceManager::PREF_CREATION_MODE));
+			$this->assign('emailSignature', $prefs->getPreference(PreferenceManager::PREF_EMAIL_SIGNATURE));
+
+			$this->assign('preventReactivation', $prefs->getPreference(PreferenceManager::ADMIN_PREF_PREVENT_REACTIVATION) ?? false);
+
+			$this->assign('canManualCreate',
+				$this->barrierTest(PreferenceManager::CREATION_MANUAL, $user, 'RequestCreation'));
+			$this->assign('canOauthCreate',
+				$this->barrierTest(PreferenceManager::CREATION_OAUTH, $user, 'RequestCreation'));
+			$this->assign('canBotCreate',
+				$this->barrierTest(PreferenceManager::CREATION_BOT, $user, 'RequestCreation'));
+		}
+	}
+
+	#endregion
+
+	private function validateUnusedEmail(string $email, int $userId) : bool {
+		$query = 'SELECT COUNT(id) FROM user WHERE email = :email AND id <> :uid';
+		$statement = $this->getDatabase()->prepare($query);
+		$statement->execute(array(':email' => $email, ':uid' => $userId));
+		$inUse = $statement->fetchColumn() > 0;
+		$statement->closeCursor();
+
+		return $inUse;
+	}
+
+	/**
+	 * Sends a status change email to the user.
+	 *
+	 * @param string      $subject           The subject of the email
+	 * @param string      $template          The smarty template to use
+	 * @param string|null $reason            The reason for performing the status change
+	 * @param User        $user              The user affected
+	 * @param string      $toolAdminUsername The tool admin's username who is making the edit
+	 */
+	private function sendStatusChangeEmail($subject, $template, $reason, $user, $toolAdminUsername)
+	{
+		$this->assign('targetUsername', $user->getUsername());
+		$this->assign('toolAdmin', $toolAdminUsername);
+		$this->assign('actionReason', $reason);
+		$this->assign('mailingList', $this->adminMailingList);
+
+		// FIXME: domains!
+		/** @var Domain $domain */
+		$domain = Domain::getById(1, $this->getDatabase());
+		$this->getEmailHelper()->sendMail(
+			$this->adminMailingList,
+			$user->getEmail(),
+			$subject,
+			$this->fetchTemplate($template)
+		);
+	}
+
+	/**
+	 * @param UserRole[] $activeRoles
+	 *
+	 * @return array
+	 */
+	private function getRoleData($activeRoles)
+	{
+		$availableRoles = $this->getSecurityManager()->getAvailableRoles();
+
+		$currentUser = User::getCurrent($this->getDatabase());
+		$this->getSecurityManager()->getActiveRoles($currentUser, $userRoles, $inactiveRoles);
+
+		$initialValue = array('active' => 0, 'allowEdit' => 0, 'description' => '???', 'object' => null);
+
+		$roleData = array();
+		foreach ($availableRoles as $role => $data) {
+			$intersection = array_intersect($data['editableBy'], $userRoles);
+
+			$roleData[$role] = $initialValue;
+			$roleData[$role]['allowEdit'] = count($intersection) > 0 ? 1 : 0;
+			$roleData[$role]['description'] = $data['description'];
+			$roleData[$role]['globalOnly'] = $data['globalOnly'];
+		}
+
+		foreach ($activeRoles as $role) {
+			if (!isset($roleData[$role->getRole()])) {
+				// This value is no longer available in the configuration, allow changing (aka removing) it.
+				$roleData[$role->getRole()] = $initialValue;
+				$roleData[$role->getRole()]['allowEdit'] = 1;
+			}
+
+			$roleData[$role->getRole()]['object'] = $role;
+			$roleData[$role->getRole()]['active'] = 1;
+		}
+
+		return $roleData;
+	}
 }

includes/Pages/PageDomainSwitch.php

Indentation +35 added lines, -35 removed lines

@@ -19,48 +19,48 @@
 
 class PageDomainSwitch extends InternalPageBase
 {
-    /**
-     * @inheritDoc
-     */
-    protected function main()
-    {
-        if (!WebRequest::wasPosted()) {
-            $this->redirect('/');
+	/**
+	 * @inheritDoc
+	 */
+	protected function main()
+	{
+		if (!WebRequest::wasPosted()) {
+			$this->redirect('/');
 
-            return;
-        }
+			return;
+		}
 
-        $database = $this->getDatabase();
-        $currentUser = User::getCurrent($database);
+		$database = $this->getDatabase();
+		$currentUser = User::getCurrent($database);
 
-        /** @var Domain|false $newDomain */
-        $newDomain = Domain::getById(WebRequest::postInt('newdomain'), $database);
+		/** @var Domain|false $newDomain */
+		$newDomain = Domain::getById(WebRequest::postInt('newdomain'), $database);
 
-        if ($newDomain === false) {
-            $this->redirect('/');
+		if ($newDomain === false) {
+			$this->redirect('/');
 
-            return;
-        }
+			return;
+		}
 
-        try {
-            $this->getDomainAccessManager()->switchDomain($currentUser, $newDomain);
-        }
-        catch(DomainSwitchNotAllowedException $ex){
-            throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
-        }
+		try {
+			$this->getDomainAccessManager()->switchDomain($currentUser, $newDomain);
+		}
+		catch(DomainSwitchNotAllowedException $ex){
+			throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
+		}
 
-        // try to stay on the same page if possible.
-        // This only checks basic ACLs and not domain privileges, so this may still result in a 403.
+		// try to stay on the same page if possible.
+		// This only checks basic ACLs and not domain privileges, so this may still result in a 403.
 
-        $referrer = WebRequest::postString('referrer');
-        $priorPath = explode('/', $referrer);
-        $router = new RequestRouter();
-        $route = $router->getRouteFromPath($priorPath);
+		$referrer = WebRequest::postString('referrer');
+		$priorPath = explode('/', $referrer);
+		$router = new RequestRouter();
+		$route = $router->getRouteFromPath($priorPath);
 
-        if ($this->barrierTest($route[1], $currentUser, $route[0])) {
-            $this->redirect('/' . $referrer);
-        } else {
-            $this->redirect('/');
-        }
-    }
+		if ($this->barrierTest($route[1], $currentUser, $route[0])) {
+			$this->redirect('/' . $referrer);
+		} else {
+			$this->redirect('/');
+		}
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         try {
             $this->getDomainAccessManager()->switchDomain($currentUser, $newDomain);
         }
-        catch(DomainSwitchNotAllowedException $ex){
+        catch (DomainSwitchNotAllowedException $ex) {
             throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
         }
 

Braces +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         try {
             $this->getDomainAccessManager()->switchDomain($currentUser, $newDomain);
         }
-        catch(DomainSwitchNotAllowedException $ex){
+        catch(DomainSwitchNotAllowedException $ex) {
             throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
         }