From b0a00c39f2a7488787e9e394730b45f5e3548e8c Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Mon, 15 Apr 2024 01:21:47 +0900
Subject: [PATCH] Use extravar skin to display member extra input fields

---
 modules/member/member.model.php |  2 ++
 modules/member/member.view.php  | 32 +++++++-------------------------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index dc0156cbb..48060ff46 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -911,6 +911,7 @@ class MemberModel extends Member
 				case 'checkbox' :
 					if($value && !is_array($value)) $value = array($value);
 					break;
+				/*
 				case 'country' :
 					$lang_type = Context::get('lang_type');
 					$country_list = Rhymix\Framework\i18n::listCountries($lang_type === 'ko' ? Rhymix\Framework\i18n::SORT_NAME_KOREAN : Rhymix\Framework\i18n::SORT_NAME_ENGLISH);
@@ -921,6 +922,7 @@ class MemberModel extends Member
 					$supported_lang = Rhymix\Framework\Lang::getSupportedList();
 					$value = $supported_lang[$value]['name'];
 					break;
+				*/
 				case 'text' :
 				case 'homepage' :
 				case 'email_address' :
diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index 6fb31ed20..cc708eaac 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -250,31 +250,13 @@ class MemberView extends Member
 			else
 			{
 				$item->title = $extendFormInfo[$formInfo->member_join_form_srl]->column_title ?? null;
-				$orgValue = $extendFormInfo[$formInfo->member_join_form_srl]->value ?? null;
-				if($formInfo->type=='tel' && is_array($orgValue))
-				{
-					$item->value = implode('-', $orgValue);
-				}
-				elseif($formInfo->type=='kr_zip' && is_array($orgValue))
-				{
-					$item->value = implode(' ', $orgValue);
-				}
-				elseif($formInfo->type=='checkbox' && is_array($orgValue))
-				{
-					$item->value = implode(", ",$orgValue);
-				}
-				elseif($formInfo->type=='date')
-				{
-					$item->value = is_array($orgValue) ? array_first($orgValue) : $orgValue;
-					if (preg_match('/^[0-9]{8}/', $item->value))
-					{
-						$item->value = sprintf('%s-%s-%s', substr($item->value, 0, 4), substr($item->value, 4, 2), substr($item->value, 6, 2));
-					}
-				}
-				else
-				{
-					$item->value = nl2br(is_array($orgValue) ? array_first($orgValue) : $orgValue);
-				}
+				$extvalue = new Rhymix\Modules\Extravar\Models\Value(0, 1, '', $formInfo->type);
+				$extvalue->parent_type = 'member';
+				$extvalue->input_name = $formInfo->name;
+				$extvalue->input_id = $formInfo->name;
+				$extvalue->value = $extendFormInfo[$formInfo->member_join_form_srl]->value ?? null;
+				$extvalue->default = $extendFormInfo[$formInfo->member_join_form_srl]->default_value ?? null;
+				$item->value = $extvalue->getValueHTML();
 			}
 
 			$displayDatas[] = $item;