From 61a4400e1fbbd1a664c9a5d2001ce6640104ab94 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 13 Sep 2019 15:38:34 +0900
Subject: [PATCH] Display phone number in member list if the field is enabled

---
 modules/member/member.admin.model.php         |  4 ++++
 modules/member/member.admin.view.php          |  9 +++++++-
 modules/member/queries/getMemberList.xml      |  1 +
 .../queries/getMemberListWithinGroup.xml      |  1 +
 modules/member/tpl/member_list.html           | 21 ++++++++++++++-----
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/modules/member/member.admin.model.php b/modules/member/member.admin.model.php
index 670ac23f0..658ca3778 100644
--- a/modules/member/member.admin.model.php
+++ b/modules/member/member.admin.model.php
@@ -79,6 +79,10 @@ class memberAdminModel extends member
 					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
 					$args->s_email_address = $search_keyword;
 					break;
+				case 'phone_number' :
+					if($search_keyword) $search_keyword = preg_replace('/[^0-9]/', '', $search_keyword);
+					$args->s_phone_number = $search_keyword;
+					break;
 				case 'regdate' :
 					$args->s_regdate = preg_replace("/[^0-9]/","",$search_keyword);
 					break;
diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php
index 303c3511c..6061234e9 100644
--- a/modules/member/member.admin.view.php
+++ b/modules/member/member.admin.view.php
@@ -95,7 +95,13 @@ class memberAdminView extends member
 			}
 		}
 		$config = $this->memberConfig;
-		$memberIdentifiers = array('user_id'=>'user_id', 'user_name'=>'user_name', 'nick_name'=>'nick_name');
+		$memberIdentifiers = array(
+			'user_id' => 'user_id',
+			'email_address' => 'email_address',
+			'phone_number' => 'phone_number',
+			'user_name' => 'user_name',
+			'nick_name' => 'nick_name'
+		);
 		$usedIdentifiers = array();	
 
 		if(is_array($config->signupForm))
@@ -114,6 +120,7 @@ class memberAdminView extends member
 		Context::set('total_count', $output->total_count);
 		Context::set('total_page', $output->total_page);
 		Context::set('page', $output->page);
+		Context::set('member_config', $oMemberModel->getMemberConfig());
 		Context::set('member_list', $output->data);
 		Context::set('usedIdentifiers', $usedIdentifiers);
 		Context::set('page_navigation', $output->page_navigation);
diff --git a/modules/member/queries/getMemberList.xml b/modules/member/queries/getMemberList.xml
index 422597ba5..cdfef0311 100644
--- a/modules/member/queries/getMemberList.xml
+++ b/modules/member/queries/getMemberList.xml
@@ -15,6 +15,7 @@
             <condition operation="like" column="nick_name" var="s_nick_name" pipe="or" />
             <condition operation="like" column="nick_name" var="html_nick_name" pipe="or" />
             <condition operation="like" column="email_address" var="s_email_address" pipe="or" />
+			<condition operation="like" column="phone_number" var="s_phone_number" pipe="or" />
             <condition operation="like" column="birthday" var="s_birthday" pipe="or" />
             <condition operation="like" column="extra_vars" var="s_extra_vars" pipe="or" />
             <condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />
diff --git a/modules/member/queries/getMemberListWithinGroup.xml b/modules/member/queries/getMemberListWithinGroup.xml
index 5c68e0991..fe4dc6368 100644
--- a/modules/member/queries/getMemberListWithinGroup.xml
+++ b/modules/member/queries/getMemberListWithinGroup.xml
@@ -28,6 +28,7 @@
 			<condition operation="like" column="member.nick_name" var="s_nick_name" pipe="or" />
 			<condition operation="like" column="member.nick_name" var="html_nick_name" pipe="or" />
 			<condition operation="like" column="member.email_address" var="s_email_address" pipe="or" />
+			<condition operation="like" column="member.phone_number" var="s_phone_number" pipe="or" />
 			<condition operation="like" column="member.birthday" var="s_birthday" pipe="or" />
 			<condition operation="like" column="member.extra_vars" var="s_extra_vars" pipe="or" />
 			<condition operation="like_prefix" column="member.regdate" var="s_regdate" pipe="or" />
diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html
index 890b62abf..e24b7ec97 100644
--- a/modules/member/tpl/member_list.html
+++ b/modules/member/tpl/member_list.html
@@ -34,7 +34,6 @@
 		<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">{$lang->email}</th>
 				<th scope="col" class="nowr" loop="$usedIdentifiers=>$name,$title">{$title}</th>
 				<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>
@@ -56,11 +55,23 @@
 					<i class="no_profile">?</i>
 					<!--@end-->
 				</td>
-				<td class="nowr">
-					<a href="#popup_menu_area" class="member_{$member_info['member_srl']}" title="Info">{getEncodeEmailAddress($member_info['email_address'])}</a>
-				</td>
 				{@ $member_info['group_list'] = implode(', ', $member_info['group_list'])}
-				<td class="nowr" loop="$usedIdentifiers=>$name,$title">{$member_info[$name]}</td>
+				<td class="nowr" loop="$usedIdentifiers=>$name,$title">
+					<!--@if($name === 'email_address')-->
+						<a href="#popup_menu_area" class="member_{$member_info['member_srl']}">{getEncodeEmailAddress($member_info['email_address'])}</a>
+					<!--@elseif($name === 'phone_number')-->
+						<!--@if($member_info['phone_country'] && $member_info['phone_country'] != $member_config->phone_number_default_country)-->
+							(+{$member_info['phone_country']})
+						<!--@end-->
+						<!--@if($member_info['phone_country'] == 82)-->
+							{\Rhymix\Framework\Korea::formatPhoneNumber($member_info['phone_number'])}
+						<!--@else-->
+							{$member_info['phone_number']}
+						<!--@end-->
+					<!--@else-->
+						{$member_info[$name]}
+					<!--@end-->
+				</td>
 				<td class="nowr">
 					<!--@if($member_info['denied']=='Y')-->
 						<span style="color:red;">{$lang->denied}</span>