fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 11:44:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'hotfix/1.7.7' into develop

Browse source
This commit is contained in:
bnu 2014-09-23 14:01:11 +09:00
commit 62a0578917
4 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1874,8 +1874,7 @@ class memberController extends member
function validateSession()
{
$destory_session = false;
if($_SESSION['ipaddress'] != $_SERVER['REMOTE_ADDR']) $destory_session = true;
if($_SESSION['destroyed'] === true) $destory_session = true;
if($destory_session)
{
@ -1888,9 +1887,16 @@ class memberController extends member
function regenerateSession()
{
if(!$_SESSION['session_checkup'] || time() - $_SESSION['session_checkup'] > 30)
if(!$_SESSION['session_checkup'])
{
session_regenerate_id(true);
$_SESSION['session_checkup'] = time();
}
if(time() - $_SESSION['session_checkup'] >= 1)
{
$_SESSION['destroyed'] = true;
session_regenerate_id();
$_SESSION['destroyed'] = false;
$_SESSION['session_checkup'] = time();
}
}

6
modules/member/skins/default/find_member_account.html
View file

@ -6,7 +6,7 @@
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/member/skin/default/find_member_account/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form action="{getUrl('')}" method="get" ruleset="findAccount">
<form action="{getUrl('', 'act', 'procMemberFindAccount')}" method="get" ruleset="findAccount">
<input type="hidden" name="mid" value="{$mid}" />
<input type="hidden" name="act" value="procMemberFindAccount" />
<input type="hidden" name="document_srl" value="{$document_srl}" />
@ -25,7 +25,7 @@
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/member/skin/default/find_member_account/2'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form action="./" method="get" ruleset="@find_member_account_by_question">
<form action="{getUrl('', 'act', 'procMemberFindAccountByQuestion')}" method="get" ruleset="@find_member_account_by_question">
<input type="hidden" name="module" value="member" />
<input type="hidden" name="mid" value="{$mid}" />
<input type="hidden" name="document_srl" value="{$document_srl}" />
@ -59,7 +59,7 @@
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/member/skin/default/find_member_account/3'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form ruleset="resendAuthMail" action="./" method="post">
<form ruleset="resendAuthMail" action="{getUrl('', 'act', 'procMemberResendAuthMail')}" method="post">
<input type="hidden" name="module" value="member" />
<input type="hidden" name="act" value="procMemberResendAuthMail" />
<input type="hidden" name="success_return_url" value="{getUrl(act, $act)}" />