From 6215e577625e90e4306e41f1c1d5c3560767dde5 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Tue, 3 Oct 2023 19:31:15 +0900 Subject: [PATCH] Add warning to discourage ruleset use https://xetown.com/questions/1788526 --- classes/module/ModuleHandler.class.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index 8093df33a..e6a1bd663 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -352,6 +352,7 @@ class ModuleHandler extends Handler $ruleset = $xml_info->action->{$this->act}->ruleset ?? ''; $meta_noindex = $xml_info->action->{$this->act}->meta_noindex ?? ''; $kind = (stripos($this->act ?? '', 'admin') !== false || stripos($class_name, 'admin') !== false) ? 'admin' : ''; + $is_namespaced_module = false; if ($meta_noindex === 'true') { Context::addMetaTag('robots', 'noindex'); @@ -426,6 +427,7 @@ class ModuleHandler extends Handler if (class_exists($class_fullname)) { $oModule = $class_fullname::getInstance(); + $is_namespaced_module = true; } else { @@ -556,6 +558,7 @@ class ModuleHandler extends Handler if (class_exists($class_fullname)) { $oModule = $class_fullname::getInstance(); + $is_namespaced_module = true; } else { @@ -610,6 +613,12 @@ class ModuleHandler extends Handler // ruleset check... if(!empty($ruleset)) { + // Rulesets are deprecated for namespaced modules + if ($is_namespaced_module) + { + trigger_error('Ruleset is deprecated in namespaced modules', E_USER_WARNING); + } + $rulesetModule = !empty($forward->module) ? $forward->module : $this->module; $rulesetFile = ModuleModel::getValidatorFilePath($rulesetModule, $ruleset, $this->mid); if(!empty($rulesetFile))