From 53aae22a60601f20f17259c1c309cad4c9689aa2 Mon Sep 17 00:00:00 2001
From: leosw <leo@lstronic.com>
Date: Thu, 18 Oct 2018 23:13:39 +0200
Subject: [PATCH] Repair member list page

---
 controllers/d.users.php       |  3 +--
 models/d.locales.php          |  7 ++-----
 views/d.user.member_list.html | 32 ++++++++++++++++----------------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/controllers/d.users.php b/controllers/d.users.php
index acf9818..a119902 100755
--- a/controllers/d.users.php
+++ b/controllers/d.users.php
@@ -208,8 +208,7 @@ if(isset($controller->splitted_url[1])) {
 				$i = 0;
 				foreach ($users->ids as $row) {
 					$user_list[$i] = new User();
-					$user_list[$i]->id = $row;
-					$user_list[$i]->populate();
+					$user_list[$i]->checkID($row);
 					$i++;
 				}
 
diff --git a/models/d.locales.php b/models/d.locales.php
index a71c3be..78d8ab8 100644
--- a/models/d.locales.php
+++ b/models/d.locales.php
@@ -45,10 +45,7 @@ class Locale
 	/*****
 	** Populate the object using raw data from SQL
 	*****/
-	private function populate($row) {
-	    $this->forcePopulate($row);
-	}
-	public function forcePopulate($row) {
+	public function populate($row) {
 	    $this->name = $row['name'];
 	    $this->display_name = $row['display_name'];
 	    $this->flag_name = $row['flag_name'];
@@ -98,7 +95,7 @@ class Locales
 		for($i = 0; $i < $this->number; $i++) {
 			$locale = pg_fetch_assoc($result, $i);
 			$this->objs[$i] = new Locale;
-			$this->objs[$i]->forcePopulate($locale);
+			$this->objs[$i]->populate($locale);
 		}
 	}
 }
diff --git a/views/d.user.member_list.html b/views/d.user.member_list.html
index dbe2afc..c6976fc 100755
--- a/views/d.user.member_list.html
+++ b/views/d.user.member_list.html
@@ -15,41 +15,41 @@
 				<tr class="first">
 					<th>
 						<a href="<?=$config['rel_root_folder']?>user/member_list/<?=$page+1?>?orderby=name&amp;order=<?=$order=='ASC'?'DESC':'ASC'?>">Nom d'utilisateur</a>
-						<?=$orderby=='name'?$order=='ASC'?'<i class="fa fa-caret-down" aria-hidden="true"></i>':'<i class="fa fa-caret-up" aria-hidden="true"></i>':''?>
+						<?=$orderby=='name'?$order=='ASC'?'<i class="fas fa-caret-down" aria-hidden="true"></i>':'<i class="fas fa-caret-up" aria-hidden="true"></i>':''?>
 					</th>
 					<th>
-						<a href="<?=$config['rel_root_folder']?>user/member_list/<?=$page+1?>?orderby=role&amp;order=<?=$order=='ASC'?'DESC':'ASC'?>">Rôle</a>
-						<?=$orderby=='role'?$order=='ASC'?'<i class="fa fa-caret-down" aria-hidden="true"></i>':'<i class="fa fa-caret-up" aria-hidden="true"></i>':''?>
+						<a href="<?=$config['rel_root_folder']?>user/member_list/<?=$page+1?>?orderby=rank&amp;order=<?=$order=='ASC'?'DESC':'ASC'?>">Rôle</a>
+						<?=$orderby=='rank'?$order=='ASC'?'<i class="fas fa-caret-down" aria-hidden="true"></i>':'<i class="fas fa-caret-up" aria-hidden="true"></i>':''?>
 					</th>
 					<th>
-						<a href="<?=$config['rel_root_folder']?>user/member_list/<?=$page+1?>?orderby=registered&amp;order=<?=$order=='ASC'?'DESC':'ASC'?>">Inscription</a>
-						<?=$orderby=='registered'?$order=='ASC'?'<i class="fa fa-caret-down" aria-hidden="true"></i>':'<i class="fa fa-caret-up" aria-hidden="true"></i>':''?>
+						<a href="<?=$config['rel_root_folder']?>user/member_list/<?=$page+1?>?orderby=register_date&amp;order=<?=$order=='ASC'?'DESC':'ASC'?>">Inscription</a>
+						<?=$orderby=='register_date'?$order=='ASC'?'<i class="fas fa-caret-down" aria-hidden="true"></i>':'<i class="fas fa-caret-up" aria-hidden="true"></i>':''?>
 					</th>
 					<th>
-						<a href="<?=$config['rel_root_folder']?>user/member_list/<?=$page+1?>?orderby=lastlogin&amp;order=<?=$order=='ASC'?'DESC':'ASC'?>">Dernière visite</a>
-						<?=$orderby=='lastlogin'?$order=='ASC'?'<i class="fa fa-caret-down" aria-hidden="true"></i>':'<i class="fa fa-caret-up" aria-hidden="true"></i>':''?>
+						<a href="<?=$config['rel_root_folder']?>user/member_list/<?=$page+1?>?orderby=visit_date&amp;order=<?=$order=='ASC'?'DESC':'ASC'?>">Dernière visite</a>
+						<?=$orderby=='visit_date'?$order=='ASC'?'<i class="fas fa-caret-down" aria-hidden="true"></i>':'<i class="fas fa-caret-up" aria-hidden="true"></i>':''?>
 					</th>
 					<th>
 						<a href="<?=$config['rel_root_folder']?>user/member_list/<?=$page+1?>?orderby=website&amp;order=<?=$order=='ASC'?'DESC':'ASC'?>">Site internet</a>
-						<?=$orderby=='website'?$order=='ASC'?'<i class="fa fa-caret-down" aria-hidden="true"></i>':'<i class="fa fa-caret-up" aria-hidden="true"></i>':''?>
+						<?=$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) { ?>
 				<tr>
 					<td>
-						<? if ($row->avatar=='t') { ?>
+						<? if ($row->is_avatar_present=='t') { ?>
 							<img alt="Avatar" class="icon avatar" src="<?=$config['rel_root_folder']?>medias/avatars/<?=$row->id?>_s.jpg">
 						<? } else { ?>
-							<i class="icon fa fa-user-secret"></i>
+							<i class="icon fas fa-user-secret"></i>
 						<? } ?>
 						<a class="username" href="<?=$config['rel_root_folder']?>user/p/<?=$row->id?>"><?=$row->name?></a>
 					</td>
-					<td><?=$row->role()?></td>
-					<td><? echo strftime('%e %B %G',strtotime($row->registered)) ?></td>
-					<td><? echo strftime('%e %B %G',strtotime($row->lastlogin)) ?></td>
+					<td><?=$row->get_rank()?></td>
+					<td><? echo strftime('%e %B %G',strtotime($row->register_date)) ?></td>
+					<td><? echo strftime('%e %B %G',strtotime($row->visit_date)) ?></td>
 					<td>
 						<? if ($row->website != "") { ?>
-						<a target="_blank" href="<?=$row->website?>">Site internet <span class="external-link"><i class="fa fa-external-link"></i></span></a>
+						<a target="_blank" href="<?=$row->website?>">Site internet <span class="external-link"><i class="fas fa-external-link-alt"></i></span></a>
 						<? } ?>
 					</td>
 				</tr>
@@ -57,8 +57,8 @@
 			</table> 
 
 			<div class="pagebuttons">
-				<? if ($page != 0) { ?><a class="previous" href="<?=$config['rel_root_folder']?>user/member_list/<?=$page?>?orderby=<?=$orderby?>&amp;order=<?=$order?>"><i class="fa fa-chevron-left fa-fw"></i></a><? }
-				if (($page+1)*$rows_per_pages < $users->number) { ?><a class="next" href="<?=$config['rel_root_folder']?>user/member_list/<?=$page+2?>?orderby=<?=$orderby?>&amp;order=<?=$order?>"><i class="fa fa-chevron-right fa-fw"></i></a><? } ?>
+				<? if ($page != 0) { ?><a class="previous" href="<?=$config['rel_root_folder']?>user/member_list/<?=$page?>?orderby=<?=$orderby?>&amp;order=<?=$order?>"><i class="fas fa-chevron-left fa-fw"></i></a><? }
+				if (($page+1)*$rows_per_pages < $users->number) { ?><a class="next" href="<?=$config['rel_root_folder']?>user/member_list/<?=$page+2?>?orderby=<?=$orderby?>&amp;order=<?=$order?>"><i class="fas fa-chevron-right fa-fw"></i></a><? } ?>
 			</div>