From 86672371e77fa7ff013114ede5c1f3929d6c1a49 Mon Sep 17 00:00:00 2001
From: aB0t <robot@vdm.io>
Date: Mon, 27 Feb 2023 00:41:45 +0200
Subject: [PATCH] Update on v2.0.1 (beta for next version)

Here's an update on the current version, which includes changes towards the next release still in beta.
---
 ...ntbuildercomponentdashboardheaderstabs.xml |   2 +-
 script.php                                    | 111 +++++++++++-------
 2 files changed, 69 insertions(+), 44 deletions(-)

diff --git a/componentbuildercomponentdashboardheaderstabs.xml b/componentbuildercomponentdashboardheaderstabs.xml
index f34abae..174ccfb 100644
--- a/componentbuildercomponentdashboardheaderstabs.xml
+++ b/componentbuildercomponentdashboardheaderstabs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="plugin" version="4" group="content" method="upgrade">
 	<name>PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS</name>
-	<creationDate>15th February, 2023</creationDate>
+	<creationDate>26th February, 2023</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>https://dev.vdm.io</authorUrl>
diff --git a/script.php b/script.php
index 5723ecd..d5e0af6 100644
--- a/script.php
+++ b/script.php
@@ -57,10 +57,13 @@ class plgContentComponentbuilderComponentDashboardHeadersTabsInstallerScript
 				$app->enqueueMessage('Joomla Component Builder must first be installed from <a href="https://www.joomlacomponentbuilder.com/ " target="_blank">Joomla Component Builder</a>.', 'error');
 				return false;
 			}
+
 			// load the helper class
 			JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php');
+
 			// block install
 			$blockInstall = true;
+
 			// check the version of JCB
 			$manifest = ComponentbuilderHelper::manifest();
 			if (isset($manifest->version) && strpos($manifest->version, '.') !== false)
@@ -78,12 +81,14 @@ class plgContentComponentbuilderComponentDashboardHeadersTabsInstallerScript
 					$blockInstall = false;
 				}
 			}
+
 			// allow install if all conditions are met
 			if ($blockInstall)
 			{
-				$app->enqueueMessage('Please upgrade to JCB-Pro v3.0.0 or higher before installing this plugin.', 'error');
+				$app->enqueueMessage('Please upgrade to JCB v3.0.0 or higher before installing this plugin.', 'error');
 				return false;
-			}
+			}
+
 
 			// check that componentbuilder is installed
 			$pathToCore = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php';
@@ -155,10 +160,13 @@ class plgContentComponentbuilderComponentDashboardHeadersTabsInstallerScript
 				$app->enqueueMessage('Joomla Component Builder must first be installed from <a href="https://www.joomlacomponentbuilder.com/ " target="_blank">Joomla Component Builder</a>.', 'error');
 				return false;
 			}
+
 			// load the helper class
 			JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php');
+
 			// block install
 			$blockInstall = true;
+
 			// check the version of JCB
 			$manifest = ComponentbuilderHelper::manifest();
 			if (isset($manifest->version) && strpos($manifest->version, '.') !== false)
@@ -176,12 +184,14 @@ class plgContentComponentbuilderComponentDashboardHeadersTabsInstallerScript
 					$blockInstall = false;
 				}
 			}
+
 			// allow install if all conditions are met
 			if ($blockInstall)
 			{
-				$app->enqueueMessage('Please upgrade to JCB-Pro v3.0.0 or higher before installing this plugin.', 'error');
+				$app->enqueueMessage('Please upgrade to JCB v3.0.0 or higher before installing this plugin.', 'error');
 				return false;
-			}
+			}
+
 
 
 			// check that componentbuilder is installed
@@ -191,10 +201,13 @@ class plgContentComponentbuilderComponentDashboardHeadersTabsInstallerScript
 				$app->enqueueMessage('Joomla Component Builder must first be installed from <a href="https://www.joomlacomponentbuilder.com/ " target="_blank">Joomla Component Builder</a>.', 'error');
 				return false;
 			}
+
 			// load the helper class
 			JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php');
+
 			// block install
 			$blockInstall = true;
+
 			// check the version of JCB
 			$manifest = ComponentbuilderHelper::manifest();
 			if (isset($manifest->version) && strpos($manifest->version, '.') !== false)
@@ -212,12 +225,14 @@ class plgContentComponentbuilderComponentDashboardHeadersTabsInstallerScript
 					$blockInstall = false;
 				}
 			}
+
 			// allow install if all conditions are met
 			if ($blockInstall)
 			{
-				$app->enqueueMessage('Please upgrade to JCB-Pro v3.0.0 or higher before installing this plugin.', 'error');
+				$app->enqueueMessage('Please upgrade to JCB v3.0.0 or higher before installing this plugin.', 'error');
 				return false;
-			}
+			}
+
 
 
 			// check that componentbuilder is installed
@@ -227,10 +242,54 @@ class plgContentComponentbuilderComponentDashboardHeadersTabsInstallerScript
 				$app->enqueueMessage('Joomla Component Builder must first be installed from <a href="https://www.joomlacomponentbuilder.com/ " target="_blank">Joomla Component Builder</a>.', 'error');
 				return false;
 			}
+
 			// load the helper class
 			JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php');
+
 			// block install
 			$blockInstall = true;
+
+			// check the version of JCB
+			$manifest = ComponentbuilderHelper::manifest();
+			if (isset($manifest->version) && strpos($manifest->version, '.') !== false)
+			{
+				// get the version
+				$jcbVersion = explode('.', $manifest->version);
+				// check that we have JCB 3.1.18 or higher installed
+				if (count($jcbVersion) == 3 && $jcbVersion[0] >= 3 &&
+					(
+						($jcbVersion[0] == 3 && $jcbVersion[1] == 1 && $jcbVersion[2] >= 18) ||
+						($jcbVersion[0] == 3 && $jcbVersion[1] > 1) ||
+						$jcbVersion[0] > 3)
+					)
+				{
+					$blockInstall = false;
+				}
+			}
+
+			// allow install if all conditions are met
+			if ($blockInstall)
+			{
+				$app->enqueueMessage('Please upgrade to JCB v3.1.18 or higher before installing this plugin.', 'error');
+				return false;
+			}
+
+
+
+			// check that componentbuilder is installed
+			$pathToCore = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php';
+			if (!JFile::exists($pathToCore))
+			{
+				$app->enqueueMessage('Joomla Component Builder must first be installed from <a href="https://www.joomlacomponentbuilder.com/ " target="_blank">Joomla Component Builder</a>.', 'error');
+				return false;
+			}
+
+			// load the helper class
+			JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php');
+
+			// block install
+			$blockInstall = true;
+
 			// check the version of JCB
 			$manifest = ComponentbuilderHelper::manifest();
 			if (isset($manifest->version) && strpos($manifest->version, '.') !== false)
@@ -248,48 +307,14 @@ class plgContentComponentbuilderComponentDashboardHeadersTabsInstallerScript
 					$blockInstall = false;
 				}
 			}
+
 			// allow install if all conditions are met
 			if ($blockInstall)
 			{
-				$app->enqueueMessage('Please upgrade to JCB-Pro v3.0.14 or higher before installing this plugin.', 'error');
-				return false;
-			}
-
-
-			// check that componentbuilder is installed
-			$pathToCore = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php';
-			if (!JFile::exists($pathToCore))
-			{
-				$app->enqueueMessage('Joomla Component Builder must first be installed from <a href="https://www.joomlacomponentbuilder.com/ " target="_blank">Joomla Component Builder</a>.', 'error');
+				$app->enqueueMessage('Please upgrade to JCB v3.0.14 or higher before installing this plugin.', 'error');
 				return false;
 			}
-			// load the helper class
-			JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php');
-			// block install
-			$blockInstall = true;
-			// check the version of JCB
-			$manifest = ComponentbuilderHelper::manifest();
-			if (isset($manifest->version) && strpos($manifest->version, '.') !== false)
-			{
-				// get the version
-				$jcbVersion = explode('.', $manifest->version);
-				// check that we have JCB 3.0.14 or higher installed
-				if (count($jcbVersion) == 3 && $jcbVersion[0] >= 3 &&
-					(
-						($jcbVersion[0] == 3 && $jcbVersion[1] == 0 && $jcbVersion[2] >= 14) ||
-						($jcbVersion[0] == 3 && $jcbVersion[1] > 0) ||
-						$jcbVersion[0] > 3)
-					)
-				{
-					$blockInstall = false;
-				}
-			}
-			// allow install if all conditions are met
-			if ($blockInstall)
-			{
-				$app->enqueueMessage('Please upgrade to JCB-Pro v3.0.14 or higher before installing this plugin.', 'error');
-				return false;
-			}
+
 		}
 
 		return true;