From 8b1bab0e235eca6061e08f307c9b23dc4361274f Mon Sep 17 00:00:00 2001
From: akasima <akasima@nate.com>
Date: Thu, 26 Dec 2013 16:36:36 +0900
Subject: [PATCH] =?UTF-8?q?NOISSUE=20=EC=84=B1=EB=8A=A5=EA=B0=9C=EC=84=A0,?=
 =?UTF-8?q?=20module=5Fconfig,=20module=5Fpart=5Fconfig,=20member=5Fgroup?=
 =?UTF-8?q?=20=EC=A0=95=EB=B3=B4=20cache=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/member/member.admin.controller.php | 31 +++++++++++++++++++---
 modules/member/member.model.php            | 24 +++++++++++++----
 modules/module/module.model.php            |  4 +--
 3 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index 06e4e4f92..621ac400f 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -1086,7 +1086,9 @@ class memberAdminController extends member
 		}
 
 		if(!$args->group_srl) $args->group_srl = getNextSequence();
-		return executeQuery('member.insertGroup', $args);
+		$output = executeQuery('member.insertGroup', $args);
+		$this->_deleteMemberGroupCache($args->site_srl);
+		return $output;
 	}
 
 	/**
@@ -1096,6 +1098,7 @@ class memberAdminController extends member
 	 */
 	function updateGroup($args)
 	{
+		if(!$args->site_srl) $args->site_srl = 0;
 		// Check the value of is_default.
 		if(!$args->group_srl) return new Object(-1, 'lang->msg_not_founded');
 		if($args->is_default!='Y')
@@ -1108,7 +1111,9 @@ class memberAdminController extends member
 			if(!$output->toBool()) return $output;
 		}
 
-		return executeQuery('member.updateGroup', $args);
+		$output = executeQuery('member.updateGroup', $args);
+		$this->_deleteMemberGroupCache($args->site_srl);
+		return $output;
 	}
 
 	/**
@@ -1134,9 +1139,12 @@ class memberAdminController extends member
 		// Change to default_group_srl
 		$this->changeGroup($group_srl, $default_group_srl);
 
+
 		$args = new stdClass;
 		$args->group_srl = $group_srl;
-		return executeQuery('member.deleteGroup', $args);
+		$output = executeQuery('member.deleteGroup', $args);
+		$this->_deleteMemberGroupCache($site_srl);
+		return $output;
 	}
 
 	/**
@@ -1213,9 +1221,26 @@ class memberAdminController extends member
 			executeQuery('member.updateMemberGroupListOrder', $args);
 		}
 
+		$this->_deleteMemberGroupCache($vars->site_srl);
+
 		$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'));
 	}
 
+	/**
+	 * Delete cached group data
+	 * @return void
+	*/
+	function _deleteMemberGroupCache($site_srl = 0)
+	{
+		//remove from cache
+		$oCacheHandler = &CacheHandler::getInstance('object', null, true);
+		if($oCacheHandler->isSupport())
+		{
+			$cache_key = 'object_groups:'.$site_srl;
+			$oCacheHandler->delete($cache_key);
+		}
+	}
+
 	/**
 	 * Register denied ID
 	 * @param string $user_id
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index 9c1531168..2b936989d 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -537,11 +537,25 @@ class memberModel extends member
 			{
 				$site_srl = 0;
 			}
-			$args = new stdClass();
-			$args->site_srl = $site_srl;
-			$args->sort_index = 'list_order';
-			$args->order_type = 'asc';
-			$output = executeQueryArray('member.getGroups', $args);
+
+			$oCacheHandler = &CacheHandler::getInstance('object', null, true);
+			if($oCacheHandler->isSupport())
+			{
+				$cache_key = 'object_groups:'.$site_srl;
+				$output = $oCacheHandler->get($cache_key);
+			}
+			if(!$output)
+			{
+
+				$args = new stdClass();
+				$args->site_srl = $site_srl;
+				$args->sort_index = 'list_order';
+				$args->order_type = 'asc';
+				$output = executeQueryArray('member.getGroups', $args);
+				//insert in cache
+				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key,$output);
+			}
+
 			if(!$output->toBool() || !$output->data)
 			{
 				return array();
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index bcfb82d7c..0a7f48620 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -1247,7 +1247,7 @@ class moduleModel extends module
 	function getModuleConfig($module, $site_srl = 0)
 	{
 		// cache controll
-		$oCacheHandler = &CacheHandler::getInstance('object');
+		$oCacheHandler = &CacheHandler::getInstance('object', null, true);
 		if($oCacheHandler->isSupport())
 		{
 			$cache_key = 'object:module_config:module_'.$module.'_site_srl_'.$site_srl;
@@ -1283,7 +1283,7 @@ class moduleModel extends module
 	function getModulePartConfig($module, $module_srl)
 	{
 		// cache controll
-		$oCacheHandler = &CacheHandler::getInstance('object');
+		$oCacheHandler = &CacheHandler::getInstance('object', null, true);
 		if($oCacheHandler->isSupport())
 		{
 			$cache_key = 'object_module_part_config:'.$module.'_'.$module_srl;