0
@@ -94,9 +94,8 @@
0
 //output any cached data.
0
 if (CmsConfig::get('full_page_caching'))
0
 {
0
-	if (!isset($_REQUEST['mact']) && !isset($_REQUEST['id']) && CmsCache::get_instance('Core')->test('page__' . $page . '__' . CmsMultiLanguage::get_client_language()))
0
+	if (!isset($_REQUEST['mact']) && !isset($_REQUEST['id']) && $data = CmsCache::get_instance('page')->get($page, CmsMultiLanguage::get_client_language()))
0
   {
0
-		$data = CmsCache::get_instance('Core')->get('page__' . $page . '__' . CmsMultiLanguage::get_client_language());
0
     echo $data;
0
     $endtime = $profiler->get_time();
0
     $memory = $profiler->get_memory();
0
@@ -169,7 +168,7 @@
0
 if (CmsConfig::get('full_page_caching'))
0
 {
0
   $data = @ob_get_flush();
0
-	CmsCache::get_instance('Core')->save($data, 'page__' . $page . '__' . CmsMultiLanguage::get_client_language());
0
+	CmsCache::get_instance('page')->save($data);
0
 }
0
 else
0
 {

0
@@ -1,149 +1 @@
0
-<?php
0
-
0
-/**
0
- * Zend Framework
0
- *
0
- * LICENSE
0
- *
0
- * This source file is subject to the new BSD license that is bundled
0
- * with this package in the file LICENSE.txt.
0
- * It is also available through the world-wide-web at this URL:
0
- * http://framework.zend.com/license/new-bsd
0
- * If you did not receive a copy of the license and are unable to
0
- * obtain it through the world-wide-web, please send an email
0
- * to license@zend.com so we can send you a copy immediately.
0
- *
0
- * @category   Zend
0
- * @package    Zend_Cache
0
- * @copyright  Copyright (c) 2005-2007 Zend Technologies USA Inc. (http://www.zend.com)
0
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
0
- */
0
-
0
-
0
-/**
0
- * @package    Zend_Cache
0
- * @copyright  Copyright (c) 2005-2007 Zend Technologies USA Inc. (http://www.zend.com)
0
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
0
- */
0
-abstract class Zend_Cache
0
-{
0
-
0
-    /**
0
-     * Standard frontends
0
-     *
0
-     * @var array
0
-     */
0
-    public static $standardFrontends = array('Core', 'Output', 'Class', 'File', 'Function', 'Page');
0
-    
0
-    /**
0
-     * Standard backends
0
-     *
0
-     * @var array
0
-     */
0
-    public static $standardBackends = array('File', 'Sqlite', 'Memcached', 'Apc', 'ZendPlatform');
0
-    
0
-    /**
0
-     * Only for backward compatibily (will be removed in 1.2.0)
0
-     *
0
-     * @var array
0
-     */
0
-    public static $availableFrontends = array('Core', 'Output', 'Class', 'File', 'Function', 'Page');
0
-    
0
-    /**
0
-     * Only for backward compatibily (will be removed in 1.2.0)
0
-     *
0
-     * @var array
0
-     */
0
-    public static $availableBackends = array('File', 'Sqlite', 'Memcached', 'Apc', 'ZendPlatform');
0
-     
0
-    /**
0
-     * Consts for clean() method
0
-     */
0
-    const CLEANING_MODE_ALL              = 'all';
0
-    const CLEANING_MODE_OLD              = 'old';
0
-    const CLEANING_MODE_MATCHING_TAG     = 'matchingTag';
0
-    const CLEANING_MODE_NOT_MATCHING_TAG = 'notMatchingTag';
0
-
0
-    /**
0
-     * Factory
0
-     *
0
-     * @param string $frontend frontend name
0
-     * @param string $backend backend name
0
-     * @param array $frontendOptions associative array of options for the corresponding frontend constructor
0
-     * @param array $backendOptions associative array of options for the corresponding backend constructor
0
-     */
0
-    public static function factory($frontend, $backend, $frontendOptions = array(), $backendOptions = array())
0
-    {
0
-
0
-        // because lowercase will fail
0
-        $frontend = self::_normalizeName($frontend);
0
-        $backend  = self::_normalizeName($backend);
0
-
0
-        // working on the frontend
0
-        if (in_array($frontend, self::$availableFrontends)) {
0
-            // we use a standard frontend
0
-            // For perfs reasons, with frontend == 'Core', we can interact with the Core itself
0
-            $frontendClass = 'Zend_Cache_' . ($frontend != 'Core' ? 'Frontend_' : '') . $frontend;
0
-            // For perfs reasons, we do not use the Zend_Loader::loadClass() method
0
-            // (security controls are explicit)
0
-            require_once str_replace('_', DIRECTORY_SEPARATOR, $frontendClass) . '.php';
0
-        } else {
0
-            // we use a custom frontend
0
-            $frontendClass = 'Zend_Cache_Frontend_' . $frontend;
0
-            // To avoid security problems in this case, we use Zend_Loader to load the custom class
0
-            require_once 'Zend/Loader.php';
0
-            Zend_Loader::loadClass($frontendClass);
0
-        }
0
-        
0
-        // working on the backend
0
-        if (in_array($backend, Zend_Cache::$availableBackends)) {
0
-            // we use a standard backend
0
-            $backendClass = 'Zend_Cache_Backend_' . $backend;
0
-            // For perfs reasons, we do not use the Zend_Loader::loadClass() method
0
-            // (security controls are explicit)
0
-            require_once str_replace('_', DIRECTORY_SEPARATOR, $backendClass) . '.php';
0
-        } else {
0
-            // we use a custom backend
0
-            $backendClass = 'Zend_Cache_Backend_' . $backend;
0
-            // To avoid security problems in this case, we use Zend_Loader to load the custom class
0
-            require_once 'Zend/Loader.php';
0
-            Zend_Loader::loadClass($backendClass);
0
-        }
0
-        
0
-        // Making objects
0
-        $frontendObject = new $frontendClass($frontendOptions);
0
-        $backendObject = new $backendClass($backendOptions);
0
-        $frontendObject->setBackend($backendObject);
0
-        return $frontendObject;
0
-
0
-    }
0
-
0
-    /**
0
-     * Throw an exception
0
-     *
0
-     * Note : for perf reasons, the "load" of Zend/Cache/Exception is dynamic
0
-     */
0
-    public static function throwException($msg)
0
-    {
0
-        // For perfs reasons, we use this dynamic inclusion
0
-        require_once 'Zend/Cache/Exception.php';
0
-        throw new Zend_Cache_Exception($msg);
0
-    }
0
-
0
-    /**
0
-     * Normalize frontend and backend names to allow multiple words TitleCased
0
-     *
0
-     * @param  string $name
0
-     * @return string
0
-     */
0
-    protected static function _normalizeName($name)
0
-    {
0
-        $name = ucfirst(strtolower($name));
0
-        $name = str_replace(array('-', '_', '.'), ' ', $name);
0
-        $name = ucwords($name);
0
-        $name = str_replace(' ', '', $name);
0
-        return $name;
0
-    }
0
-
0
-}

0
@@ -1,222 +1 @@
0
-<?php
0
-
0
-/**
0
- * Zend Framework
0
- *
0
- * LICENSE
0
- *
0
- * This source file is subject to the new BSD license that is bundled
0
- * with this package in the file LICENSE.txt.
0
- * It is also available through the world-wide-web at this URL:
0
- * http://framework.zend.com/license/new-bsd
0
- * If you did not receive a copy of the license and are unable to
0
- * obtain it through the world-wide-web, please send an email
0
- * to license@zend.com so we can send you a copy immediately.
0
- *
0
- * @category   Zend
0
- * @package    Zend_Cache
0
- * @subpackage Backend
0
- * @copyright  Copyright (c) 2005-2007 Zend Technologies USA Inc. (http://www.zend.com)
0
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
0
- */
0
-
0
-
0
-/**
0
- * @package    Zend_Cache
0
- * @subpackage Backend
0
- * @copyright  Copyright (c) 2005-2007 Zend Technologies USA Inc. (http://www.zend.com)
0
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
0
- */
0
-class Zend_Cache_Backend
0
-{
0
-
0
-    // ------------------
0
-    // --- Properties ---
0
-    // ------------------
0
-
0
-    /**
0
-     * Frontend or Core directives
0
-     *
0
-     * =====> (int) lifetime :
0
-     * - Cache lifetime (in seconds)
0
-     * - If null, the cache is valid forever
0
-     *
0
-     * =====> (int) logging :
0
-     * - if set to true, a logging is activated throw Zend_Log
0
-     *
0
-     * @var array directives
0
-     */
0
-    protected $_directives = array(
0
-        'lifetime' => 3600,
0
-        'logging'  => false,
0
-        'logger'   => null
0
-    );
0
-
0
-    /**
0
-     * Available options
0
-     *
0
-     * @var array available options
0
-     */
0
-    protected $_options = array();
0
-
0
-    // ----------------------
0
-    // --- Public methods ---
0
-    // ----------------------
0
-
0
-    /**
0
-     * Constructor
0
-     *
0
-     * @param array $options associative array of options
0
-     */
0
-    public function __construct($options = array())
0
-    {
0
-        if (!is_array($options)) Zend_Cache::throwException('Options parameter must be an array');
0
-        while (list($name, $value) = each($options)) {
0
-            $this->setOption($name, $value);
0
-        }
0
-    }
0
-
0
-    /**
0
-     * Set the frontend directives
0
-     *
0
-     * @param array $directives assoc of directives
0
-     */
0
-    public function setDirectives($directives)
0
-    {
0
-        if (!is_array($directives)) Zend_Cache::throwException('Directives parameter must be an array');
0
-        while (list($name, $value) = each($directives)) {
0
-            if (!is_string($name)) {
0
-                Zend_Cache::throwException("Incorrect option name : $name");
0
-            }
0
-            $name = strtolower($name);
0
-            if (array_key_exists($name, $this->_directives)) {
0
-                $this->_directives[$name] = $value;
0
-            }
0
-
0
-        }
0
-
0
-        $this->_loggerSanity();
0
-    }
0
-
0
-    /**
0
-     * Set an option
0
-     *
0
-     * @param string $name
0
-     * @param mixed $value
0
-     */
0
-    public function setOption($name, $value)
0
-    {
0
-        if (!is_string($name)) {
0
-            Zend_Cache::throwException("Incorrect option name : $name");
0
-        }
0
-        $name = strtolower($name);
0
-        if (!array_key_exists($name, $this->_options)) {
0
-            Zend_Cache::throwException("Incorrect option name : $name");
0
-        }
0
-        $this->_options[$name] = $value;
0
-    }
0
-
0
-    /**
0
-     * Get the life time
0
-     *
0
-     * if $specificLifetime is not false, the given specific life time is used
0
-     * else, the global lifetime is used
0
-     *
0
-     * @return int cache life time
0
-     */
0
-    public function getLifetime($specificLifetime)
0
-    {
0
-        if ($specificLifetime === false) {
0
-            return $this->_directives['lifetime'];
0
-        }
0
-        return $specificLifetime;
0
-    }
0
-
0
-    /**
0
-     * Return true if the automatic cleaning is available for the backend
0
-     *
0
-     * @return boolean
0
-     */
0
-    public function isAutomaticCleaningAvailable()
0
-    {
0
-        return true;
0
-    }
0
-
0
-    /**
0
-     * Return a system-wide tmp directory
0
-     *
0
-     * @return string system-wide tmp directory
0
-     */
0
-    static function getTmpDir()
0
-    {
0
-        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
0
-            // windows...
0
-            foreach (array($_ENV, $_SERVER) as $tab) {
0
-                foreach (array('TEMP', 'TMP', 'windir', 'SystemRoot') as $key) {
0
-                    if (isset($tab[$key])) {
0
-                        $result = $tab[$key];
0
-                        if (($key == 'windir') or ($key == 'SystemRoot')) {
0
-                            $result = $result . '\\temp';
0
-                        }
0
-                        return $result;
0
-                    }
0
-                }
0
-            }
0
-            return '\\temp';
0
-        } else {
0
-            // unix...
0
-            if (isset($_ENV['TMPDIR']))    return $_ENV['TMPDIR'];
0
-            if (isset($_SERVER['TMPDIR'])) return $_SERVER['TMPDIR'];
0
-            return '/tmp';
0
-        }
0
-    }
0
-
0
-    /**
0
-     * Make sure if we enable logging that the Zend_Log class
0
-     * is available.
0
-     * Create a default log object if none is set.
0
-     *
0
-     * @return void
0
-     * @throws Zend_Cache_Exception
0
-     */
0
-    protected function _loggerSanity()
0
-    {
0
-        if (!isset($this->_directives['logging']) || !$this->_directives['logging']) {
0
-            return;
0
-        }
0
-        try {
0
-            require_once 'Zend/Loader.php';
0
-            Zend_Loader::loadClass('Zend_Log');
0
-        } catch (Zend_Exception $e) {
0
-            Zend_Cache::throwException('Logging feature is enabled but the Zend_Log class is not available');
0
-        }
0
-        if (isset($this->_directives['logger']) && $this->_directives['logger'] instanceof Zend_Log) {
0
-            return;
0
-        }
0
-        // Create a default logger to the standard output stream
0
-        Zend_Loader::loadClass('Zend_Log_Writer_Stream');
0
-        $logger = new Zend_Log(new Zend_Log_Writer_Stream('php://output'));
0
-        $this->_directives['logger'] = $logger;
0
-    }
0
-
0
-    /**
0
-     * Log a message at the WARN (4) priority.
0
-     *
0
-     * @param string $message
0
-     * @return void
0
-     * @throws Zend_Cache_Exception
0
-     */
0
-    protected function _log($message, $priority = 4)
0
-    {
0
-        if (!$this->_directives['logging']) {
0
-            return;
0
-        }
0
-        if (!(isset($this->_directives['logger']) || $this->_directives['logger'] instanceof Zend_Log)) {
0
-            Zend_Cache::throwException('Logging is enabled but logger is not set');
0
-        }
0
-        $logger = $this->_directives['logger'];
0
-        $logger->log($message, $priority);
0
-    }
0
-
0
-}

0
@@ -1,172 +1 @@
0
-<?php
0
-
0
-/**
0
- * Zend Framework
0
- *
0
- * LICENSE
0
- *
0
- * This source file is subject to the new BSD license that is bundled
0
- * with this package in the file LICENSE.txt.
0
- * It is also available through the world-wide-web at this URL:
0
- * http://framework.zend.com/license/new-bsd
0
- * If you did not receive a copy of the license and are unable to
0
- * obtain it through the world-wide-web, please send an email
0
- * to license@zend.com so we can send you a copy immediately.
0
- *
0
- * @category   Zend
0
- * @package    Zend_Cache
0
- * @subpackage Backend
0
- * @copyright  Copyright (c) 2005-2007 Zend Technologies USA Inc. (http://www.zend.com)
0
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
0
- */
0
-
0
-
0
-/**
0
- * Zend_Cache_Backend_Interface
0
- */
0
-require_once 'Zend/Cache/Backend/Interface.php';
0
-
0
-/**
0
- * Zend_Cache_Backend
0
- */
0
-require_once 'Zend/Cache/Backend.php';
0
-
0
-
0
-/**
0
- * @package    Zend_Cache
0
- * @subpackage Backend
0
- * @copyright  Copyright (c) 2005-2007 Zend Technologies USA Inc. (http://www.zend.com)
0
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
0
- */
0
-class Zend_Cache_Backend_Apc extends Zend_Cache_Backend implements Zend_Cache_Backend_Interface
0
-{
0
-
0
-    // ----------------------
0
-    // --- Public methods ---
0
-    // ----------------------
0
-
0
-    /**
0
-     * Constructor
0
-     *
0
-     * @param array $options associative array of options
0
-     */
0
-    public function __construct($options = array())
0
-    {
0
-        if (!extension_loaded('apc')) {
0
-            Zend_Cache::throwException('The apc extension must be loaded for using this backend !');
0
-        }
0
-        parent::__construct($options);
0
-    }
0
-
0
-    /**
0
-     * Test if a cache is available for the given id and (if yes) return it (false else)
0
-     *
0
-     * WARNING $doNotTestCacheValidity=true is unsupported by the Apc backend
0
-     *
0
-     * @param string $id cache id
0
-     * @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
0
-     * @return string cached datas (or false)
0
-     */
0
-    public function load($id, $doNotTestCacheValidity = false)
0
-    {
0
-        if ($doNotTestCacheValidity) {
0
-            $this->_log("Zend_Cache_Backend_Apc::load() : \$doNotTestCacheValidity=true is unsupported by the Apc backend");
0
-        }
0
-        $tmp = apc_fetch($id);
0
-        if (is_array($tmp)) {
0
-            return $tmp[0];
0
-        }
0
-        return false;
0
-    }
0
-
0
-    /**
0
-     * Test if a cache is available or not (for the given id)
0
-     *
0
-     * @param string $id cache id
0
-     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
0
-     */
0
-    public function test($id)
0
-    {
0
-        $tmp = apc_fetch($id);
0
-        if (is_array($tmp)) {
0
-            return $tmp[1];
0
-        }
0
-        return false;
0
-    }
0
-
0
-    /**
0
-     * Save some string datas into a cache record
0
-     *
0
-     * Note : $data is always "string" (serialization is done by the
0
-     * core not by the backend)
0
-     *
0
-     * @param string $data datas to cache
0
-     * @param string $id cache id
0
-     * @param array $tags array of strings, the cache record will be tagged by each string entry
0
-     * @param int $specificLifetime if != false, set a specific lifetime for this cache record (null => infinite lifetime)
0
-     * @return boolean true if no problem
0
-     */
0
-    public function save($data, $id, $tags = array(), $specificLifetime = false)
0
-    {
0
-        $lifetime = $this->getLifetime($specificLifetime);
0
-        $result = apc_store($id, array($data, time()), $lifetime);
0
-        if (count($tags) > 0) {
0
-            $this->_log("Zend_Cache_Backend_Apc::save() : tags are unsupported by the Apc backend");
0
-        }
0
-        return $result;
0
-    }
0
-
0
-    /**
0
-     * Remove a cache record
0
-     *
0
-     * @param string $id cache id
0
-     * @return boolean true if no problem
0
-     */
0
-    public function remove($id)
0
-    {
0
-        return apc_delete($id);
0
-    }
0
-
0
-    /**
0
-     * Clean some cache records
0
-     *
0
-     * Available modes are :
0
-     * 'all' (default)  => remove all cache entries ($tags is not used)
0
-     * 'old'            => remove too old cache entries ($tags is not used)
0
-     * 'matchingTag'    => remove cache entries matching all given tags
0
-     *                     ($tags can be an array of strings or a single string)
0
-     * 'notMatchingTag' => remove cache entries not matching one of the given tags
0
-     *                     ($tags can be an array of strings or a single string)
0
-     *
0
-     * @param string $mode clean mode
0
-     * @param array $tags array of tags
0
-     * @return boolean true if no problem
0
-     */
0
-    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
0
-    {
0
-        if ($mode==Zend_Cache::CLEANING_MODE_ALL) {
0
-            return apc_clear_cache('user');
0
-        }
0
-        if ($mode==Zend_Cache::CLEANING_MODE_OLD) {
0
-            $this->_log("Zend_Cache_Backend_Apc::clean() : CLEANING_MODE_OLD is unsupported by the Apc backend");
0
-        }
0
-        if ($mode==Zend_Cache::CLEANING_MODE_MATCHING_TAG) {
0
-            $this->_log("Zend_Cache_Backend_Apc::clean() : tags are unsupported by the Apc backend");
0
-        }
0
-        if ($mode==Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG) {
0
-            $this->_log("Zend_Cache_Backend_Apc::clean() : tags are unsupported by the Apc backend");
0
-        }
0
-    }
0
-
0
-    /**
0
-     * Return true if the automatic cleaning is available for the backend
0
-     *
0
-     * @return boolean
0
-     */
0
-    public function isAutomaticCleaningAvailable()
0
-    {
0
-        return false;
0
-    }
0
-
0
-}