From bc786236b1be63a096dcc80b1f43a4ecda0ecb3a Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Tue, 23 Sep 2014 12:17:23 +0900
Subject: [PATCH] =?UTF-8?q?fix=20#980=20=EC=B5=9C=EA=B3=A0=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=90=EC=9D=98=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=EC=9C=A0=EC=A7=80=20=EB=B0=8F=20`session=5Fregenerate=5Fid(tru?=
 =?UTF-8?q?e)`=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=EC=84=B8=EC=85=98=20?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=EA=B0=80=20=EC=9C=A0=EC=A7=80?=
 =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EC=9D=84=20=EC=88=98=20=EC=9E=88?=
 =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EA=B3=A0=EC=B9=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/member/member.controller.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 471022202..769944157 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -1873,8 +1873,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)
 		{
@@ -1887,9 +1886,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();
 		}
 	}