From 21057ca527e0552afb0ce24057a046cc5e4d6168 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Wed, 1 Jan 2014 00:22:36 +0900
Subject: [PATCH] =?UTF-8?q?#242=20cache=20key=EC=97=90=20xe=20core=20?=
 =?UTF-8?q?=EB=B2=84=EC=A0=84=EB=AA=85=EC=9D=84=20prefix=EB=A1=9C=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/cache/CacheApc.class.php      |  7 -------
 classes/cache/CacheFile.class.php     |  9 +--------
 classes/cache/CacheHandler.class.php  | 21 ++++++++++++++++++++-
 classes/cache/CacheMemcache.class.php |  7 -------
 classes/cache/CacheWincache.class.php |  7 -------
 5 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/classes/cache/CacheApc.class.php b/classes/cache/CacheApc.class.php
index 43b13b939..acc2cb45a 100644
--- a/classes/cache/CacheApc.class.php
+++ b/classes/cache/CacheApc.class.php
@@ -8,13 +8,6 @@
  * */
 class CacheApc extends CacheBase
 {
-
-	/**
-	 * Default valid time
-	 * @var int
-	 */
-	var $valid_time = 36000;
-
 	/**
 	 * Get instance of CacheApc
 	 *
diff --git a/classes/cache/CacheFile.class.php b/classes/cache/CacheFile.class.php
index ba93440d2..666e8d23f 100644
--- a/classes/cache/CacheFile.class.php
+++ b/classes/cache/CacheFile.class.php
@@ -10,13 +10,6 @@
  */
 class CacheFile extends CacheBase
 {
-
-	/**
-	 * Default valid time
-	 * @var int
-	 */
-	var $valid_time = 36000;
-
 	/**
 	 * Path that value to stored
 	 * @var string
@@ -56,7 +49,7 @@ class CacheFile extends CacheBase
 	 */
 	function getCacheFileName($key)
 	{
-		return $this->cache_dir . str_replace(':', '_', $key);
+		return $this->cache_dir . str_replace(':', '_', $key);
 	}
 
 	/**
diff --git a/classes/cache/CacheHandler.class.php b/classes/cache/CacheHandler.class.php
index 8b0442638..2a4519cf7 100644
--- a/classes/cache/CacheHandler.class.php
+++ b/classes/cache/CacheHandler.class.php
@@ -8,7 +8,6 @@
  */
 class CacheHandler extends Handler
 {
-
 	/**
 	 * instance of cache handler
 	 * @var CacheBase
@@ -129,6 +128,17 @@ class CacheHandler extends Handler
 		return false;
 	}
 
+	/**
+	 * Get cache name by key
+	 *
+	 * @param string $key The key that will be associated with the item.
+	 * @return string Returns cache name
+	 */
+	function getCacheKey($key)
+	{
+		return __XE_VERSION__ . ':' . $key;
+	}
+
 	/**
 	 * Get cached data
 	 *
@@ -139,6 +149,7 @@ class CacheHandler extends Handler
 	 */
 	function get($key, $modified_time = 0)
 	{
+		$key = $this->getCacheKey($key);
 		if(!$this->handler)
 		{
 			return false;
@@ -158,6 +169,7 @@ class CacheHandler extends Handler
 	 */
 	function put($key, $obj, $valid_time = 0)
 	{
+		$key = $this->getCacheKey($key);
 		if(!$this->handler)
 		{
 			return false;
@@ -173,6 +185,7 @@ class CacheHandler extends Handler
 	 */
 	function delete($key)
 	{
+		$key = $this->getCacheKey($key);
 		if(!$this->handler)
 		{
 			return false;
@@ -190,6 +203,7 @@ class CacheHandler extends Handler
 	 */
 	function isValid($key, $modified_time)
 	{
+		$key = $this->getCacheKey($key);
 		if(!$this->handler)
 		{
 			return false;
@@ -259,6 +273,11 @@ class CacheHandler extends Handler
  */
 class CacheBase
 {
+	/**
+	 * Default valid time
+	 * @var int
+	 */
+	var $valid_time = 36000;
 
 	/**
 	 * Get cached data
diff --git a/classes/cache/CacheMemcache.class.php b/classes/cache/CacheMemcache.class.php
index 2f297b88c..c5d72efba 100644
--- a/classes/cache/CacheMemcache.class.php
+++ b/classes/cache/CacheMemcache.class.php
@@ -8,13 +8,6 @@
  */
 class CacheMemcache extends CacheBase
 {
-
-	/**
-	 * Default valid time
-	 * @var int
-	 */
-	var $valid_time = 36000;
-
 	/**
 	 * instance of Memcahe
 	 * @var Memcahe
diff --git a/classes/cache/CacheWincache.class.php b/classes/cache/CacheWincache.class.php
index 2b0ee4b11..1b393a504 100644
--- a/classes/cache/CacheWincache.class.php
+++ b/classes/cache/CacheWincache.class.php
@@ -10,13 +10,6 @@
  */
 class CacheWincache extends CacheBase
 {
-
-	/**
-	 * Default valid time
-	 * @var int
-	 */
-	var $valid_time = 36000;
-
 	/**
 	 * Get instance of CacheWincache
 	 *