From 7c31d17f25f986d011d9b7cd589c16e43fa05f23 Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 2 Jun 2022 13:46:15 -0700 Subject: [PATCH] #4784 Fixes LiteSpeed compatibility with mod-rewrite flag. Corrected 'cache_clear' event trigger. --- e107_handlers/cache_handler.php | 1 + e107_handlers/e107_class.php | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/e107_handlers/cache_handler.php b/e107_handlers/cache_handler.php index 2a43ce14e..8d6e91cba 100644 --- a/e107_handlers/cache_handler.php +++ b/e107_handlers/cache_handler.php @@ -284,6 +284,7 @@ class ecache { $file = ($CacheTag) ? preg_replace("#\W#", "_", $CacheTag)."*.cache.php" : "*.cache.php"; e107::getEvent()->triggerAdminEvent('cache_clear', "cachetag=$CacheTag&file=$file&syscache=$syscache"); + e107::getEvent()->trigger('cache_clear', ['tag'=>$CacheTag, 'file'=>$file, 'system'=>$syscache]); $ret = self::delete(e_CACHE_CONTENT, $file, $syscache); if($CacheTag && $related) //TODO - too dirty - add it to the $file pattern above diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index de62f558d..a7c638816 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -4876,17 +4876,23 @@ class e107 if(!defined('e_MOD_REWRITE')) // Allow e107_config.php to override. { - define('e_MOD_REWRITE', ((getenv('HTTP_MOD_REWRITE') === 'On' || getenv('REDIRECT_HTTP_MOD_REWRITE') === 'On'))); + $HTTP_MOD_REWRITE = isset($_SERVER['HTTP_MOD_REWRITE']) ? $_SERVER['HTTP_MOD_REWRITE'] : getenv('HTTP_MOD_REWRITE'); + $REDIRECT_HTTP_MOD_REWRITE = isset($_SERVER['REDIRECT_HTTP_MOD_REWRITE']) ? $_SERVER['REDIRECT_HTTP_MOD_REWRITE'] : getenv('REDIRECT_HTTP_MOD_REWRITE'); + define('e_MOD_REWRITE', (($HTTP_MOD_REWRITE === 'On' || $REDIRECT_HTTP_MOD_REWRITE === 'On'))); } if(!defined('e_MOD_REWRITE_MEDIA')) // Allow e107_config.php to override. { - define('e_MOD_REWRITE_MEDIA', ((getenv('HTTP_MOD_REWRITE_MEDIA') === 'On' || getenv('REDIRECT_HTTP_MOD_REWRITE_MEDIA') === 'On'))); + $HTTP_MOD_REWRITE_MEDIA = isset($_SERVER['HTTP_MOD_REWRITE_MEDIA']) ? $_SERVER['HTTP_MOD_REWRITE_MEDIA'] : getenv('HTTP_MOD_REWRITE_MEDIA'); + $REDIRECT_HTTP_MOD_REWRITE_MEDIA = isset($_SERVER['REDIRECT_HTTP_MOD_REWRITE_MEDIA']) ? $_SERVER['REDIRECT_HTTP_MOD_REWRITE_MEDIA'] : getenv('REDIRECT_HTTP_MOD_REWRITE_MEDIA'); + define('e_MOD_REWRITE_MEDIA', (($HTTP_MOD_REWRITE_MEDIA === 'On' || $REDIRECT_HTTP_MOD_REWRITE_MEDIA === 'On'))); } if(!defined('e_MOD_REWRITE_STATIC')) // Allow e107_config.php to override. { - define('e_MOD_REWRITE_STATIC', ((getenv('HTTP_MOD_REWRITE_STATIC') === 'On' || getenv('REDIRECT_HTTP_MOD_REWRITE_STATIC') === 'On'))); + $HTTP_MOD_REWRITE_STATIC = isset($_SERVER['HTTP_MOD_REWRITE_STATIC']) ? $_SERVER['HTTP_MOD_REWRITE_STATIC'] : getenv('HTTP_MOD_REWRITE_STATIC'); + $REDIRECT_HTTP_MOD_REWRITE_STATIC = isset($_SERVER['REDIRECT_HTTP_MOD_REWRITE_STATIC']) ? $_SERVER['REDIRECT_HTTP_MOD_REWRITE_STATIC'] : getenv('REDIRECT_HTTP_MOD_REWRITE_STATIC'); + define('e_MOD_REWRITE_STATIC', (($HTTP_MOD_REWRITE_STATIC === 'On' || $REDIRECT_HTTP_MOD_REWRITE_STATIC === 'On'))); } $subdomain = false;