stwalkerster / waca

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)
-    {
-        $statement = $database->prepare('SELECT * FROM comment WHERE flagged = 1;');
-        $statement->execute();
-
-        $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)
+	{
+		$statement = $database->prepare('SELECT * FROM comment WHERE flagged = 1;');
+		$statement->execute();
+
+		$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);
+	}
 }

includes/DataObjects/EmailTemplate.php

Indentation +328 added lines, -328 removed lines

@@ -21,178 +21,178 @@ 
  */
 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;
-
-    /**
-     * 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|null    $filter Template IDs to filter out
-     *
-     * @return array|false
-     */
-    public static function getActiveNonpreloadTemplates($defaultAction, PdoDatabase $database, ?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;
+
+	/**
+	 * 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|null    $filter Template IDs to filter out
+	 *
+	 * @return array|false
+	 */
+	public static function getActiveNonpreloadTemplates($defaultAction, PdoDatabase $database, ?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);
 SQL
-        );
-        $statement->bindValue(":forcreated", $defaultAction);
-        $statement->bindValue(":filter", $filter);
-        $statement->bindValue(":skipFilter", $filter === null ? 1 : 0);
-
-        $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
-     *
-     * @return array|false
-     */
-    public static function getAllActiveTemplates($defaultAction, PdoDatabase $database)
-    {
-        $statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE defaultaction = :forcreated AND active = 1;");
-
-        if ($defaultAction === false) {
-            $statement = $database->prepare(
-                "SELECT * FROM `emailtemplate` WHERE defaultaction NOT IN ('created', 'not created') AND active = 1;");
-        }
-
-        if ($defaultAction === null) {
-            $statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE  active = 1;");
-        }
-
-        $statement->bindValue(":forcreated", $defaultAction);
-
-        $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
-     *
-     * @return array
-     */
-    public static function getAllInactiveTemplates(PdoDatabase $database)
-    {
-        $statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE  active = 0;");
-        $statement->execute();
-
-        $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
-     *
-     * @return EmailTemplate|false
-     */
-    public static function getByName($name, PdoDatabase $database)
-    {
-        $statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE name = :name LIMIT 1;");
-        $statement->bindValue(":name", $name);
-
-        $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->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
+	 *
+	 * @return array|false
+	 */
+	public static function getAllActiveTemplates($defaultAction, PdoDatabase $database)
+	{
+		$statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE defaultaction = :forcreated AND active = 1;");
+
+		if ($defaultAction === false) {
+			$statement = $database->prepare(
+				"SELECT * FROM `emailtemplate` WHERE defaultaction NOT IN ('created', 'not created') AND active = 1;");
+		}
+
+		if ($defaultAction === null) {
+			$statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE  active = 1;");
+		}
+
+		$statement->bindValue(":forcreated", $defaultAction);
+
+		$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
+	 *
+	 * @return array
+	 */
+	public static function getAllInactiveTemplates(PdoDatabase $database)
+	{
+		$statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE  active = 0;");
+		$statement->execute();
+
+		$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
+	 *
+	 * @return EmailTemplate|false
+	 */
+	public static function getByName($name, PdoDatabase $database)
+	{
+		$statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE name = :name LIMIT 1;");
+		$statement->bindValue(":name", $name);
+
+		$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)
 VALUES (:name, :text, :jsquestion, :defaultaction, :active, :preloadonly, :queue);
 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);
-
-            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);
+
+			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,
@@ -204,166 +204,166 @@ 
 	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;
-    }
+			);
+			$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;
+	}
 }

includes/DataObjects/Domain.php

Indentation +305 added lines, -305 removed lines

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

Braces +2 added lines, -1 removed lines

@@ -86,7 +86,8 @@
         return $result;
     }
 
-    public static function getAll(PdoDatabase $database) {
+    public static function getAll(PdoDatabase $database)
+    {
         $statement = $database->prepare("SELECT * FROM domain;");
         $statement->execute();
 

includes/DataObjects/Ban.php

Indentation +369 added lines, -369 removed lines

@@ -19,389 +19,389 @@
  */
 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';
-
-    /**
-     * Gets all active bans, filtered by the optional target.
-     *
-     * @param PdoDatabase $database
-     *
-     * @return Ban[]
-     */
-    public static function getActiveBans(PdoDatabase $database)
-    {
-        $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';
+
+	/**
+	 * Gets all active bans, filtered by the optional target.
+	 *
+	 * @param PdoDatabase $database
+	 *
+	 * @return Ban[]
+	 */
+	public static function getActiveBans(PdoDatabase $database)
+	{
+		$query = <<<SQL
 SELECT * FROM ban 
 WHERE (duration > UNIX_TIMESTAMP() OR duration is null) 
   AND active = 1;
 SQL;
-        $statement = $database->prepare($query);
-        $statement->execute();
-        $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 it's ID if it's currently active.
-     *
-     * @param     integer $id
-     * @param PdoDatabase $database
-     *
-     * @return Ban|false
-     */
-    public static function getActiveId($id, PdoDatabase $database)
-    {
-        $statement = $database->prepare(<<<SQL
+		$statement = $database->prepare($query);
+		$statement->execute();
+		$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 it's ID if it's currently active.
+	 *
+	 * @param     integer $id
+	 * @param PdoDatabase $database
+	 *
+	 * @return Ban|false
+	 */
+	public static function getActiveId($id, PdoDatabase $database)
+	{
+		$statement = $database->prepare(<<<SQL
 SELECT *
 FROM ban
 WHERE id = :id  AND (duration > UNIX_TIMESTAMP() OR duration is null) AND active = 1;
 SQL
-        );
-        $statement->bindValue(":id", $id);
-
-        $statement->execute();
-
-        $resultObject = $statement->fetchObject(get_called_class());
-
-        if ($resultObject !== false) {
-            $resultObject->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    public static function getByIdList($values, PdoDatabase $database)
-    {
-        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) . '?';
-
-        // this is still parameterised! It's using positional parameters instead of named ones.
-        $query = 'SELECT * FROM ban WHERE id IN (' . $inSection . ')';
-        $statement = $database->prepare($query);
-
-        // 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;
-        }
-
-        return $result;
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+		);
+		$statement->bindValue(":id", $id);
+
+		$statement->execute();
+
+		$resultObject = $statement->fetchObject(get_called_class());
+
+		if ($resultObject !== false) {
+			$resultObject->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	public static function getByIdList($values, PdoDatabase $database)
+	{
+		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) . '?';
+
+		// this is still parameterised! It's using positional parameters instead of named ones.
+		$query = 'SELECT * FROM ban WHERE id IN (' . $inSection . ')';
+		$statement = $database->prepare($query);
+
+		// 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;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @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)
 VALUES (:name, :email, :ip, :ipmask, :useragent, :user, :reason, CURRENT_TIMESTAMP(), :duration, :active, :action, :targetqueue, :visibility);
 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);
-
-            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);
+
+			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 duration = :duration, active = :active, user = :user, action = :action, visibility = :visibility, 
     targetqueue = :targetqueue, updateversion = updateversion + 1
 WHERE id = :id AND updateversion = :updateversion;
 SQL
-            );
-            $statement->bindValue(':id', $this->id);
-            $statement->bindValue(':updateversion', $this->updateversion);
-
-            $statement->bindValue(':duration', $this->duration);
-            $statement->bindValue(':active', $this->active);
-            $statement->bindValue(':user', $this->user);
-            $statement->bindValue(":action", $this->action);
-            $statement->bindValue(":targetqueue", $this->targetqueue);
-            $statement->bindValue(":visibility", $this->visibility);
-
-            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;
-    }
+			);
+			$statement->bindValue(':id', $this->id);
+			$statement->bindValue(':updateversion', $this->updateversion);
+
+			$statement->bindValue(':duration', $this->duration);
+			$statement->bindValue(':active', $this->active);
+			$statement->bindValue(':user', $this->user);
+			$statement->bindValue(":action", $this->action);
+			$statement->bindValue(":targetqueue", $this->targetqueue);
+			$statement->bindValue(":visibility", $this->visibility);
+
+			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;
+	}
 }

includes/DataObjects/Request.php

Indentation +408 added lines, -408 removed lines

@@ -22,32 +22,32 @@ 
  */
 class Request extends DataObject
 {
-    private $email;
-    private $ip;
-    private $name;
-    /** @var string|null */
-    private $status = RequestStatus::OPEN;
-    private $queue;
-    private $date;
-    private $emailsent = 0;
-    private $emailconfirm;
-    /** @var int|null */
-    private $reserved = null;
-    private $useragent;
-    private $forwardedip;
-    private $hasComments = false;
-    private $hasCommentsResolved = false;
-    private $originform;
-
-    /**
-     * @throws Exception
-     * @throws OptimisticLockFailedException
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+	private $email;
+	private $ip;
+	private $name;
+	/** @var string|null */
+	private $status = RequestStatus::OPEN;
+	private $queue;
+	private $date;
+	private $emailsent = 0;
+	private $emailconfirm;
+	/** @var int|null */
+	private $reserved = null;
+	private $useragent;
+	private $forwardedip;
+	private $hasComments = false;
+	private $hasCommentsResolved = false;
+	private $originform;
+
+	/**
+	 * @throws Exception
+	 * @throws OptimisticLockFailedException
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			$statement = $this->dbObject->prepare(<<<SQL
 INSERT INTO `request` (
 	email, ip, name, status, date, emailsent,
 	emailconfirm, reserved, useragent, forwardedip,
@@ -58,29 +58,29 @@ 
     :queue, :originform
 );
 SQL
-            );
-            $statement->bindValue(':email', $this->email);
-            $statement->bindValue(':ip', $this->ip);
-            $statement->bindValue(':name', $this->name);
-            $statement->bindValue(':status', $this->status);
-            $statement->bindValue(':emailsent', $this->emailsent);
-            $statement->bindValue(':emailconfirm', $this->emailconfirm);
-            $statement->bindValue(':reserved', $this->reserved);
-            $statement->bindValue(':useragent', $this->useragent);
-            $statement->bindValue(':forwardedip', $this->forwardedip);
-            $statement->bindValue(':queue', $this->queue);
-            $statement->bindValue(':originform', $this->originform);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            // update
-            $statement = $this->dbObject->prepare(<<<SQL
+			);
+			$statement->bindValue(':email', $this->email);
+			$statement->bindValue(':ip', $this->ip);
+			$statement->bindValue(':name', $this->name);
+			$statement->bindValue(':status', $this->status);
+			$statement->bindValue(':emailsent', $this->emailsent);
+			$statement->bindValue(':emailconfirm', $this->emailconfirm);
+			$statement->bindValue(':reserved', $this->reserved);
+			$statement->bindValue(':useragent', $this->useragent);
+			$statement->bindValue(':forwardedip', $this->forwardedip);
+			$statement->bindValue(':queue', $this->queue);
+			$statement->bindValue(':originform', $this->originform);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			// update
+			$statement = $this->dbObject->prepare(<<<SQL
 UPDATE `request` SET
 	status = :status,
 	emailsent = :emailsent,
@@ -90,230 +90,230 @@ 
 	updateversion = updateversion + 1
 WHERE id = :id AND updateversion = :updateversion;
 SQL
-            );
-
-            $statement->bindValue(':id', $this->id);
-            $statement->bindValue(':updateversion', $this->updateversion);
-
-            $statement->bindValue(':status', $this->status);
-            $statement->bindValue(':emailsent', $this->emailsent);
-            $statement->bindValue(':emailconfirm', $this->emailconfirm);
-            $statement->bindValue(':reserved', $this->reserved);
-            $statement->bindValue(':queue', $this->queue);
-
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
-
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
-
-            $this->updateversion++;
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getIp()
-    {
-        return $this->ip;
-    }
-
-    /**
-     * @param string $ip
-     */
-    public function setIp($ip)
-    {
-        $this->ip = $ip;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @param string $name
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getStatus()
-    {
-        return $this->status;
-    }
-
-    /**
-     * @param string $status
-     */
-    public function setStatus($status)
-    {
-        $this->status = $status;
-    }
-
-    /**
-     * Returns the time the request was first submitted
-     *
-     * @return DateTimeImmutable
-     */
-    public function getDate()
-    {
-        return new DateTimeImmutable($this->date);
-    }
-
-    /**
-     * @return bool
-     */
-    public function getEmailSent()
-    {
-        return $this->emailsent == "1";
-    }
-
-    /**
-     * @param bool $emailSent
-     */
-    public function setEmailSent($emailSent)
-    {
-        $this->emailsent = $emailSent ? 1 : 0;
-    }
-
-    /**
-     * @return int|null
-     */
-    public function getReserved()
-    {
-        return $this->reserved;
-    }
-
-    /**
-     * @param int|null $reserved
-     */
-    public function setReserved($reserved)
-    {
-        $this->reserved = $reserved;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUserAgent()
-    {
-        return $this->useragent;
-    }
-
-    /**
-     * @param string $useragent
-     */
-    public function setUserAgent($useragent)
-    {
-        $this->useragent = $useragent;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getForwardedIp()
-    {
-        return $this->forwardedip;
-    }
-
-    /**
-     * @param string|null $forwardedip
-     */
-    public function setForwardedIp($forwardedip)
-    {
-        // Verify that the XFF chain only contains valid IP addresses, and silently discard anything that isn't.
+			);
+
+			$statement->bindValue(':id', $this->id);
+			$statement->bindValue(':updateversion', $this->updateversion);
+
+			$statement->bindValue(':status', $this->status);
+			$statement->bindValue(':emailsent', $this->emailsent);
+			$statement->bindValue(':emailconfirm', $this->emailconfirm);
+			$statement->bindValue(':reserved', $this->reserved);
+			$statement->bindValue(':queue', $this->queue);
+
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
+
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
+
+			$this->updateversion++;
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getIp()
+	{
+		return $this->ip;
+	}
+
+	/**
+	 * @param string $ip
+	 */
+	public function setIp($ip)
+	{
+		$this->ip = $ip;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * @param string $name
+	 */
+	public function setName($name)
+	{
+		$this->name = $name;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getStatus()
+	{
+		return $this->status;
+	}
+
+	/**
+	 * @param string $status
+	 */
+	public function setStatus($status)
+	{
+		$this->status = $status;
+	}
+
+	/**
+	 * Returns the time the request was first submitted
+	 *
+	 * @return DateTimeImmutable
+	 */
+	public function getDate()
+	{
+		return new DateTimeImmutable($this->date);
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getEmailSent()
+	{
+		return $this->emailsent == "1";
+	}
+
+	/**
+	 * @param bool $emailSent
+	 */
+	public function setEmailSent($emailSent)
+	{
+		$this->emailsent = $emailSent ? 1 : 0;
+	}
+
+	/**
+	 * @return int|null
+	 */
+	public function getReserved()
+	{
+		return $this->reserved;
+	}
+
+	/**
+	 * @param int|null $reserved
+	 */
+	public function setReserved($reserved)
+	{
+		$this->reserved = $reserved;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUserAgent()
+	{
+		return $this->useragent;
+	}
+
+	/**
+	 * @param string $useragent
+	 */
+	public function setUserAgent($useragent)
+	{
+		$this->useragent = $useragent;
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getForwardedIp()
+	{
+		return $this->forwardedip;
+	}
+
+	/**
+	 * @param string|null $forwardedip
+	 */
+	public function setForwardedIp($forwardedip)
+	{
+		// Verify that the XFF chain only contains valid IP addresses, and silently discard anything that isn't.
         
-        $xff = explode(',', $forwardedip);
-        $valid = array();
+		$xff = explode(',', $forwardedip);
+		$valid = array();
         
-        foreach ($xff as $ip) {
-            $ip = trim($ip);
-            if (filter_var($ip, FILTER_VALIDATE_IP)) {
-                $valid[] = $ip;
-            }
-        }
-        $this->forwardedip = implode(", ", $valid);
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasComments()
-    {
-        if ($this->hasCommentsResolved) {
-            return $this->hasComments;
-        }
-
-        $commentsQuery = $this->dbObject->prepare("SELECT COUNT(*) AS num FROM comment WHERE request = :id;");
-        $commentsQuery->bindValue(":id", $this->id);
-
-        $commentsQuery->execute();
-
-        $this->hasComments = ($commentsQuery->fetchColumn() != 0);
-        $this->hasCommentsResolved = true;
-
-        return $this->hasComments;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEmailConfirm()
-    {
-        return $this->emailconfirm;
-    }
-
-    /**
-     * @param string $emailconfirm
-     */
-    public function setEmailConfirm($emailconfirm)
-    {
-        $this->emailconfirm = $emailconfirm;
-    }
-
-    public function generateEmailConfirmationHash()
-    {
-        $this->emailconfirm = bin2hex(openssl_random_pseudo_bytes(16));
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getEmail()
-    {
-        return $this->email;
-    }
-
-    /**
-     * @param string|null $email
-     */
-    public function setEmail($email)
-    {
-        $this->email = $email;
-    }
-
-    /**
-     * @return string
-     * @throws Exception
-     */
-    public function getClosureReason()
-    {
-        if ($this->status != 'Closed') {
-            throw new Exception("Can't get closure reason for open request.");
-        }
-
-        $statement = $this->dbObject->prepare(<<<SQL
+		foreach ($xff as $ip) {
+			$ip = trim($ip);
+			if (filter_var($ip, FILTER_VALIDATE_IP)) {
+				$valid[] = $ip;
+			}
+		}
+		$this->forwardedip = implode(", ", $valid);
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function hasComments()
+	{
+		if ($this->hasCommentsResolved) {
+			return $this->hasComments;
+		}
+
+		$commentsQuery = $this->dbObject->prepare("SELECT COUNT(*) AS num FROM comment WHERE request = :id;");
+		$commentsQuery->bindValue(":id", $this->id);
+
+		$commentsQuery->execute();
+
+		$this->hasComments = ($commentsQuery->fetchColumn() != 0);
+		$this->hasCommentsResolved = true;
+
+		return $this->hasComments;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getEmailConfirm()
+	{
+		return $this->emailconfirm;
+	}
+
+	/**
+	 * @param string $emailconfirm
+	 */
+	public function setEmailConfirm($emailconfirm)
+	{
+		$this->emailconfirm = $emailconfirm;
+	}
+
+	public function generateEmailConfirmationHash()
+	{
+		$this->emailconfirm = bin2hex(openssl_random_pseudo_bytes(16));
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getEmail()
+	{
+		return $this->email;
+	}
+
+	/**
+	 * @param string|null $email
+	 */
+	public function setEmail($email)
+	{
+		$this->email = $email;
+	}
+
+	/**
+	 * @return string
+	 * @throws Exception
+	 */
+	public function getClosureReason()
+	{
+		if ($this->status != 'Closed') {
+			throw new Exception("Can't get closure reason for open request.");
+		}
+
+		$statement = $this->dbObject->prepare(<<<SQL
 SELECT closes.mail_desc
 FROM log
 INNER JOIN closes ON log.action = closes.closes
@@ -323,25 +323,25 @@ 
 ORDER BY log.timestamp DESC
 LIMIT 1;
 SQL
-        );
+		);
 
-        $statement->bindValue(":requestId", $this->id);
-        $statement->execute();
-        $reason = $statement->fetchColumn();
+		$statement->bindValue(":requestId", $this->id);
+		$statement->execute();
+		$reason = $statement->fetchColumn();
 
-        return $reason;
-    }
+		return $reason;
+	}
 
-    /**
-     * Gets a value indicating whether the request was closed as created or not.
-     */
-    public function getWasCreated()
-    {
-        if ($this->status != 'Closed') {
-            throw new Exception("Can't get closure reason for open request.");
-        }
+	/**
+	 * Gets a value indicating whether the request was closed as created or not.
+	 */
+	public function getWasCreated()
+	{
+		if ($this->status != 'Closed') {
+			throw new Exception("Can't get closure reason for open request.");
+		}
 
-        $statement = $this->dbObject->prepare(<<<SQL
+		$statement = $this->dbObject->prepare(<<<SQL
 SELECT emailtemplate.defaultaction, log.action
 FROM log
 LEFT JOIN emailtemplate ON CONCAT('Closed ', emailtemplate.id) = log.action
@@ -351,43 +351,43 @@ 
 ORDER BY log.timestamp DESC
 LIMIT 1;
 SQL
-        );
-
-        $statement->bindValue(":requestId", $this->id);
-        $statement->execute();
-        $defaultAction = $statement->fetchColumn(0);
-        $logAction = $statement->fetchColumn(1);
-        $statement->closeCursor();
-
-        if ($defaultAction === null) {
-            return $logAction === "Closed custom-y";
-        }
-
-        return $defaultAction === EmailTemplate::ACTION_CREATED;
-    }
-
-    /**
-     * @return DateTime
-     */
-    public function getClosureDate()
-    {
-        $logQuery = $this->dbObject->prepare(<<<SQL
+		);
+
+		$statement->bindValue(":requestId", $this->id);
+		$statement->execute();
+		$defaultAction = $statement->fetchColumn(0);
+		$logAction = $statement->fetchColumn(1);
+		$statement->closeCursor();
+
+		if ($defaultAction === null) {
+			return $logAction === "Closed custom-y";
+		}
+
+		return $defaultAction === EmailTemplate::ACTION_CREATED;
+	}
+
+	/**
+	 * @return DateTime
+	 */
+	public function getClosureDate()
+	{
+		$logQuery = $this->dbObject->prepare(<<<SQL
 SELECT timestamp FROM log
 WHERE objectid = :request AND objecttype = 'Request' AND action LIKE 'Closed%'
 ORDER BY timestamp DESC LIMIT 1;
 SQL
-        );
-        $logQuery->bindValue(":request", $this->getId());
-        $logQuery->execute();
-        $logTime = $logQuery->fetchColumn();
-        $logQuery->closeCursor();
-
-        return new DateTime($logTime);
-    }
-
-    public function getLastUpdated()
-    {
-        $logQuery = $this->dbObject->prepare(<<<SQL
+		);
+		$logQuery->bindValue(":request", $this->getId());
+		$logQuery->execute();
+		$logTime = $logQuery->fetchColumn();
+		$logQuery->closeCursor();
+
+		return new DateTime($logTime);
+	}
+
+	public function getLastUpdated()
+	{
+		$logQuery = $this->dbObject->prepare(<<<SQL
 SELECT max(d.ts) FROM (
     SELECT r.date AS ts FROM request r WHERE r.id = :requestr
     UNION ALL
@@ -396,93 +396,93 @@ 
     SELECT c.time AS ts FROM comment c WHERE c.request = :requestc
 ) d
 SQL
-        );
-
-        $logQuery->bindValue(":requestr", $this->getId());
-        $logQuery->bindValue(":requestl", $this->getId());
-        $logQuery->bindValue(":requestc", $this->getId());
-        $logQuery->execute();
-        $logTime = $logQuery->fetchColumn();
-        $logQuery->closeCursor();
-
-        return new DateTime($logTime);
-    }
-
-    /**
-     * Returns a hash based on data within this request which can be generated easily from the data to be used to reveal
-     * data to unauthorised* users.
-     *
-     * *:Not tool admins, check users, or the reserving user.
-     *
-     * @return string
-     *
-     * @todo future work to make invalidation better. Possibly move to the database and invalidate on relevant events?
-     *       Maybe depend on the last logged action timestamp?
-     */
-    public function getRevealHash()
-    {
-        $data = $this->id         // unique per request
-            . '|' . $this->ip           // }
-            . '|' . $this->forwardedip  // } private data not known to those without access
-            . '|' . $this->useragent    // }
-            . '|' . $this->email        // }
-            . '|' . $this->status; // to rudimentarily invalidate the token on status change
-
-        return hash('sha256', $data);
-    }
-
-    /**
-     * @return int|null
-     */
-    public function getQueue() : ?int
-    {
-        return $this->queue;
-    }
-
-    /**
-     * @return RequestQueue|null
-     */
-    public function getQueueObject(): ?RequestQueue
-    {
-        /** @var RequestQueue $queue */
-        $queue = RequestQueue::getById($this->queue, $this->getDatabase());
-
-        return $queue === false ? null : $queue;
-    }
-
-    /**
-     * @param int|null $queue
-     */
-    public function setQueue(?int $queue): void
-    {
-        $this->queue = $queue;
-    }
-
-    /**
-     * @return int|null
-     */
-    public function getOriginForm(): ?int
-    {
-        return $this->originform;
-    }
-
-    public function getOriginFormObject(): ?RequestForm
-    {
-        if ($this->originform === null) {
-            return null;
-        }
-
-        /** @var RequestForm|bool $form */
-        $form = RequestForm::getById($this->originform, $this->getDatabase());
-
-        return $form === false ? null : $form;
-    }
-
-    /**
-     * @param int|null $originForm
-     */
-    public function setOriginForm(?int $originForm): void
-    {
-        $this->originform = $originForm;
-    }
+		);
+
+		$logQuery->bindValue(":requestr", $this->getId());
+		$logQuery->bindValue(":requestl", $this->getId());
+		$logQuery->bindValue(":requestc", $this->getId());
+		$logQuery->execute();
+		$logTime = $logQuery->fetchColumn();
+		$logQuery->closeCursor();
+
+		return new DateTime($logTime);
+	}
+
+	/**
+	 * Returns a hash based on data within this request which can be generated easily from the data to be used to reveal
+	 * data to unauthorised* users.
+	 *
+	 * *:Not tool admins, check users, or the reserving user.
+	 *
+	 * @return string
+	 *
+	 * @todo future work to make invalidation better. Possibly move to the database and invalidate on relevant events?
+	 *       Maybe depend on the last logged action timestamp?
+	 */
+	public function getRevealHash()
+	{
+		$data = $this->id         // unique per request
+			. '|' . $this->ip           // }
+			. '|' . $this->forwardedip  // } private data not known to those without access
+			. '|' . $this->useragent    // }
+			. '|' . $this->email        // }
+			. '|' . $this->status; // to rudimentarily invalidate the token on status change
+
+		return hash('sha256', $data);
+	}
+
+	/**
+	 * @return int|null
+	 */
+	public function getQueue() : ?int
+	{
+		return $this->queue;
+	}
+
+	/**
+	 * @return RequestQueue|null
+	 */
+	public function getQueueObject(): ?RequestQueue
+	{
+		/** @var RequestQueue $queue */
+		$queue = RequestQueue::getById($this->queue, $this->getDatabase());
+
+		return $queue === false ? null : $queue;
+	}
+
+	/**
+	 * @param int|null $queue
+	 */
+	public function setQueue(?int $queue): void
+	{
+		$this->queue = $queue;
+	}
+
+	/**
+	 * @return int|null
+	 */
+	public function getOriginForm(): ?int
+	{
+		return $this->originform;
+	}
+
+	public function getOriginFormObject(): ?RequestForm
+	{
+		if ($this->originform === null) {
+			return null;
+		}
+
+		/** @var RequestForm|bool $form */
+		$form = RequestForm::getById($this->originform, $this->getDatabase());
+
+		return $form === false ? null : $form;
+	}
+
+	/**
+	 * @param int|null $originForm
+	 */
+	public function setOriginForm(?int $originForm): void
+	{
+		$this->originform = $originForm;
+	}
 }

includes/DataObjects/RequestQueue.php

Indentation +422 added lines, -422 removed lines

@@ -17,254 +17,254 @@ 
 
 class RequestQueue extends DataObject
 {
-    const DEFAULT_DEFAULT = 'default';
-    const DEFAULT_ANTISPOOF = 'antispoof';
-    const DEFAULT_TITLEBLACKLIST = 'titleblacklist';
-
-    /** @var int */
-    private $enabled = 0;
-    /** @var int */
-    private $isdefault = 0;
-    /** @var int */
-    private $defaultantispoof = 0;
-    /** @var int */
-    private $defaulttitleblacklist = 0;
-    /** @var int */
-    private $domain;
-    /** @var string */
-    private $apiname;
-    /** @var string */
-    private $displayname;
-    /** @var string */
-    private $header;
-    /** @var string|null */
-    private $help;
-    /**
-     * @var string
-     * @deprecated Removal due as part of #607
-     */
-    private $logname;
-    /**
-     * @param PdoDatabase $database
-     *
-     * @return RequestQueue[]
-     */
-    public static function getAllQueues(PdoDatabase $database)
-    {
-        $statement = $database->prepare(<<<SQL
+	const DEFAULT_DEFAULT = 'default';
+	const DEFAULT_ANTISPOOF = 'antispoof';
+	const DEFAULT_TITLEBLACKLIST = 'titleblacklist';
+
+	/** @var int */
+	private $enabled = 0;
+	/** @var int */
+	private $isdefault = 0;
+	/** @var int */
+	private $defaultantispoof = 0;
+	/** @var int */
+	private $defaulttitleblacklist = 0;
+	/** @var int */
+	private $domain;
+	/** @var string */
+	private $apiname;
+	/** @var string */
+	private $displayname;
+	/** @var string */
+	private $header;
+	/** @var string|null */
+	private $help;
+	/**
+	 * @var string
+	 * @deprecated Removal due as part of #607
+	 */
+	private $logname;
+	/**
+	 * @param PdoDatabase $database
+	 *
+	 * @return RequestQueue[]
+	 */
+	public static function getAllQueues(PdoDatabase $database)
+	{
+		$statement = $database->prepare(<<<SQL
             SELECT * FROM requestqueue;
 SQL
-        );
-        $statement->execute();
-
-        $resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
-
-        /** @var RequestQueue $t */
-        foreach ($resultObject as $t) {
-            $t->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    /**
-     * @param PdoDatabase $database
-     *
-     * @return RequestQueue[]
-     */
-    public static function getEnabledQueues(PdoDatabase $database)
-    {
-        $statement = $database->prepare(<<<SQL
+		);
+		$statement->execute();
+
+		$resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
+
+		/** @var RequestQueue $t */
+		foreach ($resultObject as $t) {
+			$t->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 *
+	 * @return RequestQueue[]
+	 */
+	public static function getEnabledQueues(PdoDatabase $database)
+	{
+		$statement = $database->prepare(<<<SQL
             SELECT * FROM requestqueue WHERE enabled = 1;
 SQL
-        );
-        $statement->execute();
-
-        $resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
-
-        /** @var RequestQueue $t */
-        foreach ($resultObject as $t) {
-            $t->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    /**
-     * @param PdoDatabase $database
-     * @param string      $apiName
-     * @param int         $domain
-     *
-     * @return false|RequestQueue
-     */
-    public static function getByApiName(PdoDatabase $database, string $apiName, int $domain)
-    {
-        $statement = $database->prepare(<<<SQL
+		);
+		$statement->execute();
+
+		$resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
+
+		/** @var RequestQueue $t */
+		foreach ($resultObject as $t) {
+			$t->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param string      $apiName
+	 * @param int         $domain
+	 *
+	 * @return false|RequestQueue
+	 */
+	public static function getByApiName(PdoDatabase $database, string $apiName, int $domain)
+	{
+		$statement = $database->prepare(<<<SQL
             SELECT * FROM requestqueue WHERE apiname = :apiName AND domain = :domain;
 SQL
-        );
-
-        $statement->execute([
-            ':apiName' => $apiName,
-            ':domain'  => $domain,
-        ]);
-
-        /** @var RequestQueue|false $result */
-        $result = $statement->fetchObject(get_called_class());
-
-        if ($result !== false) {
-            $result->setDatabase($database);
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param PdoDatabase $database
-     * @param string      $displayName
-     * @param int         $domain
-     *
-     * @return false|RequestQueue
-     */
-    public static function getByDisplayName(PdoDatabase $database, string $displayName, int $domain)
-    {
-        $statement = $database->prepare(<<<SQL
+		);
+
+		$statement->execute([
+			':apiName' => $apiName,
+			':domain'  => $domain,
+		]);
+
+		/** @var RequestQueue|false $result */
+		$result = $statement->fetchObject(get_called_class());
+
+		if ($result !== false) {
+			$result->setDatabase($database);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param string      $displayName
+	 * @param int         $domain
+	 *
+	 * @return false|RequestQueue
+	 */
+	public static function getByDisplayName(PdoDatabase $database, string $displayName, int $domain)
+	{
+		$statement = $database->prepare(<<<SQL
             SELECT * FROM requestqueue WHERE displayname = :displayName AND domain = :domain;
 SQL
-        );
-
-        $statement->execute([
-            ':displayName' => $displayName,
-            ':domain'      => $domain,
-        ]);
-
-        /** @var RequestQueue|false $result */
-        $result = $statement->fetchObject(get_called_class());
-
-        if ($result !== false) {
-            $result->setDatabase($database);
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param PdoDatabase $database
-     * @param string      $header
-     * @param int         $domain
-     *
-     * @return false|RequestQueue
-     */
-    public static function getByHeader(PdoDatabase $database, string $header, int $domain)
-    {
-        $statement = $database->prepare(<<<SQL
+		);
+
+		$statement->execute([
+			':displayName' => $displayName,
+			':domain'      => $domain,
+		]);
+
+		/** @var RequestQueue|false $result */
+		$result = $statement->fetchObject(get_called_class());
+
+		if ($result !== false) {
+			$result->setDatabase($database);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param string      $header
+	 * @param int         $domain
+	 *
+	 * @return false|RequestQueue
+	 */
+	public static function getByHeader(PdoDatabase $database, string $header, int $domain)
+	{
+		$statement = $database->prepare(<<<SQL
             SELECT * FROM requestqueue WHERE header = :header AND domain = :domain;
 SQL
-        );
-
-        $statement->execute([
-            ':header' => $header,
-            ':domain' => $domain,
-        ]);
-
-        /** @var RequestQueue|false $result */
-        $result = $statement->fetchObject(get_called_class());
-
-        if ($result !== false) {
-            $result->setDatabase($database);
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param PdoDatabase $database
-     * @param int         $domain
-     *
-     * @param string      $defaultType The type of default queue to get.
-     *
-     * @return false|RequestQueue
-     * @throws ApplicationLogicException
-     */
-    public static function getDefaultQueue(PdoDatabase $database, int $domain, string $defaultType = 'default')
-    {
-        switch ($defaultType) {
-            case self::DEFAULT_DEFAULT:
-                $sql = 'SELECT * FROM requestqueue WHERE isdefault = 1 AND domain = :domain;';
-                break;
-            case self::DEFAULT_ANTISPOOF:
-                $sql = 'SELECT * FROM requestqueue WHERE defaultantispoof = 1 AND domain = :domain;';
-                break;
-            case self::DEFAULT_TITLEBLACKLIST:
-                $sql = 'SELECT * FROM requestqueue WHERE defaulttitleblacklist = 1 AND domain = :domain;';
-                break;
-            default:
-                throw new ApplicationLogicException('Unknown request for default queue');
-        }
-
-        $statement = $database->prepare($sql);
-
-        $statement->execute([':domain' => $domain]);
-
-        /** @var RequestQueue|false $result */
-        $result = $statement->fetchObject(get_called_class());
-
-        if ($result !== false) {
-            $result->setDatabase($database);
-        }
-
-        return $result;
-    }
-
-    public function save()
-    {
-        // find and squish existing defaults
-        if ($this->isDefault()) {
-            $squishStatement = $this->dbObject->prepare('UPDATE requestqueue SET isdefault = 0 WHERE isdefault = 1 AND domain = :domain;');
-            $squishStatement->execute([':domain' => $this->domain]);
-        }
-
-        if ($this->isDefaultAntispoof()) {
-            $squishStatement = $this->dbObject->prepare('UPDATE requestqueue SET defaultantispoof = 0 WHERE defaultantispoof = 1 AND domain = :domain;');
-            $squishStatement->execute([':domain' => $this->domain]);
-        }
-
-        if ($this->isDefaultTitleBlacklist()) {
-            $squishStatement = $this->dbObject->prepare('UPDATE requestqueue SET defaulttitleblacklist = 0 WHERE defaulttitleblacklist = 1 AND domain = :domain;');
-            $squishStatement->execute([':domain' => $this->domain]);
-        }
-
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+		);
+
+		$statement->execute([
+			':header' => $header,
+			':domain' => $domain,
+		]);
+
+		/** @var RequestQueue|false $result */
+		$result = $statement->fetchObject(get_called_class());
+
+		if ($result !== false) {
+			$result->setDatabase($database);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param int         $domain
+	 *
+	 * @param string      $defaultType The type of default queue to get.
+	 *
+	 * @return false|RequestQueue
+	 * @throws ApplicationLogicException
+	 */
+	public static function getDefaultQueue(PdoDatabase $database, int $domain, string $defaultType = 'default')
+	{
+		switch ($defaultType) {
+			case self::DEFAULT_DEFAULT:
+				$sql = 'SELECT * FROM requestqueue WHERE isdefault = 1 AND domain = :domain;';
+				break;
+			case self::DEFAULT_ANTISPOOF:
+				$sql = 'SELECT * FROM requestqueue WHERE defaultantispoof = 1 AND domain = :domain;';
+				break;
+			case self::DEFAULT_TITLEBLACKLIST:
+				$sql = 'SELECT * FROM requestqueue WHERE defaulttitleblacklist = 1 AND domain = :domain;';
+				break;
+			default:
+				throw new ApplicationLogicException('Unknown request for default queue');
+		}
+
+		$statement = $database->prepare($sql);
+
+		$statement->execute([':domain' => $domain]);
+
+		/** @var RequestQueue|false $result */
+		$result = $statement->fetchObject(get_called_class());
+
+		if ($result !== false) {
+			$result->setDatabase($database);
+		}
+
+		return $result;
+	}
+
+	public function save()
+	{
+		// find and squish existing defaults
+		if ($this->isDefault()) {
+			$squishStatement = $this->dbObject->prepare('UPDATE requestqueue SET isdefault = 0 WHERE isdefault = 1 AND domain = :domain;');
+			$squishStatement->execute([':domain' => $this->domain]);
+		}
+
+		if ($this->isDefaultAntispoof()) {
+			$squishStatement = $this->dbObject->prepare('UPDATE requestqueue SET defaultantispoof = 0 WHERE defaultantispoof = 1 AND domain = :domain;');
+			$squishStatement->execute([':domain' => $this->domain]);
+		}
+
+		if ($this->isDefaultTitleBlacklist()) {
+			$squishStatement = $this->dbObject->prepare('UPDATE requestqueue SET defaulttitleblacklist = 0 WHERE defaulttitleblacklist = 1 AND domain = :domain;');
+			$squishStatement->execute([':domain' => $this->domain]);
+		}
+
+		if ($this->isNew()) {
+			// insert
+			$statement = $this->dbObject->prepare(<<<SQL
                 INSERT INTO requestqueue (
                     enabled, isdefault, defaultantispoof, defaulttitleblacklist, domain, apiname, displayname, header, help, logname
                 ) VALUES (
                     :enabled, :isdefault, :defaultantispoof, :defaulttitleblacklist, :domain, :apiname, :displayname, :header, :help, :logname
                 );
 SQL
-            );
-
-            $statement->bindValue(":enabled", $this->enabled);
-            $statement->bindValue(":isdefault", $this->isdefault);
-            $statement->bindValue(":defaultantispoof", $this->defaultantispoof);
-            $statement->bindValue(":defaulttitleblacklist", $this->defaulttitleblacklist);
-            $statement->bindValue(":domain", $this->domain);
-            $statement->bindValue(":apiname", $this->apiname);
-            $statement->bindValue(":displayname", $this->displayname);
-            $statement->bindValue(":header", $this->header);
-            $statement->bindValue(":help", $this->help);
-            $statement->bindValue(":logname", $this->logname);
-
-            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(":isdefault", $this->isdefault);
+			$statement->bindValue(":defaultantispoof", $this->defaultantispoof);
+			$statement->bindValue(":defaulttitleblacklist", $this->defaulttitleblacklist);
+			$statement->bindValue(":domain", $this->domain);
+			$statement->bindValue(":apiname", $this->apiname);
+			$statement->bindValue(":displayname", $this->displayname);
+			$statement->bindValue(":header", $this->header);
+			$statement->bindValue(":help", $this->help);
+			$statement->bindValue(":logname", $this->logname);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			$statement = $this->dbObject->prepare(<<<SQL
                 UPDATE requestqueue SET
                     enabled = :enabled,
                     isdefault = :isdefault,
@@ -280,194 +280,194 @@ 
                     updateversion = updateversion + 1
 				WHERE id = :id AND updateversion = :updateversion;
 SQL
-            );
-
-            $statement->bindValue(":enabled", $this->enabled);
-            $statement->bindValue(":isdefault", $this->isdefault);
-            $statement->bindValue(":defaultantispoof", $this->defaultantispoof);
-            $statement->bindValue(":defaulttitleblacklist", $this->defaulttitleblacklist);
-            $statement->bindValue(":domain", $this->domain);
-            $statement->bindValue(":apiname", $this->apiname);
-            $statement->bindValue(":displayname", $this->displayname);
-            $statement->bindValue(":header", $this->header);
-            $statement->bindValue(":help", $this->help);
-            $statement->bindValue(":logname", $this->logname);
-
-            $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 bool
-     */
-    public function isDefault(): bool
-    {
-        return $this->isdefault == 1;
-    }
-
-    /**
-     * @param bool $isDefault
-     */
-    public function setDefault(bool $isDefault): void
-    {
-        $this->isdefault = $isDefault ? 1 : 0;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isDefaultAntispoof(): bool
-    {
-        return $this->defaultantispoof == 1;
-    }
-
-    /**
-     * @param bool $isDefault
-     */
-    public function setDefaultAntispoof(bool $isDefault): void
-    {
-        $this->defaultantispoof = $isDefault ? 1 : 0;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isDefaultTitleBlacklist(): bool
-    {
-        return $this->defaulttitleblacklist == 1;
-    }
-
-    /**
-     * @param bool $isDefault
-     */
-    public function setDefaultTitleBlacklist(bool $isDefault): void
-    {
-        $this->defaulttitleblacklist = $isDefault ? 1 : 0;
-    }
-
-    /**
-     * @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 getApiName(): string
-    {
-        return $this->apiname;
-    }
-
-    /**
-     * @param string $apiName
-     */
-    public function setApiName(string $apiName): void
-    {
-        $this->apiname = $apiName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDisplayName(): string
-    {
-        return $this->displayname;
-    }
-
-    /**
-     * @param string $displayName
-     */
-    public function setDisplayName(string $displayName): void
-    {
-        $this->displayname = $displayName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getHeader(): string
-    {
-        return $this->header;
-    }
-
-    /**
-     * @param string $header
-     */
-    public function setHeader(string $header): void
-    {
-        $this->header = $header;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getHelp(): ?string
-    {
-        return $this->help;
-    }
-
-    /**
-     * @param string|null $help
-     */
-    public function setHelp(?string $help): void
-    {
-        $this->help = $help;
-    }
-
-    /**
-     * @return string
-     * @deprecated
-     */
-    public function getLogName(): string
-    {
-        return $this->logname;
-    }
-
-    /**
-     * @param string $logName
-     *
-     * @deprecated
-     */
-    public function setLogName(string $logName): void
-    {
-        $this->logname = $logName;
-    }
+			);
+
+			$statement->bindValue(":enabled", $this->enabled);
+			$statement->bindValue(":isdefault", $this->isdefault);
+			$statement->bindValue(":defaultantispoof", $this->defaultantispoof);
+			$statement->bindValue(":defaulttitleblacklist", $this->defaulttitleblacklist);
+			$statement->bindValue(":domain", $this->domain);
+			$statement->bindValue(":apiname", $this->apiname);
+			$statement->bindValue(":displayname", $this->displayname);
+			$statement->bindValue(":header", $this->header);
+			$statement->bindValue(":help", $this->help);
+			$statement->bindValue(":logname", $this->logname);
+
+			$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 bool
+	 */
+	public function isDefault(): bool
+	{
+		return $this->isdefault == 1;
+	}
+
+	/**
+	 * @param bool $isDefault
+	 */
+	public function setDefault(bool $isDefault): void
+	{
+		$this->isdefault = $isDefault ? 1 : 0;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isDefaultAntispoof(): bool
+	{
+		return $this->defaultantispoof == 1;
+	}
+
+	/**
+	 * @param bool $isDefault
+	 */
+	public function setDefaultAntispoof(bool $isDefault): void
+	{
+		$this->defaultantispoof = $isDefault ? 1 : 0;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isDefaultTitleBlacklist(): bool
+	{
+		return $this->defaulttitleblacklist == 1;
+	}
+
+	/**
+	 * @param bool $isDefault
+	 */
+	public function setDefaultTitleBlacklist(bool $isDefault): void
+	{
+		$this->defaulttitleblacklist = $isDefault ? 1 : 0;
+	}
+
+	/**
+	 * @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 getApiName(): string
+	{
+		return $this->apiname;
+	}
+
+	/**
+	 * @param string $apiName
+	 */
+	public function setApiName(string $apiName): void
+	{
+		$this->apiname = $apiName;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDisplayName(): string
+	{
+		return $this->displayname;
+	}
+
+	/**
+	 * @param string $displayName
+	 */
+	public function setDisplayName(string $displayName): void
+	{
+		$this->displayname = $displayName;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getHeader(): string
+	{
+		return $this->header;
+	}
+
+	/**
+	 * @param string $header
+	 */
+	public function setHeader(string $header): void
+	{
+		$this->header = $header;
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getHelp(): ?string
+	{
+		return $this->help;
+	}
+
+	/**
+	 * @param string|null $help
+	 */
+	public function setHelp(?string $help): void
+	{
+		$this->help = $help;
+	}
+
+	/**
+	 * @return string
+	 * @deprecated
+	 */
+	public function getLogName(): string
+	{
+		return $this->logname;
+	}
+
+	/**
+	 * @param string $logName
+	 *
+	 * @deprecated
+	 */
+	public function setLogName(string $logName): void
+	{
+		$this->logname = $logName;
+	}
 }
\ No newline at end of file

includes/API/Actions/CountAction.php

Indentation +93 added lines, -93 removed lines

@@ -21,47 +21,47 @@ 
  */
 class CountAction extends XmlApiPageBase implements IXmlApiAction
 {
-    /**
-     * The target user
-     * @var User $user
-     */
-    private $user;
+	/**
+	 * The target user
+	 * @var User $user
+	 */
+	private $user;
 
-    public function executeApiAction(DOMElement $apiDocument)
-    {
-        $username = WebRequest::getString('user');
-        if ($username === null) {
-            throw new ApiException("Please specify a username");
-        }
+	public function executeApiAction(DOMElement $apiDocument)
+	{
+		$username = WebRequest::getString('user');
+		if ($username === null) {
+			throw new ApiException("Please specify a username");
+		}
 
-        $userElement = $this->document->createElement("user");
-        $userElement->setAttribute("name", $username);
-        $apiDocument->appendChild($userElement);
+		$userElement = $this->document->createElement("user");
+		$userElement->setAttribute("name", $username);
+		$apiDocument->appendChild($userElement);
 
-        $user = User::getByUsername($username, $this->getDatabase());
+		$user = User::getByUsername($username, $this->getDatabase());
 
-        if ($user === false) {
-            $userElement->setAttribute("missing", "true");
+		if ($user === false) {
+			$userElement->setAttribute("missing", "true");
 
-            return $apiDocument;
-        }
+			return $apiDocument;
+		}
 
-        $this->user = $user;
+		$this->user = $user;
 
-        $userElement->setAttribute("level", $this->user->getStatus());
-        $userElement->setAttribute("created", $this->getAccountsCreated());
+		$userElement->setAttribute("level", $this->user->getStatus());
+		$userElement->setAttribute("created", $this->getAccountsCreated());
 
-        $userElement->setAttribute("today", $this->getToday());
+		$userElement->setAttribute("today", $this->getToday());
 
-        // Let the IRC bot handle the result of this.
-        $this->fetchAdminData($userElement);
+		// Let the IRC bot handle the result of this.
+		$this->fetchAdminData($userElement);
 
-        return $apiDocument;
-    }
+		return $apiDocument;
+	}
 
-    private function getAccountsCreated()
-    {
-        $query = <<<QUERY
+	private function getAccountsCreated()
+	{
+		$query = <<<QUERY
         SELECT COUNT(*) AS count
         FROM log
             LEFT JOIN emailtemplate ON concat('Closed ', emailtemplate.id) = log.action
@@ -72,17 +72,17 @@ 
             AND user.username = :username;
 QUERY;
 
-        $statement = $this->getDatabase()->prepare($query);
-        $statement->execute(array(":username" => $this->user->getUsername(), ":created" => EmailTemplate::ACTION_CREATED));
-        $result = $statement->fetchColumn();
-        $statement->closeCursor();
+		$statement = $this->getDatabase()->prepare($query);
+		$statement->execute(array(":username" => $this->user->getUsername(), ":created" => EmailTemplate::ACTION_CREATED));
+		$result = $statement->fetchColumn();
+		$statement->closeCursor();
 
-        return $result;
-    }
+		return $result;
+	}
 
-    private function getToday()
-    {
-        $query = <<<QUERY
+	private function getToday()
+	{
+		$query = <<<QUERY
         SELECT
             COUNT(*) AS count
         FROM log
@@ -94,76 +94,76 @@ 
             AND user.username = :username;
 QUERY;
 
-        $statement = $this->getDatabase()->prepare($query);
-        $statement->bindValue(":username", $this->user->getUsername());
-        $statement->bindValue(":date", date('Y-m-d') . "%");
-        $statement->bindValue(":created", EmailTemplate::ACTION_CREATED);
-        $statement->execute();
-        $today = $statement->fetchColumn();
-        $statement->closeCursor();
+		$statement = $this->getDatabase()->prepare($query);
+		$statement->bindValue(":username", $this->user->getUsername());
+		$statement->bindValue(":date", date('Y-m-d') . "%");
+		$statement->bindValue(":created", EmailTemplate::ACTION_CREATED);
+		$statement->execute();
+		$today = $statement->fetchColumn();
+		$statement->closeCursor();
 
-        return $today;
-    }
+		return $today;
+	}
 
-    private function fetchAdminData(DOMElement $userElement)
-    {
-        $query = "SELECT COUNT(*) AS count FROM log WHERE log.user = :userid AND log.action = :action;";
+	private function fetchAdminData(DOMElement $userElement)
+	{
+		$query = "SELECT COUNT(*) AS count FROM log WHERE log.user = :userid AND log.action = :action;";
 
-        $statement = $this->getDatabase()->prepare($query);
-        $statement->bindValue(":userid", $this->user->getId());
+		$statement = $this->getDatabase()->prepare($query);
+		$statement->bindValue(":userid", $this->user->getId());
         
-        // Each entry is in the form [ database string, attribute name ]
-        // and it happens to be that the attribute is just the lower case form of the database value
-        $actions = [
-            ['Suspended', 'suspended'],
-            ['Promoted', 'promoted'],
-            ['Approved', 'approved'],
-            ['Demoted', 'demoted'],
-            ['Declined', 'declined'],
-            ['Renamed', 'renamed'],
-            ['Edited', 'edited'],
-            ['Prefchange', 'prefchange'],
-        ];
-        foreach ($actions as $action) {
-            $dbValue = $action[0];
-            $attributeName = $action[1];
+		// Each entry is in the form [ database string, attribute name ]
+		// and it happens to be that the attribute is just the lower case form of the database value
+		$actions = [
+			['Suspended', 'suspended'],
+			['Promoted', 'promoted'],
+			['Approved', 'approved'],
+			['Demoted', 'demoted'],
+			['Declined', 'declined'],
+			['Renamed', 'renamed'],
+			['Edited', 'edited'],
+			['Prefchange', 'prefchange'],
+		];
+		foreach ($actions as $action) {
+			$dbValue = $action[0];
+			$attributeName = $action[1];
             
-            $statement->bindValue(":action", $dbValue);
-            $statement->execute();
-            $attributeValue = $statement->fetchColumn();
-            $userElement->setAttribute($attributeName, $attributeValue);
-            $statement->closeCursor();
-        }
-
-        // Combine all three actions affecting Welcome templates into one count.
-        $combinedquery = $this->getDatabase()->prepare(<<<SQL
+			$statement->bindValue(":action", $dbValue);
+			$statement->execute();
+			$attributeValue = $statement->fetchColumn();
+			$userElement->setAttribute($attributeName, $attributeValue);
+			$statement->closeCursor();
+		}
+
+		// Combine all three actions affecting Welcome templates into one count.
+		$combinedquery = $this->getDatabase()->prepare(<<<SQL
             SELECT
                 COUNT(*) AS count
             FROM log
             WHERE log.user = :userid
                 AND log.action IN ('CreatedTemplate', 'EditedTemplate', 'DeletedTemplate');
 SQL
-        );
+		);
 
-        $combinedquery->bindValue(":userid", $this->user->getId());
-        $combinedquery->execute();
-        $dtc = $combinedquery->fetchColumn();
-        $userElement->setAttribute("welctempchange", $dtc);
-        $combinedquery->closeCursor();
+		$combinedquery->bindValue(":userid", $this->user->getId());
+		$combinedquery->execute();
+		$dtc = $combinedquery->fetchColumn();
+		$userElement->setAttribute("welctempchange", $dtc);
+		$combinedquery->closeCursor();
 
-        // Combine both actions affecting Email templates into one count.
-        $combinedquery = $this->getDatabase()->prepare(<<<SQL
+		// Combine both actions affecting Email templates into one count.
+		$combinedquery = $this->getDatabase()->prepare(<<<SQL
             SELECT COUNT(*) AS count
             FROM log
             WHERE log.user = :userid
                 AND log.action IN ('CreatedEmail', 'EditedEmail');
 SQL
-        );
-
-        $combinedquery->bindValue(":userid", $this->user->getId());
-        $combinedquery->execute();
-        $cec = $combinedquery->fetchColumn();
-        $userElement->setAttribute("emailtempchange", $cec);
-        $combinedquery->closeCursor();
-    }
+		);
+
+		$combinedquery->bindValue(":userid", $this->user->getId());
+		$combinedquery->execute();
+		$cec = $combinedquery->fetchColumn();
+		$userElement->setAttribute("emailtempchange", $cec);
+		$combinedquery->closeCursor();
+	}
 }

includes/API/Actions/JsTemplateConfirmsAction.php

Indentation +12 added lines, -12 removed lines

@@ -14,18 +14,18 @@
 
 class JsTemplateConfirmsAction extends JsonApiPageBase implements IJsonApiAction
 {
-    public function executeApiAction()
-    {
-        /** @var EmailTemplate[] $templates */
-        $templates = EmailTemplate::getAllActiveTemplates(null, $this->getDatabase());
+	public function executeApiAction()
+	{
+		/** @var EmailTemplate[] $templates */
+		$templates = EmailTemplate::getAllActiveTemplates(null, $this->getDatabase());
 
-        $dataset = [];
-        foreach ($templates as $tpl) {
-            if ($tpl->getJsquestion() != "") {
-                $dataset[$tpl->getId()] = $tpl->getJsquestion();
-            }
-        }
+		$dataset = [];
+		foreach ($templates as $tpl) {
+			if ($tpl->getJsquestion() != "") {
+				$dataset[$tpl->getId()] = $tpl->getJsquestion();
+			}
+		}
 
-        return $dataset;
-    }
+		return $dataset;
+	}
 }

includes/API/Actions/JsUsersAction.php

Indentation +9 added lines, -9 removed lines

@@ -16,16 +16,16 @@
 
 class JsUsersAction extends JsonApiPageBase implements IJsonApiAction
 {
-    public function executeApiAction()
-    {
-        $userSearchHelper = UserSearchHelper::get($this->getDatabase());
+	public function executeApiAction()
+	{
+		$userSearchHelper = UserSearchHelper::get($this->getDatabase());
 
-        if (WebRequest::getString('all') === null) {
-            $userSearchHelper->byStatus(User::STATUS_ACTIVE);
+		if (WebRequest::getString('all') === null) {
+			$userSearchHelper->byStatus(User::STATUS_ACTIVE);
 
-        }
+		}
 
-        $dataset = $userSearchHelper->fetchColumn('username');
-        return $dataset;
-    }
+		$dataset = $userSearchHelper->fetchColumn('username');
+		return $dataset;
+	}
 }