Update - v3.1.24

README.md

@@ -1,4 +1,4 @@
-# Component Builder Package (v3.1.19)
+# Component Builder Package (v3.1.24)
 
 The Joomla Component Builder Package that bundles JCB Component and all the plugins and features available into one package for easy install and update of your JCB system.
 
@@ -6,52 +6,46 @@ The Joomla Component Builder Package that bundles JCB Component and all the plug
 
 - Packager: [Vast Development Method](https://dev.vdm.io/)
 - Author: [Llewellyn van der Merwe](https://io.vdm.dev/)
-- Creation Date: February 2023
+- Creation Date: May 2023
 - Max Joomla Version: J3.10
 - Minimum Joomla Version: J3.8
 
 ## Extensions
 
-- [joomla/Component-Builder](https://git.vdm.dev/joomla/Component-Builder) [v3.1.19](https://git.vdm.dev/joomla/Component-Builder/archive/v3.1.19.zip)
+- [joomla/Component-Builder](https://git.vdm.dev/joomla/Component-Builder) [master](https://git.vdm.dev/joomla/Component-Builder/archive/master.zip)
-> Stable release of v3.1.19
+> master
-
+- [joomla/plg_content_componentbuilderadminheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuilderadminheaderstabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuilderadminheaderstabs/archive/master.zip)
-We fixed #972 so that custom code (in the header) will be added after the power namespaces. We added a message to show when a server move failed. We fixed the BaseConfig to not use '_' as separator. We fixed the footable loading issue. We removed the need for passing placeholders by reference. We added the option to generate a CHANGELOG. We fixed the server class to load new client if server details changed. We fixed the readme placeholder issue #978. We fixed the empty server url issue #978. Fixed Package import to now use the phplibsec version 3.
+> master
-- [joomla/plg_content_componentbuilderadminheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuilderadminheaderstabs) [v2.0.3](https://git.vdm.dev/joomla/plg_content_componentbuilderadminheaderstabs/archive/v2.0.3.zip)
+- [joomla/plg_content_componentbuildercomponentdashboardheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentdashboardheaderstabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentdashboardheaderstabs/archive/master.zip)
-> Update on v2.0.3 (beta for next version)
+> master
-
+- [joomla/plg_content_componentbuildercomponentheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentheaderstabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentheaderstabs/archive/master.zip)
-Here's an update on the current version, which includes changes towards the next release still in beta.
+> master
-- [joomla/plg_content_componentbuildercomponentdashboardheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentdashboardheaderstabs) [v2.0.1](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentdashboardheaderstabs/archive/v2.0.1.zip)
+- [joomla/plg_content_componentbuildercustomadminheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercustomadminheaderstabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuildercustomadminheaderstabs/archive/master.zip)
-> update - v2.0.1
+> master
-- [joomla/plg_content_componentbuildercomponentheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentheaderstabs) [v2.0.1](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentheaderstabs/archive/v2.0.1.zip)
+- [joomla/plg_content_componentbuilderfieldorderingtabs](https://git.vdm.dev/joomla/plg_content_componentbuilderfieldorderingtabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuilderfieldorderingtabs/archive/master.zip)
-> update - v2.0.1
+> master
-- [joomla/plg_content_componentbuildercustomadminheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercustomadminheaderstabs) [v2.0.1](https://git.vdm.dev/joomla/plg_content_componentbuildercustomadminheaderstabs/archive/v2.0.1.zip)
+- [joomla/plg_content_componentbuilderlanguagetabs](https://git.vdm.dev/joomla/plg_content_componentbuilderlanguagetabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuilderlanguagetabs/archive/master.zip)
-> update - v2.0.1
+> master
-- [joomla/plg_content_componentbuilderfieldorderingtabs](https://git.vdm.dev/joomla/plg_content_componentbuilderfieldorderingtabs) [v1.0.2](https://git.vdm.dev/joomla/plg_content_componentbuilderfieldorderingtabs/archive/v1.0.2.zip)
+- [joomla/plg_content_componentbuilderprivacytabs](https://git.vdm.dev/joomla/plg_content_componentbuilderprivacytabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuilderprivacytabs/archive/master.zip)
-> update - v1.0.2
+> master
-- [joomla/plg_content_componentbuilderlanguagetabs](https://git.vdm.dev/joomla/plg_content_componentbuilderlanguagetabs) [v1.0.2](https://git.vdm.dev/joomla/plg_content_componentbuilderlanguagetabs/archive/v1.0.2.zip)
+- [joomla/plg_content_componentbuildersiteheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildersiteheaderstabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuildersiteheaderstabs/archive/master.zip)
-> update - v1.0.2
+> master
-- [joomla/plg_content_componentbuilderprivacytabs](https://git.vdm.dev/joomla/plg_content_componentbuilderprivacytabs) [v1.0.1](https://git.vdm.dev/joomla/plg_content_componentbuilderprivacytabs/archive/v1.0.1.zip)
+- [joomla/plg_content_componentbuilderdynamicgetheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuilderdynamicgetheaderstabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuilderdynamicgetheaderstabs/archive/master.zip)
-> update - v1.0.1
+> master
-- [joomla/plg_content_componentbuildersiteheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildersiteheaderstabs) [v2.0.1](https://git.vdm.dev/joomla/plg_content_componentbuildersiteheaderstabs/archive/v2.0.1.zip)
+- [joomla/plg_extension_componentbuilderactionlogcompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderactionlogcompiler) [master](https://git.vdm.dev/joomla/plg_extension_componentbuilderactionlogcompiler/archive/master.zip)
-> update - v2.0.1
+> master
-- [joomla/plg_content_componentbuilderdynamicgetheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuilderdynamicgetheaderstabs) [v2.0.2](https://git.vdm.dev/joomla/plg_content_componentbuilderdynamicgetheaderstabs/archive/v2.0.2.zip)
+- [joomla/plg_extension_componentbuilderexportcompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderexportcompiler) [master](https://git.vdm.dev/joomla/plg_extension_componentbuilderexportcompiler/archive/master.zip)
-> update - v2.0.2
+> master
-- [joomla/plg_extension_componentbuilderactionlogcompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderactionlogcompiler) [v1.1.0](https://git.vdm.dev/joomla/plg_extension_componentbuilderactionlogcompiler/archive/v1.1.0.zip)
+- [joomla/plg_extension_componentbuilderfieldorderingcompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderfieldorderingcompiler) [master](https://git.vdm.dev/joomla/plg_extension_componentbuilderfieldorderingcompiler/archive/master.zip)
-> update - v1.1.0
+> master
-- [joomla/plg_extension_componentbuilderexportcompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderexportcompiler) [v1.1.2](https://git.vdm.dev/joomla/plg_extension_componentbuilderexportcompiler/archive/v1.1.2.zip)
+- [joomla/plg_extension_componentbuilderheaderscompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderheaderscompiler) [master](https://git.vdm.dev/joomla/plg_extension_componentbuilderheaderscompiler/archive/master.zip)
-> update - v1.1.2
+> master
-- [joomla/plg_extension_componentbuilderfieldorderingcompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderfieldorderingcompiler) [v1.0.2](https://git.vdm.dev/joomla/plg_extension_componentbuilderfieldorderingcompiler/archive/v1.0.2.zip)
+- [joomla/plg_extension_componentbuilderlanguagepackaging](https://git.vdm.dev/joomla/plg_extension_componentbuilderlanguagepackaging) [master](https://git.vdm.dev/joomla/plg_extension_componentbuilderlanguagepackaging/archive/master.zip)
-> update - v1.0.2
+> master
-- [joomla/plg_extension_componentbuilderheaderscompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderheaderscompiler) [v2.2.3](https://git.vdm.dev/joomla/plg_extension_componentbuilderheaderscompiler/archive/v2.2.3.zip)
+- [joomla/plg_extension_componentbuilderpowersautoloadercompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderpowersautoloadercompiler) [master](https://git.vdm.dev/joomla/plg_extension_componentbuilderpowersautoloadercompiler/archive/master.zip)
-> Update on v2.2.3 (beta for next version)
+> master
-
+- [joomla/plg_extension_componentbuilderprivacycompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderprivacycompiler) [master](https://git.vdm.dev/joomla/plg_extension_componentbuilderprivacycompiler/archive/master.zip)
-Here's an update on the current version, which includes changes towards the next release still in beta.
+> master
-- [joomla/plg_extension_componentbuilderlanguagepackaging](https://git.vdm.dev/joomla/plg_extension_componentbuilderlanguagepackaging) [v1.1.4](https://git.vdm.dev/joomla/plg_extension_componentbuilderlanguagepackaging/archive/v1.1.4.zip)
-> update - v1.1.4
-- [joomla/plg_extension_componentbuilderpowersautoloadercompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderpowersautoloadercompiler) [v1.1.0](https://git.vdm.dev/joomla/plg_extension_componentbuilderpowersautoloadercompiler/archive/v1.1.0.zip)
-> update - v1.1.0
-- [joomla/plg_extension_componentbuilderprivacycompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderprivacycompiler) [v1.1.4](https://git.vdm.dev/joomla/plg_extension_componentbuilderprivacycompiler/archive/v1.1.4.zip)
-> update - v1.1.4
 
 ### Copyright (2015)
 > Copyright (C) 2015 Llewellyn van der Merwe. All rights reserved.

install_component_builder.php

@@ -0,0 +1,141 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+use Joomla\CMS\Factory;
+
+/**
+ * Script File of Componentbuilder Package
+ */
+class pkg_component_builderInstallerScript
+{
+	/**
+	 * Called after any type of action
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function postflight($type, $parent)
+	{
+		// enable the JCB plugins
+		$this->enableJCBPlugins();
+
+		// only run these if we have an update
+		if ('update' == $type)
+		{
+			// update the update server location
+			$this->updateServerLocation();
+		}
+	}
+
+	/**
+	 * Update server location
+	 *
+	 * @return  void
+	 */
+	protected function updateServerLocation()
+	{
+		$location = "https://git.vdm.dev/joomla/Component-Builder/raw/branch/master/componentbuilder_update_server.xml";
+		$elements = ['pkg_component_builder', 'com_componentbuilder'];
+
+		// Get the Package Update Site Details
+		foreach ($elements as $element)
+		{
+			if (($sites = $this->getUpdateSites($element)) !== null)
+			{
+				foreach ($sites as $site)
+				{
+					if ($site->location !== $location)
+					{
+						// Update the update site location
+						$site->location = $location;
+						Factory::getDbo()->updateObject('#__update_sites', $site, 'update_site_id');
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get Update Sites
+	 *
+	 * @return  array|null
+	 */
+	protected function getUpdateSites(string $element): ?array
+	{
+		// Get The Database object
+		$db = Factory::getDbo();
+
+		// Get the Package Update Site Details
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('s.location', 's.update_site_id')));
+		$query->from($db->quoteName('#__update_sites', 's'));
+		$query->join('LEFT', $db->quoteName('#__update_sites_extensions', 'u') . ' ON ' . $db->quoteName('s.update_site_id') . ' = ' . $db->quoteName('u.update_site_id'));
+		$query->join('LEFT', $db->quoteName('#__extensions', 'e') . ' ON ' . $db->quoteName('u.extension_id') . ' = ' . $db->quoteName('e.extension_id'));
+		$query->where($db->quoteName('e.element') . ' = ' . $db->quote($element));
+		$db->setQuery($query);
+		$db->execute();
+
+		if ($db->getNumRows())
+		{
+			return $db->loadObjectList();
+		}
+		return null;
+	}
+
+	/**
+	 * Enable all JCB Plugins
+	 *
+	 * @return  void
+	 */
+	protected function enableJCBPlugins()
+	{
+		// Get The Database object
+		$db = Factory::getDbo();
+		// enable all JCB plugins Always!
+		$plugins = [
+			'componentbuilderadminheaderstabs',
+			'componentbuildercomponentdashboardheaderstabs',
+			'componentbuildercomponentheaderstabs',
+			'componentbuildercustomadminheaderstabs',
+			'componentbuilderlanguagetabs',
+			'componentbuildersiteheaderstabs',
+			'componentbuilderdynamicgetheaderstabs',
+			'componentbuilderprivacytabs',
+			'componentbuilderfieldorderingtabs',
+			'componentbuilderactionlogcompiler',
+			'componentbuilderexportcompiler',
+			'componentbuilderfieldorderingcompiler',
+			'componentbuilderheaderscompiler',
+			'componentbuilderlanguagepackaging',
+			'componentbuilderpowersautoloadercompiler',
+			'componentbuilderprivacycompiler'
+		];
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+		// we must update the enabled field
+		$fields = [
+			$db->quoteName('enabled') . ' = 1'
+		];
+		// Conditions for which records should be updated.
+		$conditions = [
+			$db->quoteName('element') . ' IN (' . implode(',', array_map([$db, 'quote'], $plugins)) . ')'
+		];
+		// load the update query
+		$query->update($db->quoteName('#__extensions'))->set($fields)->where($conditions);
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$db->execute();
+	}
+}

pkg_component_builder.xml

@@ -2,8 +2,8 @@
 <extension version="3.8" type="package" method="upgrade">
 	<name>PKG_COMPONENT_BUILDER</name>
 	<packagename>component_builder</packagename>
-	<version>3.1.19</version>
+	<version>3.1.24</version>
-	<creationDate>February 2023</creationDate>
+	<creationDate>May 2023</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>https://io.vdm.dev/</authorUrl>
@@ -13,6 +13,7 @@
 	<packager>Vast Development Method</packager>
 	<packagerurl>https://dev.vdm.io/</packagerurl>
 	<description>The Joomla Component Builder Package that bundles JCB Component and all the plugins and features available into one package for easy install and update of your JCB system.</description>
+	<scriptfile>install_component_builder.php</scriptfile>
 	<updateservers>
 		<server type="extension" name="Component Builder Package - Updates" element="pkg_component_builder">https://git.vdm.dev/joomla/Component-Builder/raw/branch/master/componentbuilder_update_server.xml</server>
 	</updateservers>
@@ -21,22 +22,22 @@
 		<language tag="en-GB">en-GB/en-GB.pkg_component_builder.ini</language>
 	</languages>
 	<files folder="src">
-		<file type="component" id="com_componentbuilder">joomla__Component-Builder__v3.1.19.zip</file>
+		<file type="component" id="com_componentbuilder">joomla__Component-Builder__master.zip</file>
-		<file type="plugin" id="ComponentBuilderAdminHeadersTabs" group="content">joomla__plg_content_componentbuilderadminheaderstabs__v2.0.3.zip</file>
+		<file type="plugin" id="ComponentBuilderAdminHeadersTabs" group="content">joomla__plg_content_componentbuilderadminheaderstabs__master.zip</file>
-		<file type="plugin" id="ComponentBuilderComponentDashboardHeadersTabs" group="content">joomla__plg_content_componentbuildercomponentdashboardheaderstabs__v2.0.1.zip</file>
+		<file type="plugin" id="ComponentBuilderComponentDashboardHeadersTabs" group="content">joomla__plg_content_componentbuildercomponentdashboardheaderstabs__master.zip</file>
-		<file type="plugin" id="ComponentBuilderComponentHeadersTabs" group="content">joomla__plg_content_componentbuildercomponentheaderstabs__v2.0.1.zip</file>
+		<file type="plugin" id="ComponentBuilderComponentHeadersTabs" group="content">joomla__plg_content_componentbuildercomponentheaderstabs__master.zip</file>
-		<file type="plugin" id="ComponentBuilderCustomAdminHeadersTabs" group="content">joomla__plg_content_componentbuildercustomadminheaderstabs__v2.0.1.zip</file>
+		<file type="plugin" id="ComponentBuilderCustomAdminHeadersTabs" group="content">joomla__plg_content_componentbuildercustomadminheaderstabs__master.zip</file>
-		<file type="plugin" id="ComponentBuilderFieldOrderingTabs" group="content">joomla__plg_content_componentbuilderfieldorderingtabs__v1.0.2.zip</file>
+		<file type="plugin" id="ComponentBuilderFieldOrderingTabs" group="content">joomla__plg_content_componentbuilderfieldorderingtabs__master.zip</file>
-		<file type="plugin" id="ComponentBuilderLanguageTabs" group="content">joomla__plg_content_componentbuilderlanguagetabs__v1.0.2.zip</file>
+		<file type="plugin" id="ComponentBuilderLanguageTabs" group="content">joomla__plg_content_componentbuilderlanguagetabs__master.zip</file>
-		<file type="plugin" id="ComponentBuilderPrivacyTabs" group="content">joomla__plg_content_componentbuilderprivacytabs__v1.0.1.zip</file>
+		<file type="plugin" id="ComponentBuilderPrivacyTabs" group="content">joomla__plg_content_componentbuilderprivacytabs__master.zip</file>
-		<file type="plugin" id="ComponentBuilderSiteHeadersTabs" group="content">joomla__plg_content_componentbuildersiteheaderstabs__v2.0.1.zip</file>
+		<file type="plugin" id="ComponentBuilderSiteHeadersTabs" group="content">joomla__plg_content_componentbuildersiteheaderstabs__master.zip</file>
-		<file type="plugin" id="ComponentBuilderDynamicgetHeadersTabs" group="content">joomla__plg_content_componentbuilderdynamicgetheaderstabs__v2.0.2.zip</file>
+		<file type="plugin" id="ComponentBuilderDynamicgetHeadersTabs" group="content">joomla__plg_content_componentbuilderdynamicgetheaderstabs__master.zip</file>
-		<file type="plugin" id="ComponentBuilderActionLogCompiler" group="extension">joomla__plg_extension_componentbuilderactionlogcompiler__v1.1.0.zip</file>
+		<file type="plugin" id="ComponentBuilderActionLogCompiler" group="extension">joomla__plg_extension_componentbuilderactionlogcompiler__master.zip</file>
-		<file type="plugin" id="ComponentBuilderExportCompiler" group="extension">joomla__plg_extension_componentbuilderexportcompiler__v1.1.2.zip</file>
+		<file type="plugin" id="ComponentBuilderExportCompiler" group="extension">joomla__plg_extension_componentbuilderexportcompiler__master.zip</file>
-		<file type="plugin" id="ComponentBuilderFieldOrderingCompiler" group="extension">joomla__plg_extension_componentbuilderfieldorderingcompiler__v1.0.2.zip</file>
+		<file type="plugin" id="ComponentBuilderFieldOrderingCompiler" group="extension">joomla__plg_extension_componentbuilderfieldorderingcompiler__master.zip</file>
-		<file type="plugin" id="ComponentBuilderHeadersCompiler" group="extension">joomla__plg_extension_componentbuilderheaderscompiler__v2.2.3.zip</file>
+		<file type="plugin" id="ComponentBuilderHeadersCompiler" group="extension">joomla__plg_extension_componentbuilderheaderscompiler__master.zip</file>
-		<file type="plugin" id="ComponentBuilderLanguagePackaging" group="extension">joomla__plg_extension_componentbuilderlanguagepackaging__v1.1.4.zip</file>
+		<file type="plugin" id="ComponentBuilderLanguagePackaging" group="extension">joomla__plg_extension_componentbuilderlanguagepackaging__master.zip</file>
-		<file type="plugin" id="ComponentBuilderPowersAutoloaderCompiler" group="extension">joomla__plg_extension_componentbuilderpowersautoloadercompiler__v1.1.0.zip</file>
+		<file type="plugin" id="ComponentBuilderPowersAutoloaderCompiler" group="extension">joomla__plg_extension_componentbuilderpowersautoloadercompiler__master.zip</file>
-		<file type="plugin" id="ComponentBuilderPrivacyCompiler" group="extension">joomla__plg_extension_componentbuilderprivacycompiler__v1.1.4.zip</file>
+		<file type="plugin" id="ComponentBuilderPrivacyCompiler" group="extension">joomla__plg_extension_componentbuilderprivacycompiler__master.zip</file>
 	</files>
 </extension>