From 80abc68994fa2ff86cad61b34a5e0971ef4a5196 Mon Sep 17 00:00:00 2001
From: Denis Ryabov <dryabov@yandex.ru>
Date: Sat, 13 Feb 2021 23:01:07 +0300
Subject: [PATCH 1/4] support of Joomla!4

---
 .../libraries/rules/xmlinfo.php               |  2 +-
 .../libraries/rules/xmllicense.php            |  2 +-
 .../libraries/rules/xmlupdateserver.php       |  6 +-
 .../views/uploads/tmpl/default.php            | 58 +++++++++++--------
 4 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/administrator/components/com_jedchecker/libraries/rules/xmlinfo.php b/administrator/components/com_jedchecker/libraries/rules/xmlinfo.php
index b4037be..39dade0 100644
--- a/administrator/components/com_jedchecker/libraries/rules/xmlinfo.php
+++ b/administrator/components/com_jedchecker/libraries/rules/xmlinfo.php
@@ -74,7 +74,7 @@ class JedcheckerRulesXMLinfo extends JEDcheckerRule
 	 */
 	protected function find($file)
 	{
-		$xml = JFactory::getXml($file);
+		$xml = simplexml_load_file($file);
 
 		// Get all the info about the file
 		$folder_info = pathinfo($file);
diff --git a/administrator/components/com_jedchecker/libraries/rules/xmllicense.php b/administrator/components/com_jedchecker/libraries/rules/xmllicense.php
index 3ce8729..b2280b2 100644
--- a/administrator/components/com_jedchecker/libraries/rules/xmllicense.php
+++ b/administrator/components/com_jedchecker/libraries/rules/xmllicense.php
@@ -72,7 +72,7 @@ class JedcheckerRulesXMLlicense extends JEDcheckerRule
 	 */
 	protected function find($file)
 	{
-		$xml = JFactory::getXml($file);
+		$xml = simplexml_load_file($file);
 
 		// Failed to parse the xml file.
 		// Assume that this is not a extension manifest
diff --git a/administrator/components/com_jedchecker/libraries/rules/xmlupdateserver.php b/administrator/components/com_jedchecker/libraries/rules/xmlupdateserver.php
index 8e7850e..108384f 100644
--- a/administrator/components/com_jedchecker/libraries/rules/xmlupdateserver.php
+++ b/administrator/components/com_jedchecker/libraries/rules/xmlupdateserver.php
@@ -79,7 +79,7 @@ class JedcheckerRulesXMLUpdateServer extends JEDcheckerRule
 
 		foreach ($files as $file)
 		{
-			$xml = JFactory::getXml($file);
+			$xml = simplexml_load_file($file);
 
 			// Check if this is an XML and an extension manifest
 			if ($xml && ($xml->getName() == 'install' || $xml->getName() == 'extension'))
@@ -116,7 +116,7 @@ class JedcheckerRulesXMLUpdateServer extends JEDcheckerRule
 
 		foreach ($files as $file)
 		{
-			$xml = JFactory::getXml($file);
+			$xml = simplexml_load_file($file);
 
 			// Check if this is an XML and an extension manifest
 			if ($xml && ($xml->getName() == 'install' || $xml->getName() == 'extension'))
@@ -174,7 +174,7 @@ class JedcheckerRulesXMLUpdateServer extends JEDcheckerRule
 	 */
 	protected function find($file)
 	{
-		$xml = JFactory::getXml($file);
+		$xml = simplexml_load_file($file);
 
 		// Failed to parse the xml file.
 		// Assume that this is not a extension manifest
diff --git a/administrator/components/com_jedchecker/views/uploads/tmpl/default.php b/administrator/components/com_jedchecker/views/uploads/tmpl/default.php
index 0c6ebef..7d48961 100644
--- a/administrator/components/com_jedchecker/views/uploads/tmpl/default.php
+++ b/administrator/components/com_jedchecker/views/uploads/tmpl/default.php
@@ -11,28 +11,35 @@
 
 defined('_JEXEC') or die('Restricted access');
 
-JHtml::_('behavior.framework', true);
-JHtml::stylesheet('media/com_jedchecker/css/style.min.css');
-?>
-
-<script>
-function add_validation() {
-	// Fetch all the forms we want to apply custom Bootstrap validation styles to
-    var forms = document.getElementsByClassName('needs-validation');
-    // Loop over them and prevent submission
-    var validation = Array.prototype.filter.call(forms, function(form) {
-      form.addEventListener('submit', function(event) {
-        if (form.checkValidity() === false) {
-          event.preventDefault();
-          event.stopPropagation();
-        }
-        form.classList.add('was-validated');
-      }, false);
-    });
+if (version_compare(JVERSION, '3.3.0', '>='))
+{
+	JHtml::_('behavior.core');
+}
+else
+{
+	JHtml::_('behavior.framework', true);
 }
-</script>
 
-<script type="text/javascript">
+JHtml::stylesheet('media/com_jedchecker/css/style.min.css');
+
+$document = JFactory::getDocument();
+
+$options = json_encode($this->jsOptions);
+$document->addScriptDeclaration(<<<END
+	function add_validation() {
+		// Fetch all the forms we want to apply custom Bootstrap validation styles to
+		var forms = document.getElementsByClassName('needs-validation');
+		// Loop over them and prevent submission
+		var validation = Array.prototype.filter.call(forms, function(form) {
+			form.addEventListener('submit', function(event) {
+				if (form.checkValidity() === false) {
+					event.preventDefault();
+					event.stopPropagation();
+				}
+				form.classList.add('was-validated');
+			}, false);
+		});
+	}
 
 	function check(url,rule) {
 		jQuery.ajax({
@@ -45,7 +52,7 @@ function add_validation() {
 	}
 
 	Joomla.submitbutton = function (task) {
-		var options = <?php echo json_encode($this->jsOptions); ?>;
+		var options = $options;
 
 		if (task == 'check') {
 			jQuery("#police-check-result").empty();
@@ -60,9 +67,10 @@ function add_validation() {
 			Joomla.submitform(task);
 		}
 	}
-</script>
-	<?php
-	if ( version_compare(JVERSION, '3.20', 'lt') ) {
+END
+);
+
+	if ( version_compare(JVERSION, '3.20', '<') || version_compare(JVERSION, '4.0', '>=') ) {
 	?>
 	<!-- Styling of Bootstrap 4 core CSS-->
 	<link href="<?php echo JURI::root(); ?>media/com_jedchecker/css/j3-style.min.css" rel="stylesheet">
@@ -114,7 +122,7 @@ function add_validation() {
 				<div class="card-body">
 					<h5 class="card-title"><?php echo JText::_('COM_JEDCHECKER_PEOPLE_THAT_HAVE_HELPED_WITH_THE_DEVELOPMENT'); ?></h5>
 					<p class="card-text">
-						<a href="https://github.com/joomla-extensions/jedchecker/graphs/contributors" target="_blank" class="btn">
+						<a href="https://github.com/joomla-extensions/jedchecker/graphs/contributors" target="_blank" class="btn btn-light">
 						<?php echo JText::_('COM_JEDCHECKER_CONTRIBUTORS'); ?></a>
 					</p>
 				</div>

From 0ac7ee0f6b1216bffd42113a0f4fc66e09534033 Mon Sep 17 00:00:00 2001
From: Denis Ryabov <dryabov@yandex.ru>
Date: Tue, 23 Feb 2021 21:05:14 +0300
Subject: [PATCH 2/4] fixed: JFile::read is not supported by Joomla! 4

---
 .../components/com_jedchecker/controllers/police.raw.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_jedchecker/controllers/police.raw.php b/administrator/components/com_jedchecker/controllers/police.raw.php
index d162003..d2eb6b6 100644
--- a/administrator/components/com_jedchecker/controllers/police.raw.php
+++ b/administrator/components/com_jedchecker/controllers/police.raw.php
@@ -112,7 +112,7 @@ class JedcheckerControllerPolice extends JControllerLegacy
 
 		if (JFile::exists($local))
 		{
-			$content = JFile::read($local);
+			$content = file_get_contents($local);
 
 			if (!empty($content))
 			{

From 1bcd291f8ce36dcc6e6767a9569d13009c346d18 Mon Sep 17 00:00:00 2001
From: Denis Ryabov <dryabov@yandex.ru>
Date: Tue, 2 Mar 2021 01:27:29 +0300
Subject: [PATCH 3/4] JError is not supported by Joomla! 4, return false is
 sufficient to abort installation

---
 administrator/components/com_jedchecker/script.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/administrator/components/com_jedchecker/script.php b/administrator/components/com_jedchecker/script.php
index e54b2e7..443d3b6 100644
--- a/administrator/components/com_jedchecker/script.php
+++ b/administrator/components/com_jedchecker/script.php
@@ -34,7 +34,8 @@ class Com_JedcheckerInstallerScript
 		{
 			$this->loadLanguage();
 
-			Jerror::raiseWarning(null, JText::sprintf('COM_JEDCHECKER_PHP_VERSION_INCOMPATIBLE', PHP_VERSION, '5.3.10'));
+			$msg = JText::sprintf('COM_JEDCHECKER_PHP_VERSION_INCOMPATIBLE', PHP_VERSION, '5.3.10');
+			echo "<p>$msg</p>";
 
 			return false;
 		}

From 17e6f3b3a4e56aedeadcb2912dac7dac67a3dcb9 Mon Sep 17 00:00:00 2001
From: Denis Ryabov <dryabov@yandex.ru>
Date: Wed, 17 Mar 2021 18:44:19 +0300
Subject: [PATCH 4/4] Load jQuery explicitly

---
 .../components/com_jedchecker/views/uploads/tmpl/default.php   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/administrator/components/com_jedchecker/views/uploads/tmpl/default.php b/administrator/components/com_jedchecker/views/uploads/tmpl/default.php
index 7d48961..d0ff58c 100644
--- a/administrator/components/com_jedchecker/views/uploads/tmpl/default.php
+++ b/administrator/components/com_jedchecker/views/uploads/tmpl/default.php
@@ -20,6 +20,9 @@ else
 	JHtml::_('behavior.framework', true);
 }
 
+// Load jQuery
+JHtml::_('jquery.framework');
+
 JHtml::stylesheet('media/com_jedchecker/css/style.min.css');
 
 $document = JFactory::getDocument();