mdaniels5757 / waca

includes/DataObjects/Comment.php

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 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

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

includes/DataObjects/UserRole.php

Indentation +79 added lines, -79 removed lines

@@ -15,95 +15,95 @@
 
 class UserRole extends DataObject
 {
-    /** @var int */
-    private $user;
-    /** @var string */
-    private $role;
+	/** @var int */
+	private $user;
+	/** @var string */
+	private $role;
 
-    /**
-     * @param int         $userId
-     * @param PdoDatabase $database
-     *
-     * @return UserRole[]
-     */
-    public static function getForUser($userId, PdoDatabase $database)
-    {
-        $sql = 'SELECT * FROM userrole WHERE user = :user';
-        $statement = $database->prepare($sql);
-        $statement->bindValue(':user', $userId);
+	/**
+	 * @param int         $userId
+	 * @param PdoDatabase $database
+	 *
+	 * @return UserRole[]
+	 */
+	public static function getForUser($userId, PdoDatabase $database)
+	{
+		$sql = 'SELECT * FROM userrole WHERE user = :user';
+		$statement = $database->prepare($sql);
+		$statement->bindValue(':user', $userId);
 
-        $statement->execute();
+		$statement->execute();
 
-        $result = array();
+		$result = array();
 
-        /** @var Ban $v */
-        foreach ($statement->fetchAll(PDO::FETCH_CLASS, get_called_class()) as $v) {
-            $v->setDatabase($database);
-            $result[] = $v;
-        }
+		/** @var Ban $v */
+		foreach ($statement->fetchAll(PDO::FETCH_CLASS, get_called_class()) as $v) {
+			$v->setDatabase($database);
+			$result[] = $v;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Saves a data object to the database, either updating or inserting a record.
-     *
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare('INSERT INTO `userrole` (user, role) VALUES (:user, :role);'
-            );
-            $statement->bindValue(":user", $this->user);
-            $statement->bindValue(":role", $this->role);
+	/**
+	 * Saves a data object to the database, either updating or inserting a record.
+	 *
+	 * @throws Exception
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			$statement = $this->dbObject->prepare('INSERT INTO `userrole` (user, role) VALUES (:user, :role);'
+			);
+			$statement->bindValue(":user", $this->user);
+			$statement->bindValue(":role", $this->role);
 
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            // update
-            throw new Exception('Updating roles is not available');
-        }
-    }
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			// update
+			throw new Exception('Updating roles is not available');
+		}
+	}
 
-    #region Properties
+	#region Properties
 
-    /**
-     * @return int
-     */
-    public function getUser()
-    {
-        return $this->user;
-    }
+	/**
+	 * @return int
+	 */
+	public function getUser()
+	{
+		return $this->user;
+	}
 
-    /**
-     * @param int $user
-     */
-    public function setUser($user)
-    {
-        $this->user = $user;
-    }
+	/**
+	 * @param int $user
+	 */
+	public function setUser($user)
+	{
+		$this->user = $user;
+	}
 
-    /**
-     * @return string
-     */
-    public function getRole()
-    {
-        return $this->role;
-    }
+	/**
+	 * @return string
+	 */
+	public function getRole()
+	{
+		return $this->role;
+	}
 
-    /**
-     * @param string $role
-     */
-    public function setRole($role)
-    {
-        $this->role = $role;
-    }
-    #endregion
+	/**
+	 * @param string $role
+	 */
+	public function setRole($role)
+	{
+		$this->role = $role;
+	}
+	#endregion
 }

Braces +2 added lines, -4 removed lines

@@ -61,12 +61,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // update
             throw new Exception('Updating roles is not available');
         }

includes/DataObjects/SiteNotice.php

Braces +1 added lines, -2 removed lines

@@ -47,8 +47,7 @@
         if ($this->isNew()) {
             // insert
             throw new Exception('Not allowed to create new site notice object');
-        }
-        else {
+        } else {
             // update
             $statement = $this->dbObject->prepare(<<<SQL
 UPDATE sitenotice

Indentation +57 added lines, -57 removed lines

@@ -20,74 +20,74 @@
  */
 class SiteNotice extends DataObject
 {
-    /** @var string */
-    private $content;
+	/** @var string */
+	private $content;
 
-    /**
-     * Get a message.
-     *
-     * @param PdoDatabase $database
-     *
-     * @return string The content for display
-     */
-    public static function get(PdoDatabase $database)
-    {
-        /** @var SiteNotice $message */
-        $message = self::getById(1, $database);
+	/**
+	 * Get a message.
+	 *
+	 * @param PdoDatabase $database
+	 *
+	 * @return string The content for display
+	 */
+	public static function get(PdoDatabase $database)
+	{
+		/** @var SiteNotice $message */
+		$message = self::getById(1, $database);
 
-        return $message->getContent();
-    }
+		return $message->getContent();
+	}
 
-    /**
-     * Saves the object
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            throw new Exception('Not allowed to create new site notice object');
-        }
-        else {
-            // update
-            $statement = $this->dbObject->prepare(<<<SQL
+	/**
+	 * Saves the object
+	 * @throws Exception
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			throw new Exception('Not allowed to create new site notice object');
+		}
+		else {
+			// update
+			$statement = $this->dbObject->prepare(<<<SQL
 UPDATE sitenotice
 SET content = :content, updateversion = updateversion + 1
 WHERE updateversion = :updateversion;
 SQL
-            );
-            $statement->bindValue(':updateversion', $this->updateversion);
+			);
+			$statement->bindValue(':updateversion', $this->updateversion);
 
-            $statement->bindValue(':content', $this->content);
+			$statement->bindValue(':content', $this->content);
 
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
 
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
 
-            $this->updateversion++;
-        }
-    }
+			$this->updateversion++;
+		}
+	}
 
-    /**
-     * Gets the content of the message
-     * @return string
-     */
-    public function getContent()
-    {
-        return $this->content;
-    }
+	/**
+	 * Gets the content of the message
+	 * @return string
+	 */
+	public function getContent()
+	{
+		return $this->content;
+	}
 
-    /**
-     * Sets the content of the message
-     *
-     * @param string $content
-     */
-    public function setContent($content)
-    {
-        $this->content = $content;
-    }
+	/**
+	 * Sets the content of the message
+	 *
+	 * @param string $content
+	 */
+	public function setContent($content)
+	{
+		$this->content = $content;
+	}
 }

includes/DataObjects/Notification.php

Indentation +61 added lines, -61 removed lines

@@ -22,73 +22,73 @@
  */
 class Notification extends DataObject
 {
-    private $date;
-    private $type;
-    private $text;
+	private $date;
+	private $type;
+	private $text;
 
-    public function delete()
-    {
-        throw new Exception("You shouldn't be doing this...");
-    }
+	public function delete()
+	{
+		throw new Exception("You shouldn't be doing this...");
+	}
 
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare("INSERT INTO notification ( type, text ) VALUES ( :type, :text );");
-            $statement->bindValue(":type", $this->type);
-            $statement->bindValue(":text", $this->text);
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			$statement = $this->dbObject->prepare("INSERT INTO notification ( type, text ) VALUES ( :type, :text );");
+			$statement->bindValue(":type", $this->type);
+			$statement->bindValue(":text", $this->text);
 
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            throw new Exception("You shouldn't be doing this...");
-        }
-    }
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			throw new Exception("You shouldn't be doing this...");
+		}
+	}
 
-    public function getDate()
-    {
-        return new DateTimeImmutable($this->date);
-    }
+	public function getDate()
+	{
+		return new DateTimeImmutable($this->date);
+	}
 
-    /**
-     * @return int
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
+	/**
+	 * @return int
+	 */
+	public function getType()
+	{
+		return $this->type;
+	}
 
-    /**
-     * @return string
-     */
-    public function getText()
-    {
-        return $this->text;
-    }
+	/**
+	 * @return string
+	 */
+	public function getText()
+	{
+		return $this->text;
+	}
 
-    /**
-     * Summary of setType
-     *
-     * @param int $type
-     */
-    public function setType($type)
-    {
-        $this->type = $type;
-    }
+	/**
+	 * Summary of setType
+	 *
+	 * @param int $type
+	 */
+	public function setType($type)
+	{
+		$this->type = $type;
+	}
 
-    /**
-     * Summary of setText
-     *
-     * @param string $text
-     */
-    public function setText($text)
-    {
-        $this->text = $text;
-    }
+	/**
+	 * Summary of setText
+	 *
+	 * @param string $text
+	 */
+	public function setText($text)
+	{
+		$this->text = $text;
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -41,12 +41,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             throw new Exception("You shouldn't be doing this...");
         }
     }

includes/DataObjects/Request.php

Spacing +1 added lines, -1 removed lines

@@ -408,7 +408,7 @@
             . '|' . $this->forwardedip  // } private data not known to those without access
             . '|' . $this->useragent    // }
             . '|' . $this->email        // }
-            . '|' . $this->status;      // to rudimentarily invalidate the token on status change
+            . '|' . $this->status; // to rudimentarily invalidate the token on status change
 
         return hash('sha256', $data);
     }

Braces +2 added lines, -4 removed lines

@@ -67,12 +67,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 `request` SET

Indentation +351 added lines, -351 removed lines

@@ -21,31 +21,31 @@ 
  */
 class Request extends DataObject
 {
-    private $email;
-    private $ip;
-    private $name;
-    /** @var string|null */
-    private $comment;
-    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 $comment;
+	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, comment, status, date, emailsent,
 	emailconfirm, reserved, useragent, forwardedip
@@ -54,28 +54,28 @@ 
 	:emailconfirm, :reserved, :useragent, :forwardedip
 );
 SQL
-            );
-            $statement->bindValue(':email', $this->email);
-            $statement->bindValue(':ip', $this->ip);
-            $statement->bindValue(':name', $this->name);
-            $statement->bindValue(':comment', $this->comment);
-            $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(':comment', $this->comment);
+			$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,
@@ -84,163 +84,163 @@ 
 	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|null
-     */
-    public function getComment()
-    {
-        return $this->comment;
-    }
-
-    /**
-     * @param string $comment
-     */
-    public function setComment($comment)
-    {
-        $this->comment = $comment;
-    }
-
-    /**
-     * @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|null
+	 */
+	public function getComment()
+	{
+		return $this->comment;
+	}
+
+	/**
+	 * @param string $comment
+	 */
+	public function setComment($comment)
+	{
+		$this->comment = $comment;
+	}
+
+	/**
+	 * @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);
@@ -254,83 +254,83 @@ 
 		}
 
 		$this->forwardedip = implode(", ", $valid);
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasComments()
-    {
-        if ($this->hasCommentsResolved) {
-            return $this->hasComments;
-        }
-
-        if ($this->comment != "") {
-            $this->hasComments = true;
-            $this->hasCommentsResolved = true;
-
-            return true;
-        }
-
-        $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;
+		}
+
+		if ($this->comment != "") {
+			$this->hasComments = true;
+			$this->hasCommentsResolved = true;
+
+			return true;
+		}
+
+		$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
@@ -340,25 +340,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
@@ -368,60 +368,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/EmailTemplate.php

Braces +2 added lines, -4 removed lines

@@ -183,12 +183,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // update
             $statement = $this->dbObject->prepare(<<<SQL
 UPDATE `emailtemplate`

Indentation +290 added lines, -290 removed lines

@@ -21,176 +21,176 @@ 
  */
 class EmailTemplate extends DataObject
 {
-    /** Note, also used in template-table.tpl */
-    const CREATED = "created";
-    /** Note, also used in template-table.tpl */
-    const NOT_CREATED = "not created";
-    /** Note, also used in template-table.tpl */
-    const NONE = null;
-    /** @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::NOT_CREATED;
-
-    /**
-     * Gets active non-preload templates
-     *
-     * @param string      $defaultAction Default action to take (EmailTemplate::CREATED or EmailTemplate::NOT_CREATED)
-     * @param PdoDatabase $database
-     *
-     * @return array|false
-     */
-    public static function getActiveTemplates($defaultAction, PdoDatabase $database)
-    {
-        global $createdid;
-
-        $statement = $database->prepare(<<<SQL
+	/** Note, also used in template-table.tpl */
+	const CREATED = "created";
+	/** Note, also used in template-table.tpl */
+	const NOT_CREATED = "not created";
+	/** Note, also used in template-table.tpl */
+	const NONE = null;
+	/** @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::NOT_CREATED;
+
+	/**
+	 * Gets active non-preload templates
+	 *
+	 * @param string      $defaultAction Default action to take (EmailTemplate::CREATED or EmailTemplate::NOT_CREATED)
+	 * @param PdoDatabase $database
+	 *
+	 * @return array|false
+	 */
+	public static function getActiveTemplates($defaultAction, PdoDatabase $database)
+	{
+		global $createdid;
+
+		$statement = $database->prepare(<<<SQL
 SELECT * FROM `emailtemplate`
 WHERE defaultaction = :forcreated AND active = 1 AND preloadonly = 0 AND id != :createdid;
 SQL
-        );
-        $statement->bindValue(":createdid", $createdid);
-        $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 active non-preload and preload templates, optionally filtered by the default action.
-     *
-     * @param null|bool|string $defaultAction Default action to take (EmailTemplate::CREATED,
-     *                                        EmailTemplate::NOT_CREATED, or EmailTemplate::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 unactive 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->name = 'Dropped';
-
-        return $t;
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+		);
+		$statement->bindValue(":createdid", $createdid);
+		$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 active non-preload and preload templates, optionally filtered by the default action.
+	 *
+	 * @param null|bool|string $defaultAction Default action to take (EmailTemplate::CREATED,
+	 *                                        EmailTemplate::NOT_CREATED, or EmailTemplate::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 unactive 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->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)
 VALUES (:name, :text, :jsquestion, :defaultaction, :active, :preloadonly);
 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);
-
-            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);
+
+			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,
@@ -201,130 +201,130 @@ 
 	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);
-
-            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;
-    }
+			);
+			$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);
+
+			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;
+	}
 }

includes/DataObjects/AntiSpoofCache.php

Indentation +92 added lines, -92 removed lines

@@ -18,101 +18,101 @@
  */
 class AntiSpoofCache extends DataObject
 {
-    /** @var string */
-    protected $username;
-    /** @var string */
-    protected $data;
-    /** @var string */
-    protected $timestamp;
-
-    /**
-     * @param   string    $username
-     * @param PdoDatabase $database
-     *
-     * @return AntiSpoofCache|false
-     */
-    public static function getByUsername($username, PdoDatabase $database)
-    {
-        $statement = $database->prepare(<<<SQL
+	/** @var string */
+	protected $username;
+	/** @var string */
+	protected $data;
+	/** @var string */
+	protected $timestamp;
+
+	/**
+	 * @param   string    $username
+	 * @param PdoDatabase $database
+	 *
+	 * @return AntiSpoofCache|false
+	 */
+	public static function getByUsername($username, PdoDatabase $database)
+	{
+		$statement = $database->prepare(<<<SQL
 SELECT *
 FROM antispoofcache
 WHERE username = :id AND timestamp > date_sub(now(), INTERVAL 3 HOUR)
 LIMIT 1
 SQL
-        );
-        $statement->bindValue(":id", $username);
-
-        $statement->execute();
-
-        $resultObject = $statement->fetchObject(get_called_class());
-
-        if ($resultObject != false) {
-            $resultObject->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUsername()
-    {
-        return $this->username;
-    }
-
-    /**
-     * @param string $username
-     */
-    public function setUsername($username)
-    {
-        $this->username = $username;
-    }
-
-    /**
-     * @return string
-     */
-    public function getData()
-    {
-        return $this->data;
-    }
-
-    /**
-     * @param string $data
-     */
-    public function setData($data)
-    {
-        $this->data = $data;
-    }
-
-    /**
-     * @return DateTimeImmutable
-     */
-    public function getTimestamp()
-    {
-        return new DateTimeImmutable($this->timestamp);
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            // clear old data first
-            $this->dbObject->exec("DELETE FROM antispoofcache WHERE timestamp < date_sub(now(), INTERVAL 3 HOUR);");
-
-            $statement = $this->dbObject->prepare("INSERT INTO antispoofcache (username, data) VALUES (:username, :data);");
-            $statement->bindValue(":username", $this->username);
-            $statement->bindValue(":data", $this->data);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-    }
+		);
+		$statement->bindValue(":id", $username);
+
+		$statement->execute();
+
+		$resultObject = $statement->fetchObject(get_called_class());
+
+		if ($resultObject != false) {
+			$resultObject->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUsername()
+	{
+		return $this->username;
+	}
+
+	/**
+	 * @param string $username
+	 */
+	public function setUsername($username)
+	{
+		$this->username = $username;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getData()
+	{
+		return $this->data;
+	}
+
+	/**
+	 * @param string $data
+	 */
+	public function setData($data)
+	{
+		$this->data = $data;
+	}
+
+	/**
+	 * @return DateTimeImmutable
+	 */
+	public function getTimestamp()
+	{
+		return new DateTimeImmutable($this->timestamp);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			// clear old data first
+			$this->dbObject->exec("DELETE FROM antispoofcache WHERE timestamp < date_sub(now(), INTERVAL 3 HOUR);");
+
+			$statement = $this->dbObject->prepare("INSERT INTO antispoofcache (username, data) VALUES (:username, :data);");
+			$statement->bindValue(":username", $this->username);
+			$statement->bindValue(":data", $this->data);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -109,8 +109,7 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
         }

includes/DataObjects/WelcomeTemplate.php

Braces +2 added lines, -4 removed lines

@@ -65,12 +65,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 `welcometemplate`

Indentation +156 added lines, -156 removed lines

@@ -19,166 +19,166 @@
  */
 class WelcomeTemplate extends DataObject
 {
-    /** @var string */
-    private $usercode;
-    /** @var string */
-    private $botcode;
-    private $usageCache;
-    private $deleted = 0;
-
-    /**
-     * Summary of getAll
-     *
-     * @param PdoDatabase $database
-     *
-     * @return WelcomeTemplate[]
-     */
-    public static function getAll(PdoDatabase $database)
-    {
-        $statement = $database->prepare("SELECT * FROM welcometemplate WHERE deleted = 0;");
-
-        $statement->execute();
-
-        $result = array();
-        /** @var WelcomeTemplate $v */
-        foreach ($statement->fetchAll(PDO::FETCH_CLASS, self::class) as $v) {
-            $v->setDatabase($database);
-            $result[] = $v;
-        }
-
-        return $result;
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+	/** @var string */
+	private $usercode;
+	/** @var string */
+	private $botcode;
+	private $usageCache;
+	private $deleted = 0;
+
+	/**
+	 * Summary of getAll
+	 *
+	 * @param PdoDatabase $database
+	 *
+	 * @return WelcomeTemplate[]
+	 */
+	public static function getAll(PdoDatabase $database)
+	{
+		$statement = $database->prepare("SELECT * FROM welcometemplate WHERE deleted = 0;");
+
+		$statement->execute();
+
+		$result = array();
+		/** @var WelcomeTemplate $v */
+		foreach ($statement->fetchAll(PDO::FETCH_CLASS, self::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 welcometemplate (usercode, botcode) VALUES (:usercode, :botcode);
 SQL
-            );
-            $statement->bindValue(":usercode", $this->usercode);
-            $statement->bindValue(":botcode", $this->botcode);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            // update
-            $statement = $this->dbObject->prepare(<<<SQL
+			);
+			$statement->bindValue(":usercode", $this->usercode);
+			$statement->bindValue(":botcode", $this->botcode);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			// update
+			$statement = $this->dbObject->prepare(<<<SQL
 UPDATE `welcometemplate`
 SET usercode = :usercode, botcode = :botcode, updateversion = updateversion + 1
 WHERE id = :id AND updateversion = :updateversion;
 SQL
-            );
-
-            $statement->bindValue(':id', $this->id);
-            $statement->bindValue(':updateversion', $this->updateversion);
-
-            $statement->bindValue(':usercode', $this->usercode);
-            $statement->bindValue(':botcode', $this->botcode);
-
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
-
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
-
-            $this->updateversion++;
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getUserCode()
-    {
-        return $this->usercode;
-    }
-
-    /**
-     * @param string $usercode
-     */
-    public function setUserCode($usercode)
-    {
-        $this->usercode = $usercode;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBotCode()
-    {
-        return $this->botcode;
-    }
-
-    /**
-     * @param string $botcode
-     */
-    public function setBotCode($botcode)
-    {
-        $this->botcode = $botcode;
-    }
-
-    /**
-     * @return User[]
-     */
-    public function getUsersUsingTemplate()
-    {
-        if ($this->usageCache === null) {
-            $statement = $this->dbObject->prepare("SELECT * FROM user WHERE welcome_template = :id;");
-
-            $statement->execute(array(":id" => $this->id));
-
-            $result = array();
-            /** @var WelcomeTemplate $v */
-            foreach ($statement->fetchAll(PDO::FETCH_CLASS, User::class) as $v) {
-                $v->setDatabase($this->dbObject);
-                $result[] = $v;
-            }
-
-            $this->usageCache = $result;
-        }
-
-        return $this->usageCache;
-    }
-
-    /**
-     * Deletes the object from the database
-     */
-    public function delete()
-    {
-        if ($this->id === null) {
-            // wtf?
-            return;
-        }
-
-        $deleteQuery = "UPDATE welcometemplate SET deleted = 1 WHERE id = :id AND updateversion = :updateversion;";
-        $statement = $this->dbObject->prepare($deleteQuery);
-
-        $statement->bindValue(":id", $this->id);
-        $statement->bindValue(":updateversion", $this->updateversion);
-        $statement->execute();
-
-        if ($statement->rowCount() !== 1) {
-            throw new OptimisticLockFailedException();
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    public function isDeleted()
-    {
-        return ((int)$this->deleted) === 1;
-    }
+			);
+
+			$statement->bindValue(':id', $this->id);
+			$statement->bindValue(':updateversion', $this->updateversion);
+
+			$statement->bindValue(':usercode', $this->usercode);
+			$statement->bindValue(':botcode', $this->botcode);
+
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
+
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
+
+			$this->updateversion++;
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUserCode()
+	{
+		return $this->usercode;
+	}
+
+	/**
+	 * @param string $usercode
+	 */
+	public function setUserCode($usercode)
+	{
+		$this->usercode = $usercode;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getBotCode()
+	{
+		return $this->botcode;
+	}
+
+	/**
+	 * @param string $botcode
+	 */
+	public function setBotCode($botcode)
+	{
+		$this->botcode = $botcode;
+	}
+
+	/**
+	 * @return User[]
+	 */
+	public function getUsersUsingTemplate()
+	{
+		if ($this->usageCache === null) {
+			$statement = $this->dbObject->prepare("SELECT * FROM user WHERE welcome_template = :id;");
+
+			$statement->execute(array(":id" => $this->id));
+
+			$result = array();
+			/** @var WelcomeTemplate $v */
+			foreach ($statement->fetchAll(PDO::FETCH_CLASS, User::class) as $v) {
+				$v->setDatabase($this->dbObject);
+				$result[] = $v;
+			}
+
+			$this->usageCache = $result;
+		}
+
+		return $this->usageCache;
+	}
+
+	/**
+	 * Deletes the object from the database
+	 */
+	public function delete()
+	{
+		if ($this->id === null) {
+			// wtf?
+			return;
+		}
+
+		$deleteQuery = "UPDATE welcometemplate SET deleted = 1 WHERE id = :id AND updateversion = :updateversion;";
+		$statement = $this->dbObject->prepare($deleteQuery);
+
+		$statement->bindValue(":id", $this->id);
+		$statement->bindValue(":updateversion", $this->updateversion);
+		$statement->execute();
+
+		if ($statement->rowCount() !== 1) {
+			throw new OptimisticLockFailedException();
+		}
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isDeleted()
+	{
+		return ((int)$this->deleted) === 1;
+	}
 }

includes/DataObjects/Log.php

Indentation +144 added lines, -144 removed lines

@@ -17,151 +17,151 @@
  */
 class Log extends DataObject
 {
-    /** @var int */
-    private $objectid;
-    /** @var string */
-    private $objecttype;
-    /** @var int */
-    private $user;
-    /** @var string */
-    private $action;
-    private $timestamp;
-    /** @var string|null */
-    private $comment;
-
-    /**
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            $statement = $this->dbObject->prepare(<<<SQL
+	/** @var int */
+	private $objectid;
+	/** @var string */
+	private $objecttype;
+	/** @var int */
+	private $user;
+	/** @var string */
+	private $action;
+	private $timestamp;
+	/** @var string|null */
+	private $comment;
+
+	/**
+	 * @throws Exception
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			$statement = $this->dbObject->prepare(<<<SQL
                 INSERT INTO log (objectid, objecttype, user, action, timestamp, comment) 
                 VALUES (:id, :type, :user, :action, CURRENT_TIMESTAMP(), :comment);
 SQL
-            );
-
-            $statement->bindValue(":id", $this->objectid);
-            $statement->bindValue(":type", $this->objecttype);
-            $statement->bindValue(":user", $this->user);
-            $statement->bindValue(":action", $this->action);
-            $statement->bindValue(":comment", $this->comment);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            throw new Exception("Updating logs is not available");
-        }
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function delete()
-    {
-        throw new Exception("Deleting logs is not available.");
-    }
-
-    /**
-     * @return int
-     */
-    public function getObjectId()
-    {
-        return $this->objectid;
-    }
-
-    /**
-     * Summary of setObjectId
-     *
-     * @param int $objectId
-     */
-    public function setObjectId($objectId)
-    {
-        $this->objectid = $objectId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getObjectType()
-    {
-        return $this->objecttype;
-    }
-
-    /**
-     * Summary of setObjectType
-     *
-     * @param string $objectType
-     */
-    public function setObjectType($objectType)
-    {
-        $this->objecttype = $objectType;
-    }
-
-    /**
-     * @return int
-     */
-    public function getUser()
-    {
-        return $this->user;
-    }
-
-    /**
-     * Summary of setUser
-     *
-     * @param User $user
-     */
-    public function setUser(User $user)
-    {
-        $this->user = $user->getId();
-    }
-
-    /**
-     * @return string
-     */
-    public function getAction()
-    {
-        return $this->action;
-    }
-
-    /**
-     * Summary of setAction
-     *
-     * @param string $action
-     */
-    public function setAction($action)
-    {
-        $this->action = $action;
-    }
-
-    /**
-     * @return DateTimeImmutable
-     */
-    public function getTimestamp()
-    {
-        return new DateTimeImmutable($this->timestamp);
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getComment()
-    {
-        return $this->comment;
-    }
-
-    /**
-     * Summary of setComment
-     *
-     * @param string $comment
-     */
-    public function setComment($comment)
-    {
-        $this->comment = $comment;
-    }
+			);
+
+			$statement->bindValue(":id", $this->objectid);
+			$statement->bindValue(":type", $this->objecttype);
+			$statement->bindValue(":user", $this->user);
+			$statement->bindValue(":action", $this->action);
+			$statement->bindValue(":comment", $this->comment);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			throw new Exception("Updating logs is not available");
+		}
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function delete()
+	{
+		throw new Exception("Deleting logs is not available.");
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getObjectId()
+	{
+		return $this->objectid;
+	}
+
+	/**
+	 * Summary of setObjectId
+	 *
+	 * @param int $objectId
+	 */
+	public function setObjectId($objectId)
+	{
+		$this->objectid = $objectId;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getObjectType()
+	{
+		return $this->objecttype;
+	}
+
+	/**
+	 * Summary of setObjectType
+	 *
+	 * @param string $objectType
+	 */
+	public function setObjectType($objectType)
+	{
+		$this->objecttype = $objectType;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getUser()
+	{
+		return $this->user;
+	}
+
+	/**
+	 * Summary of setUser
+	 *
+	 * @param User $user
+	 */
+	public function setUser(User $user)
+	{
+		$this->user = $user->getId();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getAction()
+	{
+		return $this->action;
+	}
+
+	/**
+	 * Summary of setAction
+	 *
+	 * @param string $action
+	 */
+	public function setAction($action)
+	{
+		$this->action = $action;
+	}
+
+	/**
+	 * @return DateTimeImmutable
+	 */
+	public function getTimestamp()
+	{
+		return new DateTimeImmutable($this->timestamp);
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getComment()
+	{
+		return $this->comment;
+	}
+
+	/**
+	 * Summary of setComment
+	 *
+	 * @param string $comment
+	 */
+	public function setComment($comment)
+	{
+		$this->comment = $comment;
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -49,12 +49,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             throw new Exception("Updating logs is not available");
         }
     }