Update

README.md

@@ -1,45 +1,51 @@
-# Component Builder Package (v3.1.28)
+# Component Builder Package (v3.2.0-beta1)
 
 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.
 
 ## Details
 
 - Packager: [Vast Development Method](https://dev.vdm.io/)
-- Author: [Llewellyn van der Merwe](http://www.joomlacomponentbuilder.com/)
+- Author: [Llewellyn van der Merwe](https://io.vdm.dev/)
-- Creation Date: January 2024
+- Creation Date: March 2024
 - Max Joomla Version: J3.10
 - Minimum Joomla Version: J3.8
 
 ## Extensions
 
-- [joomla/Component-Builder](https://git.vdm.dev/joomla/Component-Builder) [v3.1.28](https://git.vdm.dev/joomla/Component-Builder/archive/v3.1.28.zip)
+- [joomla/Component-Builder](https://git.vdm.dev/joomla/Component-Builder) [3.10](https://git.vdm.dev/joomla/Component-Builder/archive/3.10.zip)
-> Updates PHPSecLib. Fixed connection failure to remote server. Adds overriding of back-folder and git-folder on component level.
+> 3.10
-- [joomla/plg_content_componentbuilderadminheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuilderadminheaderstabs) [v1.0.1](https://git.vdm.dev/joomla/plg_content_componentbuilderadminheaderstabs/releases/download/v1.0.1/plg_content_componentbuilderadminheaderstabs-v1.0.1.zip)
+- [joomla/plg_content_componentbuilderadminheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuilderadminheaderstabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuilderadminheaderstabs/archive/master.zip)
-> Plugin for adding header code to admin area - tabs (2021-10-01)
+> master
-- [joomla/plg_content_componentbuildercomponentheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentheaderstabs) [v1.0.0](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentheaderstabs/releases/download/v1.0.0/plg_content_componentbuildercomponentheaderstabs-v1.0.0.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)
-> Plugin for adding header code to your component - tabs (2021-08-01)
+> master
-- [joomla/plg_content_componentbuildercustomadminheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercustomadminheaderstabs) [v1.0.1](https://git.vdm.dev/joomla/plg_content_componentbuildercustomadminheaderstabs/releases/download/v1.0.1/plg_content_componentbuildercustomadminheaderstabs-v1.0.1.zip)
+- [joomla/plg_content_componentbuildercomponentheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentheaderstabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentheaderstabs/archive/master.zip)
-> Plugin for adding header code to custom admin area - tabs (2021-10-01)
+> master
-- [joomla/plg_content_componentbuilderfieldorderingtabs](https://git.vdm.dev/joomla/plg_content_componentbuilderfieldorderingtabs) [v1.0.0](https://git.vdm.dev/joomla/plg_content_componentbuilderfieldorderingtabs/releases/download/v1.0.0/plg_content_componentbuilderfieldorderingtabs-v1.0.0.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)
-> Plugin for changing default ordering in admin views - tabs (2021-03-01)
+> master
-- [joomla/plg_content_componentbuilderlanguagetabs](https://git.vdm.dev/joomla/plg_content_componentbuilderlanguagetabs) [v1.0.0](https://git.vdm.dev/joomla/plg_content_componentbuilderlanguagetabs/releases/download/v1.0.0/plg_content_componentbuilderlanguagetabs-v1.0.0.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)
-> Plugin for language packaging - tabs (2020-01-01)
+> master
-- [joomla/plg_content_componentbuilderprivacytabs](https://git.vdm.dev/joomla/plg_content_componentbuilderprivacytabs) [v1.0.0](https://git.vdm.dev/joomla/plg_content_componentbuilderprivacytabs/releases/download/v1.0.0/plg_content_componentbuilderprivacytabs-v1.0.0.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)
-> Plugin to integrate privacy suite - tabs (2020-11-01)
+> master
-- [joomla/plg_content_componentbuildersiteheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildersiteheaderstabs) [v1.0.0](https://git.vdm.dev/joomla/plg_content_componentbuildersiteheaderstabs/releases/download/v1.0.0/plg_content_componentbuildersiteheaderstabs-v1.0.0.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)
-> Plugin for adding header code to site area - tabs (2021-06-01)
+> master
-- [joomla/plg_extension_componentbuilderactionlogcompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderactionlogcompiler) [v1.0.2](https://git.vdm.dev/joomla/plg_extension_componentbuilderactionlogcompiler/releases/download/v1.0.2/plg_extension_componentbuilderactionlogcompiler-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)
-> Plugin for adding action log integration to your components - compiler (2020-12-01)
+> master
-- [joomla/plg_extension_componentbuilderexportcompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderexportcompiler) [v1.0.1](https://git.vdm.dev/joomla/plg_extension_componentbuilderexportcompiler/releases/download/v1.0.1/plg_extension_componentbuilderexportcompiler-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)
-> Plugin to improve the export feature - compiler (2021-03-01)
+> master
-- [joomla/plg_extension_componentbuilderfieldorderingcompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderfieldorderingcompiler) [v1.0.0](https://git.vdm.dev/joomla/plg_extension_componentbuilderfieldorderingcompiler/releases/download/v1.0.0/plg_extension_componentbuilderfieldorderingcompiler-v1.0.0.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)
-> Plugin for changing default ordering in admin views - compiler (2021-03-01)
+> master
-- [joomla/plg_extension_componentbuilderheaderscompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderheaderscompiler) [v1.0.5](https://git.vdm.dev/joomla/plg_extension_componentbuilderheaderscompiler/releases/download/v1.0.5/plg_extension_componentbuilderheaderscompiler-v1.0.5.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)
-> Plugin for adding header code to your component - compiler (2021-10-01)
+> master
-- [joomla/plg_extension_componentbuilderlanguagepackaging](https://git.vdm.dev/joomla/plg_extension_componentbuilderlanguagepackaging) [v1.0.0](https://git.vdm.dev/joomla/plg_extension_componentbuilderlanguagepackaging/releases/download/v1.0.0/plg_extension_componentbuilderlanguagepackaging-v1.0.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)
-> Plugin for language packaging - compiler (2020-01-01)
+> master
-- [joomla/plg_extension_componentbuilderprivacycompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderprivacycompiler) [v1.0.0](https://git.vdm.dev/joomla/plg_extension_componentbuilderprivacycompiler/releases/download/v1.0.0/plg_extension_componentbuilderprivacycompiler-v1.0.0.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)
-> Plugin to integrate privacy suite - compiler (2020-11-01)
+> master
+- [joomla/plg_extension_componentbuilderlanguagepackaging](https://git.vdm.dev/joomla/plg_extension_componentbuilderlanguagepackaging) [master](https://git.vdm.dev/joomla/plg_extension_componentbuilderlanguagepackaging/archive/master.zip)
+> master
+- [joomla/plg_extension_componentbuilderpowersautoloadercompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderpowersautoloadercompiler) [master](https://git.vdm.dev/joomla/plg_extension_componentbuilderpowersautoloadercompiler/archive/master.zip)
+> 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)
+> master
 
 ### 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 Component builder 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/3.10/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,38 +2,42 @@
 <extension version="3.8" type="package" method="upgrade">
 	<name>PKG_COMPONENT_BUILDER</name>
 	<packagename>component_builder</packagename>
-	<version>3.1.28</version>
+	<version>3.2.0-beta1</version>
-	<creationDate>January 2024</creationDate>
+	<creationDate>March 2024</creationDate>
 	<author>Llewellyn van der Merwe</author>
-	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
+	<authorEmail>joomla@vdm.io</authorEmail>
-	<authorUrl>http://www.joomlacomponentbuilder.com/</authorUrl>
+	<authorUrl>https://io.vdm.dev/</authorUrl>
 	<copyright>Copyright (C) 2015 Llewellyn van der Merwe. All rights reserved.</copyright>
 	<copyrightyear>2015</copyrightyear>
 	<license>GNU General Public License version 2; see LICENSE</license>
 	<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://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/master/componentbuilder_update_server.xml</server>
+		<server type="extension" name="Component Builder Package - Updates" element="pkg_component_builder">https://git.vdm.dev/joomla/Component-Builder/raw/branch/3.10/componentbuilder_update_server.xml</server>
 	</updateservers>
 	<languages folder="languages">
 		<language tag="en-GB">en-GB/en-GB.pkg_component_builder.sys.ini</language>
 		<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.28.zip</file>
+		<file type="component" id="com_componentbuilder">joomla__Component-Builder__3.10.zip</file>
-		<file type="plugin" id="ComponentBuilderAdminHeadersTabs" group="content">joomla__plg_content_componentbuilderadminheaderstabs-v1.0.1.zip</file>
+		<file type="plugin" id="ComponentBuilderAdminHeadersTabs" group="content">joomla__plg_content_componentbuilderadminheaderstabs__master.zip</file>
-		<file type="plugin" id="ComponentBuilderComponentHeadersTabs" group="content">joomla__plg_content_componentbuildercomponentheaderstabs-v1.0.0.zip</file>
+		<file type="plugin" id="ComponentBuilderComponentDashboardHeadersTabs" group="content">joomla__plg_content_componentbuildercomponentdashboardheaderstabs__master.zip</file>
-		<file type="plugin" id="ComponentBuilderCustomAdminHeadersTabs" group="content">joomla__plg_content_componentbuildercustomadminheaderstabs-v1.0.1.zip</file>
+		<file type="plugin" id="ComponentBuilderComponentHeadersTabs" group="content">joomla__plg_content_componentbuildercomponentheaderstabs__master.zip</file>
-		<file type="plugin" id="ComponentBuilderFieldOrderingTabs" group="content">joomla__plg_content_componentbuilderfieldorderingtabs-v1.0.0.zip</file>
+		<file type="plugin" id="ComponentBuilderCustomAdminHeadersTabs" group="content">joomla__plg_content_componentbuildercustomadminheaderstabs__master.zip</file>
-		<file type="plugin" id="ComponentBuilderLanguageTabs" group="content">joomla__plg_content_componentbuilderlanguagetabs-v1.0.0.zip</file>
+		<file type="plugin" id="ComponentBuilderFieldOrderingTabs" group="content">joomla__plg_content_componentbuilderfieldorderingtabs__master.zip</file>
-		<file type="plugin" id="ComponentBuilderPrivacyTabs" group="content">joomla__plg_content_componentbuilderprivacytabs-v1.0.0.zip</file>
+		<file type="plugin" id="ComponentBuilderLanguageTabs" group="content">joomla__plg_content_componentbuilderlanguagetabs__master.zip</file>
-		<file type="plugin" id="ComponentBuilderSiteHeadersTabs" group="content">joomla__plg_content_componentbuildersiteheaderstabs-v1.0.0.zip</file>
+		<file type="plugin" id="ComponentBuilderPrivacyTabs" group="content">joomla__plg_content_componentbuilderprivacytabs__master.zip</file>
-		<file type="plugin" id="ComponentBuilderActionLogCompiler" group="extension">joomla__plg_extension_componentbuilderactionlogcompiler-v1.0.2.zip</file>
+		<file type="plugin" id="ComponentBuilderSiteHeadersTabs" group="content">joomla__plg_content_componentbuildersiteheaderstabs__master.zip</file>
-		<file type="plugin" id="ComponentBuilderExportCompiler" group="extension">joomla__plg_extension_componentbuilderexportcompiler-v1.0.1.zip</file>
+		<file type="plugin" id="ComponentBuilderDynamicgetHeadersTabs" group="content">joomla__plg_content_componentbuilderdynamicgetheaderstabs__master.zip</file>
-		<file type="plugin" id="ComponentBuilderFieldOrderingCompiler" group="extension">joomla__plg_extension_componentbuilderfieldorderingcompiler-v1.0.0.zip</file>
+		<file type="plugin" id="ComponentBuilderActionLogCompiler" group="extension">joomla__plg_extension_componentbuilderactionlogcompiler__master.zip</file>
-		<file type="plugin" id="ComponentBuilderHeadersCompiler" group="extension">joomla__plg_extension_componentbuilderheaderscompiler-v1.0.5.zip</file>
+		<file type="plugin" id="ComponentBuilderExportCompiler" group="extension">joomla__plg_extension_componentbuilderexportcompiler__master.zip</file>
-		<file type="plugin" id="ComponentBuilderLanguagePackaging" group="extension">joomla__plg_extension_componentbuilderlanguagepackaging-v1.0.0.zip</file>
+		<file type="plugin" id="ComponentBuilderFieldOrderingCompiler" group="extension">joomla__plg_extension_componentbuilderfieldorderingcompiler__master.zip</file>
-		<file type="plugin" id="ComponentBuilderPrivacyCompiler" group="extension">joomla__plg_extension_componentbuilderprivacycompiler-v1.0.0.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__master.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__master.zip</file>
 	</files>
 </extension>