fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 1095, 1080 fixed

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10150 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-02-21 05:09:28 +00:00
parent 2bd25445f8
commit c5f179cbb2
4 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/member/member.admin.controller.php
View file

@ -186,7 +186,7 @@
$signupItem->isDefaultForm = in_array($key, $items); $signupItem->isDefaultForm = in_array($key, $items);
$signupItem->name = $key; $signupItem->name = $key;
if(in_array($key, $items)) $signupItem->title = $key; if(!in_array($key, $items)) $signupItem->title = $key;
else $signupItem->title = $lang->{$key}; else $signupItem->title = $lang->{$key};
$signupItem->mustRequired = in_array($key, $mustRequireds); $signupItem->mustRequired = in_array($key, $mustRequireds);
$signupItem->imageType = (strpos($key, 'image') !== false); $signupItem->imageType = (strpos($key, 'image') !== false);

26
modules/member/member.controller.php
View file

@ -490,7 +490,7 @@
$getVars = array(); $getVars = array();
if ($config->signupForm){ if ($config->signupForm){
foreach($config->signupForm as $formInfo){ 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; $getVars[] = $formInfo->name;
} }
} }
@ -558,7 +558,17 @@
} }
// Log-in // 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 // Results
$this->add('member_srl', $args->member_srl); $this->add('member_srl', $args->member_srl);
@ -580,10 +590,18 @@
} }
else 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; return;
} }
} }

7
modules/member/member.view.php
View file

@ -89,7 +89,11 @@
/** /**
* @brief Display member join form * @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'); $oMemberModel = &getModel('member');
// Get the member information if logged-in // Get the member information if logged-in
if($oMemberModel->isLogged()) return $this->stop('msg_already_logged'); if($oMemberModel->isLogged()) return $this->stop('msg_already_logged');
@ -111,6 +115,7 @@
$identifierForm->name = $member_config->identifier; $identifierForm->name = $member_config->identifier;
$identifierForm->value = $member_info->{$member_config->identifier}; $identifierForm->value = $member_info->{$member_config->identifier};
Context::set('identifierForm', $identifierForm); Context::set('identifierForm', $identifierForm);
// Set a template file // Set a template file
$this->setTemplateFile('signup_form'); $this->setTemplateFile('signup_form');
} }

2
modules/member/skins/default/login_form.html
View file

@ -5,7 +5,7 @@
</div> </div>
<h1 class="h1">{$lang->cmd_login}</h1> <h1 class="h1">{$lang->cmd_login}</h1>
<form ruleset="@login" action="./" method="post" id="fo_member_login" class="form"> <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" /> <input type="hidden" name="act" value="procMemberLogin" />
<ul> <ul>
<li> <li>