From 2098bf444afadcf0363d89b4cc1dca5d2213d754 Mon Sep 17 00:00:00 2001
From: cflip <36554078+cflip@users.noreply.github.com>
Date: Sat, 24 Apr 2021 19:40:50 -0600
Subject: Remove all uses of db_inc.php

This method of importing the database login every time wasn't very good.
Now everything uses the new Database singleton class.
---
 includes/model/User.php | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

(limited to 'includes/model/User.php')

diff --git a/includes/model/User.php b/includes/model/User.php
index c780ff0..f2bd23d 100644
--- a/includes/model/User.php
+++ b/includes/model/User.php
@@ -7,44 +7,36 @@ class User
 {
 	public $id;
 	public $name = 'Unknown';
+	public $password;
 	public $date = 0;
 	public $level = 0;
 
-	function get_by_name($name, $dbc)
+	function get_by_name($name): bool
 	{
-		$sql = "SELECT user_id, user_date, user_level FROM users WHERE user_name = ?";
-		$stmt = mysqli_stmt_init($dbc);
+		$sql = "SELECT user_id, user_date, user_level, user_pass FROM users WHERE user_name = ?";
+		$result = Database::get()->query($sql, "s", $name);
 
-		if (!mysqli_stmt_prepare($stmt, $sql)) {
-			echo 'Failed to get user: ' . mysqli_error($dbc);
+		if (empty($result)) {
+			return false;
 		}
 
-		mysqli_stmt_bind_param($stmt, "s", $name);
-		mysqli_stmt_execute($stmt);
-
-		$result = mysqli_stmt_get_result($stmt);
-
-		if (mysqli_num_rows($result) == 0) {
-		} else {
-			while ($row = mysqli_fetch_assoc($result)) {
-				$this->id = $row['user_id'];
-				$this->name = $name;
-				$this->date = $row['user_date'];
-				$this->level = $row['user_level'];
-			}
-		}
+		$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'];
 
-		mysqli_free_result($result);
-		mysqli_stmt_close($stmt);
+		return true;
 	}
 
 	function get_by_id($id)
 	{
-		$sql = "SELECT user_name, user_date, user_level FROM users WHERE user_id = ?;";
+		$sql = "SELECT user_name, user_date, user_level, user_pass FROM users WHERE user_id = ?;";
 		$result = Database::get()->query($sql, "i", $id);
 
 		$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'];
 	}
-- 
cgit v1.2.3