From e62403ab10f839246a4142c600aee3f3de54e45a Mon Sep 17 00:00:00 2001
From: devjin <namnyams@gmail.com>
Date: Thu, 9 Aug 2012 06:35:40 +0000
Subject: [PATCH] issue 2079 added the name of extra variables in a member
 information modify page and a signup page.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11011 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/member.model.php | 29 +++++++++++++++++++++++++++++
 modules/member/member.view.php  | 31 +++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index 8c15422f5..a29891ca4 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -548,6 +548,35 @@
             return $this->join_form_list;
         }
 
+		/**
+		 * get used join form list.
+		 *
+		 * @return array $joinFormList
+		 **/
+		function getUsedJoinFormList()
+		{
+			$args->sort_index = "list_order";
+			$output = executeQueryArray('member.getJoinFormList', $args);
+
+			if(!$output->toBool())
+			{
+				return array();
+			}
+
+			$joinFormList = array();
+			foreach($output->data as $val)
+			{
+				if($val->is_active != 'Y')
+				{
+					continue;
+				}
+
+				$joinFormList[] = $val;
+			}
+
+			return $joinFormList;
+		}
+
         /**
          * @brief Combine extend join form and member information (used to modify member information)
          **/
diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index 6f535501d..828f48fc3 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -106,6 +106,8 @@
 			$identifierForm->value = $member_info->{$member_config->identifier};
 			Context::set('identifierForm', $identifierForm);
 
+			$this->addExtraFormValidatorMessage();
+
             // Set a template file
             $this->setTemplateFile('signup_form');
         }
@@ -157,6 +159,9 @@
 			$identifierForm->name = $member_config->identifier;
 			$identifierForm->value = $member_info->{$member_config->identifier};
 			Context::set('identifierForm', $identifierForm);
+
+			$this->addExtraFormValidatorMessage();
+
             // Set a template file
             $this->setTemplateFile('modify_info');
         }
@@ -404,5 +409,31 @@
 
 			$this->setTemplateFile('modify_email_address');
 		}
+
+		/**
+		 * Add javascript codes into the header by checking values of member join form, required and others
+		 * @return void
+		 */
+		function addExtraFormValidatorMessage() {
+			$oMemberModel = &getModel('member');
+			$extraList = $oMemberModel->getUsedJoinFormList();
+
+			$js_code = array();
+			$js_code[] = '<script type="text/javascript">//<![CDATA[';
+			$js_code[] = '(function($){';
+			$js_code[] = 'var validator = xe.getApp("validator")[0];';
+			$js_code[] = 'if(!validator) return false;';
+
+			foreach($extraList as $val) 
+			{
+				$js_code[] = sprintf('validator.cast("ADD_MESSAGE", ["%s","%s"]);', $val->column_name, $val->column_title);
+			}
+
+			$js_code[] = '})(jQuery);';
+			$js_code[] = '//]]></script>';
+			$js_code   = implode("\n", $js_code);
+
+			Context::addHtmlHeader($js_code);
+		}
     }
 ?>