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 967, 1090 fixed problem on redirection url after member registering.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10136 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-02-20 10:03:08 +00:00
parent 2cf8b285ca
commit 4b74cbb028
3 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -559,9 +559,7 @@
} }
// Log-in // Log-in
if ($config->enable_confirm != 'Y') $this->doLogin($args->user_id); if ($config->enable_confirm != 'Y') $this->doLogin($args->user_id);
//get redirect url from cookie and invalidate cookie
$config->redirect_url = $_COOKIE["XE_REDIRECT_URL"];
setcookie("XE_REDIRECT_URL", '', 1);
// Results // Results
$this->add('member_srl', $args->member_srl); $this->add('member_srl', $args->member_srl);
if($config->redirect_url) $this->add('redirect_url', $config->redirect_url); if($config->redirect_url) $this->add('redirect_url', $config->redirect_url);
@ -574,9 +572,18 @@
$trigger_output = ModuleHandler::triggerCall('member.procMemberInsert', 'after', $config); $trigger_output = ModuleHandler::triggerCall('member.procMemberInsert', 'after', $config);
if(!$trigger_output->toBool()) return $trigger_output; if(!$trigger_output->toBool()) return $trigger_output;
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
{
if($config->redirect_url)
{
$returnUrl = $config->redirect_url;
}
else
{
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', ''); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
header('location:'.$returnUrl); }
$this->setRedirectUrl = $returnUrl;
return; return;
} }
} }

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

@ -90,10 +90,6 @@
* @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
if (!isset($_COOKIE["XE_REDIRECT_URL"]))
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');

2
modules/message/message.view.php
View file

@ -17,8 +17,6 @@
* @brief Display messages * @brief Display messages
**/ **/
function dispMessage() { function dispMessage() {
//setcookie for redirect url in case of going to member sign up
setcookie("XE_REDIRECT_URL", $_SERVER['REQUEST_URI']);
// Get configurations (using module model object) // Get configurations (using module model object)
$oModuleModel = &getModel('module'); $oModuleModel = &getModel('module');
$this->module_config = $config = $oModuleModel->getModuleConfig('message', $this->module_info->site_srl); $this->module_config = $config = $oModuleModel->getModuleConfig('message', $this->module_info->site_srl);