Update names of database variables

1 files changed, 11 insertions, 11 deletions

diff --git a/includes/model/User.php b/includes/model/User.php
index 785b847..17d40cb 100755
--- a/includes/model/User.php
+++ b/includes/model/User.php
@@ -1,7 +1,7 @@
 <?php

 include_once './includes/Database.php';

 

-const USER_LEVEL_MODERATOR = 1;

+const USER_LEVEL_MODERATOR = 'moderator';

 

 class User

 {

@@ -9,7 +9,7 @@ class User
 	public $name;

 	public $password;

 	public $date;

-	public $level = 0;

+	public $level = 'user';

 

 	private $has_value = false;

 

@@ -17,7 +17,7 @@ class User
 	// 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 = ?;";

+		$sql = "SELECT user_name, user_date_registered, user_level, user_password FROM users WHERE user_id = ?;";

 		$result = Database::get()->query($sql, "i", $id);

 

 		if (empty($result)) {

@@ -26,8 +26,8 @@ class User
 

 		$this->id = $id;

 		$this->name = $result[0]['user_name'];

-		$this->password = $result[0]['user_pass'];

-		$this->date = $result[0]['user_date'];

+		$this->password = $result[0]['user_password'];

+		$this->date = $result[0]['user_date_registered'];

 		$this->level = $result[0]['user_level'];

 

 		$this->has_value = true;

@@ -35,7 +35,7 @@ class User
 

 	public function get_by_name($name)

 	{

-		$sql = "SELECT user_id, user_date, user_level, user_pass FROM users WHERE user_name = ?";

+		$sql = "SELECT user_id, user_date_registered, user_level, user_password FROM users WHERE user_name = ?";

 		$result = Database::get()->query($sql, "s", $name);

 

 		if (empty($result)) {

@@ -44,8 +44,8 @@ class User
 

 		$this->id = $result[0]['user_id'];

 		$this->name = $name;

-		$this->password = $result[0]['user_pass'];

-		$this->date = $result[0]['user_date'];

+		$this->password = $result[0]['user_password'];

+		$this->date = $result[0]['user_date_registered'];

 		$this->level = $result[0]['user_level'];

 

 		$this->has_value = true;

@@ -58,7 +58,7 @@ class User
 

 	public static function register(string $username, string $password)

 	{

-		$sql = "INSERT INTO users(user_name, user_pass, user_date, user_level) VALUES(?, ?, NOW(), 0);";

+		$sql = "INSERT INTO users(user_name, user_password, user_date_registered) VALUES(?, ?, NOW());";

 		$pass_hash = password_hash($password, PASSWORD_DEFAULT);

 		Database::get()->query($sql, "ss", $username, $pass_hash);

 	}

@@ -75,13 +75,13 @@ class User
 			return;

 		}

 

-		$sql = "UPDATE users SET user_pass = ? WHERE user_id = ?;";

+		$sql = "UPDATE users SET user_password = ? 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";

+		$sql = "SELECT thread_id FROM threads WHERE thread_author = ? ORDER BY thread_last_post_date DESC";

 		$result = Database::get()->query($sql, "i", $this->id);

 		$threads = array();