merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -1,12 +1,15 @@
<?php
/**
* Cache class for Wincache
*
* Wincache Handler
*
* @author Arnia (support@xpressengine.org)
**/
class CacheWincache extends CacheBase {
*/
class CacheWincache extends CacheBase
{
/**
* Default valid time
* @var int
@ -19,8 +22,10 @@ class CacheWincache extends CacheBase {
* @param void $opt Not used
* @return CacheWincache instance of CacheWincache
*/
function getInstance($opt=null){
if(!$GLOBALS['__CacheWincache__']) {
function getInstance($opt = null)
{
if(!$GLOBALS['__CacheWincache__'])
{
$GLOBALS['__CacheWincache__'] = new CacheWincache();
}
return $GLOBALS['__CacheWincache__'];
@ -31,7 +36,9 @@ class CacheWincache extends CacheBase {
*
* @return void
*/
function CacheWincache(){
function CacheWincache()
{
}
/**
@ -39,7 +46,8 @@ class CacheWincache extends CacheBase {
*
* @return bool Return true on support or false on not support
*/
function isSupport(){
function isSupport()
{
return function_exists('wincache_ucache_set');
}
@ -47,16 +55,20 @@ class CacheWincache extends CacheBase {
* Adds a variable in user cache and overwrites a variable if it already exists in the cache
*
* @param string $key Store the variable using this $key value.
* If a variable with same $key is already present the function will overwrite the previous value with the new one.
* If a variable with same $key is already present the function will overwrite the previous value with the new one.
* @param mixed $buff Value of a variable to store. $value supports all data types except resources, such as file handlers.
* @param int $valid_time Time for the variable to live in the cache in seconds.
* After the value specified in ttl has passed the stored variable will be deleted from the cache.
* If no ttl is supplied, use the default valid time CacheWincache::valid_time.
* After the value specified in ttl has passed the stored variable will be deleted from the cache.
* If no ttl is supplied, use the default valid time CacheWincache::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;
return wincache_ucache_set(md5(_XE_PATH_.$key), array(time(), $buff), $valid_time);
function put($key, $buff, $valid_time = 0)
{
if($valid_time == 0)
{
$valid_time = $this->valid_time;
}
return wincache_ucache_set(md5(_XE_PATH_ . $key), array(time(), $buff), $valid_time);
}
/**
@ -64,20 +76,25 @@ class CacheWincache 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) {
$_key = md5(_XE_PATH_.$key);
function isValid($key, $modified_time = 0)
{
$_key = md5(_XE_PATH_ . $key);
$obj = wincache_ucache_get($_key, $success);
if(!$success || !is_array($obj)) return false;
if(!$success || !is_array($obj))
{
return false;
}
unset($obj[1]);
if($modified_time > 0 && $modified_time > $obj[0]) {
if($modified_time > 0 && $modified_time > $obj[0])
{
$this->_delete($_key);
return false;
}
return true;
}
@ -86,15 +103,20 @@ class CacheWincache extends CacheBase {
*
* @param string $key The $key that was used to store the variable in the cache.
* @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 = md5(_XE_PATH_.$key);
function get($key, $modified_time = 0)
{
$_key = md5(_XE_PATH_ . $key);
$obj = wincache_ucache_get($_key, $success);
if(!$success || !is_array($obj)) return false;
if(!$success || !is_array($obj))
{
return false;
}
if($modified_time > 0 && $modified_time > $obj[0]) {
if($modified_time > 0 && $modified_time > $obj[0])
{
$this->_delete($_key);
return false;
}
@ -108,7 +130,8 @@ class CacheWincache extends CacheBase {
* @param string $_key Used to store the value.
* @return void
*/
function _delete($_key) {
function _delete($_key)
{
wincache_ucache_delete($_key);
}
@ -118,8 +141,9 @@ class CacheWincache extends CacheBase {
* @param string $key Used to store the value.
* @return void
*/
function delete($key) {
$_key = md5(_XE_PATH_.$key);
function delete($key)
{
$_key = md5(_XE_PATH_ . $key);
$this->_delete($_key);
}
@ -128,10 +152,11 @@ class CacheWincache extends CacheBase {
*
* @return bool Returns true on success or false on failure.
*/
function truncate() {
function truncate()
{
return wincache_ucache_clear();
}
}
}
/* End of file CacheWincache.class.php */
/* Location: ./classes/cache/CacheWincache.class.php */