From f259efec1fb5452726c3e8485e113983a394cddb Mon Sep 17 00:00:00 2001 From: Cameron Date: Wed, 1 Jun 2016 08:58:32 -0700 Subject: [PATCH] Allow for non-hashed cache files. File-Handler getRemoteContent() debugging methods added. --- e107_handlers/cache_handler.php | 4 ++-- e107_handlers/file_class.php | 22 +++++++++++++++++++--- e107_handlers/media_class.php | 3 ++- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/e107_handlers/cache_handler.php b/e107_handlers/cache_handler.php index 8fa033799..652cc5090 100644 --- a/e107_handlers/cache_handler.php +++ b/e107_handlers/cache_handler.php @@ -43,9 +43,9 @@ class ecache { /** * Set the MD5 Hash */ - public function setMD5($text) + public function setMD5($text, $hash=true) { - $this->CachePageMD5 = md5($text); + $this->CachePageMD5 = ($hash === true) ? md5($text) : $text; return $this; } diff --git a/e107_handlers/file_class.php b/e107_handlers/file_class.php index b362c2a4f..baeedd0a2 100644 --- a/e107_handlers/file_class.php +++ b/e107_handlers/file_class.php @@ -99,7 +99,12 @@ class e_file - private $authKey = false; // Used when retrieving files from e107.org. + private $authKey = false; // Used when retrieving files from e107.org. + + + private $error = null; + + private $errornum = null; /** * Constructor @@ -169,8 +174,19 @@ class e_file $this->mode= $mode; } - - + + public function getErrorMessage() + { + return $this->error; + } + + + public function getErrorCode() + { + return $this->errornum; + } + + /** * Read files from given path * diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php index 6a36cdd1e..a79ddc5a7 100644 --- a/e107_handlers/media_class.php +++ b/e107_handlers/media_class.php @@ -925,7 +925,8 @@ class e_media } $cache = e107::getCache(); - $cache->setMD5('_'.$prefix.$type); + $cachTag = !empty($prefix) ? "glyphs_".$prefix : "glyphs"; + $cache->setMD5($cachTag, false); if($data = $cache->retrieve($type,360,true)) {