18 files changed, 1243 insertions, 1165 deletions
diff --git a/change_passw.php b/change_passw.php
index 31e0e0d..82db6d3 100644..100755
--- a/change_passw.php
+++ b/change_passw.php
@@ -1,66 +1,66 @@
-<?php
-include_once './includes/Session.php';
-include_once './includes/model/User.php';
-include_once './includes/functions_user.php';
-
-session_start();
-
-if ($_SERVER['REQUEST_METHOD'] == 'POST' and Session::get()->is_signed_in()) {
-	$errors = array();
-	$user_pass = "";
-
-	if (empty($_POST['user_pass'])) {
-		$errors[] = "You must provide a password.";
-	} else {
-		$user_pass = $_POST['user_pass'];
-		$pass_check = $_POST['user_pass_check'];
-
-		if (preg_match("/^[a-zA-Z0-9\W]*$/", $user_pass) === false) {
-			$errors[] = "Password contains invalid characters!";
-		}
-
-		if ($user_pass !== $pass_check) {
-			$errors[] = "The two passwords do not match.";
-		}
-	}
-
-	if (!empty($errors)) {
-		echo 'Please check the following problems: <ul>';
-		foreach ($errors as $err) {
-			echo '<li>' . $err . '</li>';
-		}
-		echo '</ul>';
-	} else {
-		$pass_hash = password_hash($user_pass, PASSWORD_DEFAULT);
-		change_password(Session::get()->get_current_user(), $pass_hash);
-		echo 'Password successfully changed!';
-	}
-}
-?>
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <title>Change your password - cflip.net forum</title>
-    <link rel="stylesheet" href="styles/style.css">
-</head>
-<body>
-<?php
-include_once './includes/templates/header.php';
-
-if (!Session::get()->is_signed_in()) {
-	echo '<h2>You must be logged in to change your password.</h2>';
-} else {
-	echo '
-			<h2>Change your password</h2>
-			<form action="change_passw.php" method="post">
-			<label for="user_pass">Password: </label><br>
-			<input type="password" name="user_pass"><br>
-			<label for="user_pass_check">Re-enter password: </label><br>
-			<input type="password" name="user_pass_check"><br>
-			<input type="submit" name="submit">
-			</form>
-			<br>';
-}
-?>
-</body>
-</html>
+<?php
+include_once './includes/Session.php';
+include_once './includes/model/User.php';
+include_once './includes/functions_user.php';
+
+session_start();
+
+if ($_SERVER['REQUEST_METHOD'] == 'POST' and Session::get()->is_signed_in()) {
+	$errors = array();
+	$user_pass = "";
+
+	if (empty($_POST['user_pass'])) {
+		$errors[] = "You must provide a password.";
+	} else {
+		$user_pass = $_POST['user_pass'];
+		$pass_check = $_POST['user_pass_check'];
+
+		if (preg_match("/^[a-zA-Z0-9\W]*$/", $user_pass) === false) {
+			$errors[] = "Password contains invalid characters!";
+		}
+
+		if ($user_pass !== $pass_check) {
+			$errors[] = "The two passwords do not match.";
+		}
+	}
+
+	if (!empty($errors)) {
+		echo 'Please check the following problems: <ul>';
+		foreach ($errors as $err) {
+			echo '<li>' . $err . '</li>';
+		}
+		echo '</ul>';
+	} else {
+		$pass_hash = password_hash($user_pass, PASSWORD_DEFAULT);
+		change_password(Session::get()->get_current_user(), $pass_hash);
+		echo 'Password successfully changed!';
+	}
+}
+?>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Change your password - cflip.net forum</title>
+    <link rel="stylesheet" href="styles/style.css">
+</head>
+<body>
+<?php
+include_once './includes/templates/header.php';
+
+if (!Session::get()->is_signed_in()) {
+	echo '<h2>You must be logged in to change your password.</h2>';
+} else {
+	echo '
+			<h2>Change your password</h2>
+			<form action="change_passw.php" method="post">
+			<label for="user_pass">Password: </label><br>
+			<input type="password" name="user_pass"><br>
+			<label for="user_pass_check">Re-enter password: </label><br>
+			<input type="password" name="user_pass_check"><br>
+			<input type="submit" name="submit">
+			</form>
+			<br>';
+}
+?>
+</body>
+</html>
diff --git a/create_thread.php b/create_thread.php
index 3d1c530..d01eb26 100644..100755
--- a/create_thread.php
+++ b/create_thread.php
@@ -1,78 +1,78 @@
-<?php session_start() ?>
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <title>Create a thread - cflip.net forum</title>
-    <link rel="stylesheet" href="styles/style.css">
-</head>
-<body>
-<?php include_once 'includes/templates/header.php' ?>
-<h2>Create a new thread</h2>
-<?php
-include_once 'includes/Session.php';
-include_once 'includes/error.php';
-if (!Session::get()->is_signed_in()) {
-	trigger_error('You must be <a href="signin.php">signed in</a> to create a thread.');
-	exit();
-}
-?>
-<form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" method="post">
-    <label for="thread_subject">Subject: </label><br>
-    <input type="text" name="thread_subject"><br>
-    <label for="thread_cat">Category: </label><br>
-	<?php
-	include_once './includes/model/Category.php';
-
-	$categories = Category::get_all_categories();
-
-	if (count($categories) == 0) {
-		trigger_error('There are no categories to post to!');
-	} else {
-		echo '<select name="thread_cat">';
-
-		foreach ($categories as $category) {
-			echo '<option value="' . $category->id . '">' . $category->name . '</option>';
-		}
-
-		echo '</select><br>';
-	}
-	?>
-    <label for="post_content">Write your post: </label><br>
-    <textarea name="post_content"></textarea><br>
-    <input type="submit" name="submit">
-</form>
-<?php
-include_once './includes/model/Post.php';
-include_once './includes/model/Thread.php';
-include_once './includes/error.php';
-
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-	$post_content = filter_input(INPUT_POST, 'post_content', FILTER_SANITIZE_STRING);
-	$thread_subject = filter_input(INPUT_POST, 'thread_subject', FILTER_SANITIZE_STRING);
-	$thread_cat = filter_input(INPUT_POST, 'thread_cat', FILTER_SANITIZE_NUMBER_INT);
-
-	$errors = array();
-	if (empty($thread_subject) or !$thread_subject) {
-		$errors[] = 'Thread subject cannot be empty';
-	}
-	if (empty($post_content) or !$post_content) {
-		$errors[] = 'Thread body cannot be empty';
-	}
-
-	if (!empty($errors)) {
-		$errstr = 'Please check the following problems: <ul>';
-		foreach ($errors as $err) {
-			$errstr .= '<li>' . $err . '</li>';
-		}
-		$errstr .= '</ul>';
-		trigger_error($errstr);
-	} else {
-		$thread_id = Thread::create($thread_subject, $thread_cat);
-		Post::create($post_content, $thread_id, $thread_cat);
-
-		header("Location: viewthread.php?id=" . $thread_id);
-	}
-}
-?>
-</body>
-</html>
+<?php session_start() ?>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<title>Create a thread - cflip.net forum</title>
+<?php include_once 'includes/templates/head.php'; ?>
+</head>
+<body>
+<?php include_once 'includes/templates/header.php' ?>
+	<h2>Create a new thread</h2>
+<?php
+include_once 'includes/Session.php';
+include_once 'includes/error.php';
+if (!Session::get()->is_signed_in()) {
+	trigger_error('You must be <a href="signin.php">signed in</a> to create a thread.');
+	exit();
+}
+?>
+	<form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" method="post">
+		<label for="thread_subject">Subject: </label><br>
+		<input type="text" name="thread_subject"><br>
+		<label for="thread_cat">Category: </label><br>
+		<?php
+		include_once './includes/model/Category.php';
+
+		$categories = Category::get_all_categories();
+
+		if (count($categories) == 0) {
+			trigger_error('There are no categories to post to!');
+		} else {
+			echo '<select name="thread_cat">';
+
+			foreach ($categories as $category) {
+				echo '<option value="' . $category->id . '">' . $category->name . '</option>';
+			}
+
+			echo '</select><br>';
+		}
+		?>
+		<label for="post_content">Write your post: </label><br>
+		<textarea name="post_content"></textarea><br>
+		<input type="submit" name="submit">
+	</form>
+<?php
+include_once './includes/model/Post.php';
+include_once './includes/model/Thread.php';
+include_once './includes/error.php';
+
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+	$post_content = filter_input(INPUT_POST, 'post_content', FILTER_SANITIZE_STRING);
+	$thread_subject = filter_input(INPUT_POST, 'thread_subject', FILTER_SANITIZE_STRING);
+	$thread_cat = filter_input(INPUT_POST, 'thread_cat', FILTER_SANITIZE_NUMBER_INT);
+
+	$errors = array();
+	if (empty($thread_subject) or !$thread_subject) {
+		$errors[] = 'Thread subject cannot be empty';
+	}
+	if (empty($post_content) or !$post_content) {
+		$errors[] = 'Thread body cannot be empty';
+	}
+
+	if (!empty($errors)) {
+		$errstr = 'Please check the following problems: <ul>';
+		foreach ($errors as $err) {
+			$errstr .= '<li>' . $err . '</li>';
+		}
+		$errstr .= '</ul>';
+		trigger_error($errstr);
+	} else {
+		$thread_id = Thread::create($thread_subject, $thread_cat);
+		Post::create($post_content, $thread_id, $thread_cat);
+
+		header("Location: viewthread.php?id=" . $thread_id);
+	}
+}
+?>
+</body>
+</html>
diff --git a/includes/Database.php b/includes/Database.php
index 0a79dfb..61fbbb1 100644..100755
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -1,82 +1,82 @@
-<?php
-
-class Database
-{
-	private static $instance = null;
-	private $sql_connection;
-
-	private function __construct()
-	{
-		$config = parse_ini_file('/var/www/config.ini', true)['mysql_credentials'];
-
-		$db_server = $config['server'];
-		$db_user = $config['user'];
-		$db_pass = $config['password'];
-		$db_database = $config['database'];
-
-		$this->sql_connection = mysqli_connect($db_server, $db_user, $db_pass, $db_database);
-
-		if (!$this->sql_connection) {
-			trigger_error("Database connection error: " . mysqli_connect_error());
-		}
-	}
-
-	public static function get()
-	{
-		if (self::$instance == null) {
-			self::$instance = new Database();
-		}
-
-		return self::$instance;
-	}
-
-	public function query(string $sql, string $types = "", ...$vars): array
-	{
-		$result = array();
-
-		if ($types == "") {
-			// No types were provided, preparing a statement is not necessary
-			$db_result = mysqli_query($this->sql_connection, $sql);
-		} else {
-			$stmt = mysqli_stmt_init($this->sql_connection);
-
-			if (!mysqli_stmt_prepare($stmt, $sql)) {
-				trigger_error('Internal error: ' . mysqli_error($this->sql_connection));
-				return $result;
-			}
-
-			mysqli_stmt_bind_param($stmt, $types, ...$vars);
-			mysqli_stmt_execute($stmt);
-
-			$db_result = mysqli_stmt_get_result($stmt);
-
-			mysqli_stmt_close($stmt);
-		}
-
-		if (!$db_result) {
-			return $result;
-		}
-
-		if (mysqli_num_rows($db_result) > 0) {
-			while ($row = mysqli_fetch_assoc($db_result)) {
-				array_push($result, $row);
-			}
-		}
-
-		mysqli_free_result($db_result);
-
-		return $result;
-	}
-
-	/**
-	 * Returns the auto generated ID of the last query.
-	 * This function is just a wrapper for mysqli_insert_id.
-	 * In the future, it might be better to return different
-	 * values in the query function depending on the type of
-	 * SQL query.
-	 */
-	public function get_last_id()
-	{
-		return mysqli_insert_id($this->sql_connection);
-	}
+<?php
+
+class Database
+{
+	private static $instance = null;
+	private $sql_connection;
+
+	private function __construct()
+	{
+		$config = parse_ini_file('config.ini', true)['mysql_credentials'];
+
+		$db_server = $config['server'];
+		$db_user = $config['user'];
+		$db_pass = $config['password'];
+		$db_database = $config['database'];
+
+		$this->sql_connection = mysqli_connect($db_server, $db_user, $db_pass, $db_database);
+
+		if (!$this->sql_connection) {
+			trigger_error("Database connection error: " . mysqli_connect_error());
+		}
+	}
+
+	public static function get()
+	{
+		if (self::$instance == null) {
+			self::$instance = new Database();
+		}
+
+		return self::$instance;
+	}
+
+	public function query(string $sql, string $types = "", ...$vars): array
+	{
+		$result = array();
+
+		if ($types == "") {
+			// No types were provided, preparing a statement is not necessary
+			$db_result = mysqli_query($this->sql_connection, $sql);
+		} else {
+			$stmt = mysqli_stmt_init($this->sql_connection);
+
+			if (!mysqli_stmt_prepare($stmt, $sql)) {
+				trigger_error('Internal error: ' . mysqli_error($this->sql_connection));
+				return $result;
+			}
+
+			mysqli_stmt_bind_param($stmt, $types, ...$vars);
+			mysqli_stmt_execute($stmt);
+
+			$db_result = mysqli_stmt_get_result($stmt);
+
+			mysqli_stmt_close($stmt);
+		}
+
+		if (!$db_result) {
+			return $result;
+		}
+
+		if (mysqli_num_rows($db_result) > 0) {
+			while ($row = mysqli_fetch_assoc($db_result)) {
+				array_push($result, $row);
+			}
+		}
+
+		mysqli_free_result($db_result);
+
+		return $result;
+	}
+
+	/**
+	 * Returns the auto generated ID of the last query.
+	 * This function is just a wrapper for mysqli_insert_id.
+	 * In the future, it might be better to return different
+	 * values in the query function depending on the type of
+	 * SQL query.
+	 */
+	public function get_last_id()
+	{
+		return mysqli_insert_id($this->sql_connection);
+	}
 }
 \ No newline at end of file
diff --git a/includes/Session.php b/includes/Session.php
index ceaa765..0e08482 100644..100755
--- a/includes/Session.php
+++ b/includes/Session.php
@@ -1,57 +1,57 @@
-<?php
-
-class Session
-{
-	private static $instance = null;
-
-	private function __construct()
-	{
-		if (session_status() == PHP_SESSION_NONE)
-			session_start();
-	}
-
-	public static function get()
-	{
-		if (self::$instance == null) {
-			self::$instance = new Session();
-		}
-
-		return self::$instance;
-	}
-
-	public function sign_in(User $user)
-	{
-		$_SESSION['signed_in'] = true;
-		$_SESSION['user_id'] = $user->id;
-		$_SESSION['user_name'] = $user->name;
-	}
-
-	public function sign_out()
-	{
-		session_unset();
-		session_destroy();
-	}
-
-	public function is_signed_in(): bool
-	{
-		return isset($_SESSION['signed_in']);
-	}
-
-	public function get_current_user()
-	{
-		// There is no current user
-		if (!$this->is_signed_in()) {
-			return null;
-		}
-
-		$result = new User();
-
-		if (isset($_SESSION['user_id'])) {
-			$result->get_by_id($_SESSION['user_id']);
-		} else {
-			$result = null;
-		}
-
-		return $result;
-	}
-}
+<?php
+
+class Session
+{
+	private static $instance = null;
+
+	private function __construct()
+	{
+		if (session_status() == PHP_SESSION_NONE)
+			session_start();
+	}
+
+	public static function get()
+	{
+		if (self::$instance == null) {
+			self::$instance = new Session();
+		}
+
+		return self::$instance;
+	}
+
+	public function sign_in(User $user)
+	{
+		$_SESSION['signed_in'] = true;
+		$_SESSION['user_id'] = $user->id;
+		$_SESSION['user_name'] = $user->name;
+	}
+
+	public function sign_out()
+	{
+		session_unset();
+		session_destroy();
+	}
+
+	public function is_signed_in(): bool
+	{
+		return isset($_SESSION['signed_in']);
+	}
+
+	public function get_current_user()
+	{
+		// There is no current user
+		if (!$this->is_signed_in()) {
+			return null;
+		}
+
+		$result = new User();
+
+		if (isset($_SESSION['user_id'])) {
+			$result->get_by_id($_SESSION['user_id']);
+		} else {
+			$result = null;
+		}
+
+		return $result;
+	}
+}
diff --git a/includes/error.php b/includes/error.php
index 5e33212..1450a28 100644..100755
--- a/includes/error.php
+++ b/includes/error.php
@@ -1,25 +1,25 @@
-<?php
-function user_notice($message) {
-	echo '<p class="error">'. $message .'</p>';
-}
-
-function handle_error($errno, $errstr, $errfile, $errline) {
-	if (!(error_reporting() & $errno)) {
-		// This error code is not included in error_reporting, so let it fall
-		// through to the standard PHP error handler
-		return false;
-	}
-
-	switch ($errno) {
-		// See https://www.php.net/manual/en/errorfunc.constants.php
-		case E_USER_NOTICE:
-			user_notice($errstr);
-			break;
-		default:
-			return false;
-	}
-	return true;
-}
-
-$old_error_handler = set_error_handler('handle_error');
-?>
+<?php
+function user_notice($message) {
+	echo '<p class="error">'. $message .'</p>';
+}
+
+function handle_error($errno, $errstr, $errfile, $errline) {
+	if (!(error_reporting() & $errno)) {
+		// This error code is not included in error_reporting, so let it fall
+		// through to the standard PHP error handler
+		return false;
+	}
+
+	switch ($errno) {
+		// See https://www.php.net/manual/en/errorfunc.constants.php
+		case E_USER_NOTICE:
+			user_notice($errstr);
+			break;
+		default:
+			return false;
+	}
+	return true;
+}
+
+$old_error_handler = set_error_handler('handle_error');
+?>
diff --git a/includes/model/Category.php b/includes/model/Category.php
index e8cbe60..37ad4f8 100644..100755
--- a/includes/model/Category.php
+++ b/includes/model/Category.php
@@ -1,78 +1,78 @@
-<?php
-
-include_once 'Thread.php';
-
-class Category
-{
-	public $id;
-	public $name;
-	public $description;
-	public $thread_count = 0;
-	public $post_count = 0;
-
-	// If an invalid id was passed into the constructor, the database will not have
-	// returned a result, but the object will not be null. 
-	// We need to keep track of whether or not this object has a value.
-	private $has_value = false;
-
-	public function __construct($id)
-	{
-		$sql = "SELECT cat_name, cat_description, cat_thread_count, cat_post_count FROM categories WHERE cat_id = ?;";
-		$result = Database::get()->query($sql, "i", $id);
-
-		if (empty($result)) {
-			return;
-		}
-
-		$this->id = $id;
-		$this->name = $result[0]['cat_name'];
-		$this->description = $result[0]['cat_description'];
-		$this->thread_count = $result[0]['cat_thread_count'];
-		$this->post_count = $result[0]['cat_post_count'];
-
-		$this->has_value = true;
-	}
-
-	// Returns true if this object was successfully fetched from the database
-	public function has_value()
-	{
-		return $this->has_value;
-	}
-
-	public static function get_all_categories(): array
-	{
-		$sql = "SELECT cat_id FROM categories ORDER BY cat_id;";
-		$result = Database::get()->query($sql);
-
-		$categories = array();
-
-		foreach ($result as $row) {
-			$category = new Category($row['cat_id']);
-			array_push($categories, $category);
-		}
-
-		return $categories;
-	}
-
-	public function get_threads(): array
-	{
-		$sql = "SELECT thread_id FROM threads WHERE thread_category = ? ORDER BY thread_date_lastpost DESC";
-		$result = Database::get()->query($sql, "i", $this->id);
-		$threads = array();
-
-		foreach ($result as $row) {
-			$thread = new Thread($row['thread_id']);
-			if ($thread->has_value())
-				array_push($threads, $thread);
-		}
-
-		return $threads;
-	}
-
-	public function get_latest_thread(): Thread
-	{
-		$sql = "SELECT thread_id FROM threads WHERE thread_category = ? ORDER BY thread_date_lastpost DESC LIMIT 1";
-		$result = Database::get()->query($sql, "i", $this->id);
-		return new Thread($result[0]['thread_id']);
-	}
-}
+<?php
+
+include_once 'Thread.php';
+
+class Category
+{
+	public $id;
+	public $name;
+	public $description;
+	public $thread_count = 0;
+	public $post_count = 0;
+
+	// If an invalid id was passed into the constructor, the database will not have
+	// returned a result, but the object will not be null. 
+	// We need to keep track of whether or not this object has a value.
+	private $has_value = false;
+
+	public function __construct($id)
+	{
+		$sql = "SELECT cat_name, cat_description, cat_thread_count, cat_post_count FROM categories WHERE cat_id = ?;";
+		$result = Database::get()->query($sql, "i", $id);
+
+		if (empty($result)) {
+			return;
+		}
+
+		$this->id = $id;
+		$this->name = $result[0]['cat_name'];
+		$this->description = $result[0]['cat_description'];
+		$this->thread_count = $result[0]['cat_thread_count'];
+		$this->post_count = $result[0]['cat_post_count'];
+
+		$this->has_value = true;
+	}
+
+	// Returns true if this object was successfully fetched from the database
+	public function has_value()
+	{
+		return $this->has_value;
+	}
+
+	public static function get_all_categories(): array
+	{
+		$sql = "SELECT cat_id FROM categories ORDER BY cat_id;";
+		$result = Database::get()->query($sql);
+
+		$categories = array();
+
+		foreach ($result as $row) {
+			$category = new Category($row['cat_id']);
+			array_push($categories, $category);
+		}
+
+		return $categories;
+	}
+
+	public function get_threads(): array
+	{
+		$sql = "SELECT thread_id FROM threads WHERE thread_category = ? ORDER BY thread_date_lastpost DESC";
+		$result = Database::get()->query($sql, "i", $this->id);
+		$threads = array();
+
+		foreach ($result as $row) {
+			$thread = new Thread($row['thread_id']);
+			if ($thread->has_value())
+				array_push($threads, $thread);
+		}
+
+		return $threads;
+	}
+
+	public function get_latest_thread(): Thread
+	{
+		$sql = "SELECT thread_id FROM threads WHERE thread_category = ? ORDER BY thread_date_lastpost DESC LIMIT 1";
+		$result = Database::get()->query($sql, "i", $this->id);
+		return new Thread($result[0]['thread_id']);
+	}
+}
diff --git a/includes/model/Post.php b/includes/model/Post.php
index 49fd640..1b64490 100644..100755
--- a/includes/model/Post.php
+++ b/includes/model/Post.php
@@ -1,184 +1,185 @@
-<?php
-include_once './includes/Session.php';
-include_once './includes/Database.php';
-include_once './includes/model/User.php';
-include_once './includes/model/Thread.php';
-
-// Utility functions for building the post HTML
-
-function create_quote(int $id): string
-{
-	$sql = "SELECT post_content, post_author, post_thread, user_name FROM posts LEFT JOIN users ON post_author = user_id WHERE post_id = ?;";
-	$result = Database::get()->query($sql, "i", $id);
-
-	$reply = $result[0];
-
-	if (empty($reply)) {
-		return '<blockquote><span style="color:red;">This post has been deleted</span></blockquote>';
-	}
-
-	return '<blockquote><a href="/viewthread.php?id=' . $reply['post_thread'] . '#p' . $id . '">Quote from ' . $reply['user_name'] . '</a><br>' . $reply['post_content'] . '</blockquote>';
-}
-
-function format_post_content(string $post_content)
-{
-	$post_content = preg_replace_callback('/>#\d+/', function ($matches) {
-		$result = "";
-		foreach ($matches as $match) {
-			$id = (int) filter_var($match, FILTER_SANITIZE_NUMBER_INT);
-			$result .= create_quote($id);
-		}
-		return $result;
-	}, $post_content);
-
-	$result = $post_content;
-
-	// Replace newline characters with HTML <br> tags
-	$result = nl2br($result);
-
-	// Replace YouTube URLs with embedded YouTube videos.
-	$result = preg_replace(
-		"/\s*[a-zA-Z\/:]*youtu(be.com\/watch\?v=|.be\/)([a-zA-Z0-9\-_]+)([a-zA-Z0-9\/*-_?&;%=.]*)/i",
-		'<br><iframe class="youtube-embed" src="//www.youtube.com/embed/$2" allowfullscreen></iframe>', $result);
-
-	// Replace Image URLs with embedded images.
-	$result = preg_replace('@\b(http(s)?://)([^\s]*?(?:\.[a-z\d?=/_-]+)+(?:\.jpg|\.png|\.gif))(?![^<]*?(?:</\w+>|/?>))@i', '<img class="image-embed" src="http$2://$3" alt="http$2://$3" />', $result);
-
-	// Replace other URLs with links.
-	return preg_replace('@\b(http(s)?://)([^\s]*?(?:\.[a-z\d?=/_-]+)+)(?![^<]*?(?:</\w+>|/?>))@i', '<a href="http$2://$3">$0</a>', $result);
-}
-
-class Post
-{
-	public $id;
-	public $content;
-	public $date_created;
-	public $date_edited;
-	public $thread;
-	public $author;
-
-	private $has_value = false;
-
-	public function __construct($id)
-	{
-		$sql = "SELECT post_content, post_date_created, post_date_edited, post_thread, post_author FROM posts WHERE post_id = ?;";
-		$result = Database::get()->query($sql, "i", $id);
-
-		if (empty($result)) {
-			return;
-		}
-
-		$this->id = $id;
-		$this->content = $result[0]['post_content'];
-		$this->date_created = $result[0]['post_date_created'];
-		$this->date_edited = $result[0]['post_date_edited'];
-		$this->thread = new Thread($result[0]['post_thread']);
-
-		$this->author = new User();
-		$this->author->get_by_id($result[0]['post_author']);
-
-		$this->has_value = true;
-	}
-
-	public function has_value()
-	{
-		return $this->has_value;
-	}
-
-	/**
-	 * Get the post content from the database and return it as a string ready for HTML display
-	 */
-	function get_content(): string
-	{
-		// Build the header
-		$result = '<div class="header" id="p' . $this->id . '"><b>#' . $this->id . '</b>';
-		$result .= ' Posted by <a href="viewuser.php?id=' . $this->author->id . '">' . $this->author->name . '</a>';
-		$result .= ' on ' . date('m/d/Y g:ia', strtotime($this->date_created));
-		$result .= '</div>';
-
-		// Append the formatted post content
-		$result .= '<span class="post-content">' . format_post_content($this->content) . '</span>';
-
-		return $result;
-	}
-
-	function set_content(string $post_content)
-	{
-		// User must be signed in
-		if (!Session::get()->is_signed_in()) {
-			trigger_error('You must be signed in to edit this post!');
-			return;
-		}
-
-		// User must have permission to edit the post
-		$current_user = Session::get()->get_current_user();
-		if ($current_user->id != $this->author->id) {
-			trigger_error("You don't have sufficient permissions to edit this post.");
-			return;
-		}
-
-		// Set the post content and the post edit date
-		$sql = "UPDATE posts SET post_content = ?, post_date_edited = CONVERT_TZ(NOW(), 'SYSTEM', '+00:00') WHERE post_id = ?;";
-		Database::get()->query($sql, "si", $post_content, $this->id);
-	}
-
-	function delete()
-	{
-		// User must be signed in
-		if (!Session::get()->is_signed_in()) {
-			trigger_error('You must be signed in to delete a post!');
-			return;
-		}
-
-		// User must have permission to delete the post
-		if (Session::get()->get_current_user()->level != USER_LEVEL_MODERATOR) {
-			trigger_error("You don't have sufficient permissions to delete this post.");
-			return;
-		}
-
-		// Delete the post from the database
-		Database::get()->query("DELETE FROM posts WHERE post_id = ?", "i", $this->id);
-
-		// Decrement the post count of the category
-		Database::get()->query("UPDATE categories SET `cat_post_count` = `cat_post_count` - '1' WHERE cat_id = ?", "i", $this->thread->category->id);
-	}
-
-	public static function create($post_content, $post_thread, $post_category)
-	{
-		// User must be signed in
-		if (!Session::get()->is_signed_in()) {
-			trigger_error('You must be signed in to create a post');
-			return;
-		}
-
-		$user = Session::get()->get_current_user();
-
-		// Insert the post into the database
-		$sql = "INSERT INTO posts(post_content, post_date_created, post_thread, post_author) VALUES (?, CONVERT_TZ(NOW(), 'SYSTEM', '+00:00'), ?, ?);";
-		Database::get()->query($sql, "sii", $post_content, $post_thread, $user->id);
-
-		// Increment the category's post count
-		$sql = "UPDATE categories SET `cat_post_count` = `cat_post_count` + '1' WHERE cat_id = ?;";
-		Database::get()->query($sql, "i", $post_category);
-
-		// Set the last post date of the parent thread
-		$sql = "UPDATE threads SET thread_date_lastpost = CONVERT_TZ(NOW(), 'SYSTEM', '+00:00') WHERE thread_id = ?;";
-		Database::get()->query($sql, "i", $post_thread);
-	}
-
-	public static function get_all_posts(): array
-	{
-		$sql = "SELECT post_id FROM posts";
-		$result = Database::get()->query($sql);
-
-		$posts = array();
-
-		foreach ($result as $row) {
-			$post = new Post();
-			$post->get_from_database($row['post_id']);
-			array_push($posts, $post);
-		}
-
-		return $posts;
-	}
-}
+<?php
+include_once './includes/Session.php';
+include_once './includes/Database.php';
+include_once './includes/model/User.php';
+include_once './includes/model/Thread.php';
+
+// Utility functions for building the post HTML
+
+function create_quote(int $id): string
+{
+	$sql = "SELECT post_content, post_author, post_thread, user_name FROM posts LEFT JOIN users ON post_author = user_id WHERE post_id = ?;";
+	$result = Database::get()->query($sql, "i", $id);
+
+	$reply = $result[0];
+
+	if (empty($reply)) {
+		return '<blockquote><span style="color:red;">This post has been deleted</span></blockquote>';
+	}
+
+	return '<blockquote><a href="/viewthread.php?id=' . $reply['post_thread'] . '#p' . $id . '">Quote from ' . $reply['user_name'] . '</a><br>' . $reply['post_content'] . '</blockquote>';
+}
+
+function format_post_content(string $post_content)
+{
+	$post_content = preg_replace_callback('/>#\d+/', function ($matches) {
+		$result = "";
+		foreach ($matches as $match) {
+			$id = (int) filter_var($match, FILTER_SANITIZE_NUMBER_INT);
+			$result .= create_quote($id);
+		}
+		return $result;
+	}, $post_content);
+
+	$result = $post_content;
+
+	// Replace newline characters with HTML <br> tags
+	$result = nl2br($result);
+
+	// Replace YouTube URLs with embedded YouTube videos.
+	$result = preg_replace(
+		"/\s*[a-zA-Z\/:]*youtu(be.com\/watch\?v=|.be\/)([a-zA-Z0-9\-_]+)([a-zA-Z0-9\/*-_?&;%=.]*)/i",
+		'<br><iframe class="youtube-embed" src="//www.youtube.com/embed/$2" allowfullscreen></iframe>', $result);
+
+	// Replace Image URLs with embedded images.
+	$result = preg_replace('@\b(http(s)?://)([^\s]*?(?:\.[a-z\d?=/_-]+)+(?:\.jpg|\.png|\.gif))(?![^<]*?(?:</\w+>|/?>))@i', '<img class="image-embed" src="http$2://$3" alt="http$2://$3" />', $result);
+
+	// Replace other URLs with links.
+	return preg_replace('@\b(http(s)?://)([^\s]*?(?:\.[a-z\d?=/_-]+)+)(?![^<]*?(?:</\w+>|/?>))@i', '<a href="http$2://$3">$0</a>', $result);
+}
+
+class Post
+{
+	public $id;
+	public $content;
+	public $date_created;
+	public $thread;
+	public $author;
+
+	private $has_value = false;
+
+	public function __construct($id)
+	{
+		$sql = "SELECT post_content, post_date_created, post_thread, post_author FROM posts WHERE post_id = ?;";
+		$result = Database::get()->query($sql, "i", $id);
+
+		if (empty($result)) {
+			return;
+		}
+
+		$this->id = $id;
+		$this->content = $result[0]['post_content'];
+		$this->date_created = $result[0]['post_date_created'];
+		$this->thread = new Thread($result[0]['post_thread']);
+
+		$this->author = new User();
+		$this->author->get_by_id($result[0]['post_author']);
+
+		$this->has_value = true;
+	}
+
+	public function has_value()
+	{
+		return $this->has_value;
+	}
+
+	/**
+	 * Get the post content from the database and return it as a string ready for HTML display
+	 */
+	function get_content(): string
+	{
+		// Build the header
+		$result = '<div class="header" id="p' . $this->id . '"><b>#' . $this->id . '</b>';
+		$result .= ' Posted by <a href="viewuser.php?id=' . $this->author->id . '">' . $this->author->name . '</a>';
+		$result .= ' on ' . date('m/d/Y g:ia', strtotime($this->date_created));
+		if (Session::get()->is_signed_in() && Session::get()->get_current_user()->level == USER_LEVEL_MODERATOR) {
+			$result .= '<a href="moderate.php?type=post&id=' . $this->id . '" style="float:right;">[Options]</a>';
+		}
+		$result .= '</div>';
+
+		// Append the formatted post content
+		$result .= '<span class="post-content">' . format_post_content($this->content) . '</span>';
+
+		return $result;
+	}
+
+	function set_content(string $post_content)
+	{
+		// User must be signed in
+		if (!Session::get()->is_signed_in()) {
+			trigger_error('You must be signed in to edit this post!');
+			return;
+		}
+
+		// User must have permission to edit the post
+		$current_user = Session::get()->get_current_user();
+		if ($current_user->id != $this->author->id) {
+			trigger_error("You don't have sufficient permissions to edit this post.");
+			return;
+		}
+
+		// Set the post content and the post edit date
+		$sql = "UPDATE posts SET post_content = ? WHERE post_id = ?;";
+		Database::get()->query($sql, "si", $post_content, $this->id);
+	}
+
+	function delete()
+	{
+		// User must be signed in
+		if (!Session::get()->is_signed_in()) {
+			trigger_error('You must be signed in to delete a post!');
+			return;
+		}
+
+		// User must have permission to delete the post
+		if (Session::get()->get_current_user()->level != USER_LEVEL_MODERATOR) {
+			trigger_error("You don't have sufficient permissions to delete this post.");
+			return;
+		}
+
+		// Delete the post from the database
+		Database::get()->query("DELETE FROM posts WHERE post_id = ?", "i", $this->id);
+
+		// Decrement the post count of the category
+		Database::get()->query("UPDATE categories SET `cat_post_count` = `cat_post_count` - '1' WHERE cat_id = ?", "i", $this->thread->category->id);
+	}
+
+	public static function create($post_content, $post_thread, $post_category)
+	{
+		// User must be signed in
+		if (!Session::get()->is_signed_in()) {
+			trigger_error('You must be signed in to create a post');
+			return;
+		}
+
+		$user = Session::get()->get_current_user();
+
+		// Insert the post into the database
+		$sql = "INSERT INTO posts(post_content, post_date_created, post_thread, post_author) VALUES (?, CONVERT_TZ(NOW(), 'SYSTEM', '+00:00'), ?, ?);";
+		Database::get()->query($sql, "sii", $post_content, $post_thread, $user->id);
+
+		// Increment the category's post count
+		$sql = "UPDATE categories SET `cat_post_count` = `cat_post_count` + '1' WHERE cat_id = ?;";
+		Database::get()->query($sql, "i", $post_category);
+
+		// Set the last post date of the parent thread
+		$sql = "UPDATE threads SET thread_date_lastpost = CONVERT_TZ(NOW(), 'SYSTEM', '+00:00') WHERE thread_id = ?;";
+		Database::get()->query($sql, "i", $post_thread);
+	}
+
+	public static function get_all_posts(): array
+	{
+		$sql = "SELECT post_id FROM posts";
+		$result = Database::get()->query($sql);
+
+		$posts = array();
+
+		foreach ($result as $row) {
+			$post = new Post();
+			$post->get_from_database($row['post_id']);
+			array_push($posts, $post);
+		}
+
+		return $posts;
+	}
+}
diff --git a/includes/model/User.php b/includes/model/User.php
index 13cbc03..7d3c1e4 100644..100755
--- a/includes/model/User.php
+++ b/includes/model/User.php
@@ -1,88 +1,103 @@
-<?php
-include_once './includes/Database.php';
-
-const USER_LEVEL_MODERATOR = 1;
-
-class User
-{
-	public $id;
-	public $name;
-	public $password;
-	public $date;
-	public $level = 0;
-
-	private $has_value = false;
-
-	// Can't use a constructor here because we have two possible ways to get the user from the database
-	// and PHP does not allow function overloading. 
-	public function get_by_id($id)
-	{
-		$sql = "SELECT user_name, user_date, user_level, user_pass FROM users WHERE user_id = ?;";
-		$result = Database::get()->query($sql, "i", $id);
-
-		if (empty($result)) {
-			return;
-		}
-
-		$this->id = $id;
-		$this->name = $result[0]['user_name'];
-		$this->password = $result[0]['user_pass'];
-		$this->date = $result[0]['user_date'];
-		$this->level = $result[0]['user_level'];
-
-		$this->has_value = true;
-	}
-
-	public function get_by_name($name)
-	{
-		$sql = "SELECT user_id, user_date, user_level, user_pass FROM users WHERE user_name = ?";
-		$result = Database::get()->query($sql, "s", $name);
-
-		if (empty($result)) {
-			return;
-		}
-
-		$this->id = $result[0]['user_id'];
-		$this->name = $name;
-		$this->password = $result[0]['user_pass'];
-		$this->date = $result[0]['user_date'];
-		$this->level = $result[0]['user_level'];
-
-		$this->has_value = true;
-	}
-
-	public function has_value()
-	{
-		return $this->has_value;
-	}
-
-	public static function register(string $username, string $pass_hash)
-	{
-		$sql = "INSERT INTO users(user_name, user_pass, user_date, user_level) VALUES(?, ?, NOW(), 0);";
-		Database::get()->query($sql, "ss", $username, $pass_hash);
-	}
-
-	public function change_password(string $pass_hash)
-	{
-		if (!Session::get()->is_signed_in()) {
-			trigger_error('You are not signed in.');
-			return;
-		}
-
-		if (Session::get()->get_current_user()->id != $this->id) {
-			trigger_error("You can't change another user's password.");
-			return;
-		}
-
-		$sql = "UPDATE users SET user_pass = ? WHERE user_id = ?;";
-		Database::get()->query($sql, "si", $pass_hash, $this->id);
-	}
-}
-
-function username_exists(string $username): bool
-{
-	$sql = "SELECT * FROM users WHERE user_name = ?;";
-	$result = Database::get()->query($sql, "s", $username);
-
-	return !empty($result);
+<?php
+include_once './includes/Database.php';
+
+const USER_LEVEL_MODERATOR = 1;
+
+class User
+{
+	public $id;
+	public $name;
+	public $password;
+	public $date;
+	public $level = 0;
+
+	private $has_value = false;
+
+	// Can't use a constructor here because we have two possible ways to get the user from the database
+	// and PHP does not allow function overloading. 
+	public function get_by_id($id)
+	{
+		$sql = "SELECT user_name, user_date, user_level, user_pass FROM users WHERE user_id = ?;";
+		$result = Database::get()->query($sql, "i", $id);
+
+		if (empty($result)) {
+			return;
+		}
+
+		$this->id = $id;
+		$this->name = $result[0]['user_name'];
+		$this->password = $result[0]['user_pass'];
+		$this->date = $result[0]['user_date'];
+		$this->level = $result[0]['user_level'];
+
+		$this->has_value = true;
+	}
+
+	public function get_by_name($name)
+	{
+		$sql = "SELECT user_id, user_date, user_level, user_pass FROM users WHERE user_name = ?";
+		$result = Database::get()->query($sql, "s", $name);
+
+		if (empty($result)) {
+			return;
+		}
+
+		$this->id = $result[0]['user_id'];
+		$this->name = $name;
+		$this->password = $result[0]['user_pass'];
+		$this->date = $result[0]['user_date'];
+		$this->level = $result[0]['user_level'];
+
+		$this->has_value = true;
+	}
+
+	public function has_value()
+	{
+		return $this->has_value;
+	}
+
+	public static function register(string $username, string $pass_hash)
+	{
+		$sql = "INSERT INTO users(user_name, user_pass, user_date, user_level) VALUES(?, ?, NOW(), 0);";
+		Database::get()->query($sql, "ss", $username, $pass_hash);
+	}
+
+	public function change_password(string $pass_hash)
+	{
+		if (!Session::get()->is_signed_in()) {
+			trigger_error('You are not signed in.');
+			return;
+		}
+
+		if (Session::get()->get_current_user()->id != $this->id) {
+			trigger_error("You can't change another user's password.");
+			return;
+		}
+
+		$sql = "UPDATE users SET user_pass = ? WHERE user_id = ?;";
+		Database::get()->query($sql, "si", $pass_hash, $this->id);
+	}
+
+	public function get_threads(): array
+	{
+		$sql = "SELECT thread_id FROM threads WHERE thread_author = ? ORDER BY thread_date_lastpost DESC";
+		$result = Database::get()->query($sql, "i", $this->id);
+		$threads = array();
+
+		foreach ($result as $row) {
+			$thread = new Thread($row['thread_id']);
+			if ($thread->has_value())
+				array_push($threads, $thread);
+		}
+
+		return $threads;
+	}
+}
+
+function username_exists(string $username): bool
+{
+	$sql = "SELECT * FROM users WHERE user_name = ?;";
+	$result = Database::get()->query($sql, "s", $username);
+
+	return !empty($result);
 }
 \ No newline at end of file
diff --git a/includes/templates/404.php b/includes/templates/404.php
index 74db2d6..8815b91 100644..100755
--- a/includes/templates/404.php
+++ b/includes/templates/404.php
@@ -1,14 +1,14 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>cflip.net forum</title>
-		<link rel="stylesheet" href="styles/style.css">
-		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	</head>
-	<body>
-<?php include_once 'header.php'; ?>
-		<h1>Page Not Found</h1>
-		<p>The page you requested does not exist.</p>
-	</body>
-</html>
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>cflip.net forum</title>
+		<link rel="stylesheet" href="styles/style.css">
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	</head>
+	<body>
+<?php include_once 'header.php'; ?>
+		<h1>Page Not Found</h1>
+		<p>The page you requested does not exist.</p>
+	</body>
+</html>
diff --git a/includes/templates/header.php b/includes/templates/header.php
index f1c2c94..45ec7e6 100644..100755
--- a/includes/templates/header.php
+++ b/includes/templates/header.php
@@ -1,20 +1,21 @@
-<header>
-<h1>cflip.net forum<sup style="font-size: small;">beta</sup></h1>
-<p>
-[<a href="/">Home</a>]
-[<a href="/create_thread.php">Create a thread</a>]
-<span style="float:right;">
-	<?php
-	include_once './includes/Session.php';
-	include_once './includes/model/User.php';
-
-	if (Session::get()->is_signed_in()) {
-		$user = Session::get()->get_current_user();
-		echo '[<a href="viewuser.php?id=' . $user->id . '">' . $user->name . '\'s Profile</a>] [<a href="signout.php">Log out</a>]';
-	} else {
-		echo '[<a href="signin.php">Sign in</a>] or [<a href="register.php">Register an account</a>]';
-	}
-	?>
-</span>
-</p>
-</header>
+<header>
+<h1>cflip.net forum</h1>
+<p>
+[<a href="/">Home</a>]
+[<a href="/create_thread.php">Create a thread</a>]
+<span style="float:right;">
+	<?php
+	include_once './includes/Session.php';
+	include_once './includes/model/User.php';
+
+	if (Session::get()->is_signed_in()) {
+		$user = Session::get()->get_current_user();
+		echo '[<a href="viewuser.php?id=' . $user->id . '">' . $user->name . '\'s Profile</a>] [<a href="signout.php">Log out</a>]';
+	} else {
+		echo '[<a href="signin.php">Sign in</a>] or [<a href="register.php">Register an account</a>]';
+	}
+	?>
+</span>
+</p>
+</header>
+<hr>
+\ No newline at end of file
diff --git a/moderate.php b/moderate.php
index 68bf1b9..5a181ac 100644..100755
--- a/moderate.php
+++ b/moderate.php
@@ -1,29 +1,79 @@
-<?php
-include_once './includes/functions_thread.php';
-include_once './includes/Session.php';
-include_once './includes/model/User.php';
-
-session_start();
-
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-	$thread_id = filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT);
-	$delete = filter_input(INPUT_POST, "delete", FILTER_SANITIZE_STRING);
-
-	$user = Session::get()->get_current_user();
-
-	if ($user->level == USER_LEVEL_MODERATOR) {
-		if (strcasecmp($delete, "on") == 0) {
-			$thread = new Thread();
-			$thread->get_from_database($thread_id);
-			delete_thread($thread);
-
-			header("Location: /");
-			exit();
-		}
-	}
-
-	header("Location: viewthread.php?id=$thread_id");
-	exit();
-}
-
-header("Location: /");
-\ No newline at end of file
+<?php
+include_once './includes/model/Thread.php';
+include_once './includes/Session.php';
+include_once './includes/model/User.php';
+
+$type = filter_input(INPUT_GET, "type", FILTER_SANITIZE_STRING);
+$id = filter_input(INPUT_GET, 'id', FILTER_SANITIZE_NUMBER_INT);
+
+$post = null;
+$thread = null;
+$is_post = strcasecmp($type, "post") == 0;
+$is_thread = strcasecmp($type, "thread") == 0;
+
+if ($is_post) $post = new Post($id);
+if ($is_thread) $thread = new Thread($id);
+
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+	$type = filter_input(INPUT_POST, "type", FILTER_SANITIZE_STRING);
+	$id = filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT);
+	$action = filter_input(INPUT_POST, 'action', FILTER_SANITIZE_STRING);
+
+	$user = Session::get()->get_current_user();
+
+	if (Session::get()->is_signed_in() and $user->level == USER_LEVEL_MODERATOR) {
+		// Set the value of these again with the variables from the POST request
+		$is_post = strcasecmp($type, "post") == 0;
+		$is_thread = strcasecmp($type, "thread") == 0;
+
+		if (strcasecmp($type, "thread") == 0) {
+			$thread = new Thread($id);
+			if (strcasecmp($action, "delete") == 0) Thread::delete($thread);
+		} else if (strcasecmp($type, "post") == 0) {
+			$post = new Post($id);
+			if (strcasecmp($action, "delete") == 0) $post->delete();
+		}
+	}
+} else {
+
+}
+?>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<title>cflip.net forum Moderation</title>
+<?php include_once 'includes/templates/head.php'; ?>
+</head>
+<body>
+<?php include_once 'includes/templates/header.php'; ?>
+<?php if (Session::get()->is_signed_in() and $user->level == USER_LEVEL_MODERATOR): ?>
+<?php if ($is_post): ?>
+	<h2>Moderate post</h2>
+<?php echo $post->get_content(); ?>
+	<form action="moderate.php" method="post">
+		<input type="hidden" name="id" value="<?= $post->id ?>">
+		<input type="hidden" name="type" value="post">
+		<select name="action">
+			<option value="delete">Delete</option>
+		</select>
+		<input type="submit">
+	</form>
+<?php elseif ($is_thread): ?>
+	<h2>Moderate thread</h2>
+	<p><?= $thread->subject ?></p>
+	<form action="moderate.php" method="post">
+		<input type="hidden" name="type" value="thread">
+		<label for="id">ID: </label>
+		<input type="number" name="id" value="<?= $thread->id ?>" readonly>
+		<label for="action">Action: </label>
+		<select name="action">
+			<option value="delete">Delete</option>
+		</select>
+		<input type="submit">
+	</form>
+<?php endif ?>
+<?php else: ?>
+	<section class="error">You must be signed in as a moderator to access this page.</section>
+<?php endif ?>
+</body>
+</html>
+\ No newline at end of file
diff --git a/register.php b/register.php
index 9eb3347..5128f10 100644..100755
--- a/register.php
+++ b/register.php
@@ -1,79 +1,78 @@
-<?php session_start() ?>
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <title>Register an account - cflip.net forum</title>
-    <link rel="stylesheet" href="styles/style.css">
-</head>
-<body>
-<?php include './includes/templates/header.php' ?>
-<h2>Register an account</h2>
-<form action="register.php" method="post">
-    <label for="user_name">Username: </label><br>
-    <input type="text" name="user_name"><br>
-    <label for="user_pass">Password: </label><br>
-    <input type="password" name="user_pass"><br>
-    <label for="user_pass_check">Re-enter password: </label><br>
-    <input type="password" name="user_pass_check"><br>
-    <input type="submit" name="submit">
-</form>
-<br>
-
-<?php
-include_once './includes/model/User.php';
-include_once './includes/error.php';
-
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-	$errors = array();
-
-	$user_name = "";
-	$user_pass = "";
-
-	if (empty($_POST['user_name'])) {
-		$errors[] = "You must provide a username.";
-	} else {
-		$user_name = $_POST['user_name'];
-		if (!preg_match("/^[a-zA-Z0-9_]*$/", $user_name)) {
-			$errors[] = "Username can only contain letters, numbers and underscores.";
-		}
-
-		if (strlen($user_name) > 30) {
-			$errors[] = "Your username must be 30 characters or less.";
-		}
-
-		if (username_exists($user_name) !== false) {
-			$errors[] = "The username '" . $user_name . "' has already been taken by another user.";
-		}
-	}
-
-	if (empty($_POST['user_pass'])) {
-		$errors[] = "You must provide a password.";
-	} else {
-		$user_pass = $_POST['user_pass'];
-		$pass_check = $_POST['user_pass_check'];
-
-		if (preg_match("/^[a-zA-Z0-9\W]*$/", $user_pass) === false) {
-			$errors[] = "Password contains invalid characters!";
-		}
-
-		if ($user_pass !== $pass_check) {
-			$errors[] = "The two passwords do not match.";
-		}
-	}
-
-	if (!empty($errors)) {
-		$errstr = 'Please check the following problems: <ul>';
-		foreach ($errors as $err) {
-			$errstr .= '<li>' . $err . '</li>';
-		}
-		$errstr .= '</ul>';
-		trigger_error($errstr);
-	} else {
-		$pass_hash = password_hash($user_pass, PASSWORD_DEFAULT);
-        User::register($user_name, $pass_hash);
-		echo '<p class="success">Account successfully registered! You can now <a href="signin.php">sign in</a></p>';
-	}
-}
-?>
-</body>
-</html>
+<?php session_start() ?>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<title>Register an account - cflip.net forum</title>
+<?php include_once 'includes/templates/head.php'; ?>
+</head>
+<body>
+<?php include './includes/templates/header.php' ?>
+	<h2>Register an account</h2>
+	<form action="register.php" method="post">
+		<label for="user_name">Username: </label><br>
+		<input type="text" name="user_name"><br>
+		<label for="user_pass">Password: </label><br>
+		<input type="password" name="user_pass"><br>
+		<label for="user_pass_check">Re-enter password: </label><br>
+		<input type="password" name="user_pass_check"><br>
+		<input type="submit" name="submit">
+	</form>
+	<br>
+<?php
+include_once './includes/model/User.php';
+include_once './includes/error.php';
+
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+	$errors = array();
+
+	$user_name = "";
+	$user_pass = "";
+
+	if (empty($_POST['user_name'])) {
+		$errors[] = "You must provide a username.";
+	} else {
+		$user_name = $_POST['user_name'];
+		if (!preg_match("/^[a-zA-Z0-9_]*$/", $user_name)) {
+			$errors[] = "Username can only contain letters, numbers and underscores.";
+		}
+
+		if (strlen($user_name) > 30) {
+			$errors[] = "Your username must be 30 characters or less.";
+		}
+
+		if (username_exists($user_name) !== false) {
+			$errors[] = "The username '" . $user_name . "' has already been taken by another user.";
+		}
+	}
+
+	if (empty($_POST['user_pass'])) {
+		$errors[] = "You must provide a password.";
+	} else {
+		$user_pass = $_POST['user_pass'];
+		$pass_check = $_POST['user_pass_check'];
+
+		if (preg_match("/^[a-zA-Z0-9\W]*$/", $user_pass) === false) {
+			$errors[] = "Password contains invalid characters!";
+		}
+
+		if ($user_pass !== $pass_check) {
+			$errors[] = "The two passwords do not match.";
+		}
+	}
+
+	if (!empty($errors)) {
+		$errstr = 'Please check the following problems: <ul>';
+		foreach ($errors as $err) {
+			$errstr .= '<li>' . $err . '</li>';
+		}
+		$errstr .= '</ul>';
+		trigger_error($errstr);
+	} else {
+		$pass_hash = password_hash($user_pass, PASSWORD_DEFAULT);
+		User::register($user_name, $pass_hash);
+		echo '<p class="success">Account successfully registered! You can now <a href="signin.php">sign in</a></p>';
+	}
+}
+?>
+</body>
+</html>
diff --git a/signin.php b/signin.php
index ef60750..195895a 100644..100755
--- a/signin.php
+++ b/signin.php
@@ -1,69 +1,69 @@
-<?php session_start() ?>
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<title>Sign in - cflip.net forum</title>
-		<link rel="stylesheet" href="styles/style.css">
-	</head>
-	<body>
-<?php include_once './includes/templates/header.php' ?>
-		<h2>Sign in</h2>
-		<form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" method="post">
-			<label for="user_name">Username: </label><br>
-			<input type="text" name="user_name"><br>
-			<label for="user_pass">Password: </label><br>
-			<input type="password" name="user_pass"><br>
-			<input type="submit" name="submit">
-		</form>
-<?php
-include_once 'includes/error.php';
-
-function validate($data)
-{
-	$data = trim($data);
-	$data = stripslashes($data);
-	$data = htmlspecialchars($data);
-	return $data;
-}
-
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-	$errors = array();
-
-	if (empty($_POST['user_name'])) {
-		$errors[] = 'Please provide a username.';
-	} else {
-		$user_name = validate($_POST['user_name']);
-	}
-
-	if (empty($_POST['user_pass'])) {
-		$errors[] = 'Please provide a password.';
-	} else {
-		$user_pass = $_POST['user_pass'];
-	}
-
-	if (!empty($errors)) {
-		$errstr = 'Please check the following problems: <ul>';
-		foreach ($errors as $err) {
-			$errstr .= '<li>' . $err . '</li>';
-		}
-		$errstr .= '</ul>';
-		trigger_error($errstr);
-	} else {
-		$user = new User();
-		$user->get_by_name($user_name);
-
-		if (!$user->has_value()) {
-			trigger_error('There is no user with that name. Did you mean to <a href="register.php">create a new account?</a>');
-		} else {
-			if (!password_verify($user_pass, $user->password)) {
-				echo 'Password does not match!';
-			} else {
-				Session::get()->sign_in($user);
-				header("Location: index.php");
-			}
-		}
-	}
-}
-?>
-	</body>
-</html>
+<?php session_start() ?>
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<title>Sign in - cflip.net forum</title>
+<?php include_once 'includes/templates/head.php'; ?>
+	</head>
+	<body>
+<?php include_once './includes/templates/header.php' ?>
+		<h2>Sign in</h2>
+		<form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" method="post">
+			<label for="user_name">Username: </label><br>
+			<input type="text" name="user_name"><br>
+			<label for="user_pass">Password: </label><br>
+			<input type="password" name="user_pass"><br>
+			<input type="submit" name="submit">
+		</form>
+<?php
+include_once 'includes/error.php';
+
+function validate($data)
+{
+	$data = trim($data);
+	$data = stripslashes($data);
+	$data = htmlspecialchars($data);
+	return $data;
+}
+
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+	$errors = array();
+
+	if (empty($_POST['user_name'])) {
+		$errors[] = 'Please provide a username.';
+	} else {
+		$user_name = validate($_POST['user_name']);
+	}
+
+	if (empty($_POST['user_pass'])) {
+		$errors[] = 'Please provide a password.';
+	} else {
+		$user_pass = $_POST['user_pass'];
+	}
+
+	if (!empty($errors)) {
+		$errstr = 'Please check the following problems: <ul>';
+		foreach ($errors as $err) {
+			$errstr .= '<li>' . $err . '</li>';
+		}
+		$errstr .= '</ul>';
+		trigger_error($errstr);
+	} else {
+		$user = new User();
+		$user->get_by_name($user_name);
+
+		if (!$user->has_value()) {
+			trigger_error('There is no user with that name. Did you mean to <a href="register.php">create a new account?</a>');
+		} else {
+			if (!password_verify($user_pass, $user->password)) {
+				echo 'Password does not match!';
+			} else {
+				Session::get()->sign_in($user);
+				header("Location: index.php");
+			}
+		}
+	}
+}
+?>
+	</body>
+</html>
diff --git a/signout.php b/signout.php
index bbaa47a..581617f 100644..100755
--- a/signout.php
+++ b/signout.php
@@ -1,16 +1,16 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<title>Sign out - cflip.net forums</title>
-	<link rel="stylesheet" href="styles/style.css">
-</head>
-<body>
-<?php
-include_once './includes/Session.php';
-Session::get()->sign_out();
-
-include_once './includes/templates/header.php';
-echo '<p class="success">You have now been signed out</p>';
-?>
-</body>
-</html>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<title>Sign out - cflip.net forums</title>
+<?php include_once 'includes/templates/head.php'; ?>
+</head>
+<body>
+<?php
+include_once './includes/Session.php';
+Session::get()->sign_out();
+
+include_once './includes/templates/header.php';
+echo '<p class="success">You have now been signed out</p>';
+?>
+</body>
+</html>
diff --git a/styles/style.css b/styles/style.css
index 0758f59..f849fc2 100644..100755
--- a/styles/style.css
+++ b/styles/style.css
@@ -1,112 +1,111 @@
-body {
-	font-family: Arial, sans-serif;
-	font-size: 10pt;
-	margin: 24px 5%;
-	background-color: #ffe;
-}
-
-a {
-	color: forestgreen;
-}
-
-
-a:hover {
-	color: #333;
-	text-decoration: none;
-}
-
-small {
-	font-size: 8pt;
-	color: #333;
-}
-
-table {
-	width: 100%;
-	border: none;
-	border-collapse: collapse;
-}
-
-th, .header {
-	background-color: forestgreen;
-	color: white;
-	padding: 4px;
-}
-
-th, .header a {
-	color: #eee;
-	font-weight: bold;
-}
-
-td {
-	background-color: white;
-	border: 1px solid forestgreen;
-	margin: none;
-	padding: 3px;
-}
-
-blockquote {
-	background-color: #ffd;
-	margin: 8px 40px 14px 18px;
-	padding: 12px;
-	border: 1px solid #aa6;
-	overflow: hidden;
-}
-
-textarea {
-	width: 100%;
-	height: 200px;
-	margin-right: 0px;
-	overflow: scroll;
-	resize: none;
-}
-
-.header > small {
-	color: #dde;
-}
-
-.post-content {
-	overflow: auto;
-	background-color: white;
-	padding: 12px 8px;
-	border: 1px solid forestgreen;
-	display: block;
-}
-
-.image-embed {
-	max-height: 80vh;
-}
-
-@keyframes bgslide {
-	from { background-position: 0 0px }
-	to { background-position: -5402px 0px }
-}
-
-#banner {
-	background-image: url("../img/banner.jpg");
-	background-repeat: repeat;
-
-	animation: bgslide 300s infinite linear;
-	height: 60px;
-}
-
-.success {
-	background-color: #efe;
-	margin: 8px 40px 14px 18px;
-	padding: 12px;
-	border: 1px solid #aea;
-	overflow: hidden;
-	border-radius: 5px;
-}
-
-.error {
-	background-color: #fee;
-	margin: 8px 40px 14px 18px;
-	padding: 12px;
-	border: 1px solid #eaa;
-	overflow: hidden;
-	border-radius: 5px;
-}
-
-.info {
-	color: #666;
+body {
+	font-family: Arial, sans-serif;
+	font-size: 10pt;
+	margin: 24px 10%;
+	background-image: linear-gradient(#eff, #fff);
+	background-repeat: no-repeat;
+}
+
+@media only screen and (max-width: 600px) {
+	body {
+		margin: 24px 6px;
+	}
+
+	.image-embed {
+		width: 100%;
+	}
+}
+
+a {
+	color: seagreen;
+}
+
+a:hover {
+	color: #333;
+	text-decoration: none;
+}
+
+small {
+	font-size: 8pt;
+	color: #333;
+}
+
+table {
+	width: 100%;
+	border-collapse: collapse;
+	border: 1px solid seagreen;
+}
+
+th, .header {
+	background-color: seagreen;
+	color: #eee;
+	padding: 4px;
+}
+
+th, .header a {
+	color: #eee;
+	font-weight: bold;
+}
+
+td {
+	border: 1px solid seagreen;
+	margin: none;
+	padding: 4px;
+}
+
+tr:nth-child(even) { background: #eee; }
+tr:nth-child(odd) { background: #fff; }
+
+blockquote {
+	background-color: #ffd;
+	margin: 8px 40px 14px 18px;
+	padding: 12px;
+	border: 1px solid #aa6;
+	overflow: hidden;
+}
+
+textarea {
+	width: 100%;
+	height: 200px;
+	margin-right: 0px;
+	overflow: scroll;
+	resize: none;
+}
+
+.header > small {
+	color: #dde;
+}
+
+.post-content {
+	overflow: auto;
+	background-color: white;
+	padding: 12px 8px;
+	border: 1px solid seagreen;
+	display: block;
+}
+
+.image-embed {
+	max-height: 80vh;
+}
+
+.success {
+	background-color: #efe;
+	margin: 8px 40px 14px 18px;
+	padding: 12px;
+	border: 1px solid #aea;
+	overflow: hidden;
+	border-radius: 5px;
+}
+
+.error {
+	background-color: #fee;
+	margin: 8px 40px 14px 18px;
+	padding: 12px;
+	border: 1px solid #eaa;
+	overflow: hidden;
+	border-radius: 5px;
+}
+
+.info {
+	color: #666;
 }
 \ No newline at end of file
diff --git a/viewcategory.php b/viewcategory.php
index 832d953..acca740 100644..100755
--- a/viewcategory.php
+++ b/viewcategory.php
@@ -1,57 +1,56 @@
-<?php
-include_once 'includes/model/Category.php';
-
-session_start();
-
-if (!isset($_GET['id']) or !filter_var($_GET['id'], FILTER_VALIDATE_INT)) {
-	http_response_code(404);
-	include('includes/templates/404.php');
-	die();
-}
-
-$current = new Category($_GET['id']);
-if (!$current->has_value()) {
-	http_response_code(404);
-	include('includes/templates/404.php');
-	die();
-}
-?>
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<title><?= $current->name; ?> - cflip.net forum</title>
-		<link rel="stylesheet" href="styles/style.css">
-		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	</head>
-	<body>
-<?php include_once 'includes/templates/header.php'; ?>
-		<h1><?= $current->name; ?></h1>
-		<p><?= $current->description; ?></p>
-		<span class="info"><?= $current->thread_count . ' threads, ' . $current->post_count . ' posts'; ?></span>
-		<div id="banner"></div>
-		<h2>Threads</h2>
-		<table>
-			<tr>
-				<th>Thread</th>
-				<th>Author</th>
-				<th>Date</th>
-				<th>Latest Post</th>
-			</tr>
-<?php foreach ($current->get_threads() as $thread): ?>
-			<tr>
-				<td>
-					<b><a href="viewthread.php?id=<?= $thread->id ?>"><?= $thread->subject ?></a></b>
-				</td>
-				<td><?= $thread->author->name ?></td>
-				<td><?= $thread->date_created ?></td>
-<?php $latest_post = $thread->get_latest_post(); if ($latest_post->has_value()): ?>
-				<td>by <b><a href="viewuser.php?id=<?= $latest_post->author->id ?>"><?= $latest_post->author->name ?></a></b><small> on <?= $latest_post->date_created ?></small></td>
-<?php else: ?>
-				<td>No posts yet!</td>
-<?php endif ?>
-			</tr>
-<?php endforeach ?>
-		</table>
-	</body>
-</html>
+<?php
+include_once 'includes/model/Category.php';
+
+session_start();
+
+if (!isset($_GET['id']) or !filter_var($_GET['id'], FILTER_VALIDATE_INT)) {
+	http_response_code(404);
+	include('includes/templates/404.php');
+	die();
+}
+
+$current = new Category($_GET['id']);
+if (!$current->has_value()) {
+	http_response_code(404);
+	include('includes/templates/404.php');
+	die();
+}
+?>
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<title><?= $current->name; ?> - cflip.net forum</title>
+<?php include_once 'includes/templates/head.php'; ?>
+	</head>
+	<body>
+<?php include_once 'includes/templates/header.php'; ?>
+		<h1><?= $current->name; ?></h1>
+		<p><?= $current->description; ?></p>
+		<span class="info"><?= $current->thread_count . ' threads, ' . $current->post_count . ' posts'; ?></span>
+		<h2>Threads</h2>
+		<table>
+			<tr>
+				<th>Thread</th>
+				<th>Author</th>
+				<th>Latest Post</th>
+			</tr>
+<?php foreach ($current->get_threads() as $thread): ?>
+			<tr>
+				<td>
+					<b><a href="viewthread.php?id=<?= $thread->id ?>"><?= $thread->subject ?></a></b>
+					<small>on <?= date('M d, Y', strtotime($thread->date_created)); ?></small>
+				</td>
+				<td><a href="viewuser.php?id=<?= $thread->author->id ?>"><?= $thread->author->name ?></a></td>
+<?php $latest_post = $thread->get_latest_post(); if ($latest_post->has_value()): ?>
+				<td>
+					<small>by <b><a href="viewuser.php?id=<?= $latest_post->author->id ?>"><?= $latest_post->author->name ?></a></b>
+					on <?= $latest_post->date_created ?></small>
+				</td>
+<?php else: ?>
+				<td>No posts yet!</td>
+<?php endif ?>
+			</tr>
+<?php endforeach ?>
+		</table>
+	</body>
+</html>
diff --git a/viewthread.php b/viewthread.php
index 365e014..85f1813 100644..100755
--- a/viewthread.php
+++ b/viewthread.php
@@ -1,83 +1,73 @@
-<?php
-include_once './includes/model/User.php';
-include_once './includes/model/Thread.php';
-include_once './includes/model/Post.php';
-
-session_start();
-
-if (!isset($_GET['id']) || !filter_var($_GET['id'], FILTER_VALIDATE_INT)) {
-	http_response_code(404);
-	include('includes/templates/404.php');
-	die();
-} 
-
-$current = new Thread($_GET['id']);
-if (!$current->has_value()) {
-	http_response_code(404);
-	include('includes/templates/404.php');
-	die();
-}
-?>
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<title><?= $current->subject; ?> - cflip.net forum</title>
-		<link rel="stylesheet" href="styles/style.css">
-			<meta charset="utf-8">
-			<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	</head>
-	<body>
-<?php include_once 'includes/templates/header.php'; ?>
-		<div id="banner"></div>
-		<h1><?= $current->subject; ?></h1>
-		created by <b><?= $current->author->name; ?></b>
-		in <b><?= $current->category->name; ?></b>, <?= date('M d, Y g:ia', strtotime($current->date_created)); ?>
-<?php if (Session::get()->is_signed_in() and Session::get()->get_current_user()->level == USER_LEVEL_MODERATOR): ?>
-		<form action="moderate.php" method="post">
-			<p>
-			<b>Moderator Options</b>
-			<input type="hidden" name="id" value="<?= $current->id ?>">
-			<input type="checkbox" id="delete" name="delete">
-			<label for="delete">Delete thread</label>
-			<input type="checkbox" id="lock" name="lock">
-			<label for="lock">Locked</label>
-			<input type="checkbox" id="pin" name="pin">
-			<label for="pin">Pinned</label>
-			<input type="submit" value="Update thread">
-			</p>
-		</form>
-<?php endif ?>
-		<hr>
-<?php 
-foreach ($current->get_posts() as $post) {
-	echo $post->get_content();
-} 
-?>
-		<hr>
-		<h2>Reply to this thread</h2>
-<?php
-include_once 'includes/error.php';
-
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-	if (!Session::get()->is_signed_in()) {
-		trigger_error('You must be <a href="signin.php">signed in</a> to reply to this thread.', E_USER_NOTICE);
-		return;
-	}
-
-	$post_content = filter_input(INPUT_POST, 'post_content', FILTER_SANITIZE_STRING);
-
-	if (empty($post_content) or !$post_content) {
-		trigger_error('Reply cannot be empty');
-	} else {
-		Post::create($post_content, $current->id, $current->category->id);
-		header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $current->id);
-	}
-}
-?>
-		<form method="post">
-			<textarea name="post_content" rows="10" cols="50"></textarea>
-			<br>
-			<input type="submit" name="submit">
-		</form>
-	</body>
-</html>
+<?php
+include_once './includes/model/User.php';
+include_once './includes/model/Thread.php';
+include_once './includes/model/Post.php';
+
+session_start();
+
+if (!isset($_GET['id']) || !filter_var($_GET['id'], FILTER_VALIDATE_INT)) {
+	http_response_code(404);
+	include('includes/templates/404.php');
+	die();
+} 
+
+$current = new Thread($_GET['id']);
+if (!$current->has_value()) {
+	http_response_code(404);
+	include('includes/templates/404.php');
+	die();
+}
+?>
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<title><?= $current->subject; ?> - cflip.net forum</title>
+<?php include_once 'includes/templates/head.php'; ?>
+		<meta property="og:site_name" content="cflip.net forum">
+		<meta property="og:title" content="<?= $current->subject; ?>">
+		<meta property="og:url" content="https://forum.cflip.net/viewthread.php?id=<?= $current->id; ?>">
+		<meta property="og:type" content="article">
+		<meta property="article:section" content="<?= $current->category->name; ?>">
+	</head>
+	<body>
+<?php include_once 'includes/templates/header.php'; ?>
+		<h1><?= $current->subject; ?></h1>
+		created by <b><?= $current->author->name; ?></b>
+		in <b><?= $current->category->name; ?></b>, <?= date('M d, Y g:ia', strtotime($current->date_created)); ?>
+<?php if (Session::get()->is_signed_in() and Session::get()->get_current_user()->level == USER_LEVEL_MODERATOR): ?>
+		<a href="moderate.php?type=thread&id=<?= $current->id; ?>">Moderator Options</a>
+<?php endif ?>
+		<hr>
+<?php 
+foreach ($current->get_posts() as $post) {
+	echo $post->get_content();
+} 
+?>
+		<hr>
+		<h2>Reply to this thread</h2>
+<?php
+include_once 'includes/error.php';
+
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+	if (!Session::get()->is_signed_in()) {
+		trigger_error('You must be <a href="signin.php">signed in</a> to reply to this thread.', E_USER_NOTICE);
+		return;
+	}
+
+	$post_content = filter_input(INPUT_POST, 'post_content', FILTER_SANITIZE_STRING);
+
+	if (empty($post_content) or !$post_content) {
+		trigger_error('Reply cannot be empty');
+	} else {
+		Post::create($post_content, $current->id, $current->category->id);
+		header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $current->id);
+	}
+}
+?>
+		<form method="post">
+			<textarea name="post_content" rows="10" cols="50"></textarea>
+			<br>
+			<input type="submit" name="submit">
+		</form>
+	</body>
+</html>
diff --git a/viewuser.php b/viewuser.php
index de40d6f..20dc55f 100644..100755
--- a/viewuser.php
+++ b/viewuser.php
@@ -1,31 +1,55 @@
-<?php
-include_once './includes/model/User.php';
-
-session_start();
-
-if (!isset($_GET['id']) or !filter_var($_GET['id'], FILTER_VALIDATE_INT)) {
-	http_response_code(404);
-	include('includes/templates/404.php');
-	die();
-}
-
-$current = new User();
-$current->get_by_id($_GET['id']);
-if (!$current->has_value()) {
-	http_response_code(404);
-	include('includes/templates/404.php');
-	die();
-}
-?>
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<title><?= $current->name; ?>'s Profile - cflip.net forum</title>
-	<link rel="stylesheet" href="styles/style.css">
-</head>
-<body>
-<?php include_once "includes/templates/header.php" ?>
-	<h1><?= $current->name; ?></h1>
-	member since <?= date('M d, Y', strtotime($current->date)); ?>
-</body>
-</html>
+<?php
+include_once './includes/model/User.php';
+include_once './includes/model/Thread.php';
+
+if (!isset($_GET['id']) or !filter_var($_GET['id'], FILTER_VALIDATE_INT)) {
+	http_response_code(404);
+	include('includes/templates/404.php');
+	die();
+}
+
+$current = new User();
+$current->get_by_id($_GET['id']);
+if (!$current->has_value()) {
+	http_response_code(404);
+	include('includes/templates/404.php');
+	die();
+}
+?>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<title><?= $current->name; ?>'s Profile - cflip.net forum</title>
+<?php include_once 'includes/templates/head.php'; ?>
+</head>
+<body>
+<?php include_once "includes/templates/header.php" ?>
+	<h1><?= $current->name; ?></h1>
+	member since <?= date('M d, Y', strtotime($current->date)); ?>
+	<h2><?= $current->name; ?>'s Threads</h2>
+		<table>
+			<tr>
+				<th>Thread</th>
+				<th>Category</th>
+				<th>Latest Post</th>
+			</tr>
+<?php foreach ($current->get_threads() as $thread): ?>
+			<tr>
+				<td>
+					<b><a href="viewthread.php?id=<?= $thread->id ?>"><?= $thread->subject ?></a></b>
+					<small>on <?= date('M d, Y', strtotime($thread->date_created)); ?></small>
+				</td>
+				<td><a href="viewcategory.php?id=<?= $thread->category->id ?>"><?= $thread->category->name ?></a></td>
+<?php $latest_post = $thread->get_latest_post(); if ($latest_post->has_value()): ?>
+				<td>
+					<small>by <b><a href="viewuser.php?id=<?= $latest_post->author->id ?>"><?= $latest_post->author->name ?></a></b>
+					on <?= $latest_post->date_created ?></small>
+				</td>
+<?php else: ?>
+				<td>No posts yet!</td>
+<?php endif ?>
+			</tr>
+<?php endforeach ?>
+		</table>
+</body>
+</html>