From c5f179cbb281ac63e99c5ae988f59d189ed3b703 Mon Sep 17 00:00:00 2001
From: devjin <namnyams@gmail.com>
Date: Tue, 21 Feb 2012 05:09:28 +0000
Subject: [PATCH] issue 1095, 1080 fixed

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10150 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/member.admin.controller.php   |  2 +-
 modules/member/member.controller.php         | 26 +++++++++++++++++---
 modules/member/member.view.php               |  7 +++++-
 modules/member/skins/default/login_form.html |  2 +-
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index 3389b6676..dfb6ff39a 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -186,7 +186,7 @@
 					$signupItem->isDefaultForm = in_array($key, $items);
 					
 					$signupItem->name = $key;
-					if(in_array($key, $items)) $signupItem->title = $key;
+					if(!in_array($key, $items)) $signupItem->title = $key;
 					else $signupItem->title = $lang->{$key};
 					$signupItem->mustRequired = in_array($key, $mustRequireds);
 					$signupItem->imageType = (strpos($key, 'image') !== false);
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 6104e27f1..e5df31e60 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -490,7 +490,7 @@
 			$getVars = array();
 			if ($config->signupForm){
 				foreach($config->signupForm as $formInfo){
-					if($formInfo->isDefaultForm && $formInfo->isUse && ($formInfo->required || $formInfo->mustRequired)){
+					if($formInfo->isDefaultForm && ($formInfo->isUse || $formInfo->required || $formInfo->mustRequired)){
 						$getVars[] = $formInfo->name;
 					}
 				}
@@ -558,7 +558,17 @@
 
             }
             // Log-in
-            if ($config->enable_confirm != 'Y') $this->doLogin($args->user_id);
+            if ($config->enable_confirm != 'Y')
+			{
+				if($config->identifier == 'email_address')
+				{
+					$this->doLogin($args->email_address);
+				}
+				else
+				{
+					$this->doLogin($args->user_id);
+				}
+			}
 
             // Results
             $this->add('member_srl', $args->member_srl);
@@ -580,10 +590,18 @@
 				}
 				else
 				{
-					$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
+					if(Context::get('success_return_url'))
+					{
+						$returnUrl = Context::get('success_return_url');
+					}
+					else if($_COOKIE['XE_REDIRECT_URL'])
+					{
+						$returnUrl = $_COOKIE['XE_REDIRECT_URL'];
+						setcookie("XE_REDIRECT_URL", '', 1);
+					}
 				}
 
-				$this->setRedirectUrl = $returnUrl;
+				header('location:' . $returnUrl);
 				return;
 			}
         }
diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index 040313463..5e1a7e009 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -89,7 +89,11 @@
         /**
          * @brief Display member join form
          **/
-        function dispMemberSignUpForm() {
+        function dispMemberSignUpForm() 
+		{
+			//setcookie for redirect url in case of going to member sign up
+			setcookie("XE_REDIRECT_URL", $_SERVER['HTTP_REFERER']);
+
             $oMemberModel = &getModel('member');
             // Get the member information if logged-in
             if($oMemberModel->isLogged()) return $this->stop('msg_already_logged');
@@ -111,6 +115,7 @@
 			$identifierForm->name = $member_config->identifier;
 			$identifierForm->value = $member_info->{$member_config->identifier};
 			Context::set('identifierForm', $identifierForm);
+
             // Set a template file
             $this->setTemplateFile('signup_form');
         }
diff --git a/modules/member/skins/default/login_form.html b/modules/member/skins/default/login_form.html
index bcc14d96e..bc4da1c0c 100644
--- a/modules/member/skins/default/login_form.html
+++ b/modules/member/skins/default/login_form.html
@@ -5,7 +5,7 @@
 </div>
 <h1 class="h1">{$lang->cmd_login}</h1>
 <form ruleset="@login" action="./" method="post" id="fo_member_login" class="form">
-	<input type="hidden" name="success_return_url" value="{getUrl('act', '')}" />
+	<input type="hidden" name="success_return_url" value="{$referer_url}" />
 	<input type="hidden" name="act" value="procMemberLogin" />
 	<ul>
 		<li>