issue 2119. supporting php 5.4.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12684 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-02-04 08:37:09 +00:00
parent 854e45afaa
commit bd1fa3651d
5 changed files with 173 additions and 75 deletions

View file

@ -1,4 +1,5 @@
<?php
/**
* Cache class for memcache
*
@ -6,6 +7,7 @@
*/
class CacheMemcache extends CacheBase
{
/**
* Default valid time
* @var int
@ -26,7 +28,8 @@ class CacheMemcache extends CacheBase
*/
function getInstance($url)
{
if(!$GLOBALS['__CacheMemcache__']) {
if(!$GLOBALS['__CacheMemcache__'])
{
$GLOBALS['__CacheMemcache__'] = new CacheMemcache($url);
}
return $GLOBALS['__CacheMemcache__'];
@ -42,7 +45,7 @@ class CacheMemcache extends CacheBase
function CacheMemcache($url)
{
//$config['url'] = array('memcache://localhost:11211');
$config['url'] = is_array($url)?$url:array($url);
$config['url'] = is_array($url) ? $url : array($url);
$this->Memcache = new Memcache;
foreach($config['url'] as $url)
@ -59,8 +62,11 @@ class CacheMemcache extends CacheBase
*/
function isSupport()
{
if($GLOBALS['XE_MEMCACHE_SUPPORT']) return true;
if($this->Memcache->set('xe', 'xe', MEMCACHE_COMPRESSED, 1))
if($GLOBALS['XE_MEMCACHE_SUPPORT'])
{
return true;
}
if($this->Memcache->set('xe', 'xe', MEMCACHE_COMPRESSED, 1))
{
$GLOBALS['XE_MEMCACHE_SUPPORT'] = true;
}
@ -79,7 +85,7 @@ class CacheMemcache extends CacheBase
*/
function getKey($key)
{
return md5(_XE_PATH_.$key);
return md5(_XE_PATH_ . $key);
}
/**
@ -95,13 +101,16 @@ class CacheMemcache extends CacheBase
* @param string $key The key that will be associated with the item.
* @param mixed $buff The variable to store. Strings and integers are stored as is, other types are stored serialized.
* @param int $valid_time Expiration time of the item.
* You can also use Unix timestamp or a number of seconds starting from current time, but in the latter case the number of seconds may not exceed 2592000 (30 days).
* If it's equal to zero, use the default valid time CacheMemcache::valid_time.
* You can also use Unix timestamp or a number of seconds starting from current time, but in the latter case the number of seconds may not exceed 2592000 (30 days).
* If it's equal to zero, use the default valid time CacheMemcache::valid_time.
* @return bool Returns true on success or false on failure.
*/
function put($key, $buff, $valid_time = 0)
{
if($valid_time == 0) $valid_time = $this->valid_time;
if($valid_time == 0)
{
$valid_time = $this->valid_time;
}
return $this->Memcache->set($this->getKey($key), array(time(), $buff), MEMCACHE_COMPRESSED, $valid_time);
}
@ -111,7 +120,7 @@ class CacheMemcache extends CacheBase
*
* @param string $key Cache key
* @param int $modified_time Unix time of data modified.
* If stored time is older then modified time, the data is invalid.
* If stored time is older then modified time, the data is invalid.
* @return bool Return true on valid or false on invalid.
*/
function isValid($key, $modified_time = 0)
@ -119,7 +128,10 @@ class CacheMemcache extends CacheBase
$_key = $this->getKey($key);
$obj = $this->Memcache->get($_key);
if(!$obj || !is_array($obj)) return false;
if(!$obj || !is_array($obj))
{
return false;
}
unset($obj[1]);
if($modified_time > 0 && $modified_time > $obj[0])
@ -138,14 +150,17 @@ class CacheMemcache extends CacheBase
*
* @param string $key The key to fetch
* @param int $modified_time Unix time of data modified.
* If stored time is older then modified time, return false.
* If stored time is older then modified time, return false.
* @return false|mixed Return false on failure or older then modified time. Return the string associated with the $key on success.
*/
function get($key, $modified_time = 0)
{
$_key = $this->getKey($key);
$obj = $this->Memcache->get($_key);
if(!$obj || !is_array($obj)) return false;
if(!$obj || !is_array($obj))
{
return false;
}
if($modified_time > 0 && $modified_time > $obj[0])
{
@ -197,7 +212,7 @@ class CacheMemcache extends CacheBase
{
return $this->Memcache->flush();
}
}
}
/* End of file CacheMemcache.class.php */
/* Location: ./classes/cache/CacheMemcache.class.php */