mdaniels5757 / waca

includes/PdoDatabase.php

Braces +1 added lines, -2 removed lines

@@ -97,8 +97,7 @@
         // all over the rest of the code
         if ($this->hasActiveTransaction) {
             return false;
-        }
-        else {
+        } else {
             $accessMode = 'READ WRITE';
 
             switch ($isolationLevel) {

Indentation +120 added lines, -120 removed lines

@@ -15,124 +15,124 @@
 
 class PdoDatabase extends PDO
 {
-    public const ISOLATION_SERIALIZABLE = 'SERIALIZABLE';
-    public const ISOLATION_READ_COMMITTED = 'READ COMMITTED';
-    public const ISOLATION_READ_ONLY = 'READ ONLY';
-
-    private static PdoDatabase $connection;
-    /**
-     * @var bool True if a transaction is active
-     */
-    protected bool $hasActiveTransaction = false;
-
-    /**
-     * Unless you're doing low-level work, this is not the function you want.
-     *
-     * @throws Exception
-     */
-    public static function getDatabaseConnection(SiteConfiguration $configuration): PdoDatabase
-    {
-        if (!isset(self::$connection)) {
-            $dbConfig = $configuration->getDatabaseConfig();
-
-            try {
-                $databaseObject = new PdoDatabase(
-                    $dbConfig['datasource'],
-                    $dbConfig['username'],
-                    $dbConfig['password'],
-                    [PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4 COLLATE utf8mb4_unicode_520_ci']
-                );
-            }
-            catch (PDOException $ex) {
-                // wrap around any potential stack traces which may include passwords
-                throw new EnvironmentException('Error connecting to database: ' . $ex->getMessage());
-            }
-
-            $databaseObject->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-
-            // emulating prepared statements gives a performance boost on MySQL.
-            //
-            // however, our version of PDO doesn't seem to understand parameter types when emulating
-            // the prepared statements, so we're forced to turn this off for now.
-            // -- stw 2014-02-11
-            //
-            // and that's not the only problem with emulated prepares. We've now got code that relies
-            // on real prepares.
-            // -- stw 2023-09-30
-            $databaseObject->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
-
-            // Set the default transaction mode
-            $databaseObject->exec("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;");
-
-            self::$connection = $databaseObject;
-        }
-
-        return self::$connection;
-    }
-
-    /**
-     * Determines if this connection has a transaction in progress or not
-     * @return boolean true if there is a transaction in progress.
-     */
-    public function hasActiveTransaction(): bool
-    {
-        return $this->hasActiveTransaction;
-    }
-
-    public function beginTransaction(string $isolationLevel = self::ISOLATION_READ_COMMITTED): bool
-    {
-        // Override the pre-existing method, which doesn't stop you from
-        // starting transactions within transactions - which doesn't work and
-        // will throw an exception. This eliminates the need to catch exceptions
-        // all over the rest of the code
-        if ($this->hasActiveTransaction) {
-            return false;
-        }
-        else {
-            $accessMode = 'READ WRITE';
-
-            switch ($isolationLevel) {
-                case self::ISOLATION_SERIALIZABLE:
-                case self::ISOLATION_READ_COMMITTED:
-                    break;
-                case self::ISOLATION_READ_ONLY:
-                    $isolationLevel = self::ISOLATION_READ_COMMITTED;
-                    $accessMode = 'READ ONLY';
-                    break;
-                default:
-                    throw new Exception("Invalid transaction isolation level");
-            }
-
-            // set the transaction isolation level for every transaction.
-            // string substitution is safe here; values can only be one of the above constants
-            parent::exec("SET TRANSACTION ISOLATION LEVEL ${isolationLevel}, ${accessMode};");
-
-            // start a new transaction, and return whether the start was successful
-            $this->hasActiveTransaction = parent::beginTransaction();
-
-            return $this->hasActiveTransaction;
-        }
-    }
-
-    /**
-     * Commits the active transaction
-     */
-    public function commit(): void
-    {
-        if ($this->hasActiveTransaction) {
-            parent::commit();
-            $this->hasActiveTransaction = false;
-        }
-    }
-
-    /**
-     * Rolls back a transaction
-     */
-    public function rollBack(): void
-    {
-        if ($this->hasActiveTransaction) {
-            parent::rollback();
-            $this->hasActiveTransaction = false;
-        }
-    }
+	public const ISOLATION_SERIALIZABLE = 'SERIALIZABLE';
+	public const ISOLATION_READ_COMMITTED = 'READ COMMITTED';
+	public const ISOLATION_READ_ONLY = 'READ ONLY';
+
+	private static PdoDatabase $connection;
+	/**
+	 * @var bool True if a transaction is active
+	 */
+	protected bool $hasActiveTransaction = false;
+
+	/**
+	 * Unless you're doing low-level work, this is not the function you want.
+	 *
+	 * @throws Exception
+	 */
+	public static function getDatabaseConnection(SiteConfiguration $configuration): PdoDatabase
+	{
+		if (!isset(self::$connection)) {
+			$dbConfig = $configuration->getDatabaseConfig();
+
+			try {
+				$databaseObject = new PdoDatabase(
+					$dbConfig['datasource'],
+					$dbConfig['username'],
+					$dbConfig['password'],
+					[PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4 COLLATE utf8mb4_unicode_520_ci']
+				);
+			}
+			catch (PDOException $ex) {
+				// wrap around any potential stack traces which may include passwords
+				throw new EnvironmentException('Error connecting to database: ' . $ex->getMessage());
+			}
+
+			$databaseObject->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+
+			// emulating prepared statements gives a performance boost on MySQL.
+			//
+			// however, our version of PDO doesn't seem to understand parameter types when emulating
+			// the prepared statements, so we're forced to turn this off for now.
+			// -- stw 2014-02-11
+			//
+			// and that's not the only problem with emulated prepares. We've now got code that relies
+			// on real prepares.
+			// -- stw 2023-09-30
+			$databaseObject->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
+
+			// Set the default transaction mode
+			$databaseObject->exec("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;");
+
+			self::$connection = $databaseObject;
+		}
+
+		return self::$connection;
+	}
+
+	/**
+	 * Determines if this connection has a transaction in progress or not
+	 * @return boolean true if there is a transaction in progress.
+	 */
+	public function hasActiveTransaction(): bool
+	{
+		return $this->hasActiveTransaction;
+	}
+
+	public function beginTransaction(string $isolationLevel = self::ISOLATION_READ_COMMITTED): bool
+	{
+		// Override the pre-existing method, which doesn't stop you from
+		// starting transactions within transactions - which doesn't work and
+		// will throw an exception. This eliminates the need to catch exceptions
+		// all over the rest of the code
+		if ($this->hasActiveTransaction) {
+			return false;
+		}
+		else {
+			$accessMode = 'READ WRITE';
+
+			switch ($isolationLevel) {
+				case self::ISOLATION_SERIALIZABLE:
+				case self::ISOLATION_READ_COMMITTED:
+					break;
+				case self::ISOLATION_READ_ONLY:
+					$isolationLevel = self::ISOLATION_READ_COMMITTED;
+					$accessMode = 'READ ONLY';
+					break;
+				default:
+					throw new Exception("Invalid transaction isolation level");
+			}
+
+			// set the transaction isolation level for every transaction.
+			// string substitution is safe here; values can only be one of the above constants
+			parent::exec("SET TRANSACTION ISOLATION LEVEL ${isolationLevel}, ${accessMode};");
+
+			// start a new transaction, and return whether the start was successful
+			$this->hasActiveTransaction = parent::beginTransaction();
+
+			return $this->hasActiveTransaction;
+		}
+	}
+
+	/**
+	 * Commits the active transaction
+	 */
+	public function commit(): void
+	{
+		if ($this->hasActiveTransaction) {
+			parent::commit();
+			$this->hasActiveTransaction = false;
+		}
+	}
+
+	/**
+	 * Rolls back a transaction
+	 */
+	public function rollBack(): void
+	{
+		if ($this->hasActiveTransaction) {
+			parent::rollback();
+			$this->hasActiveTransaction = false;
+		}
+	}
 }

includes/DataObjects/Ban.php

Braces +3 added lines, -6 removed lines

@@ -155,12 +155,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 `ban`
@@ -339,8 +337,7 @@ 
     {
         if ($ip === null) {
             $this->ip = null;
-        }
-        else {
+        } else {
             $this->ip = inet_pton($ip);
         }
 

Indentation +363 added lines, -363 removed lines

@@ -19,66 +19,66 @@ 
  */
 class Ban extends DataObject
 {
-    const ACTION_BLOCK = 'block';
-    const ACTION_DROP = 'drop';
-    const ACTION_DEFER = 'defer';
-    const ACTION_NONE = 'none';
-
-    /** @var string|null */
-    private $name;
-    /** @var string|null */
-    private $ip;
-    /** @var int|null */
-    private $ipmask;
-    /** @var string|null */
-    private $email;
-    /** @var string|null */
-    private $useragent;
-
-    private $user;
-    private $reason;
-    private $date;
-    private $duration;
-    private $active;
-    private $action = self::ACTION_BLOCK;
-    private $targetqueue;
-    private $visibility = 'user';
-    private ?int $domain;
-
-    /**
-     * Gets all active bans, filtered by the optional target.
-     *
-     * @return Ban[]
-     */
-    public static function getActiveBans(PdoDatabase $database, int $domain)
-    {
-        $query = <<<SQL
+	const ACTION_BLOCK = 'block';
+	const ACTION_DROP = 'drop';
+	const ACTION_DEFER = 'defer';
+	const ACTION_NONE = 'none';
+
+	/** @var string|null */
+	private $name;
+	/** @var string|null */
+	private $ip;
+	/** @var int|null */
+	private $ipmask;
+	/** @var string|null */
+	private $email;
+	/** @var string|null */
+	private $useragent;
+
+	private $user;
+	private $reason;
+	private $date;
+	private $duration;
+	private $active;
+	private $action = self::ACTION_BLOCK;
+	private $targetqueue;
+	private $visibility = 'user';
+	private ?int $domain;
+
+	/**
+	 * Gets all active bans, filtered by the optional target.
+	 *
+	 * @return Ban[]
+	 */
+	public static function getActiveBans(PdoDatabase $database, int $domain)
+	{
+		$query = <<<SQL
 SELECT * FROM ban 
 WHERE (duration > UNIX_TIMESTAMP() OR duration is null) 
     AND active = 1
     AND (domain IS NULL OR domain = :domain);
 SQL;
-        $statement = $database->prepare($query);
-        $statement->execute([':domain' => $domain]);
-        $result = array();
-
-        /** @var Ban $v */
-        foreach ($statement->fetchAll(PDO::FETCH_CLASS, get_called_class()) as $v) {
-            $v->setDatabase($database);
-            $result[] = $v;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Gets a ban by its ID if it's currently active.
-     *
-     * @return Ban|false
-     */
-    public static function getActiveId($id, PdoDatabase $database, int $domain)
-    {
-        $statement = $database->prepare(<<<SQL
+		$statement = $database->prepare($query);
+		$statement->execute([':domain' => $domain]);
+		$result = array();
+
+		/** @var Ban $v */
+		foreach ($statement->fetchAll(PDO::FETCH_CLASS, get_called_class()) as $v) {
+			$v->setDatabase($database);
+			$result[] = $v;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Gets a ban by its ID if it's currently active.
+	 *
+	 * @return Ban|false
+	 */
+	public static function getActiveId($id, PdoDatabase $database, int $domain)
+	{
+		$statement = $database->prepare(<<<SQL
 SELECT *
 FROM ban
 WHERE id = :id  
@@ -86,332 +86,332 @@ 
   AND (duration > UNIX_TIMESTAMP() OR duration is null) 
   AND active = 1;
 SQL
-        );
-        $statement->bindValue(":id", $id);
-        $statement->bindValue(":domain", $domain);
+		);
+		$statement->bindValue(":id", $id);
+		$statement->bindValue(":domain", $domain);
 
-        $statement->execute();
+		$statement->execute();
 
-        $resultObject = $statement->fetchObject(get_called_class());
+		$resultObject = $statement->fetchObject(get_called_class());
 
-        if ($resultObject !== false) {
-            $resultObject->setDatabase($database);
-        }
+		if ($resultObject !== false) {
+			$resultObject->setDatabase($database);
+		}
 
-        return $resultObject;
-    }
+		return $resultObject;
+	}
 
-    public static function getByIdList($values, PdoDatabase $database, int $domain): array
-    {
-        if (count($values) === 0) {
-            return [];
-        }
+	public static function getByIdList($values, PdoDatabase $database, int $domain): array
+	{
+		if (count($values) === 0) {
+			return [];
+		}
 
-        // use the provided array to produce a list of question marks of the same length as the array.
-        $valueCount = count($values);
-        $inSection = str_repeat('?,', $valueCount - 1) . '?';
+		// use the provided array to produce a list of question marks of the same length as the array.
+		$valueCount = count($values);
+		$inSection = str_repeat('?,', $valueCount - 1) . '?';
 
-        // this is still parameterised! It's using positional parameters instead of named ones.
-        $query = 'SELECT * FROM ban WHERE id IN (' . $inSection . ')';
+		// this is still parameterised! It's using positional parameters instead of named ones.
+		$query = 'SELECT * FROM ban WHERE id IN (' . $inSection . ')';
 
-        $query .= ' AND (domain IS NULL OR domain = ?)';
-        $values[] = $domain;
+		$query .= ' AND (domain IS NULL OR domain = ?)';
+		$values[] = $domain;
 
-        $statement = $database->prepare($query);
+		$statement = $database->prepare($query);
 
-        // execute the statement with the provided parameter list.
-        $statement->execute($values);
+		// execute the statement with the provided parameter list.
+		$statement->execute($values);
 
-        $result = [];
-        foreach ($statement->fetchAll(PDO::FETCH_CLASS, get_called_class()) as $v) {
-            $v->setDatabase($database);
-            $result[] = $v;
-        }
+		$result = [];
+		foreach ($statement->fetchAll(PDO::FETCH_CLASS, get_called_class()) as $v) {
+			$v->setDatabase($database);
+			$result[] = $v;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+	/**
+	 * @throws Exception
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			$statement = $this->dbObject->prepare(<<<SQL
 INSERT INTO `ban` (name, email, ip, ipmask, useragent, user, reason, date, duration, active, action, targetqueue, visibility, domain)
 VALUES (:name, :email, :ip, :ipmask, :useragent, :user, :reason, CURRENT_TIMESTAMP(), :duration, :active, :action, :targetqueue, :visibility, :domain);
 SQL
-            );
-
-            $statement->bindValue(":name", $this->name);
-            $statement->bindValue(":email", $this->email);
-            $statement->bindValue(":ip", $this->ip);
-            $statement->bindValue(":ipmask", $this->ipmask);
-            $statement->bindValue(":useragent", $this->useragent);
-
-            $statement->bindValue(":user", $this->user);
-            $statement->bindValue(":reason", $this->reason);
-            $statement->bindValue(":duration", $this->duration);
-            $statement->bindValue(":active", $this->active);
-            $statement->bindValue(":action", $this->action);
-            $statement->bindValue(":targetqueue", $this->targetqueue);
-            $statement->bindValue(":visibility", $this->visibility);
-            $statement->bindValue(":domain", $this->domain);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            // update
-            $statement = $this->dbObject->prepare(<<<SQL
+			);
+
+			$statement->bindValue(":name", $this->name);
+			$statement->bindValue(":email", $this->email);
+			$statement->bindValue(":ip", $this->ip);
+			$statement->bindValue(":ipmask", $this->ipmask);
+			$statement->bindValue(":useragent", $this->useragent);
+
+			$statement->bindValue(":user", $this->user);
+			$statement->bindValue(":reason", $this->reason);
+			$statement->bindValue(":duration", $this->duration);
+			$statement->bindValue(":active", $this->active);
+			$statement->bindValue(":action", $this->action);
+			$statement->bindValue(":targetqueue", $this->targetqueue);
+			$statement->bindValue(":visibility", $this->visibility);
+			$statement->bindValue(":domain", $this->domain);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			// update
+			$statement = $this->dbObject->prepare(<<<SQL
 UPDATE `ban`
 SET active = :active, updateversion = updateversion + 1
 WHERE id = :id AND updateversion = :updateversion;
 SQL
-            );
-            $statement->bindValue(':id', $this->id);
-            $statement->bindValue(':updateversion', $this->updateversion);
-
-            $statement->bindValue(':active', $this->active);
-
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
-
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
-
-            $this->updateversion++;
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getReason()
-    {
-        return $this->reason;
-    }
-
-    /**
-     * @param string $reason
-     */
-    public function setReason($reason)
-    {
-        $this->reason = $reason;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getDate()
-    {
-        return $this->date;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getDuration()
-    {
-        return $this->duration;
-    }
-
-    /**
-     * @param mixed $duration
-     */
-    public function setDuration($duration)
-    {
-        $this->duration = $duration;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isActive()
-    {
-        return $this->active == 1;
-    }
-
-    /**
-     * @param bool $active
-     */
-    public function setActive($active)
-    {
-        $this->active = $active ? 1 : 0;
-    }
-
-    /**
-     * @return int
-     */
-    public function getUser()
-    {
-        return $this->user;
-    }
-
-    /**
-     * @param int $user UserID of user who is setting the ban
-     */
-    public function setUser($user)
-    {
-        $this->user = $user;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAction(): string
-    {
-        return $this->action;
-    }
-
-    /**
-     * @param string $action
-     */
-    public function setAction(string $action): void
-    {
-        $this->action = $action;
-    }
-
-    /**
-     * @return string
-     */
-    public function getVisibility() : string
-    {
-        return $this->visibility;
-    }
-
-    /**
-     * @param string $visibility
-     */
-    public function setVisibility(string $visibility): void
-    {
-        $this->visibility = $visibility;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getName(): ?string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @param string|null $name
-     */
-    public function setName(?string $name): void
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getIp(): ?string
-    {
-        if ($this->ip === null) {
-            return null;
-        }
-
-        return inet_ntop($this->ip);
-    }
-
-    /**
-     * @return int|null
-     */
-    public function getIpMask(): ?int
-    {
-        return $this->ipmask;
-    }
-
-    /**
-     * @param string|null $ip
-     * @param int|null    $mask
-     */
-    public function setIp(?string $ip, ?int $mask): void
-    {
-        if ($ip === null) {
-            $this->ip = null;
-        }
-        else {
-            $this->ip = inet_pton($ip);
-        }
-
-        $this->ipmask = $mask;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getEmail(): ?string
-    {
-        return $this->email;
-    }
-
-    /**
-     * @param string|null $email
-     */
-    public function setEmail(?string $email): void
-    {
-        $this->email = $email;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getUseragent(): ?string
-    {
-        return $this->useragent;
-    }
-
-    /**
-     * @param string|null $useragent
-     */
-    public function setUseragent(?string $useragent): void
-    {
-        $this->useragent = $useragent;
-    }
-
-    /**
-     * @return int|null
-     */
-    public function getTargetQueue(): ?int
-    {
-        return $this->targetqueue;
-    }
-
-    /**
-     * @return RequestQueue|null
-     */
-    public function getTargetQueueObject(): ?RequestQueue
-    {
-        /** @var RequestQueue $queue */
-        $queue = RequestQueue::getById($this->targetqueue, $this->getDatabase());
-        return $queue === false ? null : $queue;
-    }
-
-    /**
-     * @param int|null $targetQueue
-     */
-    public function setTargetQueue(?int $targetQueue): void
-    {
-        $this->targetqueue = $targetQueue;
-    }
-
-    public function setDomain(?int $domain): void
-    {
-        $this->domain = $domain;
-    }
-
-    public function getDomain(): ?int
-    {
-        return $this->domain;
-    }
+			);
+			$statement->bindValue(':id', $this->id);
+			$statement->bindValue(':updateversion', $this->updateversion);
+
+			$statement->bindValue(':active', $this->active);
+
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
+
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
+
+			$this->updateversion++;
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getReason()
+	{
+		return $this->reason;
+	}
+
+	/**
+	 * @param string $reason
+	 */
+	public function setReason($reason)
+	{
+		$this->reason = $reason;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getDate()
+	{
+		return $this->date;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getDuration()
+	{
+		return $this->duration;
+	}
+
+	/**
+	 * @param mixed $duration
+	 */
+	public function setDuration($duration)
+	{
+		$this->duration = $duration;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isActive()
+	{
+		return $this->active == 1;
+	}
+
+	/**
+	 * @param bool $active
+	 */
+	public function setActive($active)
+	{
+		$this->active = $active ? 1 : 0;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getUser()
+	{
+		return $this->user;
+	}
+
+	/**
+	 * @param int $user UserID of user who is setting the ban
+	 */
+	public function setUser($user)
+	{
+		$this->user = $user;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getAction(): string
+	{
+		return $this->action;
+	}
+
+	/**
+	 * @param string $action
+	 */
+	public function setAction(string $action): void
+	{
+		$this->action = $action;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getVisibility() : string
+	{
+		return $this->visibility;
+	}
+
+	/**
+	 * @param string $visibility
+	 */
+	public function setVisibility(string $visibility): void
+	{
+		$this->visibility = $visibility;
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getName(): ?string
+	{
+		return $this->name;
+	}
+
+	/**
+	 * @param string|null $name
+	 */
+	public function setName(?string $name): void
+	{
+		$this->name = $name;
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getIp(): ?string
+	{
+		if ($this->ip === null) {
+			return null;
+		}
+
+		return inet_ntop($this->ip);
+	}
+
+	/**
+	 * @return int|null
+	 */
+	public function getIpMask(): ?int
+	{
+		return $this->ipmask;
+	}
+
+	/**
+	 * @param string|null $ip
+	 * @param int|null    $mask
+	 */
+	public function setIp(?string $ip, ?int $mask): void
+	{
+		if ($ip === null) {
+			$this->ip = null;
+		}
+		else {
+			$this->ip = inet_pton($ip);
+		}
+
+		$this->ipmask = $mask;
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getEmail(): ?string
+	{
+		return $this->email;
+	}
+
+	/**
+	 * @param string|null $email
+	 */
+	public function setEmail(?string $email): void
+	{
+		$this->email = $email;
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getUseragent(): ?string
+	{
+		return $this->useragent;
+	}
+
+	/**
+	 * @param string|null $useragent
+	 */
+	public function setUseragent(?string $useragent): void
+	{
+		$this->useragent = $useragent;
+	}
+
+	/**
+	 * @return int|null
+	 */
+	public function getTargetQueue(): ?int
+	{
+		return $this->targetqueue;
+	}
+
+	/**
+	 * @return RequestQueue|null
+	 */
+	public function getTargetQueueObject(): ?RequestQueue
+	{
+		/** @var RequestQueue $queue */
+		$queue = RequestQueue::getById($this->targetqueue, $this->getDatabase());
+		return $queue === false ? null : $queue;
+	}
+
+	/**
+	 * @param int|null $targetQueue
+	 */
+	public function setTargetQueue(?int $targetQueue): void
+	{
+		$this->targetqueue = $targetQueue;
+	}
+
+	public function setDomain(?int $domain): void
+	{
+		$this->domain = $domain;
+	}
+
+	public function getDomain(): ?int
+	{
+		return $this->domain;
+	}
 }

includes/DataObjects/UserDomain.php

Indentation +52 added lines, -52 removed lines

@@ -13,72 +13,72 @@
 
 class UserDomain extends DataObject
 {
-    /** @var int */
-    private $user;
+	/** @var int */
+	private $user;
 
-    /** @var int */
-    private $domain;
+	/** @var int */
+	private $domain;
 
-    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 userdomain (
                     user, domain
                 ) VALUES (
                     :user, :domain
                 );
 SQL
-            );
+			);
 
-            $statement->bindValue(":user", $this->user);
-            $statement->bindValue(":domain", $this->domain);
+			$statement->bindValue(":user", $this->user);
+			$statement->bindValue(":domain", $this->domain);
 
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            // insert / delete only, no updates please.
-            throw new Exception('Updating domain membership is not available');
-        }
-    }
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			// insert / delete only, no updates please.
+			throw new Exception('Updating domain membership is not available');
+		}
+	}
 
-    /**
-     * @return int
-     */
-    public function getUser(): int
-    {
-        return $this->user;
-    }
+	/**
+	 * @return int
+	 */
+	public function getUser(): int
+	{
+		return $this->user;
+	}
 
-    /**
-     * @param int $user
-     */
-    public function setUser(int $user): void
-    {
-        $this->user = $user;
-    }
+	/**
+	 * @param int $user
+	 */
+	public function setUser(int $user): void
+	{
+		$this->user = $user;
+	}
 
-    /**
-     * @return int
-     */
-    public function getDomain(): int
-    {
-        return $this->domain;
-    }
+	/**
+	 * @return int
+	 */
+	public function getDomain(): int
+	{
+		return $this->domain;
+	}
 
-    /**
-     * @param int $domain
-     */
-    public function setDomain(int $domain): void
-    {
-        $this->domain = $domain;
-    }
+	/**
+	 * @param int $domain
+	 */
+	public function setDomain(int $domain): void
+	{
+		$this->domain = $domain;
+	}
 
 
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -37,12 +37,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // insert / delete only, no updates please.
             throw new Exception('Updating domain membership is not available');
         }

includes/DataObjects/RequestForm.php

Indentation +282 added lines, -282 removed lines

@@ -16,126 +16,126 @@ 
 
 class RequestForm extends DataObject
 {
-    /** @var int */
-    private $enabled = 0;
-    /** @var int */
-    private $domain;
-    /** @var string */
-    private $name = '';
-    /** @var string */
-    private $publicendpoint = '';
-    /** @var string */
-    private $formcontent = '';
-    /** @var int|null */
-    private $overridequeue;
-    /** @var string */
-    private $usernamehelp;
-    /** @var string */
-    private $emailhelp;
-    /** @var string */
-    private $commentshelp;
-
-    /**
-     * @param PdoDatabase $database
-     * @param int         $domain
-     *
-     * @return RequestForm[]
-     */
-    public static function getAllForms(PdoDatabase $database, int $domain)
-    {
-        $statement = $database->prepare("SELECT * FROM requestform WHERE domain = :domain;");
-        $statement->execute([':domain' => $domain]);
-
-        $resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
-
-        if ($resultObject === false) {
-            return [];
-        }
-
-        /** @var RequestQueue $t */
-        foreach ($resultObject as $t) {
-            $t->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    public static function getByName(PdoDatabase $database, string $name, int $domain)
-    {
-        $statement = $database->prepare(<<<SQL
+	/** @var int */
+	private $enabled = 0;
+	/** @var int */
+	private $domain;
+	/** @var string */
+	private $name = '';
+	/** @var string */
+	private $publicendpoint = '';
+	/** @var string */
+	private $formcontent = '';
+	/** @var int|null */
+	private $overridequeue;
+	/** @var string */
+	private $usernamehelp;
+	/** @var string */
+	private $emailhelp;
+	/** @var string */
+	private $commentshelp;
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param int         $domain
+	 *
+	 * @return RequestForm[]
+	 */
+	public static function getAllForms(PdoDatabase $database, int $domain)
+	{
+		$statement = $database->prepare("SELECT * FROM requestform WHERE domain = :domain;");
+		$statement->execute([':domain' => $domain]);
+
+		$resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
+
+		if ($resultObject === false) {
+			return [];
+		}
+
+		/** @var RequestQueue $t */
+		foreach ($resultObject as $t) {
+			$t->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	public static function getByName(PdoDatabase $database, string $name, int $domain)
+	{
+		$statement = $database->prepare(<<<SQL
             SELECT * FROM requestform WHERE name = :name AND domain = :domain;
 SQL
-        );
+		);
 
-        $statement->execute([
-            ':name' => $name,
-            ':domain'  => $domain,
-        ]);
+		$statement->execute([
+			':name' => $name,
+			':domain'  => $domain,
+		]);
 
-        /** @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 getByPublicEndpoint(PdoDatabase $database, string $endpoint, int $domain)
-    {
-        $statement = $database->prepare(<<<SQL
+	public static function getByPublicEndpoint(PdoDatabase $database, string $endpoint, int $domain)
+	{
+		$statement = $database->prepare(<<<SQL
             SELECT * FROM requestform WHERE publicendpoint = :endpoint and domain = :domain;
 SQL
-        );
+		);
 
-        $statement->execute([
-            ':endpoint' => $endpoint,
-            ':domain' => $domain,
-        ]);
+		$statement->execute([
+			':endpoint' => $endpoint,
+			':domain' => $domain,
+		]);
 
-        /** @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 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 requestform (
                     enabled, domain, name, publicendpoint, formcontent, overridequeue, usernamehelp, emailhelp, commentshelp
                 ) VALUES (
                     :enabled, :domain, :name, :publicendpoint, :formcontent, :overridequeue, :usernamehelp, :emailhelp, :commentshelp
                 );
 SQL
-            );
-
-            $statement->bindValue(":enabled", $this->enabled);
-            $statement->bindValue(":domain", $this->domain);
-            $statement->bindValue(":name", $this->name);
-            $statement->bindValue(":publicendpoint", $this->publicendpoint);
-            $statement->bindValue(":formcontent", $this->formcontent);
-            $statement->bindValue(":overridequeue", $this->overridequeue);
-            $statement->bindValue(":usernamehelp", $this->usernamehelp);
-            $statement->bindValue(":emailhelp", $this->emailhelp);
-            $statement->bindValue(":commentshelp", $this->commentshelp);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            $statement = $this->dbObject->prepare(<<<SQL
+			);
+
+			$statement->bindValue(":enabled", $this->enabled);
+			$statement->bindValue(":domain", $this->domain);
+			$statement->bindValue(":name", $this->name);
+			$statement->bindValue(":publicendpoint", $this->publicendpoint);
+			$statement->bindValue(":formcontent", $this->formcontent);
+			$statement->bindValue(":overridequeue", $this->overridequeue);
+			$statement->bindValue(":usernamehelp", $this->usernamehelp);
+			$statement->bindValue(":emailhelp", $this->emailhelp);
+			$statement->bindValue(":commentshelp", $this->commentshelp);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			$statement = $this->dbObject->prepare(<<<SQL
                 UPDATE requestform SET
                     enabled = :enabled,
                     domain = :domain,
@@ -150,186 +150,186 @@ 
                     updateversion = updateversion + 1
 				WHERE id = :id AND updateversion = :updateversion;
 SQL
-            );
-
-            $statement->bindValue(":enabled", $this->enabled);
-            $statement->bindValue(":domain", $this->domain);
-            $statement->bindValue(":name", $this->name);
-            $statement->bindValue(":publicendpoint", $this->publicendpoint);
-            $statement->bindValue(":formcontent", $this->formcontent);
-            $statement->bindValue(":overridequeue", $this->overridequeue);
-            $statement->bindValue(":usernamehelp", $this->usernamehelp);
-            $statement->bindValue(":emailhelp", $this->emailhelp);
-            $statement->bindValue(":commentshelp", $this->commentshelp);
-
-
-            $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 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 getDomain(): int
-    {
-        return $this->domain;
-    }
-
-    public function getDomainObject(): ?Domain
-    {
-        if ($this->domain !== null) {
-            /** @var Domain $domain */
-            $domain = Domain::getById($this->domain, $this->getDatabase());
-            return $domain;
-        }
-
-        return null;
-    }
-
-    /**
-     * @param int $domain
-     */
-    public function setDomain(int $domain): void
-    {
-        $this->domain = $domain;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @param string $name
-     */
-    public function setName(string $name): void
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPublicEndpoint(): string
-    {
-        return $this->publicendpoint;
-    }
-
-    /**
-     * @param string $publicEndpoint
-     */
-    public function setPublicEndpoint(string $publicEndpoint): void
-    {
-        $this->publicendpoint = $publicEndpoint;
-    }
-
-    /**
-     * @return string
-     */
-    public function getFormContent(): string
-    {
-        return $this->formcontent;
-    }
-
-    /**
-     * @param string $formContent
-     */
-    public function setFormContent(string $formContent): void
-    {
-        $this->formcontent = $formContent;
-    }
-
-    /**
-     * @return int|null
-     */
-    public function getOverrideQueue(): ?int
-    {
-        return $this->overridequeue;
-    }
-
-    /**
-     * @param int|null $overrideQueue
-     */
-    public function setOverrideQueue(?int $overrideQueue): void
-    {
-        $this->overridequeue = $overrideQueue;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUsernameHelp(): ?string
-    {
-        return $this->usernamehelp;
-    }
-
-    /**
-     * @param string $usernamehelp
-     */
-    public function setUsernameHelp(string $usernamehelp): void
-    {
-        $this->usernamehelp = $usernamehelp;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEmailHelp(): ?string
-    {
-        return $this->emailhelp;
-    }
-
-    /**
-     * @param string $emailhelp
-     */
-    public function setEmailHelp(string $emailhelp): void
-    {
-        $this->emailhelp = $emailhelp;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCommentHelp(): ?string
-    {
-        return $this->commentshelp;
-    }
-
-    /**
-     * @param string $commenthelp
-     */
-    public function setCommentHelp(string $commenthelp): void
-    {
-        $this->commentshelp = $commenthelp;
-    }
+			);
+
+			$statement->bindValue(":enabled", $this->enabled);
+			$statement->bindValue(":domain", $this->domain);
+			$statement->bindValue(":name", $this->name);
+			$statement->bindValue(":publicendpoint", $this->publicendpoint);
+			$statement->bindValue(":formcontent", $this->formcontent);
+			$statement->bindValue(":overridequeue", $this->overridequeue);
+			$statement->bindValue(":usernamehelp", $this->usernamehelp);
+			$statement->bindValue(":emailhelp", $this->emailhelp);
+			$statement->bindValue(":commentshelp", $this->commentshelp);
+
+
+			$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 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 getDomain(): int
+	{
+		return $this->domain;
+	}
+
+	public function getDomainObject(): ?Domain
+	{
+		if ($this->domain !== null) {
+			/** @var Domain $domain */
+			$domain = Domain::getById($this->domain, $this->getDatabase());
+			return $domain;
+		}
+
+		return null;
+	}
+
+	/**
+	 * @param int $domain
+	 */
+	public function setDomain(int $domain): void
+	{
+		$this->domain = $domain;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName(): string
+	{
+		return $this->name;
+	}
+
+	/**
+	 * @param string $name
+	 */
+	public function setName(string $name): void
+	{
+		$this->name = $name;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getPublicEndpoint(): string
+	{
+		return $this->publicendpoint;
+	}
+
+	/**
+	 * @param string $publicEndpoint
+	 */
+	public function setPublicEndpoint(string $publicEndpoint): void
+	{
+		$this->publicendpoint = $publicEndpoint;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getFormContent(): string
+	{
+		return $this->formcontent;
+	}
+
+	/**
+	 * @param string $formContent
+	 */
+	public function setFormContent(string $formContent): void
+	{
+		$this->formcontent = $formContent;
+	}
+
+	/**
+	 * @return int|null
+	 */
+	public function getOverrideQueue(): ?int
+	{
+		return $this->overridequeue;
+	}
+
+	/**
+	 * @param int|null $overrideQueue
+	 */
+	public function setOverrideQueue(?int $overrideQueue): void
+	{
+		$this->overridequeue = $overrideQueue;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUsernameHelp(): ?string
+	{
+		return $this->usernamehelp;
+	}
+
+	/**
+	 * @param string $usernamehelp
+	 */
+	public function setUsernameHelp(string $usernamehelp): void
+	{
+		$this->usernamehelp = $usernamehelp;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getEmailHelp(): ?string
+	{
+		return $this->emailhelp;
+	}
+
+	/**
+	 * @param string $emailhelp
+	 */
+	public function setEmailHelp(string $emailhelp): void
+	{
+		$this->emailhelp = $emailhelp;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getCommentHelp(): ?string
+	{
+		return $this->commentshelp;
+	}
+
+	/**
+	 * @param string $commenthelp
+	 */
+	public function setCommentHelp(string $commenthelp): void
+	{
+		$this->commentshelp = $commenthelp;
+	}
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -129,12 +129,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             $statement = $this->dbObject->prepare(<<<SQL
                 UPDATE requestform SET
                     enabled = :enabled,

includes/DataObjects/EmailTemplate.php

Indentation +348 added lines, -348 removed lines

@@ -21,188 +21,188 @@ 
  */
 class EmailTemplate extends DataObject
 {
-    const ACTION_CREATED = 'created';
-    const ACTION_NOT_CREATED = 'not created';
-    const ACTION_NONE = 'none';
-    const ACTION_DEFER = 'defer';
-
-    /** @var string the name of the template */
-    private $name;
-    private $text;
-    /** @var string|null */
-    private $jsquestion;
-    private $active = 1;
-    private $preloadonly = 0;
-    private $defaultaction = self::ACTION_NOT_CREATED;
-    private $queue;
-    /** @var int */
-    private $domain;
-
-    /**
-     * Gets active non-preload templates
-     *
-     * @param string      $defaultAction Default action to take (EmailTemplate::ACTION_CREATED or EmailTemplate::ACTION_NOT_CREATED)
-     * @param PdoDatabase $database
-     * @param int         $domain
-     * @param int|null    $filter        Template IDs to filter out
-     *
-     * @return array|false
-     */
-    public static function getActiveNonpreloadTemplates($defaultAction, PdoDatabase $database, int $domain, ?int $filter = null)
-    {
-        $statement = $database->prepare(<<<SQL
+	const ACTION_CREATED = 'created';
+	const ACTION_NOT_CREATED = 'not created';
+	const ACTION_NONE = 'none';
+	const ACTION_DEFER = 'defer';
+
+	/** @var string the name of the template */
+	private $name;
+	private $text;
+	/** @var string|null */
+	private $jsquestion;
+	private $active = 1;
+	private $preloadonly = 0;
+	private $defaultaction = self::ACTION_NOT_CREATED;
+	private $queue;
+	/** @var int */
+	private $domain;
+
+	/**
+	 * Gets active non-preload templates
+	 *
+	 * @param string      $defaultAction Default action to take (EmailTemplate::ACTION_CREATED or EmailTemplate::ACTION_NOT_CREATED)
+	 * @param PdoDatabase $database
+	 * @param int         $domain
+	 * @param int|null    $filter        Template IDs to filter out
+	 *
+	 * @return array|false
+	 */
+	public static function getActiveNonpreloadTemplates($defaultAction, PdoDatabase $database, int $domain, ?int $filter = null)
+	{
+		$statement = $database->prepare(<<<SQL
 SELECT * FROM `emailtemplate`
 WHERE defaultaction = :forcreated AND active = 1 AND preloadonly = 0 AND (:skipFilter = 1 OR id <> :filter) AND domain = :domain;
 SQL
-        );
-        $statement->bindValue(":forcreated", $defaultAction);
-        $statement->bindValue(":filter", $filter);
-        $statement->bindValue(":skipFilter", $filter === null ? 1 : 0);
-        $statement->bindValue(":domain", $domain);
-
-        $statement->execute();
-
-        $resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
-
-        /** @var EmailTemplate $t */
-        foreach ($resultObject as $t) {
-            $t->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    /**
-     * Gets active non-preload and preload templates, optionally filtered by the default action.
-     *
-     * @param null|bool|string $defaultAction Default action to take (EmailTemplate::ACTION_CREATED,
-     *                                        EmailTemplate::ACTION_NOT_CREATED, or EmailTemplate::ACTION_NONE), or optionally null to
-     *                                        just get everything.
-     * @param PdoDatabase      $database
-     * @param int              $domain
-     *
-     * @return array|false
-     */
-    public static function getAllActiveTemplates($defaultAction, PdoDatabase $database, int $domain)
-    {
-        if ($defaultAction === false) {
-            $statement = $database->prepare(
-                "SELECT * FROM `emailtemplate` WHERE defaultaction NOT IN ('created', 'not created') AND active = 1 AND domain = :domain;");
-        }
-        elseif ($defaultAction === null) {
-            $statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE active = 1 AND domain = :domain;");
-        }
-        else {
-            $statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE defaultaction = :forcreated AND active = 1 AND domain = :domain;");
-            $statement->bindValue(":forcreated", $defaultAction);
-        }
-
-        $statement->bindValue(":domain", $domain);
-
-        $statement->execute();
-
-        $resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
-
-        /** @var EmailTemplate $t */
-        foreach ($resultObject as $t) {
-            $t->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    /**
-     * Gets all the inactive templates
-     *
-     * @param PdoDatabase $database
-     * @param int         $domain
-     *
-     * @return array
-     */
-    public static function getAllInactiveTemplates(PdoDatabase $database, int $domain)
-    {
-        $statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE active = 0 AND domain = :domain;");
-        $statement->execute([':domain' => $domain]);
-
-        $resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
-
-        /** @var EmailTemplate $t */
-        foreach ($resultObject as $t) {
-            $t->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    /**
-     * @param string      $name
-     * @param PdoDatabase $database
-     * @param int         $domain
-     *
-     * @return EmailTemplate|false
-     */
-    public static function getByName($name, PdoDatabase $database, int $domain)
-    {
-        $statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE name = :name AND domain = :domain LIMIT 1;");
-        $statement->bindValue(":name", $name);
-        $statement->bindValue(":domain", $domain);
-
-        $statement->execute();
-
-        $resultObject = $statement->fetchObject(get_called_class());
-
-        if ($resultObject != false) {
-            $resultObject->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    /**
-     * @return EmailTemplate
-     */
-    public static function getDroppedTemplate()
-    {
-        $t = new EmailTemplate();
-        $t->id = 0;
-        $t->active = 1;
-        $t->defaultaction = self::ACTION_NONE;
-        $t->name = 'Dropped';
-
-        return $t;
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+		);
+		$statement->bindValue(":forcreated", $defaultAction);
+		$statement->bindValue(":filter", $filter);
+		$statement->bindValue(":skipFilter", $filter === null ? 1 : 0);
+		$statement->bindValue(":domain", $domain);
+
+		$statement->execute();
+
+		$resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
+
+		/** @var EmailTemplate $t */
+		foreach ($resultObject as $t) {
+			$t->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	/**
+	 * Gets active non-preload and preload templates, optionally filtered by the default action.
+	 *
+	 * @param null|bool|string $defaultAction Default action to take (EmailTemplate::ACTION_CREATED,
+	 *                                        EmailTemplate::ACTION_NOT_CREATED, or EmailTemplate::ACTION_NONE), or optionally null to
+	 *                                        just get everything.
+	 * @param PdoDatabase      $database
+	 * @param int              $domain
+	 *
+	 * @return array|false
+	 */
+	public static function getAllActiveTemplates($defaultAction, PdoDatabase $database, int $domain)
+	{
+		if ($defaultAction === false) {
+			$statement = $database->prepare(
+				"SELECT * FROM `emailtemplate` WHERE defaultaction NOT IN ('created', 'not created') AND active = 1 AND domain = :domain;");
+		}
+		elseif ($defaultAction === null) {
+			$statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE active = 1 AND domain = :domain;");
+		}
+		else {
+			$statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE defaultaction = :forcreated AND active = 1 AND domain = :domain;");
+			$statement->bindValue(":forcreated", $defaultAction);
+		}
+
+		$statement->bindValue(":domain", $domain);
+
+		$statement->execute();
+
+		$resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
+
+		/** @var EmailTemplate $t */
+		foreach ($resultObject as $t) {
+			$t->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	/**
+	 * Gets all the inactive templates
+	 *
+	 * @param PdoDatabase $database
+	 * @param int         $domain
+	 *
+	 * @return array
+	 */
+	public static function getAllInactiveTemplates(PdoDatabase $database, int $domain)
+	{
+		$statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE active = 0 AND domain = :domain;");
+		$statement->execute([':domain' => $domain]);
+
+		$resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
+
+		/** @var EmailTemplate $t */
+		foreach ($resultObject as $t) {
+			$t->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	/**
+	 * @param string      $name
+	 * @param PdoDatabase $database
+	 * @param int         $domain
+	 *
+	 * @return EmailTemplate|false
+	 */
+	public static function getByName($name, PdoDatabase $database, int $domain)
+	{
+		$statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE name = :name AND domain = :domain LIMIT 1;");
+		$statement->bindValue(":name", $name);
+		$statement->bindValue(":domain", $domain);
+
+		$statement->execute();
+
+		$resultObject = $statement->fetchObject(get_called_class());
+
+		if ($resultObject != false) {
+			$resultObject->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	/**
+	 * @return EmailTemplate
+	 */
+	public static function getDroppedTemplate()
+	{
+		$t = new EmailTemplate();
+		$t->id = 0;
+		$t->active = 1;
+		$t->defaultaction = self::ACTION_NONE;
+		$t->name = 'Dropped';
+
+		return $t;
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			$statement = $this->dbObject->prepare(<<<SQL
 INSERT INTO `emailtemplate` (name, text, jsquestion, defaultaction, active, preloadonly, queue, domain)
 VALUES (:name, :text, :jsquestion, :defaultaction, :active, :preloadonly, :queue, :domain);
 SQL
-            );
-            $statement->bindValue(":name", $this->name);
-            $statement->bindValue(":text", $this->text);
-            $statement->bindValue(":jsquestion", $this->jsquestion);
-            $statement->bindValue(":defaultaction", $this->defaultaction);
-            $statement->bindValue(":active", $this->active);
-            $statement->bindValue(":preloadonly", $this->preloadonly);
-            $statement->bindValue(":queue", $this->queue);
-            $statement->bindValue(":domain", $this->domain);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            // update
-            $statement = $this->dbObject->prepare(<<<SQL
+			);
+			$statement->bindValue(":name", $this->name);
+			$statement->bindValue(":text", $this->text);
+			$statement->bindValue(":jsquestion", $this->jsquestion);
+			$statement->bindValue(":defaultaction", $this->defaultaction);
+			$statement->bindValue(":active", $this->active);
+			$statement->bindValue(":preloadonly", $this->preloadonly);
+			$statement->bindValue(":queue", $this->queue);
+			$statement->bindValue(":domain", $this->domain);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			// update
+			$statement = $this->dbObject->prepare(<<<SQL
 UPDATE `emailtemplate`
 SET name = :name,
 	text = :text,
@@ -214,176 +214,176 @@ 
 	updateversion = updateversion + 1
 WHERE id = :id AND updateversion = :updateversion;
 SQL
-            );
-            $statement->bindValue(':id', $this->id);
-            $statement->bindValue(':updateversion', $this->updateversion);
-
-            $statement->bindValue(':name', $this->name);
-            $statement->bindValue(":text", $this->text);
-            $statement->bindValue(":jsquestion", $this->jsquestion);
-            $statement->bindValue(":defaultaction", $this->defaultaction);
-            $statement->bindValue(":active", $this->active);
-            $statement->bindValue(":preloadonly", $this->preloadonly);
-            $statement->bindValue(":queue", $this->queue);
-
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
-
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
-
-            $this->updateversion++;
-        }
-    }
-
-    /**
-     * Override delete() from DataObject
-     */
-    public function delete()
-    {
-        throw new Exception("You shouldn't be doing that, you'll break logs.");
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @param string $name
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getText()
-    {
-        return $this->text;
-    }
-
-    /**
-     * @param string $text
-     */
-    public function setText($text)
-    {
-        $this->text = $text;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getJsquestion()
-    {
-        return $this->jsquestion;
-    }
-
-    /**
-     * @param string $jsquestion
-     */
-    public function setJsquestion($jsquestion)
-    {
-        $this->jsquestion = $jsquestion;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDefaultAction()
-    {
-        return $this->defaultaction;
-    }
-
-    /**
-     * @param string $defaultAction
-     */
-    public function setDefaultAction($defaultAction)
-    {
-        $this->defaultaction = $defaultAction;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getActive()
-    {
-        return $this->active == 1;
-    }
-
-    /**
-     * @param bool $active
-     */
-    public function setActive($active)
-    {
-        $this->active = $active ? 1 : 0;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getPreloadOnly()
-    {
-        return $this->preloadonly == 1;
-    }
-
-    /**
-     * @param bool $preloadonly
-     */
-    public function setPreloadOnly($preloadonly)
-    {
-        $this->preloadonly = $preloadonly ? 1 : 0;
-    }
-
-    /**
-     * @return int|null
-     */
-    public function getQueue(): ?int
-    {
-        return $this->queue;
-    }
-
-    /**
-     * @return RequestQueue|null
-     */
-    public function getQueueObject(): ?RequestQueue
-    {
-        if ($this->queue === null) {
-            return null;
-        }
-
-        /** @var $dataObject RequestQueue|false */
-        $dataObject = RequestQueue::getById($this->queue, $this->getDatabase());
-
-        if ($dataObject === false) {
-            return null;
-        }
-
-        return $dataObject;
-    }
-
-    /**
-     * @param int|null $queue
-     */
-    public function setQueue(?int $queue): void
-    {
-        $this->queue = $queue;
-    }
-
-    public function getDomain(): int
-    {
-        return $this->domain;
-    }
-
-    public function setDomain(int $domain): void
-    {
-        $this->domain = $domain;
-    }
+			);
+			$statement->bindValue(':id', $this->id);
+			$statement->bindValue(':updateversion', $this->updateversion);
+
+			$statement->bindValue(':name', $this->name);
+			$statement->bindValue(":text", $this->text);
+			$statement->bindValue(":jsquestion", $this->jsquestion);
+			$statement->bindValue(":defaultaction", $this->defaultaction);
+			$statement->bindValue(":active", $this->active);
+			$statement->bindValue(":preloadonly", $this->preloadonly);
+			$statement->bindValue(":queue", $this->queue);
+
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
+
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
+
+			$this->updateversion++;
+		}
+	}
+
+	/**
+	 * Override delete() from DataObject
+	 */
+	public function delete()
+	{
+		throw new Exception("You shouldn't be doing that, you'll break logs.");
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * @param string $name
+	 */
+	public function setName($name)
+	{
+		$this->name = $name;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getText()
+	{
+		return $this->text;
+	}
+
+	/**
+	 * @param string $text
+	 */
+	public function setText($text)
+	{
+		$this->text = $text;
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getJsquestion()
+	{
+		return $this->jsquestion;
+	}
+
+	/**
+	 * @param string $jsquestion
+	 */
+	public function setJsquestion($jsquestion)
+	{
+		$this->jsquestion = $jsquestion;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDefaultAction()
+	{
+		return $this->defaultaction;
+	}
+
+	/**
+	 * @param string $defaultAction
+	 */
+	public function setDefaultAction($defaultAction)
+	{
+		$this->defaultaction = $defaultAction;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getActive()
+	{
+		return $this->active == 1;
+	}
+
+	/**
+	 * @param bool $active
+	 */
+	public function setActive($active)
+	{
+		$this->active = $active ? 1 : 0;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getPreloadOnly()
+	{
+		return $this->preloadonly == 1;
+	}
+
+	/**
+	 * @param bool $preloadonly
+	 */
+	public function setPreloadOnly($preloadonly)
+	{
+		$this->preloadonly = $preloadonly ? 1 : 0;
+	}
+
+	/**
+	 * @return int|null
+	 */
+	public function getQueue(): ?int
+	{
+		return $this->queue;
+	}
+
+	/**
+	 * @return RequestQueue|null
+	 */
+	public function getQueueObject(): ?RequestQueue
+	{
+		if ($this->queue === null) {
+			return null;
+		}
+
+		/** @var $dataObject RequestQueue|false */
+		$dataObject = RequestQueue::getById($this->queue, $this->getDatabase());
+
+		if ($dataObject === false) {
+			return null;
+		}
+
+		return $dataObject;
+	}
+
+	/**
+	 * @param int|null $queue
+	 */
+	public function setQueue(?int $queue): void
+	{
+		$this->queue = $queue;
+	}
+
+	public function getDomain(): int
+	{
+		return $this->domain;
+	}
+
+	public function setDomain(int $domain): void
+	{
+		$this->domain = $domain;
+	}
 }

Braces +4 added lines, -8 removed lines

@@ -88,11 +88,9 @@ 
         if ($defaultAction === false) {
             $statement = $database->prepare(
                 "SELECT * FROM `emailtemplate` WHERE defaultaction NOT IN ('created', 'not created') AND active = 1 AND domain = :domain;");
-        }
-        elseif ($defaultAction === null) {
+        } elseif ($defaultAction === null) {
             $statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE active = 1 AND domain = :domain;");
-        }
-        else {
+        } else {
             $statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE defaultaction = :forcreated AND active = 1 AND domain = :domain;");
             $statement->bindValue(":forcreated", $defaultAction);
         }
@@ -195,12 +193,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 `emailtemplate`

includes/DataObjects/RequestData.php

Indentation +121 added lines, -121 removed lines

@@ -20,137 +20,137 @@
  */
 class RequestData extends DataObject
 {
-    const TYPE_IPV4 = 'ipv4';
-    const TYPE_IPV6 = 'ipv6';
-    const TYPE_EMAIL = 'email';
-    const TYPE_USERAGENT = 'useragent';
-    const TYPE_CLIENTHINT = 'clienthint';
-
-    /** @var int */
-    private $request;
-    /** @var string */
-    private $type;
-    /** @var string|null */
-    private $name;
-    /** @var string */
-    private $value;
-
-    public static function getForRequest(int $requestId, PdoDatabase $database, ?string $type = null)
-    {
-        $statement = $database->prepare(<<<SQL
+	const TYPE_IPV4 = 'ipv4';
+	const TYPE_IPV6 = 'ipv6';
+	const TYPE_EMAIL = 'email';
+	const TYPE_USERAGENT = 'useragent';
+	const TYPE_CLIENTHINT = 'clienthint';
+
+	/** @var int */
+	private $request;
+	/** @var string */
+	private $type;
+	/** @var string|null */
+	private $name;
+	/** @var string */
+	private $value;
+
+	public static function getForRequest(int $requestId, PdoDatabase $database, ?string $type = null)
+	{
+		$statement = $database->prepare(<<<SQL
 SELECT * FROM requestdata
 WHERE request = :request AND type LIKE COALESCE(:type, '%');
 SQL
-        );
+		);
 
-        $statement->bindValue(":request", $requestId);
-        $statement->bindValue(":type", $type);
+		$statement->bindValue(":request", $requestId);
+		$statement->bindValue(":type", $type);
 
-        $statement->execute();
+		$statement->execute();
 
-        $result = array();
-        /** @var RequestData $v */
-        foreach ($statement->fetchAll(PDO::FETCH_CLASS, get_called_class()) as $v) {
-            $v->setDatabase($database);
-            $result[] = $v;
-        }
+		$result = array();
+		/** @var RequestData $v */
+		foreach ($statement->fetchAll(PDO::FETCH_CLASS, get_called_class()) as $v) {
+			$v->setDatabase($database);
+			$result[] = $v;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
 
-    /**
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+	/**
+	 * @throws Exception
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			$statement = $this->dbObject->prepare(<<<SQL
 INSERT INTO `requestdata` (request, type, name, value)
 VALUES (:request, :type, :name, :value);
 SQL
-            );
-
-            $statement->bindValue(":request", $this->request);
-            $statement->bindValue(":type", $this->type);
-            $statement->bindValue(":name", $this->name);
-            $statement->bindValue(":value", $this->value);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            // update
-            throw new ApplicationLogicException('Updates to RequestData are not supported.');
-        }
-    }
-
-    /**
-     * @return int
-     */
-    public function getRequest(): int
-    {
-        return $this->request;
-    }
-
-    /**
-     * @param int $request
-     */
-    public function setRequest(int $request): void
-    {
-        $this->request = $request;
-    }
-
-    /**
-     * @return string
-     */
-    public function getType(): string
-    {
-        return $this->type;
-    }
-
-    /**
-     * @param string $type
-     */
-    public function setType(string $type): void
-    {
-        $this->type = $type;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getName(): ?string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @param string|null $name
-     */
-    public function setName(?string $name): void
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getValue(): string
-    {
-        return $this->value;
-    }
-
-    /**
-     * @param string $value
-     */
-    public function setValue(string $value): void
-    {
-        $this->value = $value;
-    }
+			);
+
+			$statement->bindValue(":request", $this->request);
+			$statement->bindValue(":type", $this->type);
+			$statement->bindValue(":name", $this->name);
+			$statement->bindValue(":value", $this->value);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			// update
+			throw new ApplicationLogicException('Updates to RequestData are not supported.');
+		}
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getRequest(): int
+	{
+		return $this->request;
+	}
+
+	/**
+	 * @param int $request
+	 */
+	public function setRequest(int $request): void
+	{
+		$this->request = $request;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getType(): string
+	{
+		return $this->type;
+	}
+
+	/**
+	 * @param string $type
+	 */
+	public function setType(string $type): void
+	{
+		$this->type = $type;
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getName(): ?string
+	{
+		return $this->name;
+	}
+
+	/**
+	 * @param string|null $name
+	 */
+	public function setName(?string $name): void
+	{
+		$this->name = $name;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getValue(): string
+	{
+		return $this->value;
+	}
+
+	/**
+	 * @param string $value
+	 */
+	public function setValue(string $value): void
+	{
+		$this->value = $value;
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -79,12 +79,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // update
             throw new ApplicationLogicException('Updates to RequestData are not supported.');
         }

includes/DataObjects/User.php

Braces +6 added lines, -12 removed lines

@@ -56,12 +56,10 @@ 
 
                 if ($user === false) {
                     self::$currentUser = new CommunityUser();
-                }
-                else {
+                } else {
                     self::$currentUser = $user;
                 }
-            }
-            else {
+            } else {
                 $anonymousCoward = new CommunityUser();
 
                 self::$currentUser = $anonymousCoward;
@@ -189,12 +187,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 
@@ -393,12 +389,10 @@ 
         if ($this->forceidentified === 0 || $this->forceidentified === "0") {
             // User forced to unidentified in the database.
             return false;
-        }
-        elseif ($this->forceidentified === 1 || $this->forceidentified === "1") {
+        } elseif ($this->forceidentified === 1 || $this->forceidentified === "1") {
             // User forced to identified in the database.
             return true;
-        }
-        else {
+        } else {
             // User not forced to any particular identified status; consult IdentificationVerifier
             return $iv->isUserIdentified($this->getOnWikiName());
         }

Indentation +431 added lines, -431 removed lines

@@ -21,154 +21,154 @@ 
  */
 class User extends DataObject
 {
-    const STATUS_ACTIVE = 'Active';
-    const STATUS_SUSPENDED = 'Suspended';
-    const STATUS_DECLINED = 'Declined';
-    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_SUSPENDED = 'Suspended';
+	const STATUS_DECLINED = 'Declined';
+	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,26 +179,26 @@ 
 					: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(":forceidentified", $this->forceidentified);
-            $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(":forceidentified", $this->forceidentified);
+			$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,
@@ -210,263 +210,263 @@ 
                     updateversion = updateversion + 1
 				WHERE id = :id AND updateversion = :updateversion;
 SQL
-            );
-            $statement->bindValue(":forceidentified", $this->forceidentified);
-
-            $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(':forceidentified', $this->forceidentified);
-            $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 (User, Admin, Suspended, etc - excludes checkuser) 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;
-    }
-
-    /**
-     * Tests if the user is identified
-     *
-     * @param IdentificationVerifier $iv
-     *
-     * @return bool
-     * @todo     Figure out what on earth is going on with PDO's typecasting here.  Apparently, it returns string("0") for
-     *       the force-unidentified case, and int(1) for the identified case?!  This is quite ugly, but probably needed
-     *       to play it safe for now.
-     * @category Security-Critical
-     */
-    public function isIdentified(IdentificationVerifier $iv)
-    {
-        if ($this->forceidentified === 0 || $this->forceidentified === "0") {
-            // User forced to unidentified in the database.
-            return false;
-        }
-        elseif ($this->forceidentified === 1 || $this->forceidentified === "1") {
-            // User forced to identified in the database.
-            return true;
-        }
-        else {
-            // User not forced to any particular identified status; consult IdentificationVerifier
-            return $iv->isUserIdentified($this->getOnWikiName());
-        }
-    }
-
-    /**
-     * DO NOT USE FOR TESTING IDENTIFICATION STATUS.
-     *
-     * @return bool|null
-     */
-    public function getForceIdentified()
-    {
-        return $this->forceidentified;
-    }
-
-    /**
-     * Tests if the user is suspended
-     * @return bool
-     * @category Security-Critical
-     */
-    public function isSuspended()
-    {
-        return $this->status == self::STATUS_SUSPENDED;
-    }
-
-    /**
-     * 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 declined access to the tool
-     * @return bool
-     * @category Security-Critical
-     */
-    public function isDeclined()
-    {
-        return $this->status == self::STATUS_DECLINED;
-    }
-
-    /**
-     * 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(":forceidentified", $this->forceidentified);
+
+			$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(':forceidentified', $this->forceidentified);
+			$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 (User, Admin, Suspended, etc - excludes checkuser) 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;
+	}
+
+	/**
+	 * Tests if the user is identified
+	 *
+	 * @param IdentificationVerifier $iv
+	 *
+	 * @return bool
+	 * @todo     Figure out what on earth is going on with PDO's typecasting here.  Apparently, it returns string("0") for
+	 *       the force-unidentified case, and int(1) for the identified case?!  This is quite ugly, but probably needed
+	 *       to play it safe for now.
+	 * @category Security-Critical
+	 */
+	public function isIdentified(IdentificationVerifier $iv)
+	{
+		if ($this->forceidentified === 0 || $this->forceidentified === "0") {
+			// User forced to unidentified in the database.
+			return false;
+		}
+		elseif ($this->forceidentified === 1 || $this->forceidentified === "1") {
+			// User forced to identified in the database.
+			return true;
+		}
+		else {
+			// User not forced to any particular identified status; consult IdentificationVerifier
+			return $iv->isUserIdentified($this->getOnWikiName());
+		}
+	}
+
+	/**
+	 * DO NOT USE FOR TESTING IDENTIFICATION STATUS.
+	 *
+	 * @return bool|null
+	 */
+	public function getForceIdentified()
+	{
+		return $this->forceidentified;
+	}
+
+	/**
+	 * Tests if the user is suspended
+	 * @return bool
+	 * @category Security-Critical
+	 */
+	public function isSuspended()
+	{
+		return $this->status == self::STATUS_SUSPENDED;
+	}
+
+	/**
+	 * 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 declined access to the tool
+	 * @return bool
+	 * @category Security-Critical
+	 */
+	public function isDeclined()
+	{
+		return $this->status == self::STATUS_DECLINED;
+	}
+
+	/**
+	 * 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
@@ -475,12 +475,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;
+	}
 }

includes/DataObjects/Comment.php

Indentation +214 added lines, -214 removed lines

@@ -20,228 +20,228 @@
  */
 class Comment extends DataObject
 {
-    private $time;
-    private $user;
-    private $comment;
-    private $visibility = "user";
-    private $request;
-    private $flagged = 0;
-    private $edited;
-
-    /**
-     * Retrieves all comments for a request, optionally filtered
-     *
-     * @param integer     $id             Request ID to search by
-     * @param PdoDatabase $database
-     * @param bool        $showRestricted True to show all comments, False to show only unprotected comments, and protected
-     *                                    comments visible to $userId
-     * @param bool        $showCheckuser
-     * @param null|int    $userId         User to filter by
-     *
-     * @return Comment[]
-     */
-    public static function getForRequest($id, PdoDatabase $database, $showRestricted = false, $showCheckuser = false, $userId = null)
-    {
-        $parameters = ['requester', 'user'];
-        if ($showCheckuser) {
-            $parameters[] = 'checkuser';
-        }
-        if ($showRestricted) {
-            $parameters[] = 'admin';
-        }
-
-        $visibilityPlaceholders = str_repeat('?,', count($parameters) - 1) . '?';
-
-        $statement = $database->prepare(<<<SQL
+	private $time;
+	private $user;
+	private $comment;
+	private $visibility = "user";
+	private $request;
+	private $flagged = 0;
+	private $edited;
+
+	/**
+	 * Retrieves all comments for a request, optionally filtered
+	 *
+	 * @param integer     $id             Request ID to search by
+	 * @param PdoDatabase $database
+	 * @param bool        $showRestricted True to show all comments, False to show only unprotected comments, and protected
+	 *                                    comments visible to $userId
+	 * @param bool        $showCheckuser
+	 * @param null|int    $userId         User to filter by
+	 *
+	 * @return Comment[]
+	 */
+	public static function getForRequest($id, PdoDatabase $database, $showRestricted = false, $showCheckuser = false, $userId = null)
+	{
+		$parameters = ['requester', 'user'];
+		if ($showCheckuser) {
+			$parameters[] = 'checkuser';
+		}
+		if ($showRestricted) {
+			$parameters[] = 'admin';
+		}
+
+		$visibilityPlaceholders = str_repeat('?,', count($parameters) - 1) . '?';
+
+		$statement = $database->prepare(<<<SQL
 SELECT * FROM comment
 WHERE (visibility in (${visibilityPlaceholders}) OR user = ?) AND request = ?;
 SQL
-        );
-
-        $parameters[] = $userId;
-        $parameters[] = $id;
-
-        $statement->execute($parameters);
-
-        $result = array();
-        /** @var Comment $v */
-        foreach ($statement->fetchAll(PDO::FETCH_CLASS, get_called_class()) as $v) {
-            $v->setDatabase($database);
-            $result[] = $v;
-        }
-
-        return $result;
-    }
-
-    public static function getFlaggedComments(PdoDatabase $database, int $domain)
-    {
-        $statement = $database->prepare('SELECT c.* FROM comment c INNER JOIN request r ON c.request = r.id WHERE c.flagged = 1 AND r.domain = :domain;');
-        $statement->execute([':domain' => $domain]);
-
-        $result = array();
-        /** @var Comment $v */
-        foreach ($statement->fetchAll(PDO::FETCH_CLASS, get_called_class()) as $v) {
-            $v->setDatabase($database);
-            $result[] = $v;
-        }
-
-        return $result;
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+		);
+
+		$parameters[] = $userId;
+		$parameters[] = $id;
+
+		$statement->execute($parameters);
+
+		$result = array();
+		/** @var Comment $v */
+		foreach ($statement->fetchAll(PDO::FETCH_CLASS, get_called_class()) as $v) {
+			$v->setDatabase($database);
+			$result[] = $v;
+		}
+
+		return $result;
+	}
+
+	public static function getFlaggedComments(PdoDatabase $database, int $domain)
+	{
+		$statement = $database->prepare('SELECT c.* FROM comment c INNER JOIN request r ON c.request = r.id WHERE c.flagged = 1 AND r.domain = :domain;');
+		$statement->execute([':domain' => $domain]);
+
+		$result = array();
+		/** @var Comment $v */
+		foreach ($statement->fetchAll(PDO::FETCH_CLASS, get_called_class()) as $v) {
+			$v->setDatabase($database);
+			$result[] = $v;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			$statement = $this->dbObject->prepare(<<<SQL
 INSERT INTO comment ( time, user, comment, visibility, request, flagged )
 VALUES ( CURRENT_TIMESTAMP(), :user, :comment, :visibility, :request, :flagged );
 SQL
-            );
-            $statement->bindValue(":user", $this->user);
-            $statement->bindValue(":comment", $this->comment);
-            $statement->bindValue(":visibility", $this->visibility);
-            $statement->bindValue(":request", $this->request);
-            $statement->bindValue(":flagged", $this->flagged);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            // update
-            $statement = $this->dbObject->prepare(<<<SQL
+			);
+			$statement->bindValue(":user", $this->user);
+			$statement->bindValue(":comment", $this->comment);
+			$statement->bindValue(":visibility", $this->visibility);
+			$statement->bindValue(":request", $this->request);
+			$statement->bindValue(":flagged", $this->flagged);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			// update
+			$statement = $this->dbObject->prepare(<<<SQL
 UPDATE comment
 SET comment = :comment, visibility = :visibility, flagged = :flagged, edited = :edited, updateversion = updateversion + 1
 WHERE id = :id AND updateversion = :updateversion;
 SQL
-            );
-
-            $statement->bindValue(':id', $this->id);
-            $statement->bindValue(':updateversion', $this->updateversion);
-
-            $statement->bindValue(':comment', $this->comment);
-            $statement->bindValue(':visibility', $this->visibility);
-            $statement->bindValue(":flagged", $this->flagged);
-            $statement->bindValue(":edited", $this->edited);
-
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
-
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
-
-            $this->updateversion++;
-        }
-    }
-
-    /**
-     * @return DateTimeImmutable
-     */
-    public function getTime()
-    {
-        return new DateTimeImmutable($this->time);
-    }
-
-    /**
-     * @return int
-     */
-    public function getUser()
-    {
-        return $this->user;
-    }
-
-    /**
-     * @param int $user
-     */
-    public function setUser($user)
-    {
-        $this->user = $user;
-    }
-
-    /**
-     * @return string
-     */
-    public function getComment()
-    {
-        return $this->comment;
-    }
-
-    /**
-     * @param string $comment
-     */
-    public function setComment($comment)
-    {
-        $this->comment = $comment;
-    }
-
-    /**
-     * @return string
-     */
-    public function getVisibility()
-    {
-        return $this->visibility;
-    }
-
-    /**
-     * @param string $visibility
-     */
-    public function setVisibility($visibility)
-    {
-        $this->visibility = $visibility;
-    }
-
-    /**
-     * @return int
-     */
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-    /**
-     * @param int $request
-     */
-    public function setRequest($request)
-    {
-        $this->request = $request;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getFlagged() : bool
-    {
-        return $this->flagged == 1;
-    }
-
-    /**
-     * @param bool $flagged
-     */
-    public function setFlagged(bool $flagged): void
-    {
-        $this->flagged = $flagged ? 1 : 0;
-    }
-
-    public function touchEdited() : void
-    {
-        $dateTimeImmutable = new DateTimeImmutable("now");
-        $this->edited = $dateTimeImmutable->format('Y-m-d H:i:s');
-    }
-
-    public function getEdited() : ?DateTimeImmutable
-    {
-        if ($this->edited === null) {
-            return null;
-        }
-
-        return new DateTimeImmutable($this->edited);
-    }
+			);
+
+			$statement->bindValue(':id', $this->id);
+			$statement->bindValue(':updateversion', $this->updateversion);
+
+			$statement->bindValue(':comment', $this->comment);
+			$statement->bindValue(':visibility', $this->visibility);
+			$statement->bindValue(":flagged", $this->flagged);
+			$statement->bindValue(":edited", $this->edited);
+
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
+
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
+
+			$this->updateversion++;
+		}
+	}
+
+	/**
+	 * @return DateTimeImmutable
+	 */
+	public function getTime()
+	{
+		return new DateTimeImmutable($this->time);
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getUser()
+	{
+		return $this->user;
+	}
+
+	/**
+	 * @param int $user
+	 */
+	public function setUser($user)
+	{
+		$this->user = $user;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getComment()
+	{
+		return $this->comment;
+	}
+
+	/**
+	 * @param string $comment
+	 */
+	public function setComment($comment)
+	{
+		$this->comment = $comment;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getVisibility()
+	{
+		return $this->visibility;
+	}
+
+	/**
+	 * @param string $visibility
+	 */
+	public function setVisibility($visibility)
+	{
+		$this->visibility = $visibility;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getRequest()
+	{
+		return $this->request;
+	}
+
+	/**
+	 * @param int $request
+	 */
+	public function setRequest($request)
+	{
+		$this->request = $request;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getFlagged() : bool
+	{
+		return $this->flagged == 1;
+	}
+
+	/**
+	 * @param bool $flagged
+	 */
+	public function setFlagged(bool $flagged): void
+	{
+		$this->flagged = $flagged ? 1 : 0;
+	}
+
+	public function touchEdited() : void
+	{
+		$dateTimeImmutable = new DateTimeImmutable("now");
+		$this->edited = $dateTimeImmutable->format('Y-m-d H:i:s');
+	}
+
+	public function getEdited() : ?DateTimeImmutable
+	{
+		if ($this->edited === null) {
+			return null;
+		}
+
+		return new DateTimeImmutable($this->edited);
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -108,12 +108,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 comment

includes/DataObjects/UserPreference.php

Indentation +150 added lines, -150 removed lines

@@ -16,165 +16,165 @@
 class UserPreference extends DataObject
 {
 
-    /** @var int */
-    private $user;
-
-    /** @var ?int */
-    private $domain;
-
-    /** @var string */
-    private $preference;
-
-    /** @var ?mixed */
-    private $value;
-
-    public static function getLocalPreference(PdoDatabase $database, int $user, string $preference, int $domain) {
-        $statement = $database->prepare('SELECT * FROM userpreference WHERE preference = :preference AND USER = :user AND domain = :domain');
-        $statement->execute([
-            ':user' => $user,
-            ':preference' => $preference,
-            ':domain' => $domain
-        ]);
-
-        $resultObject = $statement->fetchObject(get_called_class());
-
-        if ($resultObject !== false) {
-            $resultObject->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    public static function getGlobalPreference(PdoDatabase $database, int $user, string $preference) {
-        $statement = $database->prepare('SELECT * FROM userpreference WHERE preference = :preference AND USER = :user AND domain IS NULL');
-        $statement->execute([
-            ':user' => $user,
-            ':preference' => $preference
-        ]);
-
-        $resultObject = $statement->fetchObject(get_called_class());
-
-        if ($resultObject !== false) {
-            $resultObject->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    /**
-     * @inheritDoc
-     * @throws Exception
-     */
-    public function save()
-    {
-        if($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+	/** @var int */
+	private $user;
+
+	/** @var ?int */
+	private $domain;
+
+	/** @var string */
+	private $preference;
+
+	/** @var ?mixed */
+	private $value;
+
+	public static function getLocalPreference(PdoDatabase $database, int $user, string $preference, int $domain) {
+		$statement = $database->prepare('SELECT * FROM userpreference WHERE preference = :preference AND USER = :user AND domain = :domain');
+		$statement->execute([
+			':user' => $user,
+			':preference' => $preference,
+			':domain' => $domain
+		]);
+
+		$resultObject = $statement->fetchObject(get_called_class());
+
+		if ($resultObject !== false) {
+			$resultObject->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	public static function getGlobalPreference(PdoDatabase $database, int $user, string $preference) {
+		$statement = $database->prepare('SELECT * FROM userpreference WHERE preference = :preference AND USER = :user AND domain IS NULL');
+		$statement->execute([
+			':user' => $user,
+			':preference' => $preference
+		]);
+
+		$resultObject = $statement->fetchObject(get_called_class());
+
+		if ($resultObject !== false) {
+			$resultObject->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	/**
+	 * @inheritDoc
+	 * @throws Exception
+	 */
+	public function save()
+	{
+		if($this->isNew()) {
+			// insert
+			$statement = $this->dbObject->prepare(<<<SQL
                 INSERT INTO `userpreference` (
                     user, domain, preference, value
                 ) VALUES (
                     :user, :domain, :preference, :value
                 );
 SQL
-            );
-            $statement->bindValue(":user", $this->user);
-            $statement->bindValue(":domain", $this->domain);
-            $statement->bindValue(":preference", $this->preference);
-            $statement->bindValue(":value", $this->value);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }else{
-            // update
-            $statement = $this->dbObject->prepare(<<<SQL
+			);
+			$statement->bindValue(":user", $this->user);
+			$statement->bindValue(":domain", $this->domain);
+			$statement->bindValue(":preference", $this->preference);
+			$statement->bindValue(":value", $this->value);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}else{
+			// update
+			$statement = $this->dbObject->prepare(<<<SQL
                 UPDATE `userpreference` SET 
                     value = :value,
                     updateversion = updateversion + 1
                 WHERE id = :id AND updateversion = :updateversion;
 SQL
-            );
-            $statement->bindValue(":value", $this->value);
-
-            $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 int
-     */
-    public function getUser(): int
-    {
-        return $this->user;
-    }
-
-    /**
-     * @param int $user
-     */
-    public function setUser(int $user): void
-    {
-        $this->user = $user;
-    }
-
-    /**
-     * @return ?int
-     */
-    public function getDomain(): ?int
-    {
-        return $this->domain;
-    }
-
-    /**
-     * @param ?int $domain
-     */
-    public function setDomain(?int $domain): void
-    {
-        $this->domain = $domain;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPreference(): string
-    {
-        return $this->preference;
-    }
-
-    /**
-     * @param string $preference
-     */
-    public function setPreference(string $preference): void
-    {
-        $this->preference = $preference;
-    }
-
-    /**
-     * @return mixed|null
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * @param mixed|null $value
-     */
-    public function setValue($value): void
-    {
-        $this->value = $value;
-    }
+			);
+			$statement->bindValue(":value", $this->value);
+
+			$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 int
+	 */
+	public function getUser(): int
+	{
+		return $this->user;
+	}
+
+	/**
+	 * @param int $user
+	 */
+	public function setUser(int $user): void
+	{
+		$this->user = $user;
+	}
+
+	/**
+	 * @return ?int
+	 */
+	public function getDomain(): ?int
+	{
+		return $this->domain;
+	}
+
+	/**
+	 * @param ?int $domain
+	 */
+	public function setDomain(?int $domain): void
+	{
+		$this->domain = $domain;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getPreference(): string
+	{
+		return $this->preference;
+	}
+
+	/**
+	 * @param string $preference
+	 */
+	public function setPreference(string $preference): void
+	{
+		$this->preference = $preference;
+	}
+
+	/**
+	 * @return mixed|null
+	 */
+	public function getValue()
+	{
+		return $this->value;
+	}
+
+	/**
+	 * @param mixed|null $value
+	 */
+	public function setValue($value): void
+	{
+		$this->value = $value;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
      */
     public function save()
     {
-        if($this->isNew()) {
+        if ($this->isNew()) {
             // insert
             $statement = $this->dbObject->prepare(<<<SQL
                 INSERT INTO `userpreference` (
@@ -88,7 +88,7 @@ 
             else {
                 throw new Exception($statement->errorInfo());
             }
-        }else{
+        } else {
             // update
             $statement = $this->dbObject->prepare(<<<SQL
                 UPDATE `userpreference` SET 

Braces +6 added lines, -5 removed lines

@@ -28,7 +28,8 @@ 
     /** @var ?mixed */
     private $value;
 
-    public static function getLocalPreference(PdoDatabase $database, int $user, string $preference, int $domain) {
+    public static function getLocalPreference(PdoDatabase $database, int $user, string $preference, int $domain)
+    {
         $statement = $database->prepare('SELECT * FROM userpreference WHERE preference = :preference AND USER = :user AND domain = :domain');
         $statement->execute([
             ':user' => $user,
@@ -45,7 +46,8 @@ 
         return $resultObject;
     }
 
-    public static function getGlobalPreference(PdoDatabase $database, int $user, string $preference) {
+    public static function getGlobalPreference(PdoDatabase $database, int $user, string $preference)
+    {
         $statement = $database->prepare('SELECT * FROM userpreference WHERE preference = :preference AND USER = :user AND domain IS NULL');
         $statement->execute([
             ':user' => $user,
@@ -84,11 +86,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 `userpreference` SET