From b6b06af33663b58a6c2e323c0132248f07acab0c Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 16 Dec 2020 21:54:47 +0900
Subject: [PATCH] Fix #907 support more sort options in member list

---
 modules/member/member.admin.model.php | 2 +-
 modules/member/tpl/member_list.html   | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/member/member.admin.model.php b/modules/member/member.admin.model.php
index 13904ff36..8240e5f3e 100644
--- a/modules/member/member.admin.model.php
+++ b/modules/member/member.admin.model.php
@@ -120,7 +120,7 @@ class memberAdminModel extends member
 		// Change the query id if selected_group_srl exists (for table join)
 		$sort_order = Context::get('sort_order');
 		$sort_index = Context::get('sort_index');
-		if(!$sort_index)
+		if(!$sort_index || !in_array($sort_index, ['user_id', 'email_address', 'phone_number', 'user_name', 'nick_name', 'regdate', 'last_login']))
 		{
 			$sort_index = "list_order";
 		}
diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html
index 848a2003e..6c819b140 100644
--- a/modules/member/tpl/member_list.html
+++ b/modules/member/tpl/member_list.html
@@ -34,7 +34,11 @@
 		<thead>
 			<tr>
 				<th scope="col" class="nowr rx_detail_marks" cond="$profileImageConfig == 'Y' && $config->member_profile_view == 'Y'">{$lang->profile_image}</th>
-				<th scope="col" class="nowr" loop="$usedIdentifiers=>$name,$title">{$title}</th>
+				<!--@foreach($usedIdentifiers as $name => $title)-->
+					<th scope="col" class="nowr">
+						<a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'sort_index', $name, 'sort_order', ($sort_order == 'asc') ? 'desc' : 'asc', 'selected_group_srl', $selected_group_srl)}">{$title}<block cond="$sort_index == $name"> <em cond="$sort_order=='asc'">▲</em><em cond="$sort_order != 'asc'">▼</em></block></a>
+					</th>
+				<!--@endforeach-->
 				<th scope="col" class="nowr">{$lang->status}</th>
 				<th scope="col" class="nowr rx_detail_marks"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'sort_index', 'regdate', 'sort_order', ($sort_order == 'asc') ? 'desc' : 'asc', 'selected_group_srl', $selected_group_srl)}">{$lang->signup_date}<block cond="$sort_index == 'regdate'"> <em cond="$sort_order=='asc'">▲</em><em cond="$sort_order != 'asc'">▼</em></block></a></th>
 				<th scope="col" class="nowr rx_detail_marks"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'sort_index', 'last_login', 'sort_order',  ($sort_order == 'asc') ? 'desc' : 'asc', 'selected_group_srl', $selected_group_srl)}">{$lang->last_login}<block cond="$sort_index == 'last_login'"> <em cond="$sort_order=='asc'">▲</em><em cond="$sort_order != 'asc'">▼</em></block></a></th>