From 1b3b020322463946b91ec780ed515d0899c27ceb Mon Sep 17 00:00:00 2001
From: Denis Ryabov <dryabov@yandex.ru>
Date: Mon, 10 May 2021 20:16:42 +0300
Subject: [PATCH] switch to use of JEDCheckerHelper in xmlfiles

---
 .../libraries/rules/xmlfiles.php              | 66 ++-----------------
 1 file changed, 7 insertions(+), 59 deletions(-)

diff --git a/administrator/components/com_jedchecker/libraries/rules/xmlfiles.php b/administrator/components/com_jedchecker/libraries/rules/xmlfiles.php
index be981ec..c1d04a6 100644
--- a/administrator/components/com_jedchecker/libraries/rules/xmlfiles.php
+++ b/administrator/components/com_jedchecker/libraries/rules/xmlfiles.php
@@ -13,6 +13,9 @@ defined('_JEXEC') or die('Restricted access');
 // Include the rule base class
 require_once JPATH_COMPONENT_ADMINISTRATOR . '/models/rule.php';
 
+// Include the helper class
+require_once JPATH_COMPONENT_ADMINISTRATOR . '/libraries/helper.php';
+
 
 /**
  * class JedcheckerRulesXMLFiles
@@ -229,79 +232,24 @@ class JedcheckerRulesXMLFiles extends JEDcheckerRule
 		{
 			$attributes = array('addfieldpath', 'addformpath', 'addrulepath');
 
+			$element = JEDCheckerHelper::getElementName($xml);
 			$extensionPath = false;
 
-			// @TODO move element name extraction into a helper (similar code is used in XMLinfo rule)
-			switch ((string) $xml['type'])
+			$type = (string) $xml['type'];
+
+			switch ($type)
 			{
 				case 'module':
-					if (isset($xml->element))
-					{
-						$element = (string) $xml->element;
-					}
-					else
-					{
-						$element = (string) $xml->name;
-
-						if (isset($xml->files))
-						{
-							foreach ($xml->files->children() as $child)
-							{
-								if (isset($child['module']))
-								{
-									$element = (string) $child['module'];
-									break;
-								}
-							}
-						}
-					}
-
-					$element = strtolower(JFilterInput::getInstance()->clean($element, 'cmd'));
-
 					$extensionPath = 'modules/' . $element . '/';
 					break;
 
 				case 'plugin':
-					if (isset($xml->element))
-					{
-						$element = (string) $xml->element;
-					}
-					else
-					{
-						$element = (string) $xml->name;
-
-						if (isset($xml->files))
-						{
-							foreach ($xml->files->children() as $child)
-							{
-								if (isset($child['plugin']))
-								{
-									$element = (string) $child['plugin'];
-									break;
-								}
-							}
-						}
-					}
-
-					$element = strtolower(JFilterInput::getInstance()->clean($element, 'cmd'));
-
 					$group = (string) $xml['group'];
 
 					$extensionPath = 'plugins/' . $group . '/' . $element . '/';
 					break;
 
 				case 'template':
-					if (isset($xml->element))
-					{
-						$element = (string) $xml->element;
-					}
-					else
-					{
-						$element = (string) $xml->name;
-					}
-
-					$element = strtolower(JFilterInput::getInstance()->clean($element, 'cmd'));
-
 					$extensionPath = 'templates/' . $element . '/';
 			}