From 18bb1ba4bf79316af4b5d12d165e6dda33d20b3a Mon Sep 17 00:00:00 2001
From: devjin <namnyams@gmail.com>
Date: Thu, 16 Aug 2012 04:52:03 +0000
Subject: [PATCH] issue 1794 changed the code that display a member
 information.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11032 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/member.view.php                | 84 +++++++++++++++++++
 modules/member/skins/default/member_info.html | 43 +---------
 .../modules/member/member_info.html           | 43 +---------
 3 files changed, 90 insertions(+), 80 deletions(-)

diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index 4b9538f1e..40cd0bb7d 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -90,9 +90,93 @@
             unset($extendForm->find_member_answer);
             Context::set('extend_form_list', $extendForm);
 
+			$this->_getDisplayedMemberInfo($member_info, $extendForm, $this->member_config);
+
             $this->setTemplateFile('member_info');
         }
 
+		function _getDisplayedMemberInfo($memberInfo, $extendFormInfo, $memberConfig)
+		{
+			$displayDatas = array();
+			foreach($memberConfig->signupForm as $no=>$formInfo)
+			{
+				if(!$formInfo->isUse)
+				{
+					continue;
+				}
+
+				if($formInfo->name == 'password' || $formInfo->name == 'find_account_question')
+				{
+					continue;
+				}
+
+				if($memberInfo->member_srl != $logged_info->member_srl && $formInfo->isPublic != 'Y')
+				{
+					continue;
+				}
+				
+				$item = $formInfo;
+				
+				if($formInfo->isDefaultForm)
+				{
+					$item->title = Context::getLang($formInfo->name);
+					$item->value = $memberInfo->{$formInfo->name};
+
+					if($formInfo->name == 'profile_image' && $memberInfo->profile_image)
+					{
+						$target = $memberInfo->profile_image;
+						$item->value = '<img src="'.$target->src.'" />';
+					}
+					elseif($formInfo->name == 'image_name' && $memberInfo->image_name)
+					{
+						$target = $memberInfo->image_name;
+						$item->value = '<img src="'.$target->src.'" />';
+					}
+					elseif($formInfo->name == 'image_mark' && $memberInfo->image_mark)
+					{
+						$target = $memberInfo->image_mark;
+						$item->value = '<img src="'.$target->src.'" />';
+					}
+					elseif($formInfo->name == 'birthday' && $memberInfo->birthday)
+					{
+						$item->value = zdate($item->value, 'Y-m-d');
+					}
+				}
+				else
+				{
+					$item->title = $extendFormInfo[$formInfo->member_join_form_srl]->column_title;
+					$orgValue = $extendFormInfo[$formInfo->member_join_form_srl]->value;
+					
+					if($formInfo->type=='tel')
+					{
+						$item->value = implode('-', $orgValue);
+					}
+					elseif($formInfo->type=='kr_zip')
+					{
+						$item->value = implode(' ', $orgValue);
+					}
+					elseif($formInfo->type=='checkbox' && is_array($orgValue))
+					{
+						$item->value = implode(", ",$orgValue);
+					}
+					elseif($formInfo->type=='date')
+					{
+						$item->value = zdate($orgValue, "Y-m-d");
+					}
+					else
+					{
+						$item->value = nl2br($orgValue);
+					}
+				}
+
+				$displayDatas[] = $item;
+			}
+
+			debugPrint($displayDatas);
+			Context::set('displayDatas', $displayDatas);
+			return $displayDatas;
+		}
+
         /**
          * @brief Display member join form
          **/
diff --git a/modules/member/skins/default/member_info.html b/modules/member/skins/default/member_info.html
index 278fba196..ca500238b 100644
--- a/modules/member/skins/default/member_info.html
+++ b/modules/member/skins/default/member_info.html
@@ -2,47 +2,10 @@
 <h1 class="h1">{$lang->member_info}</h1>
 <div class="table even">
 	<table width="100%" border="1" cellspacing="0">
-		<!--@foreach($member_config->signupForm as $no=>$formInfo)-->
-		<!--@if($formInfo->isUse && ($formInfo->name != 'password' && $formInfo->name != 'find_account_question'))-->
-		<!--@if($formInfo->isDefaultForm)-->
-{@$title = Context::getLang($formInfo->name)}
-{@$value = $memberInfo[$formInfo->name]}
-			<!--@if($formInfo->name == 'profile_image' && $memberInfo['profile_image'])-->
-{@$target = $memberInfo['profile_image']}
-{@$value = '<img src="'.$target->src.'" />'}
-			<!--@elseif($formInfo->name == 'image_name' && $memberInfo['image_name'])-->
-{@$target = $memberInfo['image_name']}
-{@$value = '<img src="'.$target->src.'" />'}
-			<!--@elseif($formInfo->name == 'image_mark' && $memberInfo['image_mark'])-->
-{@$target = $memberInfo['image_mark']}
-{@$value = '<img src="'.$target->src.'" />'}
-			<!--@end-->
-		<!--@else-->
-{@$title = $extend_form_list[$formInfo->member_join_form_srl]->column_title}
-{@$orgValue = $extend_form_list[$formInfo->member_join_form_srl]->value}
-			<!--@if($formInfo->type=='tel')-->
-				{@$value = $orgValue[0]}
-					<!--@if($orgValue[1])-->{@$value .= '-'}<!--@end-->
-				{@$value .= $orgValue[1]}
-					<!--@if($orgValue[2])-->{@$value .= '-'}<!--@end-->
-				{@$value .= $orgValue[2]}
-			<!--@elseif($formInfo->type=='kr_zip')-->
-				{@$value = $orgValue[0]}<!--@if($orgValue[1]&&$orgValue[0])--><br /><!--@end-->{@$value .= ' ' .$orgValue[1]}
-			<!--@elseif($formInfo->type=='checkbox' && is_array($orgValue))-->
-				{@$value = implode(", ",$orgValue)}
-			<!--@elseif($formInfo->type=='date')-->
-				{@$value = zdate($orgValue, "Y-m-d")}
-			<!--@else-->
-				{@$value = nl2br($orgValue)}
-			<!--@end-->
-		<!--@end-->
-
-		<tr cond="$memberInfo['member_srl'] == $logged_info->member_srl || $formInfo->isPublic == 'Y'">
-			<th scope="row" >{$title} <em cond="$formInfo->required || $formInfo->mustRequired">*</em></th>
-			<td class="text">{$value}</td>
+		<tr loop="$displayDatas => $item">
+			<th scope="row" >{$item->title} <em cond="$item->required || $item->mustRequired">*</em></th>
+			<td class="text">{$item->value}</td>
 		</tr>
-		<!--@end-->
-		<!--@end-->
 		<tr>
 			<th scope="row">{$lang->member_group}</th>
 			<td class="text">{implode(', ', $memberInfo['group_list'])}</td>
diff --git a/themes/xe_solid_enterprise/modules/member/member_info.html b/themes/xe_solid_enterprise/modules/member/member_info.html
index 7a251ba7d..6b396781e 100644
--- a/themes/xe_solid_enterprise/modules/member/member_info.html
+++ b/themes/xe_solid_enterprise/modules/member/member_info.html
@@ -2,47 +2,10 @@
 
 <h3 class="pTitle1">{$lang->cmd_view_member_info}</h3>
     <table cellspacing="0" cellpadding="0" class="rowTable">
-		<!--@foreach($member_config->signupForm as $no=>$formInfo)-->
-		<!--@if($formInfo->isUse && ($formInfo->name != 'password' && $formInfo->name != 'find_account_question'))-->
-		<!--@if($formInfo->isDefaultForm)-->
-{@$title = Context::getLang($formInfo->name)}
-{@$value = $memberInfo[$formInfo->name]}
-			<!--@if($formInfo->name == 'profile_image' && $memberInfo['profile_image'])-->
-{@$target = $memberInfo['profile_image']}
-{@$value = '<img src="'.$target->src.'" />'}
-			<!--@elseif($formInfo->name == 'image_name' && $memberInfo['image_name'])-->
-{@$target = $memberInfo['image_name']}
-{@$value = '<img src="'.$target->src.'" />'}
-			<!--@elseif($formInfo->name == 'image_mark' && $memberInfo['image_mark'])-->
-{@$target = $memberInfo['image_mark']}
-{@$value = '<img src="'.$target->src.'" />'}
-			<!--@end-->
-		<!--@else-->
-{@$title = $extend_form_list[$formInfo->member_join_form_srl]->column_title}
-{@$orgValue = $extend_form_list[$formInfo->member_join_form_srl]->value}
-			<!--@if($formInfo->type=='tel')-->
-				{@$value = $orgValue[0]}
-					<!--@if($orgValue[1])-->{@$value .= '-'}<!--@end-->
-				{@$value .= $orgValue[1]}
-					<!--@if($orgValue[2])-->{@$value .= '-'}<!--@end-->
-				{@$value .= $orgValue[2]}
-			<!--@elseif($formInfo->type=='kr_zip')-->
-				{@$value = $orgValue[0]}<!--@if($orgValue[1]&&$orgValue[0])--><br /><!--@end-->{@$value .= ' ' .$orgValue[1]}
-			<!--@elseif($formInfo->type=='checkbox' && is_array($orgValue))-->
-				{@$value = implode(", ",$orgValue)}
-			<!--@elseif($formInfo->type=='date')-->
-				{@$value = zdate($orgValue, "Y-m-d")}
-			<!--@else-->
-				{@$value = nl2br($orgValue)}
-			<!--@end-->
-		<!--@end-->
-
-		<tr cond="$memberInfo['member_srl'] == $logged_info->member_srl || $formInfo->isPublic == 'Y'">
-			<th scope="row" >{$title} <em cond="$formInfo->required || $formInfo->mustRequired">*</em></th>
-			<td class="text">{$value}</td>
+		<tr loop="$displayDatas => $item">
+			<th scope="row" >{$item->title} <em cond="$item->required || $item->mustRequired">*</em></th>
+			<td class="text">{$item->value}</td>
 		</tr>
-		<!--@end-->
-		<!--@end-->
 
 		<tr>
 			<th scope="row">{$lang->group}</th>