From f5e972c030675f46cda543e13da1b787457e070b Mon Sep 17 00:00:00 2001
From: cflip <36554078+cflip@users.noreply.github.com>
Date: Wed, 23 Jun 2021 15:21:12 -0600
Subject: Add the rest of the changes
---
includes/Database.php | 162 +++++++++----------
includes/Session.php | 114 ++++++-------
includes/error.php | 50 +++---
includes/model/Category.php | 156 +++++++++---------
includes/model/Post.php | 369 +++++++++++++++++++++---------------------
includes/model/User.php | 189 ++++++++++++----------
includes/templates/404.php | 28 ++--
includes/templates/header.php | 41 ++---
8 files changed, 563 insertions(+), 546 deletions(-)
mode change 100644 => 100755 includes/Database.php
mode change 100644 => 100755 includes/Session.php
mode change 100644 => 100755 includes/error.php
mode change 100644 => 100755 includes/model/Category.php
mode change 100644 => 100755 includes/model/Post.php
mode change 100644 => 100755 includes/model/User.php
mode change 100644 => 100755 includes/templates/404.php
mode change 100644 => 100755 includes/templates/header.php
(limited to 'includes')
diff --git a/includes/Database.php b/includes/Database.php
old mode 100644
new mode 100755
index 0a79dfb..61fbbb1
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -1,82 +1,82 @@
-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);
- }
+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
old mode 100644
new mode 100755
index ceaa765..0e08482
--- a/includes/Session.php
+++ b/includes/Session.php
@@ -1,57 +1,57 @@
-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;
- }
-}
+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
old mode 100644
new mode 100755
index 5e33212..1450a28
--- a/includes/error.php
+++ b/includes/error.php
@@ -1,25 +1,25 @@
-'. $message .'';
-}
-
-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');
-?>
+'. $message .'';
+}
+
+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
old mode 100644
new mode 100755
index e8cbe60..37ad4f8
--- a/includes/model/Category.php
+++ b/includes/model/Category.php
@@ -1,78 +1,78 @@
-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']);
- }
-}
+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
old mode 100644
new mode 100755
index 49fd640..1b64490
--- a/includes/model/Post.php
+++ b/includes/model/Post.php
@@ -1,184 +1,185 @@
-query($sql, "i", $id);
-
- $reply = $result[0];
-
- if (empty($reply)) {
- return 'This post has been deleted Quote from ' . $reply['user_name'] . ' $0 ', $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 = '';
-
- // Append the formatted post content
- $result .= '' . format_post_content($this->content) . ' ';
-
- 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;
- }
-}
+query($sql, "i", $id);
+
+ $reply = $result[0];
+
+ if (empty($reply)) {
+ return 'This post has been deleted Quote from ' . $reply['user_name'] . ' $0 ', $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 = '';
+
+ // Append the formatted post content
+ $result .= '' . format_post_content($this->content) . ' ';
+
+ 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
old mode 100644
new mode 100755
index 13cbc03..7d3c1e4
--- a/includes/model/User.php
+++ b/includes/model/User.php
@@ -1,88 +1,103 @@
-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);
+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
old mode 100644
new mode 100755
index 74db2d6..8815b91
--- a/includes/templates/404.php
+++ b/includes/templates/404.php
@@ -1,14 +1,14 @@
-
-
-
- cflip.net forum
- Page Not Found
- The page you requested does not exist.
-
-
+
+
+
+ cflip.net forum
+ Page Not Found
+ The page you requested does not exist.
+
+
diff --git a/includes/templates/header.php b/includes/templates/header.php
old mode 100644
new mode 100755
index f1c2c94..45ec7e6
--- a/includes/templates/header.php
+++ b/includes/templates/header.php
@@ -1,20 +1,21 @@
-
+
+