From a2f2385464fedbc648ad2951e581d5a58dc61d05 Mon Sep 17 00:00:00 2001
From: devjin <namnyams@gmail.com>
Date: Tue, 11 Oct 2011 05:53:39 +0000
Subject: [PATCH] issue 434 fixed rule value

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9571 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/member.admin.controller.php | 8 +++++---
 modules/member/tpl/insert_join_form.html   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index 60ddd4ae9..ea7886ee8 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -247,9 +247,10 @@
 			$fields = array();
 			foreach($signupForm as $formInfo){
 				if ($formInfo->required || $formInfo->mustRequired){
-					if($formInfo->name == 'password')
+					if($formInfo->name == 'password'){
 						$fields[] = '<field name="password"><if test="$act == \'procMemberInsert\'" attr="required" value="true" /><if test="$act == \'procMemberInsert\'" attr="length" value="3:20" /></field>';
-					else if($formInfo->name == 'find_account_question'){
+						$fields[] = '<field name="password2"><if test="$act == \'procMemberInsert\'" attr="required" value="true" /><if test="$act == \'procMemberInsert\'" attr="equalto" value="password" /></field>';
+					}else if($formInfo->name == 'find_account_question'){
 						$fields[] = '<field name="find_account_question" required="true" />';
 						$fields[] = '<field name="find_account_answer" required="true" length=":250"/>';
 					}else if($formInfo->name == 'email_address'){
@@ -280,7 +281,8 @@
 					.'</ruleset>';
 
 			$fields = array();
-			$fields[] = sprintf('<field name="user_id" required="true" rule="%s"/>', $identifier);
+			$trans = array('email_address'=>'email', 'user_id'=> 'userid');
+			$fields[] = sprintf('<field name="user_id" required="true" rule="%s"/>', $trans[$identifier]);
 			$fields[] = '<field name="password" required="true" />';
 
 			$xml_buff = sprintf($buff, implode('', $fields));
diff --git a/modules/member/tpl/insert_join_form.html b/modules/member/tpl/insert_join_form.html
index 420033769..354a1b4b2 100644
--- a/modules/member/tpl/insert_join_form.html
+++ b/modules/member/tpl/insert_join_form.html
@@ -17,7 +17,7 @@
 				</select>
 			</p>
 			<p class="q multiExample">{$lang->about_multi_type}</p>
-			<p class="a multiExample"><textarea rows="5" cols="42" id="multiSelect" name="default_value">{implode('<enter>', $default_value)}</textarea></p>
+			<p class="a multiExample"><textarea rows="5" cols="42" id="multiSelect" name="default_value"><block cond="$default_value">{implode('<enter>', $default_value)}</block></textarea></p>
 		</li>
 		<script type="text/javascript">
 		var $ = jQuery;