From 250aff13e5eab3935465ad3cb14288e84b078baf Mon Sep 17 00:00:00 2001
From: leosw <leo@lstronic.com>
Date: Thu, 18 Oct 2018 23:17:49 +0200
Subject: [PATCH] Optimize user list

---
 controllers/d.users.php       | 7 -------
 models/d.users.php            | 9 +++++----
 views/d.user.member_list.html | 2 +-
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/controllers/d.users.php b/controllers/d.users.php
index a119902..890407a 100755
--- a/controllers/d.users.php
+++ b/controllers/d.users.php
@@ -205,13 +205,6 @@ if(isset($controller->splitted_url[1])) {
 
 				$users->list_users($page*$rows_per_pages,$rows_per_pages,$orderby,$order);
 
-				$i = 0;
-				foreach ($users->ids as $row) {
-					$user_list[$i] = new User();
-					$user_list[$i]->checkID($row);
-					$i++;
-				}
-
 				$first = $page*$rows_per_pages+1;
 				$last = (($page+1)*$rows_per_pages > $users->number ? $users->number : ($page+1)*$rows_per_pages);
 				
diff --git a/models/d.users.php b/models/d.users.php
index 54ba283..06a524e 100755
--- a/models/d.users.php
+++ b/models/d.users.php
@@ -383,7 +383,7 @@ function randomPassword() {
 
 class Users
 {
-	public $ids = array();
+	public $objs = array();
 	public $number = NULL;
 
 	/*****
@@ -421,9 +421,9 @@ class Users
 		$orderbysafe=$orders[$key];
 
 		if ($order == 'ASC')
-			$query = "SELECT id FROM users ORDER BY $orderbysafe ASC LIMIT $1 OFFSET $2";
+			$query = "SELECT * FROM users ORDER BY $orderbysafe ASC LIMIT $1 OFFSET $2";
 		else
-			$query = "SELECT id FROM users ORDER BY $orderbysafe DESC LIMIT $1 OFFSET $2";
+			$query = "SELECT * FROM users ORDER BY $orderbysafe DESC LIMIT $1 OFFSET $2";
 		
 
 		pg_prepare($con, "prepare1", $query) 
@@ -435,7 +435,8 @@ class Users
 
 		for($i = 0; $i < pg_num_rows($result); $i++) {
 			$row = pg_fetch_assoc($result, $i);
-			$this->ids[$i] = $row['id'];
+			$this->objs[$i] = new User;
+			$this->objs[$i]->populate($row);
 		}
 	}
 }
diff --git a/views/d.user.member_list.html b/views/d.user.member_list.html
index c6976fc..083e01f 100755
--- a/views/d.user.member_list.html
+++ b/views/d.user.member_list.html
@@ -34,7 +34,7 @@
 						<?=$orderby=='website'?$order=='ASC'?'<i class="fas fa-caret-down" aria-hidden="true"></i>':'<i class="fas fa-caret-up" aria-hidden="true"></i>':''?>
 					</th>
 				</tr>
-			<? foreach ($user_list as $row) { ?>
+			<? foreach ($users->objs as $row) { ?>
 				<tr>
 					<td>
 						<? if ($row->is_avatar_present=='t') { ?>