mdaniels5757 / waca

includes/DataObjects/Request.php

Indentation +326 added lines, -326 removed lines

@@ -21,30 +21,30 @@ 
  */
 class Request extends DataObject
 {
-    private $email;
-    private $ip;
-    private $name;
-    /** @var string|null */
-    private $status = "Open";
-    private $date;
-    private $emailsent = 0;
-    private $emailconfirm;
-    /** @var int|null */
-    private $reserved = null;
-    private $useragent;
-    private $forwardedip;
-    private $hasComments = false;
-    private $hasCommentsResolved = false;
-
-    /**
-     * @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 = "Open";
+	private $date;
+	private $emailsent = 0;
+	private $emailconfirm;
+	/** @var int|null */
+	private $reserved = null;
+	private $useragent;
+	private $forwardedip;
+	private $hasComments = false;
+	private $hasCommentsResolved = false;
+
+	/**
+	 * @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
@@ -53,27 +53,27 @@ 
 	:emailconfirm, :reserved, :useragent, :forwardedip
 );
 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);
-
-            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);
+
+			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,
@@ -82,147 +82,147 @@ 
 	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);
-
-            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)
-    {
+			);
+
+			$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);
+
+			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);
@@ -236,76 +236,76 @@ 
 		}
 
 		$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
+	}
+
+	/**
+	 * @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
@@ -315,25 +315,25 @@ 
 ORDER BY log.timestamp DESC
 LIMIT 1;
 SQL
-        );
-
-        $statement->bindValue(":requestId", $this->id);
-        $statement->execute();
-        $reason = $statement->fetchColumn();
-
-        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.");
-        }
+		);
+
+		$statement->bindValue(":requestId", $this->id);
+		$statement->execute();
+		$reason = $statement->fetchColumn();
+
+		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.");
+		}
 
-        $statement = $this->dbObject->prepare(<<<SQL
+		$statement = $this->dbObject->prepare(<<<SQL
 SELECT emailtemplate.oncreated, log.action
 FROM log
 LEFT JOIN emailtemplate ON CONCAT('Closed ', emailtemplate.id) = log.action
@@ -343,60 +343,60 @@ 
 ORDER BY log.timestamp DESC
 LIMIT 1;
 SQL
-        );
-
-        $statement->bindValue(":requestId", $this->id);
-        $statement->execute();
-        $onCreated = $statement->fetchColumn(0);
-        $logAction = $statement->fetchColumn(1);
-        $statement->closeCursor();
-
-        if ($onCreated === null) {
-            return $logAction === "Closed custom-y";
-        }
-
-        return (bool)$onCreated;
-    }
-
-    /**
-     * @return DateTime
-     */
-    public function getClosureDate()
-    {
-        $logQuery = $this->dbObject->prepare(<<<SQL
+		);
+
+		$statement->bindValue(":requestId", $this->id);
+		$statement->execute();
+		$onCreated = $statement->fetchColumn(0);
+		$logAction = $statement->fetchColumn(1);
+		$statement->closeCursor();
+
+		if ($onCreated === null) {
+			return $logAction === "Closed custom-y";
+		}
+
+		return (bool)$onCreated;
+	}
+
+	/**
+	 * @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);
-    }
-
-    /**
-     * 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);
-    }
+		);
+		$logQuery->bindValue(":request", $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);
+	}
 }

includes/DataObjects/Comment.php

Indentation +157 added lines, -157 removed lines

@@ -20,171 +20,171 @@
  */
 class Comment extends DataObject
 {
-    private $time;
-    private $user;
-    private $comment;
-    private $visibility = "user";
-    private $request;
-
-    /**
-     * Retrieves all comments for a request, optionally filtered
-     *
-     * @param integer     $id      Request ID to search by
-     * @param PdoDatabase $database
-     * @param bool        $showAll True to show all comments, False to show only unprotected comments, and protected
-     *                             comments visible to $userId
-     * @param null|int    $userId  User to filter by
-     *
-     * @return Comment[]
-     */
-    public static function getForRequest($id, PdoDatabase $database, $showAll = false, $userId = null)
-    {
-        if ($showAll) {
-            $statement = $database->prepare('SELECT * FROM comment WHERE request = :target;');
-        }
-        else {
-            $statement = $database->prepare(<<<SQL
+	private $time;
+	private $user;
+	private $comment;
+	private $visibility = "user";
+	private $request;
+
+	/**
+	 * Retrieves all comments for a request, optionally filtered
+	 *
+	 * @param integer     $id      Request ID to search by
+	 * @param PdoDatabase $database
+	 * @param bool        $showAll True to show all comments, False to show only unprotected comments, and protected
+	 *                             comments visible to $userId
+	 * @param null|int    $userId  User to filter by
+	 *
+	 * @return Comment[]
+	 */
+	public static function getForRequest($id, PdoDatabase $database, $showAll = false, $userId = null)
+	{
+		if ($showAll) {
+			$statement = $database->prepare('SELECT * FROM comment WHERE request = :target;');
+		}
+		else {
+			$statement = $database->prepare(<<<SQL
 SELECT * FROM comment
 WHERE request = :target AND (visibility = 'user' OR visibility = 'requester' OR user = :userid);
 SQL
-            );
-            $statement->bindValue(':userid', $userId);
-        }
-
-        $statement->bindValue(':target', $id);
-
-        $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
+			);
+			$statement->bindValue(':userid', $userId);
+		}
+
+		$statement->bindValue(':target', $id);
+
+		$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 )
 VALUES ( CURRENT_TIMESTAMP(), :user, :comment, :visibility, :request );
 SQL
-            );
-            $statement->bindValue(":user", $this->user);
-            $statement->bindValue(":comment", $this->comment);
-            $statement->bindValue(":visibility", $this->visibility);
-            $statement->bindValue(":request", $this->request);
-
-            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);
+
+			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, 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);
-
-            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;
-    }
+			);
+
+			$statement->bindValue(':id', $this->id);
+			$statement->bindValue(':updateversion', $this->updateversion);
+
+			$statement->bindValue(':comment', $this->comment);
+			$statement->bindValue(':visibility', $this->visibility);
+
+			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;
+	}
 }

Braces +3 added lines, -6 removed lines

@@ -41,8 +41,7 @@ 
     {
         if ($showAll) {
             $statement = $database->prepare('SELECT * FROM comment WHERE request = :target;');
-        }
-        else {
+        } else {
             $statement = $database->prepare(<<<SQL
 SELECT * FROM comment
 WHERE request = :target AND (visibility = 'user' OR visibility = 'requester' OR user = :userid);
@@ -84,12 +83,10 @@ 
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // update
             $statement = $this->dbObject->prepare(<<<SQL
 UPDATE comment

includes/Pages/PageEditComment.php

Indentation +68 added lines, -68 removed lines

@@ -21,72 +21,72 @@
 
 class PageEditComment extends InternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @throws ApplicationLogicException
-     * @throws Exception
-     */
-    protected function main()
-    {
-        $commentId = WebRequest::getInt('id');
-        if ($commentId === null) {
-            throw new ApplicationLogicException('Comment ID not specified');
-        }
-
-        $database = $this->getDatabase();
-
-        /** @var Comment $comment */
-        $comment = Comment::getById($commentId, $database);
-        if ($comment === false) {
-            throw new ApplicationLogicException('Comment not found');
-        }
-
-        $currentUser = User::getCurrent($database);
-        if ($comment->getUser() !== $currentUser->getId() && !$this->barrierTest('editOthers', $currentUser)) {
-            throw new AccessDeniedException($this->getSecurityManager());
-        }
-
-        /** @var Request $request */
-        $request = Request::getById($comment->getRequest(), $database);
-
-        if ($request === false) {
-            throw new ApplicationLogicException('Request was not found.');
-        }
-
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-            $newComment = WebRequest::postString('newcomment');
-
-            if($comment ->getVisibility() !== 'requester') {
-                $visibility = WebRequest::postString('visibility');
-
-                if ($visibility !== 'user' && $visibility !== 'admin') {
-                    throw new ApplicationLogicException('Comment visibility is not valid');
-                }
-
-                $comment->setVisibility($visibility);
-            }
-
-            // optimistically lock from the load of the edit comment form
-            $updateVersion = WebRequest::postInt('updateversion');
-            $comment->setUpdateVersion($updateVersion);
-
-            $comment->setComment($newComment);
-
-            $comment->save();
-
-            Logger::editComment($database, $comment, $request);
-            $this->getNotificationHelper()->commentEdited($comment, $request);
-            SessionAlert::success("Comment has been saved successfully");
-
-            $this->redirect('viewRequest', null, array('id' => $comment->getRequest()));
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->assign('comment', $comment);
-            $this->assign('request', $request);
-            $this->assign('user', User::getById($comment->getUser(), $database));
-            $this->setTemplate('edit-comment.tpl');
-        }
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @throws ApplicationLogicException
+	 * @throws Exception
+	 */
+	protected function main()
+	{
+		$commentId = WebRequest::getInt('id');
+		if ($commentId === null) {
+			throw new ApplicationLogicException('Comment ID not specified');
+		}
+
+		$database = $this->getDatabase();
+
+		/** @var Comment $comment */
+		$comment = Comment::getById($commentId, $database);
+		if ($comment === false) {
+			throw new ApplicationLogicException('Comment not found');
+		}
+
+		$currentUser = User::getCurrent($database);
+		if ($comment->getUser() !== $currentUser->getId() && !$this->barrierTest('editOthers', $currentUser)) {
+			throw new AccessDeniedException($this->getSecurityManager());
+		}
+
+		/** @var Request $request */
+		$request = Request::getById($comment->getRequest(), $database);
+
+		if ($request === false) {
+			throw new ApplicationLogicException('Request was not found.');
+		}
+
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+			$newComment = WebRequest::postString('newcomment');
+
+			if($comment ->getVisibility() !== 'requester') {
+				$visibility = WebRequest::postString('visibility');
+
+				if ($visibility !== 'user' && $visibility !== 'admin') {
+					throw new ApplicationLogicException('Comment visibility is not valid');
+				}
+
+				$comment->setVisibility($visibility);
+			}
+
+			// optimistically lock from the load of the edit comment form
+			$updateVersion = WebRequest::postInt('updateversion');
+			$comment->setUpdateVersion($updateVersion);
+
+			$comment->setComment($newComment);
+
+			$comment->save();
+
+			Logger::editComment($database, $comment, $request);
+			$this->getNotificationHelper()->commentEdited($comment, $request);
+			SessionAlert::success("Comment has been saved successfully");
+
+			$this->redirect('viewRequest', null, array('id' => $comment->getRequest()));
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->assign('comment', $comment);
+			$this->assign('request', $request);
+			$this->assign('user', User::getById($comment->getUser(), $database));
+			$this->setTemplate('edit-comment.tpl');
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
             $this->validateCSRFToken();
             $newComment = WebRequest::postString('newcomment');
 
-            if($comment ->getVisibility() !== 'requester') {
+            if ($comment ->getVisibility() !== 'requester') {
                 $visibility = WebRequest::postString('visibility');
 
                 if ($visibility !== 'user' && $visibility !== 'admin') {

includes/Pages/PageViewRequest.php

Indentation +270 added lines, -270 removed lines

@@ -25,274 +25,274 @@
 
 class PageViewRequest extends InternalPageBase
 {
-    use RequestData;
-    const STATUS_SYMBOL_OPEN = '&#x2610';
-    const STATUS_SYMBOL_ACCEPTED = '&#x2611';
-    const STATUS_SYMBOL_REJECTED = '&#x2612';
-
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @throws ApplicationLogicException
-     */
-    protected function main()
-    {
-        // set up csrf protection
-        $this->assignCSRFToken();
-
-        // get some useful objects
-        $database = $this->getDatabase();
-        $request = $this->getRequest($database, WebRequest::getInt('id'));
-        $config = $this->getSiteConfiguration();
-        $currentUser = User::getCurrent($database);
-
-        // Test we should be able to look at this request
-        if ($config->getEmailConfirmationEnabled()) {
-            if ($request->getEmailConfirm() !== 'Confirmed') {
-                // Not allowed to look at this yet.
-                throw new ApplicationLogicException('The email address has not yet been confirmed for this request.');
-            }
-        }
-
-        $this->setupBasicData($request, $config);
-
-        $this->setupUsernameData($request);
-
-        $this->setupTitle($request);
-
-        $this->setupReservationDetails($request->getReserved(), $database, $currentUser);
-        $this->setupGeneralData($database);
-
-        $this->assign('requestDataCleared', false);
-        if ($request->getEmail() === $this->getSiteConfiguration()->getDataClearEmail()) {
-            $this->assign('requestDataCleared', true);
-        }
-
-        $allowedPrivateData = $this->isAllowedPrivateData($request, $currentUser);
-
-        $this->setupCreationTypes($currentUser);
-
-        $this->setupLogData($request, $database);
-
-        $this->addJs("/api.php?action=templates&targetVariable=templateconfirms");
-
-        $this->assign('showRevealLink', false);
-        if ($request->getReserved() === $currentUser->getId() ||
-            $this->barrierTest('alwaysSeeHash', $currentUser, 'RequestData')
-        ) {
-            $this->assign('showRevealLink', true);
-            $this->assign('revealHash', $request->getRevealHash());
-        }
-
-        if ($allowedPrivateData) {
-            $this->setTemplate('view-request/main-with-data.tpl');
-            $this->setupPrivateData($request, $currentUser, $this->getSiteConfiguration(), $database);
-
-            $this->assign('canSetBan', $this->barrierTest('set', $currentUser, PageBan::class));
-            $this->assign('canSeeCheckuserData', $this->barrierTest('seeUserAgentData', $currentUser, 'RequestData'));
-
-            if ($this->barrierTest('seeUserAgentData', $currentUser, 'RequestData')) {
-                $this->setTemplate('view-request/main-with-checkuser-data.tpl');
-                $this->setupCheckUserData($request);
-            }
-        }
-        else {
-            $this->setTemplate('view-request/main.tpl');
-        }
-    }
-
-    /**
-     * @param Request $request
-     */
-    protected function setupTitle(Request $request)
-    {
-        $statusSymbol = self::STATUS_SYMBOL_OPEN;
-        if ($request->getStatus() === 'Closed') {
-            if ($request->getWasCreated()) {
-                $statusSymbol = self::STATUS_SYMBOL_ACCEPTED;
-            }
-            else {
-                $statusSymbol = self::STATUS_SYMBOL_REJECTED;
-            }
-        }
-
-        $this->setHtmlTitle($statusSymbol . ' #' . $request->getId());
-    }
-
-    /**
-     * Sets up data unrelated to the request, such as the email template information
-     *
-     * @param PdoDatabase $database
-     */
-    protected function setupGeneralData(PdoDatabase $database)
-    {
-        $config = $this->getSiteConfiguration();
-
-        $this->assign('createAccountReason', 'Requested account at [[WP:ACC]], request #');
-
-        $this->assign('defaultRequestState', $config->getDefaultRequestStateKey());
-
-        $this->assign('requestStates', $config->getRequestStates());
-
-        /** @var EmailTemplate $createdTemplate */
-        $createdTemplate = EmailTemplate::getById($config->getDefaultCreatedTemplateId(), $database);
-
-        $this->assign('createdHasJsQuestion', $createdTemplate->getJsquestion() != '');
-        $this->assign('createdId', $createdTemplate->getId());
-        $this->assign('createdName', $createdTemplate->getName());
-
-        $createReasons = EmailTemplate::getActiveTemplates(EmailTemplate::CREATED, $database);
-        $this->assign("createReasons", $createReasons);
-        $declineReasons = EmailTemplate::getActiveTemplates(EmailTemplate::NOT_CREATED, $database);
-        $this->assign("declineReasons", $declineReasons);
-
-        $allCreateReasons = EmailTemplate::getAllActiveTemplates(EmailTemplate::CREATED, $database);
-        $this->assign("allCreateReasons", $allCreateReasons);
-        $allDeclineReasons = EmailTemplate::getAllActiveTemplates(EmailTemplate::NOT_CREATED, $database);
-        $this->assign("allDeclineReasons", $allDeclineReasons);
-        $allOtherReasons = EmailTemplate::getAllActiveTemplates(false, $database);
-        $this->assign("allOtherReasons", $allOtherReasons);
-    }
-
-    private function setupLogData(Request $request, PdoDatabase $database)
-    {
-        $currentUser = User::getCurrent($database);
-
-        $logs = LogHelper::getRequestLogsWithComments($request->getId(), $database, $this->getSecurityManager());
-        $requestLogs = array();
-
-        /** @var User[] $nameCache */
-        $nameCache = array();
-
-        $editableComments = $this->barrierTest('editOthers', $currentUser, PageEditComment::class);
-
-        /** @var Log|Comment $entry */
-        foreach ($logs as $entry) {
-            // both log and comment have a 'user' field
-            if (!array_key_exists($entry->getUser(), $nameCache)) {
-                $entryUser = User::getById($entry->getUser(), $database);
-                $nameCache[$entry->getUser()] = $entryUser;
-            }
-
-            if ($entry instanceof Comment) {
-                $requestLogs[] = array(
-                    'type'     => 'comment',
-                    'security' => $entry->getVisibility(),
-                    'user'     => $entry->getVisibility() == 'requester' ? $request->getName() :$nameCache[$entry->getUser()]->getUsername(),
-                    'userid'   => $entry->getUser() == -1 ? null : $entry->getUser(),
-                    'entry'    => null,
-                    'time'     => $entry->getTime(),
-                    'canedit'  => ($editableComments || $entry->getUser() == $currentUser->getId()),
-                    'id'       => $entry->getId(),
-                    'comment'  => $entry->getComment(),
-                );
-            }
-
-            if ($entry instanceof Log) {
-                $invalidUserId = $entry->getUser() === -1 || $entry->getUser() === 0;
-                $entryUser = $invalidUserId ? User::getCommunity() : $nameCache[$entry->getUser()];
-
-                $entryComment = $entry->getComment();
-
-                if($entry->getAction() === 'JobIssueRequest' || $entry->getAction() === 'JobCompletedRequest'){
-                    $data = unserialize($entry->getComment());
-                    /** @var JobQueue $job */
-                    $job = JobQueue::getById($data['job'], $database);
-                    $requestLogs[] = array(
-                        'type'     => 'joblog',
-                        'security' => 'user',
-                        'userid'   => $entry->getUser() == -1 ? null : $entry->getUser(),
-                        'user'     => $entryUser->getUsername(),
-                        'entry'    => LogHelper::getLogDescription($entry),
-                        'time'     => $entry->getTimestamp(),
-                        'canedit'  => false,
-                        'id'       => $entry->getId(),
-                        'jobId'    => $job->getId(),
-                        'jobDesc'  => JobQueue::getTaskDescriptions()[$job->getTask()],
-                    );
-                } else {
-                    $requestLogs[] = array(
-                        'type'     => 'log',
-                        'security' => 'user',
-                        'userid'   => $entry->getUser() == -1 ? null : $entry->getUser(),
-                        'user'     => $entryUser->getUsername(),
-                        'entry'    => LogHelper::getLogDescription($entry),
-                        'time'     => $entry->getTimestamp(),
-                        'canedit'  => false,
-                        'id'       => $entry->getId(),
-                        'comment'  => $entryComment,
-                    );
-                }
-            }
-        }
-
-        $this->addJs("/api.php?action=users&targetVariable=typeaheaddata");
-
-        $this->assign("requestLogs", $requestLogs);
-    }
-
-    /**
-     * @param Request $request
-     */
-    protected function setupUsernameData(Request $request)
-    {
-        $blacklistData = $this->getBlacklistHelper()->isBlacklisted($request->getName());
-
-        $this->assign('requestIsBlacklisted', $blacklistData !== false);
-        $this->assign('requestBlacklist', $blacklistData);
-
-        try {
-            $spoofs = $this->getAntiSpoofProvider()->getSpoofs($request->getName());
-        }
-        catch (Exception $ex) {
-            $spoofs = $ex->getMessage();
-        }
-
-        $this->assign("spoofs", $spoofs);
-    }
-
-    private function setupCreationTypes(User $user)
-    {
-        $this->assign('allowWelcomeSkip', false);
-        $this->assign('forceWelcomeSkip', false);
-
-        $oauth = new OAuthUserHelper($user, $this->getDatabase(), $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
-
-        if ($user->getWelcomeTemplate() != 0) {
-            $this->assign('allowWelcomeSkip', true);
-
-            if (!$oauth->canWelcome()) {
-                $this->assign('forceWelcomeSkip', true);
-            }
-        }
-
-        // test credentials
-        $canManualCreate = $this->barrierTest(User::CREATION_MANUAL, $user, 'RequestCreation');
-        $canOauthCreate = $this->barrierTest(User::CREATION_OAUTH, $user, 'RequestCreation');
-        $canBotCreate = $this->barrierTest(User::CREATION_BOT, $user, 'RequestCreation');
-
-        $this->assign('canManualCreate', $canManualCreate);
-        $this->assign('canOauthCreate', $canOauthCreate);
-        $this->assign('canBotCreate', $canBotCreate);
-
-        // show/hide the type radio buttons
-        $creationHasChoice = count(array_filter([$canManualCreate, $canOauthCreate, $canBotCreate])) > 1;
-
-        if (!$this->barrierTest($user->getCreationMode(), $user, 'RequestCreation')) {
-            // user is not allowed to use their default. Force a choice.
-            $creationHasChoice = true;
-        }
-
-        $this->assign('creationHasChoice', $creationHasChoice);
-
-        // determine problems in creation types
-        $this->assign('botProblem', false);
-        if ($canBotCreate && $this->getSiteConfiguration()->getCreationBotPassword() === null) {
-            $this->assign('botProblem', true);
-        }
-
-        $this->assign('oauthProblem', false);
-        if ($canOauthCreate && !$oauth->canCreateAccount()) {
-            $this->assign('oauthProblem', true);
-        }
-    }
+	use RequestData;
+	const STATUS_SYMBOL_OPEN = '&#x2610';
+	const STATUS_SYMBOL_ACCEPTED = '&#x2611';
+	const STATUS_SYMBOL_REJECTED = '&#x2612';
+
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @throws ApplicationLogicException
+	 */
+	protected function main()
+	{
+		// set up csrf protection
+		$this->assignCSRFToken();
+
+		// get some useful objects
+		$database = $this->getDatabase();
+		$request = $this->getRequest($database, WebRequest::getInt('id'));
+		$config = $this->getSiteConfiguration();
+		$currentUser = User::getCurrent($database);
+
+		// Test we should be able to look at this request
+		if ($config->getEmailConfirmationEnabled()) {
+			if ($request->getEmailConfirm() !== 'Confirmed') {
+				// Not allowed to look at this yet.
+				throw new ApplicationLogicException('The email address has not yet been confirmed for this request.');
+			}
+		}
+
+		$this->setupBasicData($request, $config);
+
+		$this->setupUsernameData($request);
+
+		$this->setupTitle($request);
+
+		$this->setupReservationDetails($request->getReserved(), $database, $currentUser);
+		$this->setupGeneralData($database);
+
+		$this->assign('requestDataCleared', false);
+		if ($request->getEmail() === $this->getSiteConfiguration()->getDataClearEmail()) {
+			$this->assign('requestDataCleared', true);
+		}
+
+		$allowedPrivateData = $this->isAllowedPrivateData($request, $currentUser);
+
+		$this->setupCreationTypes($currentUser);
+
+		$this->setupLogData($request, $database);
+
+		$this->addJs("/api.php?action=templates&targetVariable=templateconfirms");
+
+		$this->assign('showRevealLink', false);
+		if ($request->getReserved() === $currentUser->getId() ||
+			$this->barrierTest('alwaysSeeHash', $currentUser, 'RequestData')
+		) {
+			$this->assign('showRevealLink', true);
+			$this->assign('revealHash', $request->getRevealHash());
+		}
+
+		if ($allowedPrivateData) {
+			$this->setTemplate('view-request/main-with-data.tpl');
+			$this->setupPrivateData($request, $currentUser, $this->getSiteConfiguration(), $database);
+
+			$this->assign('canSetBan', $this->barrierTest('set', $currentUser, PageBan::class));
+			$this->assign('canSeeCheckuserData', $this->barrierTest('seeUserAgentData', $currentUser, 'RequestData'));
+
+			if ($this->barrierTest('seeUserAgentData', $currentUser, 'RequestData')) {
+				$this->setTemplate('view-request/main-with-checkuser-data.tpl');
+				$this->setupCheckUserData($request);
+			}
+		}
+		else {
+			$this->setTemplate('view-request/main.tpl');
+		}
+	}
+
+	/**
+	 * @param Request $request
+	 */
+	protected function setupTitle(Request $request)
+	{
+		$statusSymbol = self::STATUS_SYMBOL_OPEN;
+		if ($request->getStatus() === 'Closed') {
+			if ($request->getWasCreated()) {
+				$statusSymbol = self::STATUS_SYMBOL_ACCEPTED;
+			}
+			else {
+				$statusSymbol = self::STATUS_SYMBOL_REJECTED;
+			}
+		}
+
+		$this->setHtmlTitle($statusSymbol . ' #' . $request->getId());
+	}
+
+	/**
+	 * Sets up data unrelated to the request, such as the email template information
+	 *
+	 * @param PdoDatabase $database
+	 */
+	protected function setupGeneralData(PdoDatabase $database)
+	{
+		$config = $this->getSiteConfiguration();
+
+		$this->assign('createAccountReason', 'Requested account at [[WP:ACC]], request #');
+
+		$this->assign('defaultRequestState', $config->getDefaultRequestStateKey());
+
+		$this->assign('requestStates', $config->getRequestStates());
+
+		/** @var EmailTemplate $createdTemplate */
+		$createdTemplate = EmailTemplate::getById($config->getDefaultCreatedTemplateId(), $database);
+
+		$this->assign('createdHasJsQuestion', $createdTemplate->getJsquestion() != '');
+		$this->assign('createdId', $createdTemplate->getId());
+		$this->assign('createdName', $createdTemplate->getName());
+
+		$createReasons = EmailTemplate::getActiveTemplates(EmailTemplate::CREATED, $database);
+		$this->assign("createReasons", $createReasons);
+		$declineReasons = EmailTemplate::getActiveTemplates(EmailTemplate::NOT_CREATED, $database);
+		$this->assign("declineReasons", $declineReasons);
+
+		$allCreateReasons = EmailTemplate::getAllActiveTemplates(EmailTemplate::CREATED, $database);
+		$this->assign("allCreateReasons", $allCreateReasons);
+		$allDeclineReasons = EmailTemplate::getAllActiveTemplates(EmailTemplate::NOT_CREATED, $database);
+		$this->assign("allDeclineReasons", $allDeclineReasons);
+		$allOtherReasons = EmailTemplate::getAllActiveTemplates(false, $database);
+		$this->assign("allOtherReasons", $allOtherReasons);
+	}
+
+	private function setupLogData(Request $request, PdoDatabase $database)
+	{
+		$currentUser = User::getCurrent($database);
+
+		$logs = LogHelper::getRequestLogsWithComments($request->getId(), $database, $this->getSecurityManager());
+		$requestLogs = array();
+
+		/** @var User[] $nameCache */
+		$nameCache = array();
+
+		$editableComments = $this->barrierTest('editOthers', $currentUser, PageEditComment::class);
+
+		/** @var Log|Comment $entry */
+		foreach ($logs as $entry) {
+			// both log and comment have a 'user' field
+			if (!array_key_exists($entry->getUser(), $nameCache)) {
+				$entryUser = User::getById($entry->getUser(), $database);
+				$nameCache[$entry->getUser()] = $entryUser;
+			}
+
+			if ($entry instanceof Comment) {
+				$requestLogs[] = array(
+					'type'     => 'comment',
+					'security' => $entry->getVisibility(),
+					'user'     => $entry->getVisibility() == 'requester' ? $request->getName() :$nameCache[$entry->getUser()]->getUsername(),
+					'userid'   => $entry->getUser() == -1 ? null : $entry->getUser(),
+					'entry'    => null,
+					'time'     => $entry->getTime(),
+					'canedit'  => ($editableComments || $entry->getUser() == $currentUser->getId()),
+					'id'       => $entry->getId(),
+					'comment'  => $entry->getComment(),
+				);
+			}
+
+			if ($entry instanceof Log) {
+				$invalidUserId = $entry->getUser() === -1 || $entry->getUser() === 0;
+				$entryUser = $invalidUserId ? User::getCommunity() : $nameCache[$entry->getUser()];
+
+				$entryComment = $entry->getComment();
+
+				if($entry->getAction() === 'JobIssueRequest' || $entry->getAction() === 'JobCompletedRequest'){
+					$data = unserialize($entry->getComment());
+					/** @var JobQueue $job */
+					$job = JobQueue::getById($data['job'], $database);
+					$requestLogs[] = array(
+						'type'     => 'joblog',
+						'security' => 'user',
+						'userid'   => $entry->getUser() == -1 ? null : $entry->getUser(),
+						'user'     => $entryUser->getUsername(),
+						'entry'    => LogHelper::getLogDescription($entry),
+						'time'     => $entry->getTimestamp(),
+						'canedit'  => false,
+						'id'       => $entry->getId(),
+						'jobId'    => $job->getId(),
+						'jobDesc'  => JobQueue::getTaskDescriptions()[$job->getTask()],
+					);
+				} else {
+					$requestLogs[] = array(
+						'type'     => 'log',
+						'security' => 'user',
+						'userid'   => $entry->getUser() == -1 ? null : $entry->getUser(),
+						'user'     => $entryUser->getUsername(),
+						'entry'    => LogHelper::getLogDescription($entry),
+						'time'     => $entry->getTimestamp(),
+						'canedit'  => false,
+						'id'       => $entry->getId(),
+						'comment'  => $entryComment,
+					);
+				}
+			}
+		}
+
+		$this->addJs("/api.php?action=users&targetVariable=typeaheaddata");
+
+		$this->assign("requestLogs", $requestLogs);
+	}
+
+	/**
+	 * @param Request $request
+	 */
+	protected function setupUsernameData(Request $request)
+	{
+		$blacklistData = $this->getBlacklistHelper()->isBlacklisted($request->getName());
+
+		$this->assign('requestIsBlacklisted', $blacklistData !== false);
+		$this->assign('requestBlacklist', $blacklistData);
+
+		try {
+			$spoofs = $this->getAntiSpoofProvider()->getSpoofs($request->getName());
+		}
+		catch (Exception $ex) {
+			$spoofs = $ex->getMessage();
+		}
+
+		$this->assign("spoofs", $spoofs);
+	}
+
+	private function setupCreationTypes(User $user)
+	{
+		$this->assign('allowWelcomeSkip', false);
+		$this->assign('forceWelcomeSkip', false);
+
+		$oauth = new OAuthUserHelper($user, $this->getDatabase(), $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
+
+		if ($user->getWelcomeTemplate() != 0) {
+			$this->assign('allowWelcomeSkip', true);
+
+			if (!$oauth->canWelcome()) {
+				$this->assign('forceWelcomeSkip', true);
+			}
+		}
+
+		// test credentials
+		$canManualCreate = $this->barrierTest(User::CREATION_MANUAL, $user, 'RequestCreation');
+		$canOauthCreate = $this->barrierTest(User::CREATION_OAUTH, $user, 'RequestCreation');
+		$canBotCreate = $this->barrierTest(User::CREATION_BOT, $user, 'RequestCreation');
+
+		$this->assign('canManualCreate', $canManualCreate);
+		$this->assign('canOauthCreate', $canOauthCreate);
+		$this->assign('canBotCreate', $canBotCreate);
+
+		// show/hide the type radio buttons
+		$creationHasChoice = count(array_filter([$canManualCreate, $canOauthCreate, $canBotCreate])) > 1;
+
+		if (!$this->barrierTest($user->getCreationMode(), $user, 'RequestCreation')) {
+			// user is not allowed to use their default. Force a choice.
+			$creationHasChoice = true;
+		}
+
+		$this->assign('creationHasChoice', $creationHasChoice);
+
+		// determine problems in creation types
+		$this->assign('botProblem', false);
+		if ($canBotCreate && $this->getSiteConfiguration()->getCreationBotPassword() === null) {
+			$this->assign('botProblem', true);
+		}
+
+		$this->assign('oauthProblem', false);
+		if ($canOauthCreate && !$oauth->canCreateAccount()) {
+			$this->assign('oauthProblem', true);
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -177,7 +177,7 @@ 
                 $requestLogs[] = array(
                     'type'     => 'comment',
                     'security' => $entry->getVisibility(),
-                    'user'     => $entry->getVisibility() == 'requester' ? $request->getName() :$nameCache[$entry->getUser()]->getUsername(),
+                    'user'     => $entry->getVisibility() == 'requester' ? $request->getName() : $nameCache[$entry->getUser()]->getUsername(),
                     'userid'   => $entry->getUser() == -1 ? null : $entry->getUser(),
                     'entry'    => null,
                     'time'     => $entry->getTime(),
@@ -193,7 +193,7 @@ 
 
                 $entryComment = $entry->getComment();
 
-                if($entry->getAction() === 'JobIssueRequest' || $entry->getAction() === 'JobCompletedRequest'){
+                if ($entry->getAction() === 'JobIssueRequest' || $entry->getAction() === 'JobCompletedRequest') {
                     $data = unserialize($entry->getComment());
                     /** @var JobQueue $job */
                     $job = JobQueue::getById($data['job'], $database);

includes/Pages/Request/PageRequestAccount.php

Indentation +184 added lines, -184 removed lines

@@ -21,188 +21,188 @@
 
 class PageRequestAccount extends PublicInterfacePageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     * @throws OptimisticLockFailedException
-     * @throws Exception
-     */
-    protected function main()
-    {
-        // dual mode page
-        if (WebRequest::wasPosted()) {
-            $request = $this->createNewRequest();
-            $comment = $this->createComment();
-
-            $validationErrors = $this->validateRequest($request);
-
-            if (count($validationErrors) > 0) {
-                foreach ($validationErrors as $validationError) {
-                    SessionAlert::error($validationError->getErrorMessage());
-                }
-
-                // Preserve the data after an error
-                WebRequest::setSessionContext('accountReq',
-                    array(
-                        'username' => WebRequest::postString('name'),
-                        'email'    => WebRequest::postEmail('email'),
-                        'comments' => WebRequest::postString('comments'),
-                    )
-                );
-
-                // Validation error, bomb out early.
-                $this->redirect();
-
-                return;
-            }
-
-            // actually save the request to the database
-            if ($this->getSiteConfiguration()->getEmailConfirmationEnabled()) {
-                $this->saveAsEmailConfirmation($request, $comment);
-            }
-            else {
-                $this->saveWithoutEmailConfirmation($request, $comment);
-            }
-        }
-        else {
-            // set the form values from the session context
-            $context = WebRequest::getSessionContext('accountReq');
-            if ($context !== null && is_array($context)) {
-                $this->assign('username', $context['username']);
-                $this->assign('email', $context['email']);
-                $this->assign('comments', $context['comments']);
-            }
-
-            // Clear it for a refresh
-            WebRequest::setSessionContext('accountReq', null);
-
-            $this->setTemplate('request/request-form.tpl');
-        }
-    }
-
-    /**
-     * @return Request
-     */
-    protected function createNewRequest()
-    {
-        $request = new Request();
-        $request->setDatabase($this->getDatabase());
-
-        $request->setName(WebRequest::postString('name'));
-        $request->setEmail(WebRequest::postEmail('email'));
-
-        $request->setIp(WebRequest::remoteAddress());
-        $request->setForwardedIp(WebRequest::forwardedAddress());
-
-        $request->setUserAgent(WebRequest::userAgent());
-
-        return $request;
-    }
-
-    /**
-     * @return Comment|null
-     */
-    private function createComment()
-    {
-        $commentText = WebRequest::postString('comments');
-        if ($commentText === null || trim($commentText) === '') {
-            return null;
-        }
-
-        $comment = new Comment();
-        $comment->setDatabase($this->getDatabase());
-
-        $comment->setVisibility('requester');
-        $comment->setUser(null);
-        $comment->setComment($commentText);
-
-        return $comment;
-    }
-
-    /**
-     * @param Request $request
-     *
-     * @return ValidationError[]
-     */
-    protected function validateRequest($request)
-    {
-        $validationHelper = new RequestValidationHelper(
-            new BanHelper($this->getDatabase()),
-            $request,
-            WebRequest::postEmail('emailconfirm'),
-            $this->getDatabase(),
-            $this->getAntiSpoofProvider(),
-            $this->getXffTrustProvider(),
-            $this->getHttpHelper(),
-            $this->getSiteConfiguration()->getMediawikiWebServiceEndpoint(),
-            $this->getSiteConfiguration()->getTitleBlacklistEnabled(),
-            $this->getTorExitProvider());
-
-        // These are arrays of ValidationError.
-        $nameValidation = $validationHelper->validateName();
-        $emailValidation = $validationHelper->validateEmail();
-        $otherValidation = $validationHelper->validateOther();
-
-        $validationErrors = array_merge($nameValidation, $emailValidation, $otherValidation);
-
-        return $validationErrors;
-    }
-
-    /**
-     * @param Request      $request
-     *
-     * @param Comment|null $comment
-     *
-     * @throws OptimisticLockFailedException
-     * @throws Exception
-     */
-    protected function saveAsEmailConfirmation(Request $request, $comment)
-    {
-        $request->generateEmailConfirmationHash();
-        $request->save();
-
-        if ($comment !== null) {
-            $comment->setRequest($request->getId());
-            $comment->save();
-        }
-
-        $trustedIp = $this->getXffTrustProvider()->getTrustedClientIp(
-            $request->getIp(),
-            $request->getForwardedIp());
-
-        $this->assign("ip", $trustedIp);
-        $this->assign("id", $request->getId());
-        $this->assign("hash", $request->getEmailConfirm());
-
-        // Sends the confirmation email to the user.
-        $this->getEmailHelper()->sendMail(
-            $request->getEmail(),
-            "[ACC #{$request->getId()}] English Wikipedia Account Request",
-            $this->fetchTemplate('request/confirmation-mail.tpl'));
-
-        $this->redirect('emailConfirmationRequired');
-    }
-
-    /**
-     * @param Request      $request
-     *
-     * @param Comment|null $comment
-     *
-     * @throws OptimisticLockFailedException
-     * @throws Exception
-     */
-    protected function saveWithoutEmailConfirmation(Request $request, $comment)
-    {
-        $request->setEmailConfirm(0); // fixme Since it can't be null
-        $request->save();
-
-        if ($comment !== null) {
-            $comment->setRequest($request->getId());
-            $comment->save();
-        }
-
-        $this->getNotificationHelper()->requestReceived($request);
-
-        $this->redirect('requestSubmitted');
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 * @throws OptimisticLockFailedException
+	 * @throws Exception
+	 */
+	protected function main()
+	{
+		// dual mode page
+		if (WebRequest::wasPosted()) {
+			$request = $this->createNewRequest();
+			$comment = $this->createComment();
+
+			$validationErrors = $this->validateRequest($request);
+
+			if (count($validationErrors) > 0) {
+				foreach ($validationErrors as $validationError) {
+					SessionAlert::error($validationError->getErrorMessage());
+				}
+
+				// Preserve the data after an error
+				WebRequest::setSessionContext('accountReq',
+					array(
+						'username' => WebRequest::postString('name'),
+						'email'    => WebRequest::postEmail('email'),
+						'comments' => WebRequest::postString('comments'),
+					)
+				);
+
+				// Validation error, bomb out early.
+				$this->redirect();
+
+				return;
+			}
+
+			// actually save the request to the database
+			if ($this->getSiteConfiguration()->getEmailConfirmationEnabled()) {
+				$this->saveAsEmailConfirmation($request, $comment);
+			}
+			else {
+				$this->saveWithoutEmailConfirmation($request, $comment);
+			}
+		}
+		else {
+			// set the form values from the session context
+			$context = WebRequest::getSessionContext('accountReq');
+			if ($context !== null && is_array($context)) {
+				$this->assign('username', $context['username']);
+				$this->assign('email', $context['email']);
+				$this->assign('comments', $context['comments']);
+			}
+
+			// Clear it for a refresh
+			WebRequest::setSessionContext('accountReq', null);
+
+			$this->setTemplate('request/request-form.tpl');
+		}
+	}
+
+	/**
+	 * @return Request
+	 */
+	protected function createNewRequest()
+	{
+		$request = new Request();
+		$request->setDatabase($this->getDatabase());
+
+		$request->setName(WebRequest::postString('name'));
+		$request->setEmail(WebRequest::postEmail('email'));
+
+		$request->setIp(WebRequest::remoteAddress());
+		$request->setForwardedIp(WebRequest::forwardedAddress());
+
+		$request->setUserAgent(WebRequest::userAgent());
+
+		return $request;
+	}
+
+	/**
+	 * @return Comment|null
+	 */
+	private function createComment()
+	{
+		$commentText = WebRequest::postString('comments');
+		if ($commentText === null || trim($commentText) === '') {
+			return null;
+		}
+
+		$comment = new Comment();
+		$comment->setDatabase($this->getDatabase());
+
+		$comment->setVisibility('requester');
+		$comment->setUser(null);
+		$comment->setComment($commentText);
+
+		return $comment;
+	}
+
+	/**
+	 * @param Request $request
+	 *
+	 * @return ValidationError[]
+	 */
+	protected function validateRequest($request)
+	{
+		$validationHelper = new RequestValidationHelper(
+			new BanHelper($this->getDatabase()),
+			$request,
+			WebRequest::postEmail('emailconfirm'),
+			$this->getDatabase(),
+			$this->getAntiSpoofProvider(),
+			$this->getXffTrustProvider(),
+			$this->getHttpHelper(),
+			$this->getSiteConfiguration()->getMediawikiWebServiceEndpoint(),
+			$this->getSiteConfiguration()->getTitleBlacklistEnabled(),
+			$this->getTorExitProvider());
+
+		// These are arrays of ValidationError.
+		$nameValidation = $validationHelper->validateName();
+		$emailValidation = $validationHelper->validateEmail();
+		$otherValidation = $validationHelper->validateOther();
+
+		$validationErrors = array_merge($nameValidation, $emailValidation, $otherValidation);
+
+		return $validationErrors;
+	}
+
+	/**
+	 * @param Request      $request
+	 *
+	 * @param Comment|null $comment
+	 *
+	 * @throws OptimisticLockFailedException
+	 * @throws Exception
+	 */
+	protected function saveAsEmailConfirmation(Request $request, $comment)
+	{
+		$request->generateEmailConfirmationHash();
+		$request->save();
+
+		if ($comment !== null) {
+			$comment->setRequest($request->getId());
+			$comment->save();
+		}
+
+		$trustedIp = $this->getXffTrustProvider()->getTrustedClientIp(
+			$request->getIp(),
+			$request->getForwardedIp());
+
+		$this->assign("ip", $trustedIp);
+		$this->assign("id", $request->getId());
+		$this->assign("hash", $request->getEmailConfirm());
+
+		// Sends the confirmation email to the user.
+		$this->getEmailHelper()->sendMail(
+			$request->getEmail(),
+			"[ACC #{$request->getId()}] English Wikipedia Account Request",
+			$this->fetchTemplate('request/confirmation-mail.tpl'));
+
+		$this->redirect('emailConfirmationRequired');
+	}
+
+	/**
+	 * @param Request      $request
+	 *
+	 * @param Comment|null $comment
+	 *
+	 * @throws OptimisticLockFailedException
+	 * @throws Exception
+	 */
+	protected function saveWithoutEmailConfirmation(Request $request, $comment)
+	{
+		$request->setEmailConfirm(0); // fixme Since it can't be null
+		$request->save();
+
+		if ($comment !== null) {
+			$comment->setRequest($request->getId());
+			$comment->save();
+		}
+
+		$this->getNotificationHelper()->requestReceived($request);
+
+		$this->redirect('requestSubmitted');
+	}
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -59,12 +59,10 @@
             // actually save the request to the database
             if ($this->getSiteConfiguration()->getEmailConfirmationEnabled()) {
                 $this->saveAsEmailConfirmation($request, $comment);
-            }
-            else {
+            } else {
                 $this->saveWithoutEmailConfirmation($request, $comment);
             }
-        }
-        else {
+        } else {
             // set the form values from the session context
             $context = WebRequest::getSessionContext('accountReq');
             if ($context !== null && is_array($context)) {