Release of v5.0.3-beta3

Fix the missing edit button on fields in the related views. Fix the dashboard display. Place the search option back in the use field of the related views. Fix the namespace issue that broken the linker.

CHANGELOG.md

@@ -1,14 +1,18 @@
-# v5.0.3-beta2
+# v5.0.3-beta3
 
-- Fix the demo site view to also display files
+- Fix the missing edit button on fields in the related views
-- Fix the message of field type init
+- Fix the dashboard display
-- Fix to ensure type-agnostic comparisons by casting to CHAR in joins in dynamic get
+- Place the search option back in the use field of the related views
-- Fix dynamic download for site area to have correct namespace
+- Fix the namespace issue that broken the linker
 
 # v5.0.3-beta
 
 - Fix zip missing working path
 - Fix demo site view dynamic get
+- Fix the demo site view to also display files
+- Fix the message of field type init
+- Fix to ensure type-agnostic comparisons by casting to CHAR in joins in dynamic get
+- Fix dynamic download for site area to have correct namespace
 
 # v5.0.3-alpha
 

ComponentbuilderInstallerScript.php

@@ -1517,7 +1517,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 			$this->setDatabaseAssetsRulesFix(95520, "MEDIUMTEXT");
 			// Install the global extension params.
 			$this->setExtensionsParams(
-				'{"autorName":"Llewellyn van der Merwe","autorEmail":"joomla@vdm.io","subform_layouts":"default","editor":"none","manage_jcb_package_directories":"2","set_browser_storage":"1","storage_time_to_live":"global","super_powers_documentation":"0","powers_repository":"0","super_powers_repositories":"0","builder_gif_size":"480-272","compiler_plugin":["componentbuilderactionlogcompiler","componentbuilderfieldorderingcompiler","componentbuilderheaderscompiler","componentbuilderpowersautoloadercompiler","componentbuilderprivacycompiler"],"add_menu_prefix":"1","menu_prefix":"»","namespace_prefix":"JCB","minify":"0","language":"en-GB","percentagelanguageadd":"30","assets_table_fix":"2","compiler_field_builder_type":"2","field_name_builder":"2","type_name_builder":"2","import_guid_only":"1","export_language_strings":"1","cronjob_backup_type":"1","cronjob_backup_server":"0","backup_package_name":"JCB_Backup_[YEAR]_[MONTH]_[DAY]","export_company":"Vast Development Method","export_owner":"Llewellyn van der Merwe","export_email":"joomla@vdm.io","export_website":"https://dev.vdm.io/","export_license":"GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html","export_copyright":"Copyright (C) 2015. All Rights Reserved","check_in":"-1 day","save_history":"1","history_limit":"10","add_jquery_framework":"1","uikit_load":"1","uikit_min":"","uikit_style":""}'
+				'{"autorName":"Llewellyn van der Merwe","autorEmail":"joomla@vdm.io","subform_layouts":{"subform_layouts0":{"view_field":"default","layout":"repeatablejcbjfive"}},"editor":"none","manage_jcb_package_directories":"2","set_browser_storage":"1","storage_time_to_live":"global","super_powers_documentation":"0","powers_repository":"0","super_powers_repositories":"0","builder_gif_size":"480-272","compiler_plugin":["componentbuilderactionlogcompiler","componentbuilderfieldorderingcompiler","componentbuilderheaderscompiler","componentbuilderpowersautoloadercompiler","componentbuilderprivacycompiler"],"add_menu_prefix":"1","menu_prefix":"»","namespace_prefix":"JCB","minify":"0","language":"en-GB","percentagelanguageadd":"30","assets_table_fix":"2","compiler_field_builder_type":"2","field_name_builder":"2","type_name_builder":"2","import_guid_only":"1","export_language_strings":"1","cronjob_backup_type":"1","cronjob_backup_server":"0","backup_package_name":"JCB_Backup_[YEAR]_[MONTH]_[DAY]","export_company":"Vast Development Method","export_owner":"Llewellyn van der Merwe","export_email":"joomla@vdm.io","export_website":"https://dev.vdm.io/","export_license":"GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html","export_copyright":"Copyright (C) 2015. All Rights Reserved","check_in":"-1 day","save_history":"1","history_limit":"10","add_jquery_framework":"1","uikit_load":"1","uikit_min":"","uikit_style":""}'
 			);
 
 
@@ -3270,7 +3270,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 			echo '<div style="background-color: #fff;" class="alert alert-info"><a target="_blank" href="https://dev.vdm.io" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 5.0.3-beta2 Was Successful! Let us know if anything is not working as expected.</h3></div>';
+				<h3>Upgrade to Version 5.0.3-beta3 Was Successful! Let us know if anything is not working as expected.</h3></div>';
 
 			// Add/Update component in the action logs extensions table.
 			$this->setActionLogsExtensions();

README.md

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.0.3-beta2) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.0.3-beta3) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -144,14 +144,14 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 19th September, 2024
++ *Last Build*: 20th September, 2024
-+ *Version*: 5.0.3-beta2
++ *Version*: 5.0.3-beta3
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **857969**
++ *Line count*: **858230**
 + *Field count*: **2104**
-+ *File count*: **5922**
++ *File count*: **5926**
-+ *Folder count*: **630**
++ *Folder count*: **631**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)

admin/README.txt

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.0.3-beta2) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.0.3-beta3) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -144,14 +144,14 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 19th September, 2024
++ *Last Build*: 20th September, 2024
-+ *Version*: 5.0.3-beta2
++ *Version*: 5.0.3-beta3
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **857969**
++ *Line count*: **858230**
 + *Field count*: **2104**
-+ *File count*: **5922**
++ *File count*: **5926**
-+ *Folder count*: **630**
++ *Folder count*: **631**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)

admin/language/en-GB/en-GB.com_componentbuilder.ini

@@ -1357,7 +1357,7 @@ COM_COMPONENTBUILDER_BSB_COULD_NOT_BE_IMPORTEDS="<b>%s</b> could not be imported
 COM_COMPONENTBUILDER_BSB_HAS_BEEN_IMPORTED="<b>%s</b> has been imported!"
 COM_COMPONENTBUILDER_BSB_HAS_BEEN_UPDATED="<b>%s</b> has been updated!"
 COM_COMPONENTBUILDER_BSB_WAS_FOUND="<b>%s</b> was found!"
-COM_COMPONENTBUILDER_BTHE_TMP_FOLDER_HAS_BEEN_CLEAR_SUCCESSFULLYB="<b>The tmp folder has been clear successfully!</b>"
+COM_COMPONENTBUILDER_BTHE_TMP_FOLDER_HAS_BEEN_CLEARED_SUCCESSFULLYB="<b>The tmp folder has been cleared successfully!</b>"
 COM_COMPONENTBUILDER_BUILD="Build"
 COM_COMPONENTBUILDER_BUILDIN="Build-in"
 COM_COMPONENTBUILDER_BUILD_DATE="Build Date"

admin/src/Controller/CompilerController.php

@@ -565,7 +565,7 @@ class CompilerController extends AdminController
 			$tmp = $comConfig->get('tmp_path');
 			if ($model->emptyFolder($tmp))
 			{
-				$message = Text::_('COM_COMPONENTBUILDER_BTHE_TMP_FOLDER_HAS_BEEN_CLEAR_SUCCESSFULLYB');
+				$message = Text::_('COM_COMPONENTBUILDER_BTHE_TMP_FOLDER_HAS_BEEN_CLEARED_SUCCESSFULLYB');
 				$this->setRedirect($redirect_url, $message, 'message');
 				// get application
 				$app = Factory::getApplication();

admin/src/Controller/Joomla_componentsController.php

@@ -143,7 +143,7 @@ class Joomla_componentsController extends AdminController
 			$tmp = $comConfig->get('tmp_path');
 			if ($model->emptyFolder($tmp))
 			{
-				$message = Text::_('COM_COMPONENTBUILDER_BTHE_TMP_FOLDER_HAS_BEEN_CLEAR_SUCCESSFULLYB');
+				$message = Text::_('COM_COMPONENTBUILDER_BTHE_TMP_FOLDER_HAS_BEEN_CLEARED_SUCCESSFULLYB');
 				$this->setRedirect($redirect_url, $message, 'message');
 				// get application
 				$app = Factory::getApplication();

admin/src/Field/ClassextendsField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -70,7 +71,7 @@ class ClassextendsField extends ListField
 				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				// get the return value.
-				$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();
+				$_uri = (string) Uri::getInstance();
 				$_return = urlencode(base64_encode($_uri));
 				// load return value.
 				$ref .= '&return=' . $_return;
@@ -101,12 +102,14 @@ class ClassextendsField extends ListField
 				// build script
 				$script[] = "
 					document.addEventListener('DOMContentLoaded', function() {
-						document.getElementById('jform_".$button_code_name."').addEventListener('change', function(e) {
+						let  ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."');
+						if (!".$button_code_name."Field) { return; }
+						".$button_code_name."Field.addEventListener('change', function(e) {
 							e.preventDefault();
 							let ".$button_code_name."Value = this.value;
 							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						let ".$button_code_name."Value = document.getElementById('jform_".$button_code_name."').value;
+						let ".$button_code_name."Value = ".$button_code_name."Field.value;
 						".$button_code_name."Button(".$button_code_name."Value);
 					});
 					function ".$button_code_name."Button(value) {

admin/src/Field/ClasspowersField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -70,7 +71,7 @@ class ClasspowersField extends ListField
 				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				// get the return value.
-				$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();
+				$_uri = (string) Uri::getInstance();
 				$_return = urlencode(base64_encode($_uri));
 				// load return value.
 				$ref .= '&return=' . $_return;
@@ -101,12 +102,14 @@ class ClasspowersField extends ListField
 				// build script
 				$script[] = "
 					document.addEventListener('DOMContentLoaded', function() {
-						document.getElementById('jform_".$button_code_name."').addEventListener('change', function(e) {
+						let  ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."');
+						if (!".$button_code_name."Field) { return; }
+						".$button_code_name."Field.addEventListener('change', function(e) {
 							e.preventDefault();
 							let ".$button_code_name."Value = this.value;
 							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						let ".$button_code_name."Value = document.getElementById('jform_".$button_code_name."').value;
+						let ".$button_code_name."Value = ".$button_code_name."Field.value;
 						".$button_code_name."Button(".$button_code_name."Value);
 					});
 					function ".$button_code_name."Button(value) {

admin/src/Field/Cron_serversField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -70,7 +71,7 @@ class Cron_serversField extends ListField
 				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				// get the return value.
-				$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();
+				$_uri = (string) Uri::getInstance();
 				$_return = urlencode(base64_encode($_uri));
 				// load return value.
 				$ref .= '&return=' . $_return;
@@ -101,12 +102,14 @@ class Cron_serversField extends ListField
 				// build script
 				$script[] = "
 					document.addEventListener('DOMContentLoaded', function() {
-						document.getElementById('jform_".$button_code_name."').addEventListener('change', function(e) {
+						let  ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."');
+						if (!".$button_code_name."Field) { return; }
+						".$button_code_name."Field.addEventListener('change', function(e) {
 							e.preventDefault();
 							let ".$button_code_name."Value = this.value;
 							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						let ".$button_code_name."Value = document.getElementById('jform_".$button_code_name."').value;
+						let ".$button_code_name."Value = ".$button_code_name."Field.value;
 						".$button_code_name."Button(".$button_code_name."Value);
 					});
 					function ".$button_code_name."Button(value) {

admin/src/Field/DynamicgetField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -70,7 +71,7 @@ class DynamicgetField extends ListField
 				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				// get the return value.
-				$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();
+				$_uri = (string) Uri::getInstance();
 				$_return = urlencode(base64_encode($_uri));
 				// load return value.
 				$ref .= '&return=' . $_return;
@@ -101,12 +102,14 @@ class DynamicgetField extends ListField
 				// build script
 				$script[] = "
 					document.addEventListener('DOMContentLoaded', function() {
-						document.getElementById('jform_".$button_code_name."').addEventListener('change', function(e) {
+						let  ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."');
+						if (!".$button_code_name."Field) { return; }
+						".$button_code_name."Field.addEventListener('change', function(e) {
 							e.preventDefault();
 							let ".$button_code_name."Value = this.value;
 							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						let ".$button_code_name."Value = document.getElementById('jform_".$button_code_name."').value;
+						let ".$button_code_name."Value = ".$button_code_name."Field.value;
 						".$button_code_name."Button(".$button_code_name."Value);
 					});
 					function ".$button_code_name."Button(value) {

admin/src/Field/ExcludedlanguagesField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -70,7 +71,7 @@ class ExcludedlanguagesField extends ListField
 				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				// get the return value.
-				$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();
+				$_uri = (string) Uri::getInstance();
 				$_return = urlencode(base64_encode($_uri));
 				// load return value.
 				$ref .= '&return=' . $_return;
@@ -101,12 +102,14 @@ class ExcludedlanguagesField extends ListField
 				// build script
 				$script[] = "
 					document.addEventListener('DOMContentLoaded', function() {
-						document.getElementById('jform_".$button_code_name."').addEventListener('change', function(e) {
+						let  ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."');
+						if (!".$button_code_name."Field) { return; }
+						".$button_code_name."Field.addEventListener('change', function(e) {
 							e.preventDefault();
 							let ".$button_code_name."Value = this.value;
 							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						let ".$button_code_name."Value = document.getElementById('jform_".$button_code_name."').value;
+						let ".$button_code_name."Value = ".$button_code_name."Field.value;
 						".$button_code_name."Button(".$button_code_name."Value);
 					});
 					function ".$button_code_name."Button(value) {

admin/src/Field/FieldtypesField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -70,7 +71,7 @@ class FieldtypesField extends ListField
 				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				// get the return value.
-				$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();
+				$_uri = (string) Uri::getInstance();
 				$_return = urlencode(base64_encode($_uri));
 				// load return value.
 				$ref .= '&return=' . $_return;
@@ -101,12 +102,14 @@ class FieldtypesField extends ListField
 				// build script
 				$script[] = "
 					document.addEventListener('DOMContentLoaded', function() {
-						document.getElementById('jform_".$button_code_name."').addEventListener('change', function(e) {
+						let  ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."');
+						if (!".$button_code_name."Field) { return; }
+						".$button_code_name."Field.addEventListener('change', function(e) {
 							e.preventDefault();
 							let ".$button_code_name."Value = this.value;
 							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						let ".$button_code_name."Value = document.getElementById('jform_".$button_code_name."').value;
+						let ".$button_code_name."Value = ".$button_code_name."Field.value;
 						".$button_code_name."Button(".$button_code_name."Value);
 					});
 					function ".$button_code_name."Button(value) {

admin/src/Field/InterfacepowersField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -70,7 +71,7 @@ class InterfacepowersField extends ListField
 				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				// get the return value.
-				$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();
+				$_uri = (string) Uri::getInstance();
 				$_return = urlencode(base64_encode($_uri));
 				// load return value.
 				$ref .= '&return=' . $_return;
@@ -101,12 +102,14 @@ class InterfacepowersField extends ListField
 				// build script
 				$script[] = "
 					document.addEventListener('DOMContentLoaded', function() {
-						document.getElementById('jform_".$button_code_name."').addEventListener('change', function(e) {
+						let  ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."');
+						if (!".$button_code_name."Field) { return; }
+						".$button_code_name."Field.addEventListener('change', function(e) {
 							e.preventDefault();
 							let ".$button_code_name."Value = this.value;
 							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						let ".$button_code_name."Value = document.getElementById('jform_".$button_code_name."').value;
+						let ".$button_code_name."Value = ".$button_code_name."Field.value;
 						".$button_code_name."Button(".$button_code_name."Value);
 					});
 					function ".$button_code_name."Button(value) {

admin/src/Field/JoomlacomponentField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -70,7 +71,7 @@ class JoomlacomponentField extends ListField
 				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				// get the return value.
-				$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();
+				$_uri = (string) Uri::getInstance();
 				$_return = urlencode(base64_encode($_uri));
 				// load return value.
 				$ref .= '&return=' . $_return;
@@ -101,12 +102,14 @@ class JoomlacomponentField extends ListField
 				// build script
 				$script[] = "
 					document.addEventListener('DOMContentLoaded', function() {
-						document.getElementById('jform_".$button_code_name."').addEventListener('change', function(e) {
+						let  ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."');
+						if (!".$button_code_name."Field) { return; }
+						".$button_code_name."Field.addEventListener('change', function(e) {
 							e.preventDefault();
 							let ".$button_code_name."Value = this.value;
 							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						let ".$button_code_name."Value = document.getElementById('jform_".$button_code_name."').value;
+						let ".$button_code_name."Value = ".$button_code_name."Field.value;
 						".$button_code_name."Button(".$button_code_name."Value);
 					});
 					function ".$button_code_name."Button(value) {

admin/src/Field/JoomlaplugingroupsField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -70,7 +71,7 @@ class JoomlaplugingroupsField extends ListField
 				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				// get the return value.
-				$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();
+				$_uri = (string) Uri::getInstance();
 				$_return = urlencode(base64_encode($_uri));
 				// load return value.
 				$ref .= '&return=' . $_return;
@@ -101,12 +102,14 @@ class JoomlaplugingroupsField extends ListField
 				// build script
 				$script[] = "
 					document.addEventListener('DOMContentLoaded', function() {
-						document.getElementById('jform_".$button_code_name."').addEventListener('change', function(e) {
+						let  ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."');
+						if (!".$button_code_name."Field) { return; }
+						".$button_code_name."Field.addEventListener('change', function(e) {
 							e.preventDefault();
 							let ".$button_code_name."Value = this.value;
 							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						let ".$button_code_name."Value = document.getElementById('jform_".$button_code_name."').value;
+						let ".$button_code_name."Value = ".$button_code_name."Field.value;
 						".$button_code_name."Button(".$button_code_name."Value);
 					});
 					function ".$button_code_name."Button(value) {

admin/src/Field/JoomlapluginsField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -70,7 +71,7 @@ class JoomlapluginsField extends ListField
 				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				// get the return value.
-				$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();
+				$_uri = (string) Uri::getInstance();
 				$_return = urlencode(base64_encode($_uri));
 				// load return value.
 				$ref .= '&return=' . $_return;
@@ -101,12 +102,14 @@ class JoomlapluginsField extends ListField
 				// build script
 				$script[] = "
 					document.addEventListener('DOMContentLoaded', function() {
-						document.getElementById('jform_".$button_code_name."').addEventListener('change', function(e) {
+						let  ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."');
+						if (!".$button_code_name."Field) { return; }
+						".$button_code_name."Field.addEventListener('change', function(e) {
 							e.preventDefault();
 							let ".$button_code_name."Value = this.value;
 							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						let ".$button_code_name."Value = document.getElementById('jform_".$button_code_name."').value;
+						let ".$button_code_name."Value = ".$button_code_name."Field.value;
 						".$button_code_name."Button(".$button_code_name."Value);
 					});
 					function ".$button_code_name."Button(value) {

admin/src/Field/LibrariesField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -70,7 +71,7 @@ class LibrariesField extends ListField
 				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				// get the return value.
-				$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();
+				$_uri = (string) Uri::getInstance();
 				$_return = urlencode(base64_encode($_uri));
 				// load return value.
 				$ref .= '&return=' . $_return;
@@ -101,12 +102,14 @@ class LibrariesField extends ListField
 				// build script
 				$script[] = "
 					document.addEventListener('DOMContentLoaded', function() {
-						document.getElementById('jform_".$button_code_name."').addEventListener('change', function(e) {
+						let  ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."');
+						if (!".$button_code_name."Field) { return; }
+						".$button_code_name."Field.addEventListener('change', function(e) {
 							e.preventDefault();
 							let ".$button_code_name."Value = this.value;
 							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						let ".$button_code_name."Value = document.getElementById('jform_".$button_code_name."').value;
+						let ".$button_code_name."Value = ".$button_code_name."Field.value;
 						".$button_code_name."Button(".$button_code_name."Value);
 					});
 					function ".$button_code_name."Button(value) {

admin/src/Field/LibrariesxField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -70,7 +71,7 @@ class LibrariesxField extends ListField
 				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				// get the return value.
-				$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();
+				$_uri = (string) Uri::getInstance();
 				$_return = urlencode(base64_encode($_uri));
 				// load return value.
 				$ref .= '&return=' . $_return;
@@ -101,12 +102,14 @@ class LibrariesxField extends ListField
 				// build script
 				$script[] = "
 					document.addEventListener('DOMContentLoaded', function() {
-						document.getElementById('jform_".$button_code_name."').addEventListener('change', function(e) {
+						let  ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."');
+						if (!".$button_code_name."Field) { return; }
+						".$button_code_name."Field.addEventListener('change', function(e) {
 							e.preventDefault();
 							let ".$button_code_name."Value = this.value;
 							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						let ".$button_code_name."Value = document.getElementById('jform_".$button_code_name."').value;
+						let ".$button_code_name."Value = ".$button_code_name."Field.value;
 						".$button_code_name."Button(".$button_code_name."Value);
 					});
 					function ".$button_code_name."Button(value) {

admin/src/Field/LibraryField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -70,7 +71,7 @@ class LibraryField extends ListField
 				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				// get the return value.
-				$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();
+				$_uri = (string) Uri::getInstance();
 				$_return = urlencode(base64_encode($_uri));
 				// load return value.
 				$ref .= '&return=' . $_return;
@@ -101,12 +102,14 @@ class LibraryField extends ListField
 				// build script
 				$script[] = "
 					document.addEventListener('DOMContentLoaded', function() {
-						document.getElementById('jform_".$button_code_name."').addEventListener('change', function(e) {
+						let  ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."');
+						if (!".$button_code_name."Field) { return; }
+						".$button_code_name."Field.addEventListener('change', function(e) {
 							e.preventDefault();
 							let ".$button_code_name."Value = this.value;
 							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						let ".$button_code_name."Value = document.getElementById('jform_".$button_code_name."').value;
+						let ".$button_code_name."Value = ".$button_code_name."Field.value;
 						".$button_code_name."Button(".$button_code_name."Value);
 					});
 					function ".$button_code_name."Button(value) {

admin/src/Field/MaingetsField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -70,7 +71,7 @@ class MaingetsField extends ListField
 				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				// get the return value.
-				$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();
+				$_uri = (string) Uri::getInstance();
 				$_return = urlencode(base64_encode($_uri));
 				// load return value.
 				$ref .= '&return=' . $_return;
@@ -101,12 +102,14 @@ class MaingetsField extends ListField
 				// build script
 				$script[] = "
 					document.addEventListener('DOMContentLoaded', function() {
-						document.getElementById('jform_".$button_code_name."').addEventListener('change', function(e) {
+						let  ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."');
+						if (!".$button_code_name."Field) { return; }
+						".$button_code_name."Field.addEventListener('change', function(e) {
 							e.preventDefault();
 							let ".$button_code_name."Value = this.value;
 							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						let ".$button_code_name."Value = document.getElementById('jform_".$button_code_name."').value;
+						let ".$button_code_name."Value = ".$button_code_name."Field.value;
 						".$button_code_name."Button(".$button_code_name."Value);
 					});
 					function ".$button_code_name."Button(value) {

admin/src/Field/ServersField.php

@@ -16,6 +16,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -70,7 +71,7 @@ class ServersField extends ListField
 				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				// get the return value.
-				$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();
+				$_uri = (string) Uri::getInstance();
 				$_return = urlencode(base64_encode($_uri));
 				// load return value.
 				$ref .= '&return=' . $_return;
@@ -101,12 +102,14 @@ class ServersField extends ListField
 				// build script
 				$script[] = "
 					document.addEventListener('DOMContentLoaded', function() {
-						document.getElementById('jform_".$button_code_name."').addEventListener('change', function(e) {
+						let  ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."');
+						if (!".$button_code_name."Field) { return; }
+						".$button_code_name."Field.addEventListener('change', function(e) {
 							e.preventDefault();
 							let ".$button_code_name."Value = this.value;
 							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						let ".$button_code_name."Value = document.getElementById('jform_".$button_code_name."').value;
+						let ".$button_code_name."Value = ".$button_code_name."Field.value;
 						".$button_code_name."Button(".$button_code_name."Value);
 					});
 					function ".$button_code_name."Button(value) {

admin/src/Field/SnippetsField.php

@@ -17,6 +17,7 @@ use Joomla\CMS\HTML\HTMLHelper as Html;
 use Joomla\CMS\Component\ComponentHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -71,7 +72,7 @@ class SnippetsField extends ListField
 				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
 				// get the return value.
-				$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();
+				$_uri = (string) Uri::getInstance();
 				$_return = urlencode(base64_encode($_uri));
 				// load return value.
 				$ref .= '&return=' . $_return;
@@ -102,12 +103,14 @@ class SnippetsField extends ListField
 				// build script
 				$script[] = "
 					document.addEventListener('DOMContentLoaded', function() {
-						document.getElementById('jform_".$button_code_name."').addEventListener('change', function(e) {
+						let  ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."');
+						if (!".$button_code_name."Field) { return; }
+						".$button_code_name."Field.addEventListener('change', function(e) {
 							e.preventDefault();
 							let ".$button_code_name."Value = this.value;
 							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						let ".$button_code_name."Value = document.getElementById('jform_".$button_code_name."').value;
+						let ".$button_code_name."Value = ".$button_code_name."Field.value;
 						".$button_code_name."Button(".$button_code_name."Value);
 					});
 					function ".$button_code_name."Button(value) {

admin/src/Model/AjaxModel.php

@@ -2026,15 +2026,15 @@ class AjaxModel extends ListModel
 		{
 			// check if we have GUID setup
 			$validGUID = function ($guid) {
-				if (method_exists('ComponentbuilderHelper', 'validGUID') && ComponentbuilderHelper::validGUID($guid))
+				if (method_exists(ComponentbuilderHelper::class, 'validGUID') && ComponentbuilderHelper::validGUID($guid))
 				{
 					return true;
 				}
 				return false;
 			};
 			// check if functions exists
-			$guidEdit = method_exists('ComponentbuilderHelper', 'getEditButtonGUID');
+			$guidEdit = method_exists(ComponentbuilderHelper::class, 'getEditButtonGUID');
-			$getEdit =  method_exists('ComponentbuilderHelper', 'getEditButton');
+			$getEdit =  method_exists(ComponentbuilderHelper::class, 'getEditButton');
 			// reset bucket
 			$bucket = array();
 			if (UtilitiesArrayHelper::check($value))

admin/tmpl/componentbuilder/default.php

@@ -25,18 +25,10 @@ defined('_JEXEC') or die;
 		<?php echo Html::_('uitab.addTab', 'cpanel_tab', 'cpanel', Text::_('cPanel', true)); ?>
 		<div class="row">
 			<div class="col-md-9">
-				<?php echo Html::_('bootstrap.startAccordion', 'dashboard_left', array('active' => 'main')); ?>
-					<?php echo Html::_('bootstrap.addSlide', 'dashboard_left', 'Control Panel', 'main'); ?>
 				<?php echo $this->loadTemplate('main');?>
-					<?php echo Html::_('bootstrap.endSlide'); ?>
-				<?php echo Html::_('bootstrap.endAccordion'); ?>
 			</div>
 			<div class="col-md-3">
-				<?php echo Html::_('bootstrap.startAccordion', 'dashboard_right', array('active' => 'vdm')); ?>
-					<?php echo Html::_('bootstrap.addSlide', 'dashboard_right', 'Vast Development Method', 'vdm'); ?>
 				<?php echo $this->loadTemplate('vdm');?>
-					<?php echo Html::_('bootstrap.endSlide'); ?>
-				<?php echo Html::_('bootstrap.endAccordion'); ?>
 			</div>
 		</div>
 		<?php echo Html::_('uitab.endTab'); ?>
@@ -44,11 +36,7 @@ defined('_JEXEC') or die;
 		<?php echo Html::_('uitab.addTab', 'cpanel_tab', 'wiki', Text::_('Wiki', true)); ?>
 		<div class="row">
 			<div class="col-md-12">
-				<?php  echo Html::_('bootstrap.startAccordion', 'wiki_accordian', array('active' => 'wiki_one')); ?>
-					<?php  echo Html::_('bootstrap.addSlide', 'wiki_accordian', 'Tutorials', 'wiki_one'); ?>
 				<?php echo $this->loadTemplate('wiki_tutorials');?>
-					<?php  echo Html::_('bootstrap.endSlide'); ?>
-				<?php  echo Html::_('bootstrap.endAccordion'); ?>
 			</div>
 		</div>
 		<?php echo Html::_('uitab.endTab'); ?>
@@ -56,11 +44,7 @@ defined('_JEXEC') or die;
 		<?php echo Html::_('uitab.addTab', 'cpanel_tab', 'notice_board', Text::_('Notice Board', true)); ?>
 		<div class="row">
 			<div class="col-md-12">
-				<?php  echo Html::_('bootstrap.startAccordion', 'notice_board_accordian', array('active' => 'notice_board_one')); ?>
-					<?php  echo Html::_('bootstrap.addSlide', 'notice_board_accordian', 'Vast Development Method', 'notice_board_one'); ?>
 				<?php echo $this->loadTemplate('notice_board_vast_development_method');?>
-					<?php  echo Html::_('bootstrap.endSlide'); ?>
-				<?php  echo Html::_('bootstrap.endAccordion'); ?>
 			</div>
 		</div>
 		<?php echo Html::_('uitab.endTab'); ?>
@@ -68,11 +52,7 @@ defined('_JEXEC') or die;
 		<?php echo Html::_('uitab.addTab', 'cpanel_tab', 'readme', Text::_('Readme', true)); ?>
 		<div class="row">
 			<div class="col-md-12">
-				<?php  echo Html::_('bootstrap.startAccordion', 'readme_accordian', array('active' => 'readme_one')); ?>
-					<?php  echo Html::_('bootstrap.addSlide', 'readme_accordian', 'Information', 'readme_one'); ?>
 				<?php echo $this->loadTemplate('readme_information');?>
-					<?php  echo Html::_('bootstrap.endSlide'); ?>
-				<?php  echo Html::_('bootstrap.endAccordion'); ?>
 			</div>
 		</div>
 		<?php echo Html::_('uitab.endTab'); ?>

componentbuilder.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="5.0" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>19th September, 2024</creationDate>
+	<creationDate>20th September, 2024</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>https://dev.vdm.io</authorUrl>
 	<copyright>Copyright (C) 2015 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>5.0.3-beta2</version>
+	<version>5.0.3-beta3</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.5.0.3-beta2)</h1>
+		<h1>Component Builder (v.5.0.3-beta3)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
 

componentbuilder_update_server.xml

@@ -116,7 +116,7 @@
 		<version>5.0.3-beta</version>
 		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v5.0.3-beta2.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v5.0.3-beta3.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>beta</tag>
@@ -131,10 +131,10 @@
 		<element>pkg_component_builder</element>
 		<type>package</type>
 		<client>site</client>
-		<version>5.0.3-beta2</version>
+		<version>5.0.3-beta3</version>
 		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v5.0.3-beta2.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v5.0.3-beta3.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>beta</tag>

images/vdm/icon/index.html

@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>

libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/ConfigFieldsets.php

@@ -329,10 +329,11 @@ final class ConfigFieldsets
 								$field['custom_value']
 							))
 						{
-							// add array if found
+							// add array or object if found
-							if ((strpos((string) $field['custom_value'], '["') !== false)
+							if (((strpos((string) $field['custom_value'], '["') !== false)
-								&& (strpos((string) $field['custom_value'], '"]')
+								&& (strpos((string) $field['custom_value'], '"]') !== false)) ||
-									!== false))
+								((strpos((string) $field['custom_value'], '{"') !== false)
+								&& (strpos((string) $field['custom_value'], '"}') !== false)))
 							{
 								// load the Global checkin defautls
 								$this->extensionsparams->add('component', '"' . $fieldName

libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFive/InputButton.php

@@ -154,7 +154,7 @@ final class InputButton implements InputButtonInterface
 				. "\$button_code_name = \$this->getAttribute('name');";
 			$addButton[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
 				. " get the input from url";
-			$addButton[] = Indent::_(3) . "\$app = Factory::getApplication();";
+			$addButton[] = Indent::_(3) . "\$app = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();";
 			$addButton[] = Indent::_(3) . "\$jinput = \$app->input;";
 			$addButton[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
 				. " get the view name & id";
@@ -181,7 +181,7 @@ final class InputButton implements InputButtonInterface
 				$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
 					. " get the return value.";
 				$addButton[] = Indent::_(4)
-					. "\$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();";
+					. "\$_uri = (string) Joomla__"."_eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::getInstance();";
 				$addButton[] = Indent::_(4)
 					. "\$_return = urlencode(base64_encode(\$_uri));";
 				$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
@@ -206,7 +206,7 @@ final class InputButton implements InputButtonInterface
 				$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
 					. " get the return value.";
 				$addButton[] = Indent::_(4)
-					. "\$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();";
+					. "\$_uri = (string) Joomla__"."_eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::getInstance();";
 				$addButton[] = Indent::_(4)
 					. "\$_return = urlencode(base64_encode(\$_uri));";
 				$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
@@ -231,7 +231,7 @@ final class InputButton implements InputButtonInterface
 				. "\$button_label = ucfirst(strtolower(\$button_label));";
 			$addButton[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
 				. " get user object";
-			$addButton[] = Indent::_(3) . "\$user = Factory::getApplication()->getIdentity();";
+			$addButton[] = Indent::_(3) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();";
 			$addButton[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
 				. " only add if user allowed to create " . $fieldData['view'];
 			// check if the item has permissions.
@@ -272,7 +272,11 @@ final class InputButton implements InputButtonInterface
 $addButton[] = Indent::_(4) . "\$script[] = \"";
 			$addButton[] = Indent::_(5) . "document.addEventListener('DOMContentLoaded', function() {";
 			$addButton[] = Indent::_(6)
-				. "document.getElementById('jform_\".\$button_code_name.\"').addEventListener('change', function(e) {";
+				. "let  \".\$button_code_name.\"Field = document.getElementById('jform_\".\$button_code_name.\"');";
+			$addButton[] = Indent::_(6)
+				. "if (!\".\$button_code_name.\"Field) { return; }";
+			$addButton[] = Indent::_(6)
+				. "\".\$button_code_name.\"Field.addEventListener('change', function(e) {";
 			$addButton[] = Indent::_(7) . "e.preventDefault();";
 			$addButton[] = Indent::_(7)
 				. "let \".\$button_code_name.\"Value = this.value;";
@@ -280,7 +284,7 @@ $addButton[] = Indent::_(4) . "\$script[] = \"";
 				. "\".\$button_code_name.\"Button(\".\$button_code_name.\"Value);";
 			$addButton[] = Indent::_(6) . "});";
 			$addButton[] = Indent::_(6)
-				. "let \".\$button_code_name.\"Value = document.getElementById('jform_\".\$button_code_name.\"').value;";
+				. "let \".\$button_code_name.\"Value = \".\$button_code_name.\"Field.value;";
 			$addButton[] = Indent::_(6)
 				. "\".\$button_code_name.\"Button(\".\$button_code_name.\"Value);";
 			$addButton[] = Indent::_(5) . "});";
@@ -324,7 +328,7 @@ $addButton[] = Indent::_(4) . "\$script[] = \"";
 			$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
 				. " Load the needed script.";
 			$addButton[] = Indent::_(4)
-				. "\$document = Factory::getApplication()->getDocument();";
+				. "\$document = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getDocument();";
 			$addButton[] = Indent::_(4)
 				. "\$document->addScriptDeclaration(implode(' ',\$script));";
 			$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)

libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFour/InputButton.php

@@ -154,7 +154,7 @@ final class InputButton implements InputButtonInterface
 				. "\$button_code_name = \$this->getAttribute('name');";
 			$addButton[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
 				. " get the input from url";
-			$addButton[] = Indent::_(3) . "\$app = Factory::getApplication();";
+			$addButton[] = Indent::_(3) . "\$app = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication();";
 			$addButton[] = Indent::_(3) . "\$jinput = \$app->input;";
 			$addButton[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
 				. " get the view name & id";
@@ -181,7 +181,7 @@ final class InputButton implements InputButtonInterface
 				$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
 					. " get the return value.";
 				$addButton[] = Indent::_(4)
-					. "\$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();";
+					. "\$_uri = (string) Joomla__"."_eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::getInstance();";
 				$addButton[] = Indent::_(4)
 					. "\$_return = urlencode(base64_encode(\$_uri));";
 				$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
@@ -206,7 +206,7 @@ final class InputButton implements InputButtonInterface
 				$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
 					. " get the return value.";
 				$addButton[] = Indent::_(4)
-					. "\$_uri = (string) \Joomla\CMS\Uri\Uri::getInstance();";
+					. "\$_uri = (string) Joomla__"."_eecc143e_b5cf_4c33_ba4d_97da1df61422___Power::getInstance();";
 				$addButton[] = Indent::_(4)
 					. "\$_return = urlencode(base64_encode(\$_uri));";
 				$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
@@ -231,7 +231,7 @@ final class InputButton implements InputButtonInterface
 				. "\$button_label = ucfirst(strtolower(\$button_label));";
 			$addButton[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
 				. " get user object";
-			$addButton[] = Indent::_(3) . "\$user = Factory::getApplication()->getIdentity();";
+			$addButton[] = Indent::_(3) . "\$user = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getIdentity();";
 			$addButton[] = Indent::_(3) . "//" . Line::_(__Line__, __Class__)
 				. " only add if user allowed to create " . $fieldData['view'];
 			// check if the item has permissions.
@@ -272,7 +272,11 @@ final class InputButton implements InputButtonInterface
 $addButton[] = Indent::_(4) . "\$script[] = \"";
 			$addButton[] = Indent::_(5) . "document.addEventListener('DOMContentLoaded', function() {";
 			$addButton[] = Indent::_(6)
-				. "document.getElementById('jform_\".\$button_code_name.\"').addEventListener('change', function(e) {";
+				. "let  \".\$button_code_name.\"Field = document.getElementById('jform_\".\$button_code_name.\"');";
+			$addButton[] = Indent::_(6)
+				. "if (!\".\$button_code_name.\"Field) { return; }";
+			$addButton[] = Indent::_(6)
+				. "\".\$button_code_name.\"Field.addEventListener('change', function(e) {";
 			$addButton[] = Indent::_(7) . "e.preventDefault();";
 			$addButton[] = Indent::_(7)
 				. "let \".\$button_code_name.\"Value = this.value;";
@@ -280,7 +284,7 @@ $addButton[] = Indent::_(4) . "\$script[] = \"";
 				. "\".\$button_code_name.\"Button(\".\$button_code_name.\"Value);";
 			$addButton[] = Indent::_(6) . "});";
 			$addButton[] = Indent::_(6)
-				. "let \".\$button_code_name.\"Value = document.getElementById('jform_\".\$button_code_name.\"').value;";
+				. "let \".\$button_code_name.\"Value = \".\$button_code_name.\"Field.value;";
 			$addButton[] = Indent::_(6)
 				. "\".\$button_code_name.\"Button(\".\$button_code_name.\"Value);";
 			$addButton[] = Indent::_(5) . "});";
@@ -324,7 +328,7 @@ $addButton[] = Indent::_(4) . "\$script[] = \"";
 			$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
 				. " Load the needed script.";
 			$addButton[] = Indent::_(4)
-				. "\$document = Factory::getApplication()->getDocument();";
+				. "\$document = Joomla__"."_39403062_84fb_46e0_bac4_0023f766e827___Power::getApplication()->getDocument();";
 			$addButton[] = Indent::_(4)
 				. "\$document->addScriptDeclaration(implode(' ',\$script));";
 			$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)

libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Infusion.php

@@ -1588,7 +1588,7 @@ class Infusion extends Interpretation
 
 				// DASHBOARDICONACCESS
 				CFactory::_('Compiler.Builder.Content.Multi')->set(CFactory::_('Config')->component_code_name . '|DASHBOARDICONACCESS',
-					$this->setDashboardIconAccess()
+					CFactory::_('Compiler.Builder.Permission.Dashboard')->build()
 				);
 
 				// DASH_MODEL_METHODS

libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php

@@ -21424,6 +21424,15 @@ class Interpretation extends Fields
 	}
 
 	public function setDashboardDisplayData()
+	{
+		if (CFactory::_('Config')->get('joomla_version', 3) == 3)
+		{
+			return $this->setDashboardDisplayDataJ3();
+		}
+		return $this->setDashboardDisplayDataJ4();
+	}
+
+	public function setDashboardDisplayDataJ3()
 	{
 		// display array reset
 		$display           = [];
@@ -21435,13 +21444,7 @@ class Interpretation extends Fields
 		$row_class         = 'row-fluid';
 		$form_class        = 'form-horizontal';
 		$uitab             = 'bootstrap';
-		if (CFactory::_('Config')->get('joomla_version', 3) != 3)
+
-		{
-			$width_class = 'col-md-';
-			$row_class   = 'row';
-			$form_class  = 'main-card';
-			$uitab       = 'uitab';
-		}
 		// check if we have custom tabs
 		if (CFactory::_('Component')->isArray('dashboard_tab'))
 		{
@@ -21574,6 +21577,120 @@ class Interpretation extends Fields
 		return PHP_EOL . implode(PHP_EOL, $display);
 	}
 
+	public function setDashboardDisplayDataJ4()
+	{
+		// display array reset
+		$display           = [];
+		$mainAccordianName = 'cPanel';
+		$builder           = [];
+		$tab               = Indent::_(3);
+		$loadTabs          = false;
+		$width_class       = 'col-md-';
+		$row_class         = 'row';
+		$form_class        = 'main-card';
+		$uitab             = 'uitab';
+
+		// check if we have custom tabs
+		if (CFactory::_('Component')->isArray('dashboard_tab'))
+		{
+			// build the tabs and accordians
+			foreach (CFactory::_('Component')->get('dashboard_tab') as $data)
+			{
+				$builder[$data['name']][$data['header']]
+					= CFactory::_('Placeholder')->update_(
+					$data['html']
+				);
+			}
+			// since we have custom tabs we must load the tab structure around the cpanel
+			$display[] = '<div id="j-main-container">';
+			$display[] = Indent::_(1) . '<div class="' . $form_class . '">';
+			$display[] = Indent::_(1)
+				. "<?php echo Html::_('{$uitab}.startTabSet', 'cpanel_tab', array('active' => 'cpanel')); ?>";
+			$display[] = PHP_EOL . Indent::_(2)
+				. "<?php echo Html::_('{$uitab}.addTab', 'cpanel_tab', 'cpanel', Text:"
+				. ":_('cPanel', true)); ?>";
+			$display[] = Indent::_(2) . '<div class="' . $row_class . '">';
+			// change the name of the main tab
+			$mainAccordianName = 'Control Panel';
+			$loadTabs          = true;
+		}
+		else
+		{
+			$display[] = '<div id="j-main-container">';
+			$display[] = Indent::_(1) . '<div class="' . $form_class . '" style="padding: 20px;">';
+			$display[] = Indent::_(2) . '<div class="' . $row_class . '">';
+		}
+		// set dashboard display
+		$display[] = $tab . '<div class="' . $width_class . '9">';
+		$display[] = $tab . Indent::_(1)
+			. "<?php echo \$this->loadTemplate('main');?>";
+		$display[] = $tab . "</div>";
+		$display[] = $tab . '<div class="' . $width_class . '3">';
+		$display[] = $tab . Indent::_(1)
+			. "<?php echo \$this->loadTemplate('vdm');?>";
+		$display[] = $tab . "</div>";
+
+		if ($loadTabs)
+		{
+			$display[] = Indent::_(2) . "</div>";
+			$display[] = Indent::_(2)
+				. "<?php echo Html::_('{$uitab}.endTab'); ?>";
+			// load the new tabs
+			foreach ($builder as $tabname => $accordians)
+			{
+				$alias        = StringHelper::safe($tabname);
+				$display[]    = PHP_EOL . Indent::_(2)
+					. "<?php echo Html::_('{$uitab}.addTab', 'cpanel_tab', '"
+					. $alias . "', Text:" . ":_('" . $tabname
+					. "', true)); ?>";
+				$display[]    = Indent::_(2) . '<div class="' . $row_class . '">';
+				$display[]    = $tab . '<div class="' . $width_class . '12">';
+				$slidecounter = 1;
+				foreach ($accordians as $accordianname => $html)
+				{
+					$ac_alias    = StringHelper::safe(
+						$accordianname
+					);
+					$counterName = StringHelper::safe(
+						$slidecounter
+					);
+					$tempName    = $alias . '_' . $ac_alias;
+					$display[]   = $tab . Indent::_(1)
+						. "<?php echo \$this->loadTemplate('" . $tempName
+						. "');?>";
+					$slidecounter++;
+					// build the template file
+					$target = array('custom_admin' => CFactory::_('Config')->component_code_name);
+					CFactory::_('Utilities.Structure')->build($target, 'template', $tempName);
+					// set the file data
+					$TARGET = StringHelper::safe(
+						CFactory::_('Config')->build_target, 'U'
+					);
+					// SITE_TEMPLATE_BODY <<<DYNAMIC>>>
+					CFactory::_('Compiler.Builder.Content.Multi')->set(CFactory::_('Config')->component_code_name . '_' . $tempName . '|CUSTOM_ADMIN_TEMPLATE_BODY', PHP_EOL . $html);
+					// SITE_TEMPLATE_CODE_BODY <<<DYNAMIC>>>
+					CFactory::_('Compiler.Builder.Content.Multi')->set(CFactory::_('Config')->component_code_name . '_' . $tempName . '|CUSTOM_ADMIN_TEMPLATE_CODE_BODY', '');
+				}
+				$display[] = $tab . "</div>";
+				$display[] = Indent::_(2) . "</div>";
+				$display[] = Indent::_(2)
+					. "<?php echo Html::_('{$uitab}.endTab'); ?>";
+			}
+
+			$display[] = PHP_EOL . Indent::_(1)
+				. "<?php echo Html::_('{$uitab}.endTabSet'); ?>";
+		}
+		else
+		{
+			$display[] = Indent::_(2) . "</div>";
+		}
+		$display[] = Indent::_(1) . "</div>";
+		$display[] = "</div>";
+
+		// return the display
+		return PHP_EOL . implode(PHP_EOL, $display);
+	}
+
 	public function addCustomDashboardIcons(&$view, &$counter)
 	{
 		$icon = '';

libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Power.php

@@ -492,7 +492,7 @@ class Power implements PowerInterface
 			$this->active[$guid]->file_name = array_pop($src_array);
 
 			// namespace array
-			$namespace_array = [...$path_array, ...$src_array];
+			$namespace_array = array_merge($path_array, $src_array);
 		}
 		else
 		{
@@ -534,12 +534,12 @@ class Power implements PowerInterface
 		// set the actual class namespace
 		$this->active[$guid]->_namespace = implode('\\', $namespace_array);
 
-		// set global namespaces for autoloader
-		$this->namespace[implode('.', $path_array)] = $path_array;
-
 		// get the parent folder (the first value in array)
 		$prefix_folder = implode('.', $path_array);
 
+		// set global namespaces for autoloader
+		$this->namespace[$prefix_folder] = $path_array;
+
 		// make sub folders if still found
 		$sub_folder = '';
 		if (ArrayHelper::check($src_array))