From 71cd2aca3cbc1bd8ca249c609ce580846e46b172 Mon Sep 17 00:00:00 2001 From: Cameron Date: Sat, 15 Dec 2012 03:49:15 -0800 Subject: [PATCH] Should help with Issue #53 - PHP Strict issues --- class2.php | 2 +- e107_handlers/cache_handler.php | 28 ++++++++++++++++------------ e107_handlers/e107_class.php | 6 ++++++ e107_handlers/pref_class.php | 10 +++++----- e107_handlers/theme_handler.php | 2 +- 5 files changed, 29 insertions(+), 19 deletions(-) diff --git a/class2.php b/class2.php index 39bd01f2b..9f7eadc7f 100644 --- a/class2.php +++ b/class2.php @@ -1445,7 +1445,7 @@ function save_prefs($table = 'core', $uid = USERID, $row_val = '') // Create the data to be stored if($sql->db_Select_gen("REPLACE INTO `#core` (e107_name,e107_value) values ('SitePrefs', '".$eArrayStorage->WriteArray($_pref)."') ")) { - ecache::clear_sys('Config_core'); + ecacXXXhe::clear_sys('Config_core'); return true; } else diff --git a/e107_handlers/cache_handler.php b/e107_handlers/cache_handler.php index 223a089ea..b7d198122 100644 --- a/e107_handlers/cache_handler.php +++ b/e107_handlers/cache_handler.php @@ -36,8 +36,8 @@ class ecache { function __construct() { - $this->UserCacheActive = e107::getPref('cachestatus'); - $this->SystemCacheActive = e107::getPref('syscachestatus'); + //$this->UserCacheActive = e107::getPref('cachestatus'); + //$this->SystemCacheActive = e107::getPref('syscachestatus'); } /** @@ -105,7 +105,7 @@ class ecache { { if(($ForcedCheck != false ) || ($syscache == false && $this->UserCacheActive) || ($syscache == true && $this->SystemCacheActive) && !e107::getParser()->checkHighlighting()) { - $cache_file = (isset($this) && $this instanceof ecache ? $this->cache_fname($CacheTag, $syscache) : ecache::cache_fname($CacheTag, $syscache)); + $cache_file = (isset($this) && $this instanceof ecache ? $this->cache_fname($CacheTag, $syscache) : self::cache_fname($CacheTag, $syscache)); if (file_exists($cache_file)) { if ($MaximumAge != false && (filemtime($cache_file) + ($MaximumAge * 60)) < time()) { @@ -133,9 +133,10 @@ class ecache { } /** - * @return string - * @param string $query + * @return string + * @param string $CacheTag * @param int $MaximumAge the time in minutes before the cache file 'expires' + * @param boolean $force * @desc Returns the data from the cache file associated with $query, else it returns false if there is no cache for $query. * @scope public */ @@ -147,7 +148,7 @@ class ecache { } else { - return ecache::retrieve($CacheTag, $MaximumAge, $ForcedCheck, true); + return self::retrieve($CacheTag, $MaximumAge, $ForcedCheck, true); } } @@ -165,7 +166,7 @@ class ecache { { if(($ForceCache != false ) || ($syscache == false && $this->UserCacheActive) || ($syscache == true && $this->SystemCacheActive) && !e107::getParser()->checkHighlighting()) { - $cache_file = (isset($this) && $this instanceof ecache ? $this->cache_fname($CacheTag, $syscache) : ecache::cache_fname($CacheTag, $syscache)); + $cache_file = (isset($this) && $this instanceof ecache ? $this->cache_fname($CacheTag, $syscache) : self::cache_fname($CacheTag, $syscache)); @file_put_contents($cache_file, ($bRaw? $Data : self::CACHE_PREFIX.$Data) ); @chmod($cache_file, 0755); //Cache should not be world-writeable @touch($cache_file); @@ -189,7 +190,7 @@ class ecache { } else { - ecache::set($CacheTag, $Data, $ForceCache, $bRaw, true); + self::set($CacheTag, $Data, $ForceCache, $bRaw, true); } } @@ -207,12 +208,14 @@ class ecache { { $file = ($CacheTag) ? preg_replace("#\W#", "_", $CacheTag)."*.cache.php" : "*.cache.php"; e107::getEvent()->triggerAdminEvent('cache_clear', "cachetag=$CacheTag&file=$file&syscache=$syscache"); - $ret = ecache::delete(e_CACHE_CONTENT, $file, $syscache); + $ret = self::delete(e_CACHE_CONTENT, $file, $syscache); if($CacheTag && $related) //TODO - too dirty - add it to the $file pattern above { - ecache::delete(e_CACHE_CONTENT, 'nq_'.$file, $syscache); - ecache::delete(e_CACHE_CONTENT, 'nomd5_'.$file, $syscache); + self::delete(e_CACHE_CONTENT, 'nq_'.$file, $syscache); + self::delete(e_CACHE_CONTENT, 'nomd5_'.$file, $syscache); + //ecache::delete(e_CACHE_CONTENT, 'nq_'.$file, $syscache); + //ecache::delete(e_CACHE_CONTENT, 'nomd5_'.$file, $syscache); } return $ret; } @@ -230,7 +233,8 @@ class ecache { } else { - ecache::clear($CacheTag, true, $related); + self::clear($CacheTag, true, $related); + // ecache::clear($CacheTag, true, $related); } } diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index 98cdf4065..b67b4edb3 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -832,6 +832,12 @@ class e107 { e107_require_once(e_HANDLER.'pref_class.php'); self::$_core_config_arr[$name] = new e_core_pref($name, $load); + + if($name == 'core') // prevent loop between pref and cache handlers. + { + e107::getCache()->UserCacheActive = self::getPref('cachestatus'); + e107::getCache()->SystemCacheActive = self::getPref('syscachestatus'); + } } return self::$_core_config_arr[$name]; diff --git a/e107_handlers/pref_class.php b/e107_handlers/pref_class.php index 47c405c0e..a22a4efe2 100644 --- a/e107_handlers/pref_class.php +++ b/e107_handlers/pref_class.php @@ -491,7 +491,7 @@ class e_pref extends e_front_model * * @param boolean $from_post merge post data * @param boolean $force - * @param boolean $session_messages use session messages //FIXME Appears to be ignored on "Settings successfully saved."; + * @param boolean $session_messages use session messages //FIXME Appears to be ignored on "Settings successfully saved. * @return boolean|integer 0 - no change, true - saved, false - error */ public function save($from_post = true, $force = false, $session_messages = false) @@ -559,7 +559,7 @@ class e_pref extends e_front_model if(e107::getDb()->db_Select_gen("REPLACE INTO `#core` (e107_name,e107_value) values ('".$this->prefid."_Backup', '".addslashes($dbdata)."') ")) { if(!$disallow_logs) $admin_log->logMessage('Backup of '.$this->alias.' ('.$this->prefid.') successfully created.', E_MESSAGE_DEBUG, E_MESSAGE_SUCCESS, $session_messages); - ecache::clear_sys('Config_'.$this->alias.'_backup'); + e107::getCache()->clear_sys('Config_'.$this->alias.'_backup'); } } $this->setPrefCache($this->toString(false), true); //reset pref cache - runtime & file @@ -609,7 +609,7 @@ class e_pref extends e_front_model { if(!$this->pref_cache) { - $this->pref_cache = ecache::retrieve_sys('Config_'.$this->alias, 24 * 60, true); + $this->pref_cache = e107::getCache()->retrieve_sys('Config_'.$this->alias, 24 * 60, true); } return ($toArray && $this->pref_cache ? e107::getArrayStorage()->ReadArray($this->pref_cache) : $this->pref_cache); @@ -636,7 +636,7 @@ class e_pref extends e_front_model } if($save) { - ecache::set_sys('Config_'.($save !== true ? $save : $this->alias), $cache_string, true); + e107::getCache()->set_sys('Config_'.($save !== true ? $save : $this->alias), $cache_string, true); } return $this; } @@ -654,7 +654,7 @@ class e_pref extends e_front_model { $this->pref_cache = ''; } - ecache::clear_sys('Config_'.(!empty($cache_name) ? $cache_name : $this->alias)); + e107::getCache()->clear_sys('Config_'.(!empty($cache_name) ? $cache_name : $this->alias)); return $this; } diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php index 82c5e054a..01413226e 100644 --- a/e107_handlers/theme_handler.php +++ b/e107_handlers/theme_handler.php @@ -1123,7 +1123,7 @@ class themeHandler $sql->db_Delete("menus", "menu_layout !='' "); - ecache::clear_sys(); + e107::getCache()->clear_sys(); if($core->save()) {