Release of v3.2.2

Fix auto build from SQL in Joomla 4 and 5. Fix permission issue for admin views. Add extending options to interfaces. Update the Schema class to also update null mismatching if needed. Add repositories for better integration with gitea. Refactored the Data classes. Add new Data classes. Add new subform classes. Fix registry class methods return type. Update all list and custom fields to use the new layouts. Add push options to Joomla Power. Complete the Joomla Power Init and Reset features. Fix Gitea Contents class functions. Fix subform set methods. Improved the Joomla Power Push path. Fix the metadata, metadesc, metakey database issue. Fix function mismatch call in the compiler power class. Fix init feature to only add missing powers. Fix controller postSaveHook function, for correct model class in Joomla 4 and 5. Fix app instances (mismatch) in the install script and schema class when installing from CLI. Add option to use placeholders in Joomla Power namespaces. Fix subform layout of uikit in JCB.

.gitea/ISSUE_TEMPLATE/a-bug.yml

@@ -91,17 +91,6 @@ body:
       placeholder: e.g., v5.0.0-alpha3
     validations:
       required: true
-  - type: dropdown
-    id: jcb_installed_on_joomla
-    attributes:
-      label: Which Joomla version is JCB installed on?
-      multiple: true
-      options:
-        - Joomla 5
-        - Joomla 4
-        - Joomla 3
-    validations:
-      required: true
   - type: dropdown
     id: area
     attributes:

CHANGELOG.md

@@ -1,3 +1,55 @@
+# v3.2.2
+
+- Fix auto build from SQL in Joomla 4 and 5.
+- Fix permission issue for admin views.
+- Add extending options to interfaces.
+- Update the Schema class to also update null mismatching if needed
+- Add repositories for better integration with gitea
+- Refactored the Data classes
+- Add new Data classes
+- Add new subform classes
+- Fix registry class methods return type
+- Update all list and custom fields to use the new layouts
+- Add push options to Joomla Power
+- Complete the Joomla Power Init and Reset features
+- Fix Gitea Contents class functions
+- Fix subform set methods
+- Improved the Joomla Power Push path
+- Fix the metadata, metadesc, metakey database issue
+- Fix function mismatch call in the compiler power class.
+- Fix init feature to only add missing powers
+- Fix controller postSaveHook function, for correct model class in Joomla 4 and 5
+- Fix app instances (mismatch) in the install script and schema class when installing from CLI
+- Add option to use placeholders in Joomla Power namespaces.
+- Fix subform layout of uikit in JCB
+
+# v3.2.1
+
+- Add power path override option on component level.
+- Fix the sql build feature. #1032
+- Add view list and single name fix.
+- Add component code name fix.
+- Add reset list of powers.
+- Fix missing Factory class in plugin. #1102
+- Fix plugin code display when methods and properties are missing.
+- Add Joomla powers for namespace dynamic management.
+- Add fallback option to ensure that all JCB tables and fields exist.
+- Move the powers autoloader to its own file.
+- Fix the media field size limitation. #1109
+- Add dynamic datatype update to schema field check.
+- Fix version_update column size.
+- Improved the Schema Table update engine.
+- Improved the Schema Table update engine (more)
+- Fix autoloader timing, and loading.
+- Implement the Joomla Powers in JCB code, to move away from JClasses.
+- Remove many of the SQL updates, to only use the Schema updates of table columns to avoid collusion.
+- Fix the admin.css file loading on dashboard. #1112
+- Fix the missing model call. #1114
+- Fix the wrong $date call. #1115
+- Add the BaseDatabaseModel use statement to custom site view controller. #1119
+- Fix the customfolderlist field. #1120
+- Stable release of JCB 3.2.1
+
 # v3.2.0
 
 - Fix #1053 so that the right and left tabs display correctly in Joomla 4&5
@@ -20,84 +72,45 @@
 
 # v3.2.0-beta
 
-- Move beta to main repo
-
-# v3.1.42
-
-- Fix #1055 to add the style and scripts to all views.
-
-# v3.1.40
-
-- Fix #1052 so that tabs last opened is remembered and opened again on save, refresh or reopening of an item.
-- Fix #1057 so that the datetime fields will be set correctly in mysql.
-
-# v3.1.39
-
-- Fix #1051 making sure the list view is lowercase.
-
-# v3.1.38
-
-- Fix #1046 so that the version restore function will work.
-
-# v3.1.37
-
-- Fix #1041 so that custom tabs are build correctly.
-- Fix #1043 so that delete function in Joomla 4 and 5 will work.
-- Fix #1045 so that plug-in Structure::setMainXmlFile method will except an object.
-- Fix #1042 so that it will remove line breaks and new lines from other languages as well.
-
-# v3.1.36
-
-- Move the defined or die below use statements.
-- Add the new router view
-
-# v3.1.35
-
-- Improve the Joomla 4 Templates.
-- Fix #1033 the response class issue for the gitea classes.
-- Remove the JRegistry class to resolve #1036, #1035
-
-# v3.1.34
-
-- Fix the AjaxController contructor class.
-- Improved the getModel calls from the AxajController class.
-
-# v3.1.33
-
+- Add namspace prefix to both global, and component override level.
+- Add Joomla 4 and 5 build option
+- Add joomla_version to custom code.
+- Add Joomla 4 and 5 correct build files.
+- Fix #1026 by removing chosen everywhere.
+- Resolve #1028 by adding in line helper toggle integration to all admin views.
+- Remove the import and export buttons until the area is fixed.
+- Add emptystate list template to all admin list views.
 - Fix #1026 by adding the correct layout to the filter views.
 - Fix #1026 by adding the class to the filter views.
 - Fix #1026 by adding a hint to the filters that are having multiple selection.
 - Fix the directional bog where a field in the filters are also called direction.
-- Fix the getModel helper method fot J4+.
-
-# v3.1.32
-
-- Fix #1026 by removing chosen everywhere.
-- Resolve #1028 by adding in line helper toggle integration to all admin views.
-- Remove the import and export buttons until the area is fixed.
-- Add emptystate list template to all admin list views.
-
-# v3.1.31
-
-- Add joomla_version to custom code.
-- Add Joomla 4 and 5 correct build files.
-
-# v3.1.30
-
-- Add namspace prefix to both global, and component override level.
-- Add Joomla 4 and 5 build option
+- Fix the getModel helper method fot J4+.
+- Fix the AjaxController contructor class.
+- Improved the getModel calls from the AxajController class.
+- Improve the Joomla 4 Templates.
+- Fix #1033 the response class issue for the gitea classes.
+- Remove the JRegistry class to resolve #1036, #1035
+- Move the defined or die below use statements.
+- Add the new router view
+- Fix #1041 so that custom tabs are build correctly.
+- Fix #1043 so that delete function in Joomla 4 and 5 will work.
+- Fix #1045 so that plug-in Structure::setMainXmlFile method will except an object.
+- Fix #1042 so that it will remove line breaks and new lines from other languages as well.
+- Fix #1046 so that the version restore function will work.
+- Fix #1051 making sure the list view is lowercase.
+- Fix #1052 so that tabs last opened is remembered and opened again on save, refresh or reopening of an item.
+- Fix #1057 so that the datetime fields will be set correctly in mysql.
+- Fix #1055 to add the style and scripts to all views.
+- Move beta to main repo
 
 # v3.1.28
 
+- Adds better remote repository management for the super power features.
+- Fixes #1014 so that powers are added to components.
 - Updates PHPSecLib.
 - Fixed connection failure to remote server.
 - Adds overriding of back-folder and git-folder on component level.
 
-# v3.1.27
-
-- Adds better remote repository management for the super power features.
-- Fixes #1014 so that powers are added to components.
-
 # v3.1.26
 
 - Fixed changelog direction so newest changes is listed at top of the file.

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 (3.2.0) 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 (3.2.2) 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*: 27th March, 2024
-+ *Version*: 3.2.0
++ *Last Build*: 20th July, 2024
++ *Version*: 3.2.2
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **738967**
-+ *Field count*: **2078**
-+ *File count*: **5201**
-+ *Folder count*: **459**
++ *Line count*: **796047**
++ *Field count*: **2104**
++ *File count*: **5469**
++ *Folder count*: **482**
 
 > 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 (3.2.0) 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 (3.2.2) 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*: 27th March, 2024
-+ *Version*: 3.2.0
++ *Last Build*: 20th July, 2024
++ *Version*: 3.2.2
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **738967**
-+ *Field count*: **2078**
-+ *File count*: **5201**
-+ *Folder count*: **459**
++ *Line count*: **796047**
++ *Field count*: **2104**
++ *File count*: **5469**
++ *Folder count*: **482**
 
 > 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/access.xml

@@ -418,6 +418,20 @@
 		<action name="joomla_plugin_updates.edit.own" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_OWN" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_OWN_DESC" />
 		<action name="joomla_plugin_updates.edit.state" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_STATE" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_STATE_DESC" />
 		<action name="joomla_plugin_updates.version" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_VERSION" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_EDIT_VERSION_DESC" />
+		<action name="joomla_power.init" title="COM_COMPONENTBUILDER_JOOMLA_POWER_INIT_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_POWER_INIT_BUTTON_ACCESS_DESC" />
+		<action name="joomla_power.push" title="COM_COMPONENTBUILDER_JOOMLA_POWER_PUSH_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_POWER_PUSH_BUTTON_ACCESS_DESC" />
+		<action name="joomla_power.reset" title="COM_COMPONENTBUILDER_JOOMLA_POWER_RESET_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_POWER_RESET_BUTTON_ACCESS_DESC" />
+		<action name="joomla_power.access" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_ACCESS_DESC" />
+		<action name="joomla_power.batch" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_BATCH_USE" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_BATCH_USE_DESC" />
+		<action name="joomla_power.create" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_CREATE" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_CREATE_DESC" />
+		<action name="joomla_power.delete" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_DELETE" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_DELETE_DESC" />
+		<action name="joomla_power.edit" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_DESC" />
+		<action name="joomla_power.edit.created_by" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_CREATED_BY" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_CREATED_BY_DESC" />
+		<action name="joomla_power.edit.created" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_CREATED_DATE" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_CREATED_DATE_DESC" />
+		<action name="joomla_power.edit.own" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_OWN" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_OWN_DESC" />
+		<action name="joomla_power.edit.state" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_STATE" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_STATE_DESC" />
+		<action name="joomla_power.version" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_VERSION" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_VERSION_DESC" />
+		<action name="joomla_power.submenu" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_SUBMENU" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_SUBMENU_DESC" />
 		<action name="language.build" title="COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS_DESC" />
 		<action name="language_translation.access" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_ACCESS" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_ACCESS_DESC" />
 		<action name="language_translation.batch" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_USE" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_USE_DESC" />
@@ -508,6 +522,18 @@
 		<action name="power.edit.state" title="COM_COMPONENTBUILDER_POWERS_EDIT_STATE" description="COM_COMPONENTBUILDER_POWERS_EDIT_STATE_DESC" />
 		<action name="power.version" title="COM_COMPONENTBUILDER_POWERS_EDIT_VERSION" description="COM_COMPONENTBUILDER_POWERS_EDIT_VERSION_DESC" />
 		<action name="power.submenu" title="COM_COMPONENTBUILDER_POWERS_SUBMENU" description="COM_COMPONENTBUILDER_POWERS_SUBMENU_DESC" />
+		<action name="repository.access" title="COM_COMPONENTBUILDER_REPOSITORIES_ACCESS" description="COM_COMPONENTBUILDER_REPOSITORIES_ACCESS_DESC" />
+		<action name="repository.batch" title="COM_COMPONENTBUILDER_REPOSITORIES_BATCH_USE" description="COM_COMPONENTBUILDER_REPOSITORIES_BATCH_USE_DESC" />
+		<action name="repository.create" title="COM_COMPONENTBUILDER_REPOSITORIES_CREATE" description="COM_COMPONENTBUILDER_REPOSITORIES_CREATE_DESC" />
+		<action name="repository.dashboard_list" title="COM_COMPONENTBUILDER_REPOSITORIES_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_REPOSITORIES_DASHBOARD_LIST_DESC" />
+		<action name="repository.delete" title="COM_COMPONENTBUILDER_REPOSITORIES_DELETE" description="COM_COMPONENTBUILDER_REPOSITORIES_DELETE_DESC" />
+		<action name="repository.edit" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_DESC" />
+		<action name="repository.edit.created_by" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_BY" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_BY_DESC" />
+		<action name="repository.edit.created" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_DATE" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_DATE_DESC" />
+		<action name="repository.edit.own" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_OWN" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_OWN_DESC" />
+		<action name="repository.edit.state" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_STATE" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_STATE_DESC" />
+		<action name="repository.version" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_VERSION" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_VERSION_DESC" />
+		<action name="repository.submenu" title="COM_COMPONENTBUILDER_REPOSITORIES_SUBMENU" description="COM_COMPONENTBUILDER_REPOSITORIES_SUBMENU_DESC" />
 		<action name="search.access" title="COM_COMPONENTBUILDER_SEARCH_ACCESS" description="COM_COMPONENTBUILDER_SEARCH_ACCESS_DESC" />
 		<action name="search.compiler" title="COM_COMPONENTBUILDER_SEARCH_COMPILER_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_SEARCH_COMPILER_BUTTON_ACCESS_DESC" />
 		<action name="search.dashboard_list" title="COM_COMPONENTBUILDER_SEARCH_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_SEARCH_DASHBOARD_LIST_DESC" />
@@ -607,6 +633,17 @@
 		<action name="joomla_plugin.access" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_ACCESS_DESC" />
 		<action name="joomla_plugin.version" title="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_EDIT_VERSION" description="COM_COMPONENTBUILDER_JOOMLA_PLUGINS_EDIT_VERSION_DESC" />
 	</section>
+	<section name="joomla_power">
+		<action name="joomla_power.edit" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_DESC" />
+		<action name="joomla_power.edit.own" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_OWN" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_OWN_DESC" />
+		<action name="joomla_power.edit.state" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_STATE" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_STATE_DESC" />
+		<action name="joomla_power.edit.created_by" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_CREATED_BY" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_CREATED_BY_DESC" />
+		<action name="joomla_power.edit.created" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_CREATED_DATE" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_CREATED_DATE_DESC" />
+		<action name="joomla_power.create" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_CREATE" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_CREATE_DESC" />
+		<action name="joomla_power.delete" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_DELETE" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_DELETE_DESC" />
+		<action name="joomla_power.access" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_ACCESS_DESC" />
+		<action name="joomla_power.version" title="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_VERSION" description="COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_VERSION_DESC" />
+	</section>
 	<section name="power">
 		<action name="power.edit" title="COM_COMPONENTBUILDER_POWERS_EDIT" description="COM_COMPONENTBUILDER_POWERS_EDIT_DESC" />
 		<action name="power.edit.own" title="COM_COMPONENTBUILDER_POWERS_EDIT_OWN" description="COM_COMPONENTBUILDER_POWERS_EDIT_OWN_DESC" />
@@ -790,6 +827,17 @@
 		<action name="server.access" title="COM_COMPONENTBUILDER_SERVERS_ACCESS" description="COM_COMPONENTBUILDER_SERVERS_ACCESS_DESC" />
 		<action name="server.version" title="COM_COMPONENTBUILDER_SERVERS_EDIT_VERSION" description="COM_COMPONENTBUILDER_SERVERS_EDIT_VERSION_DESC" />
 	</section>
+	<section name="repository">
+		<action name="repository.edit" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_DESC" />
+		<action name="repository.edit.own" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_OWN" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_OWN_DESC" />
+		<action name="repository.edit.state" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_STATE" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_STATE_DESC" />
+		<action name="repository.edit.created_by" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_BY" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_BY_DESC" />
+		<action name="repository.edit.created" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_DATE" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_DATE_DESC" />
+		<action name="repository.create" title="COM_COMPONENTBUILDER_REPOSITORIES_CREATE" description="COM_COMPONENTBUILDER_REPOSITORIES_CREATE_DESC" />
+		<action name="repository.delete" title="COM_COMPONENTBUILDER_REPOSITORIES_DELETE" description="COM_COMPONENTBUILDER_REPOSITORIES_DELETE_DESC" />
+		<action name="repository.access" title="COM_COMPONENTBUILDER_REPOSITORIES_ACCESS" description="COM_COMPONENTBUILDER_REPOSITORIES_ACCESS_DESC" />
+		<action name="repository.version" title="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_VERSION" description="COM_COMPONENTBUILDER_REPOSITORIES_EDIT_VERSION_DESC" />
+	</section>
 	<section name="help_document">
 		<action name="help_document.edit" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_DESC" />
 		<action name="help_document.edit.own" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_OWN" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_OWN_DESC" />

admin/assets/css/joomla_power.css

@@ -0,0 +1,13 @@
+/**
+ * @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
+ */
+
+/* CSS Document */
+
+

admin/assets/css/joomla_powers.css

@@ -0,0 +1,13 @@
+/**
+ * @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
+ */
+
+/* CSS Document */
+
+

admin/assets/css/repositories.css

@@ -0,0 +1,13 @@
+/**
+ * @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
+ */
+
+/* CSS Document */
+
+

admin/assets/css/repository.css

@@ -0,0 +1,13 @@
+/**
+ * @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
+ */
+
+/* CSS Document */
+
+

admin/compiler/joomla_3/FormController_custom_site.php

@@ -94,14 +94,14 @@ class ###Component###Controller###SView### extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   JModelLegacy  $model      The data model object.
-	 * @param   array         $validData  The validated data.
+	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void
 	 *
-	 * @since   12.2
+	 * @since   11.1
 	 */
-	protected function postSaveHook(JModelLegacy $model, $validData = [])
+	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
 	}
 }

admin/compiler/joomla_3/Helper.php

@@ -15,7 +15,9 @@ defined('_JEXEC') or die('Restricted access');
 ###BOM###
 
 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');###ADMIN_POWER_HELPER###
+defined('_JEXEC') or die('Restricted access');
+
+###POWER_AUTOLOADER###
 
 ###ADMIN_HELPER_CLASS_HEADER###
 

admin/compiler/joomla_3/Helper_site.php

@@ -15,7 +15,9 @@ defined('_JEXEC') or die('Restricted access');
 ###BOM###
 
 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');###SITE_POWER_HELPER###
+defined('_JEXEC') or die('Restricted access');
+
+###SITE_POWER_AUTOLOADER###
 
 ###SITE_HELPER_CLASS_HEADER###
 

admin/compiler/joomla_3/autoloader.php

@@ -0,0 +1,18 @@
+<?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');
+?>
+###BOM###
+
+// No direct access to this file
+defined('_JEXEC') or die;###ADMIN_POWER_HELPER###

admin/compiler/joomla_3/autoloader_site.php

@@ -0,0 +1,18 @@
+<?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');
+?>
+###BOM###
+
+// No direct access to this file
+defined('_JEXEC') or die;###SITE_POWER_HELPER###

admin/compiler/joomla_3/component_admin.php

@@ -15,7 +15,9 @@ defined('_JEXEC') or die('Restricted access');
 ###BOM###
 
 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');###ADMIN_POWER_HELPER###
+defined('_JEXEC') or die('Restricted access');
+
+###POWER_AUTOLOADER###
 
 ###ADMIN_COMPONENT_HEADER###
 

admin/compiler/joomla_3/component_site.php

@@ -15,7 +15,9 @@ defined('_JEXEC') or die('Restricted access');
 ###BOM###
 
 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');###ADMIN_POWER_HELPER###
+defined('_JEXEC') or die('Restricted access');
+
+###SITE_POWER_AUTOLOADER###
 
 ###SITE_COMPONENT_HEADER###
 

admin/compiler/joomla_3/script.php

@@ -138,76 +138,77 @@ class Com_###Component###InstallerScript
 	}
 
 	/**
-	 * Remove folders with files
+	 * Remove folders with files (with ignore options)
 	 *
-	 * @param   string   $dir     The path to folder to remove
-	 * @param   boolean  $ignore  The folders and files to ignore and not remove
-	 *
-	 * @return  boolean   True in all is removed
+	 * @param   string	    $dir	 The path to the folder to remove.
+	 * @param   array|null  $ignore  The folders and files to ignore and not remove.
 	 *
+	 * @return  bool   True if all specified files/folders are removed, false otherwise.
+	 * @since 3.2.2
 	 */
-	protected function removeFolder($dir, $ignore = false)
+	protected function removeFolder(string $dir, ?array $ignore = null): bool
 	{
-		if (Folder::exists($dir))
+		if (!is_dir($dir))
 		{
-			$it = new RecursiveDirectoryIterator($dir);
-			$it = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
-			// remove ending /
-			$dir = rtrim($dir, '/');
-			// now loop the files & folders
-			foreach ($it as $file)
-			{
-				if ('.' === $file->getBasename() || '..' ===  $file->getBasename()) continue;
-				// set file dir
-				$file_dir = $file->getPathname();
-				// check if this is a dir or a file
-				if ($file->isDir())
-				{
-					$keeper = false;
-					if ($this->checkArray($ignore))
-					{
-						foreach ($ignore as $keep)
-						{
-							if (strpos($file_dir, $dir.'/'.$keep) !== false)
-							{
-								$keeper = true;
-							}
-						}
-					}
-					if ($keeper)
-					{
-						continue;
-					}
-					Folder::delete($file_dir);
-				}
-				else
-				{
-					$keeper = false;
-					if ($this->checkArray($ignore))
-					{
-						foreach ($ignore as $keep)
-						{
-							if (strpos($file_dir, $dir.'/'.$keep) !== false)
-							{
-								$keeper = true;
-							}
-						}
-					}
-					if ($keeper)
-					{
-						continue;
-					}
-					File::delete($file_dir);
-				}
-			}
-			// delete the root folder if not ignore found
-			if (!$this->checkArray($ignore))
-			{
-				return Folder::delete($dir);
-			}
-			return true;
+			return false;
 		}
-		return false;
+
+		$it = new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS);
+		$it = new \RecursiveIteratorIterator($it, \RecursiveIteratorIterator::CHILD_FIRST);
+
+		// Remove trailing slash
+		$dir = rtrim($dir, '/');
+
+		foreach ($it as $file)
+		{
+			$filePath = $file->getPathname();
+			$relativePath = str_replace($dir . '/', '', $filePath);
+
+			if ($ignore !== null && in_array($relativePath, $ignore, true))
+			{
+				continue;
+			}
+
+			if ($file->isDir())
+			{
+				Folder::delete($filePath);
+			}
+			else
+			{
+				File::delete($filePath);
+			}
+		}
+
+		// Delete the root folder if there are no ignored files/folders left
+		if ($ignore === null || $this->isDirEmpty($dir, $ignore))
+		{
+			return Folder::delete($dir);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a directory is empty considering ignored files/folders.
+	 *
+	 * @param   string  $dir	 The path to the folder to check.
+	 * @param   array   $ignore  The folders and files to ignore.
+	 *
+	 * @return  bool    True if the directory is empty or contains only ignored items, false otherwise.
+     * @since 3.2.1
+	 */
+	protected function isDirEmpty(string $dir, array $ignore): bool
+	{
+		$it = new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS);
+		foreach ($it as $file)
+		{
+			$relativePath = str_replace($dir . '/', '', $file->getPathname());
+			if (!in_array($relativePath, $ignore, true))
+			{
+				return false;
+			}
+		}
+		return true;
 	}
 
 	/**
@@ -216,6 +217,7 @@ class Com_###Component###InstallerScript
 	 * @input    array   The array to check
 	 *
 	 * @returns bool/int  number of items in array on success
+	 * @since 3.2.2
 	 */
 	protected function checkArray($array, $removeEmptyString = false)
 	{
@@ -236,5 +238,29 @@ class Com_###Component###InstallerScript
 			return $nr;
 		}
 		return false;
-	}###MOVEFOLDERSMETHOD###
+	}
+
+	/**
+	 * Ensures that a class in the namespace is available.
+	 * If the class is not already loaded, it attempts to load it via the specified autoloader.
+	 *
+	 * @param string  $className   The fully qualified name of the class to check.
+	 *
+	 * @return bool True if the class exists or was successfully loaded, false otherwise.
+	 * @since 3.2.2
+	 */
+	protected function classExists(string $className): bool
+	{
+		if (!class_exists($className, true))
+		{
+###THREE_POWER_AUTOLOADER###
+
+			// Check again if the class now exists after requiring the autoloader
+			if (!class_exists($className, true))
+			{
+				return false;
+			}
+		}
+		return true;
+	}###INSTALLERMETHODS###
 }

admin/compiler/joomla_3/settings.json

@@ -164,6 +164,20 @@
 				"newName": "category.php",
 				"type": "file"
 			},
+			"autoloader.php": {
+				"naam": "autoloader.php",
+				"path": "c0mp0n3nt/admin/helpers",
+				"rename": "new",
+				"newName": "powerloader.php",
+				"type": "file"
+			},
+			"autoloader_site.php": {
+				"naam": "autoloader_site.php",
+				"path": "c0mp0n3nt/site/helpers",
+				"rename": "new",
+				"newName": "powerloader.php",
+				"type": "file"
+			},
 			"script.php": {
 				"naam": "script.php",
 				"path": "c0mp0n3nt/",

admin/compiler/joomla_4/ADMIN_AUTOLOADER_CLASS.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September 2022
+ * @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 JCB template file (EVER)
+defined('_JCB_TEMPLATE') or die;
+?>
+###BOM###
+
+// No direct access to this file
+defined('_JEXEC') or die;###ADMIN_POWER_HELPER###

admin/compiler/joomla_4/ADMIN_HELPER_CLASS.php

@@ -15,7 +15,7 @@ defined('_JCB_TEMPLATE') or die;
 ###BOM###
 namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator\Helper;
 
-###ADMIN_POWER_HELPER###
+###POWER_AUTOLOADER###
 
 ###ADMIN_HELPER_CLASS_HEADER###
 

admin/compiler/joomla_4/ADMIN_PROVIDER.php

@@ -14,7 +14,7 @@ defined('_JCB_TEMPLATE') or die;
 ?>
 ###BOM###
 
-###ADMIN_POWER_HELPER###
+###POWER_AUTOLOADER###
 
 // (soon) use Joomla\CMS\Association\AssociationExtensionInterface;
 use Joomla\CMS\Categories\CategoryFactoryInterface;
@@ -55,10 +55,10 @@ return new class () implements ServiceProviderInterface
 	{
 		// (soon) $container->set(AssociationExtensionInterface::class, new AssociationsHelper());
 
-		$container->registerServiceProvider(new CategoryFactory('\\###NAMESPACEPREFIX###\\Component\\###Component###'));
-		$container->registerServiceProvider(new MVCFactory('\\###NAMESPACEPREFIX###\\Component\\###Component###'));
-		$container->registerServiceProvider(new ComponentDispatcherFactory('\\###NAMESPACEPREFIX###\\Component\\###Component###'));
-		$container->registerServiceProvider(new RouterFactory('\\###NAMESPACEPREFIX###\\Component\\###Component###'));
+		$container->registerServiceProvider(new CategoryFactory('\\###NAMESPACEPREFIX###\\Component\\###ComponentNamespace###'));
+		$container->registerServiceProvider(new MVCFactory('\\###NAMESPACEPREFIX###\\Component\\###ComponentNamespace###'));
+		$container->registerServiceProvider(new ComponentDispatcherFactory('\\###NAMESPACEPREFIX###\\Component\\###ComponentNamespace###'));
+		$container->registerServiceProvider(new RouterFactory('\\###NAMESPACEPREFIX###\\Component\\###ComponentNamespace###'));
 
 		$container->set(
 			ComponentInterface::class,

admin/compiler/joomla_4/ADMIN_VIEW_CONTROLLER.php

@@ -261,7 +261,7 @@ class ###View###Controller extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   BaseDatabaseModel  $model     The data model object.
 	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void

admin/compiler/joomla_4/DASH_MODEL.php

@@ -27,6 +27,27 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator
  */
 class ###Component###Model extends ListModel
 {
+	/**
+	 * The styles array.
+	 *
+	 * @var    array
+	 * @since  4.3
+	 */
+	protected array $styles = [
+		'administrator/components/com_###component###/assets/css/admin.css',
+		'administrator/components/com_###component###/assets/css/dashboard.css'
+ 	];
+
+	/**
+	 * The scripts array.
+	 *
+	 * @var    array
+	 * @since  4.3
+	 */
+	protected array $scripts = [
+		'administrator/components/com_###component###/assets/js/admin.js'
+ 	];
+
 	public function getIcons()
 	{
 		// load user for access menus
@@ -221,5 +242,49 @@ class ###Component###Model extends ListModel
 			}
 		}
 		return $icons;
+	}
+
+	/**
+	 * Method to get the styles that have to be included on the view
+	 *
+	 * @return  array    styles files
+	 * @since   4.3
+	 */
+	public function getStyles(): array
+	{
+		return $this->styles;
+	}
+
+	/**
+	 * Method to set the styles that have to be included on the view
+	 *
+	 * @return  void
+	 * @since   4.3
+	 */
+	public function setStyles(string $path): void
+	{
+		$this->styles[] = $path;
+	}
+
+	/**
+	 * Method to get the script that have to be included on the view
+	 *
+	 * @return  array    script files
+	 * @since   4.3
+	 */
+	public function getScripts(): array
+	{
+		return $this->scripts;
+	}
+
+	/**
+	 * Method to set the script that have to be included on the view
+	 *
+	 * @return  void
+	 * @since   4.3
+	 */
+	public function setScript(string $path): void
+	{
+		$this->scripts[] = $path;
 	}###DASH_MODEL_METHODS###
 }

admin/compiler/joomla_4/DASH_VIEW_HTML.php

@@ -35,6 +35,8 @@ class HtmlView extends BaseHtmlView
 	{
 		// Assign data to the view
 		$this->icons          = $this->get('Icons');
+		$this->styles         = $this->get('Styles');
+		$this->scripts        = $this->get('Scripts');
 		$this->contributors   = ###Component###Helper::getContributors();
 
 		// get the manifest details of the component
@@ -90,11 +92,17 @@ class HtmlView extends BaseHtmlView
 	{
 		// set page title
 		$this->getDocument()->setTitle(Text::_('COM_###COMPONENT###_DASHBOARD'));
-
 		// add manifest to page JavaScript
 		$this->getDocument()->addScriptDeclaration("var manifest = JSON.parse('" . json_encode($this->manifest) . "');", "text/javascript");
-
-		// add dashboard style sheets
-		Html::_('stylesheet', "administrator/components/com_###component###/assets/css/dashboard.css", ['version' => 'auto']);
+		// add styles
+		foreach ($this->styles as $style)
+		{
+			Html::_('stylesheet', $style, ['version' => 'auto']);
+		}
+		// add scripts
+		foreach ($this->scripts as $script)
+		{
+			Html::_('script', $script, ['version' => 'auto']);
+		}
 	}
 }

admin/compiler/joomla_4/INSTALLER_SCRIPT.php

@@ -19,7 +19,6 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Installer\InstallerAdapter;
 use Joomla\CMS\Installer\InstallerScriptInterface;
-use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Version;
 use Joomla\CMS\HTML\HTMLHelper as Html;
@@ -39,10 +38,9 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 	/**
 	 * The CMS Application.
 	 *
-	 * @var   CMSApplication
 	 * @since 4.4.2
 	 */
-	protected CMSApplication $app;
+	protected $app;
 
 	/**
 	 * The database class.
@@ -279,6 +277,80 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 		return true;
 	}
 
+	/**
+	 * Remove folders with files (with ignore options)
+	 *
+	 * @param   string	    $dir	 The path to the folder to remove.
+	 * @param   array|null  $ignore  The folders and files to ignore and not remove.
+	 *
+	 * @return  bool   True if all specified files/folders are removed, false otherwise.
+	 * @since 3.2.2
+	 */
+	protected function removeFolder(string $dir, ?array $ignore = null): bool
+	{
+		if (!is_dir($dir))
+		{
+			return false;
+		}
+
+		$it = new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS);
+		$it = new \RecursiveIteratorIterator($it, \RecursiveIteratorIterator::CHILD_FIRST);
+
+		// Remove trailing slash
+		$dir = rtrim($dir, '/');
+
+		foreach ($it as $file)
+		{
+			$filePath = $file->getPathname();
+			$relativePath = str_replace($dir . '/', '', $filePath);
+
+			if ($ignore !== null && in_array($relativePath, $ignore, true))
+			{
+				continue;
+			}
+
+			if ($file->isDir())
+			{
+				Folder::delete($filePath);
+			}
+			else
+			{
+				File::delete($filePath);
+			}
+		}
+
+		// Delete the root folder if there are no ignored files/folders left
+		if ($ignore === null || $this->isDirEmpty($dir, $ignore))
+		{
+			return Folder::delete($dir);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a directory is empty considering ignored files/folders.
+	 *
+	 * @param   string  $dir	 The path to the folder to check.
+	 * @param   array   $ignore  The folders and files to ignore.
+	 *
+	 * @return  bool    True if the directory is empty or contains only ignored items, false otherwise.
+     * @since 3.2.1
+	 */
+	protected function isDirEmpty(string $dir, array $ignore): bool
+	{
+		$it = new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS);
+		foreach ($it as $file)
+		{
+			$relativePath = str_replace($dir . '/', '', $file->getPathname());
+			if (!in_array($relativePath, $ignore, true))
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+
 	/**
 	 * Remove the files and folders in the given array from
 	 *
@@ -1095,5 +1167,29 @@ class Com_###Component###InstallerScript implements InstallerScriptInterface
 				);
 			}
 		}
-	}###MOVEFOLDERSMETHOD###
+	}
+
+	/**
+	 * Ensures that a class in the namespace is available.
+	 * If the class is not already loaded, it attempts to load it via the specified autoloader.
+	 *
+	 * @param string  $className   The fully qualified name of the class to check.
+	 *
+	 * @return bool True if the class exists or was successfully loaded, false otherwise.
+	 * @since 4.0.1
+	 */
+	protected function classExists(string $className): bool
+	{
+		if (!class_exists($className, true))
+		{
+###THREE_POWER_AUTOLOADER###
+
+			// Check again if the class now exists after requiring the autoloader
+			if (!class_exists($className, true))
+			{
+				return false;
+			}
+		}
+		return true;
+	}###INSTALLERMETHODS###
 }

admin/compiler/joomla_4/SITE_ADMIN_VIEW_CONTROLLER.php

@@ -277,7 +277,7 @@ class ###View###Controller extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   BaseDatabaseModel  $model     The data model object.
 	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void

admin/compiler/joomla_4/SITE_ADMIN_VIEW_MODEL.php

@@ -178,7 +178,7 @@ class ###View###Model extends AdminModel
 	 */
 	protected function prepareTable($table)
 	{###LICENSE_TABLE_LOCKED_CHECK###
-		$date = $this->getDatabase();
+		$date = Factory::getDate();
 		$user = $this->getCurrentUser();
 
 		if (isset($table->name))

admin/compiler/joomla_4/SITE_AUTOLOADER_CLASS.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September 2022
+ * @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 JCB template file (EVER)
+defined('_JCB_TEMPLATE') or die;
+?>
+###BOM###
+
+// No direct access to this file
+defined('_JEXEC') or die;###SITE_POWER_HELPER###

admin/compiler/joomla_4/SITE_HELPER_CLASS.php

@@ -15,7 +15,7 @@ defined('_JCB_TEMPLATE') or die;
 ###BOM###
 namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\Helper;
 
-###SITE_POWER_HELPER###
+###SITE_POWER_AUTOLOADER###
 
 ###SITE_HELPER_CLASS_HEADER###
 

admin/compiler/joomla_4/SITE_VIEW_CONTROLLER.php

@@ -107,14 +107,14 @@ class ###SView###Controller extends FormController
 	 * Function that allows child controller access to model data
 	 * after the data has been saved.
 	 *
-	 * @param   JModelLegacy  $model      The data model object.
-	 * @param   array         $validData  The validated data.
+	 * @param   BaseDatabaseModel  $model      The data model object.
+	 * @param   array              $validData  The validated data.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.2
 	 */
-	protected function postSaveHook(JModelLegacy $model, $validData = [])
+	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
 	}
 }

admin/compiler/joomla_4/settings.json

@@ -161,6 +161,20 @@
 				"newName": "[[[Component]]]Helper.php",
 				"type": "file"
 			},
+			"ADMIN_AUTOLOADER_CLASS.php": {
+				"naam": "ADMIN_AUTOLOADER_CLASS.php",
+				"path": "c0mp0n3nt/admin/src/Helper",
+				"rename": "new",
+				"newName": "PowerloaderHelper.php",
+				"type": "file"
+			},
+			"SITE_AUTOLOADER_CLASS.php": {
+				"naam": "SITE_AUTOLOADER_CLASS.php",
+				"path": "c0mp0n3nt/site/src/Helper",
+				"rename": "new",
+				"newName": "PowerloaderHelper.php",
+				"type": "file"
+			},
 			"INSTALLER_SCRIPT.php": {
 				"naam": "INSTALLER_SCRIPT.php",
 				"path": "c0mp0n3nt/",

admin/componentbuilder.php

@@ -12,61 +12,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// add the autoloader for the composer classes
-$composer_autoloader = JPATH_LIBRARIES . '/phpseclib3/vendor/autoload.php';
-if (file_exists($composer_autoloader))
+// The power autoloader for this project (JPATH_ADMINISTRATOR) area.
+$power_autoloader = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/powerloader.php';
+if (file_exists($power_autoloader))
 {
-	require_once $composer_autoloader;
+	require_once $power_autoloader;
 }
 
-// register additional namespace
-\spl_autoload_register(function ($class) {
-	// project-specific base directories and namespace prefix
-	$search = [
-		'libraries/jcb_powers/VDM.Joomla.Openai' => 'VDM\\Joomla\\Openai',
-		'libraries/jcb_powers/VDM.Joomla.Gitea' => 'VDM\\Joomla\\Gitea',
-		'libraries/jcb_powers/VDM.Joomla.FOF' => 'VDM\\Joomla\\FOF',
-		'libraries/jcb_powers/VDM.Joomla' => 'VDM\\Joomla',
-		'libraries/jcb_powers/VDM.Minify' => 'VDM\\Minify',
-		'libraries/jcb_powers/VDM.Psr' => 'VDM\\Psr'
-	];
-	// Start the search and load if found
-	$found = false;
-	$found_base_dir = "";
-	$found_len = 0;
-	foreach ($search as $base_dir => $prefix)
-	{
-		// does the class use the namespace prefix?
-		$len = strlen($prefix);
-		if (strncmp($prefix, $class, $len) === 0)
-		{
-			// we have a match so load the values
-			$found = true;
-			$found_base_dir = $base_dir;
-			$found_len = $len;
-			// done here
-			break;
-		}
-	}
-	// check if we found a match
-	if (!$found)
-	{
-		// not found so move to the next registered autoloader
-		return;
-	}
-	// get the relative class name
-	$relative_class = substr($class, $found_len);
-	// replace the namespace prefix with the base directory, replace namespace
-	// separators with directory separators in the relative class name, append
-	// with .php
-	$file = JPATH_ROOT . '/' . $found_base_dir . '/src' . str_replace('\\', '/', $relative_class) . '.php';
-	// if the file exists, require it
-	if (file_exists($file))
-	{
-		require $file;
-	}
-});
-
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Access\Exception\NotAllowed;

admin/config.xml

@@ -134,6 +134,19 @@
 			folder="editors"
 			filter="cmd"
 		/>
+		<!-- Gitea_username Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="gitea_username"
+			label="COM_COMPONENTBUILDER_CONFIG_GITEA_USERNAME_LABEL"
+			size="128"
+			maxlength="50"
+			description="COM_COMPONENTBUILDER_CONFIG_GITEA_USERNAME_DESCRIPTION"
+			class="text_area"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_CONFIG_GITEA_USERNAME_MESSAGE"
+			hint="COM_COMPONENTBUILDER_CONFIG_GITEA_USERNAME_HINT"
+		/>
 		<!-- Gitea_token Field. Type: Password. (joomla) -->
 		<field
 			type="password"
@@ -189,6 +202,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGE_DIRECTORIES_LABEL"
 			description="COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGE_DIRECTORIES_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="true"
 			default=""
 			showon="manage_jcb_package_directories:1">
@@ -222,6 +236,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_STORAGE_TIME_TO_LIVE_LABEL"
 			description="COM_COMPONENTBUILDER_CONFIG_STORAGE_TIME_TO_LIVE_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="global"
 			showon="set_browser_storage:1">
@@ -695,8 +710,6 @@
 		name="super_power_custom_config"
 		label="COM_COMPONENTBUILDER_CONFIG_SUPER_POWER">
 
-		<!-- Note_not_ready_super_powers Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_not_ready_super_powers" label="COM_COMPONENTBUILDER_CONFIG_NOTE_NOT_READY_SUPER_POWERS_LABEL" heading="h2" class="alert alert-error note_not_ready_super_powers" />
 		<!-- Super_powers_documentation Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -745,62 +758,7 @@
 				COM_COMPONENTBUILDER_CONFIG_NO</option>
 		</field>
 		<!-- Note_super_powers_repositories Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_super_powers_repositories" label="COM_COMPONENTBUILDER_CONFIG_NOTE_SUPER_POWERS_REPOSITORIES_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_SUPER_POWERS_REPOSITORIES_DESCRIPTION" heading="h4" class="alert alert-info note_super_powers_repositories" showon="powers_repository:1[AND]super_powers_repositories:1" />
-		<!-- Approved_paths Field. Type: Subform. (joomla) -->
-		<field
-			type="subform"
-			name="approved_paths"
-			label="COM_COMPONENTBUILDER_CONFIG_APPROVED_PATHS_LABEL"
-			layout="joomla.form.field.subform.repeatable-table"
-			multiple="true"
-			buttons="add,remove,move"
-			icon="list"
-			max="30"
-			min="1"
-			showon="powers_repository:1[AND]super_powers_repositories:1">
-			<form hidden="true" name="list_approved_paths_modal" repeat="true">
-				<!-- Owner Field. Type: Text. (joomla) -->
-				<field
-					type="text"
-					name="owner"
-					label="COM_COMPONENTBUILDER_CONFIG_OWNER_LABEL"
-					size="70"
-					maxlength="150"
-					class="text_area span12"
-					readonly="false"
-					filter="CMD"
-					hint="COM_COMPONENTBUILDER_CONFIG_OWNER_HINT"
-					autocomplete="on"
-				/>
-				<!-- Repo Field. Type: Text. (joomla) -->
-				<field
-					type="text"
-					name="repo"
-					label="COM_COMPONENTBUILDER_CONFIG_REPO_LABEL"
-					size="70"
-					maxlength="150"
-					class="text_area span12"
-					readonly="false"
-					filter="CMD"
-					hint="COM_COMPONENTBUILDER_CONFIG_REPO_HINT"
-					autocomplete="on"
-				/>
-				<!-- Branch Field. Type: Text. (joomla) -->
-				<field
-					type="text"
-					name="branch"
-					label="COM_COMPONENTBUILDER_CONFIG_BRANCH_LABEL"
-					size="70"
-					maxlength="150"
-					default="default"
-					class="text_area span12"
-					readonly="false"
-					filter="CMD"
-					hint="COM_COMPONENTBUILDER_CONFIG_BRANCH_HINT"
-					autocomplete="on"
-				/>
-			</form>
-		</field>
+		<field type="note" name="note_super_powers_repositories" label="COM_COMPONENTBUILDER_CONFIG_NOTE_SUPER_POWERS_REPOSITORIES_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_SUPER_POWERS_REPOSITORIES_DESCRIPTION" heading="h4" class="alert alert-error note_super_powers_repositories" showon="powers_repository:1[AND]super_powers_repositories:1" />
 		<!-- Note_powers_repository_path Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_powers_repository_path" label="COM_COMPONENTBUILDER_CONFIG_NOTE_POWERS_REPOSITORY_PATH_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_POWERS_REPOSITORY_PATH_DESCRIPTION" heading="h4" class="alert alert-info note_powers_repository_path" showon="powers_repository:1" />
 		<!-- Local_powers_repository_path Field. Type: Text. (joomla) -->
@@ -821,88 +779,6 @@
 			autocomplete="on"
 			showon="powers_repository:1"
 		/>
-		<!-- Add_custom_gitea_url Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_custom_gitea_url"
-			label="COM_COMPONENTBUILDER_CONFIG_ADD_CUSTOM_GITEA_URL_LABEL"
-			description="COM_COMPONENTBUILDER_CONFIG_ADD_CUSTOM_GITEA_URL_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="1">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_CONFIG_GITVDMDEV</option>
-			<option value="2">
-				COM_COMPONENTBUILDER_CONFIG_CUSTOMGITEA</option>
-		</field>
-		<!-- Note_custom_gitea_url Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_custom_gitea_url" label="COM_COMPONENTBUILDER_CONFIG_NOTE_CUSTOM_GITEA_URL_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_CUSTOM_GITEA_URL_DESCRIPTION" heading="h3" class="alert alert-success note_custom_gitea_url" showon="add_custom_gitea_url:2" />
-		<!-- Custom_gitea_url Field. Type: Url. (joomla) -->
-		<field
-			type="url"
-			name="custom_gitea_url"
-			label="COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_URL_LABEL"
-			size="70"
-			maxlength="150"
-			default="https://git.vdm.dev"
-			description="COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_URL_DESCRIPTION"
-			class="text_area"
-			filter="url"
-			validated="url"
-			scheme="http,https"
-			message="COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_URL_MESSAGE"
-			hint="COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_URL_HINT"
-			autocomplete="on"
-			showon="add_custom_gitea_url:2"
-		/>
-		<!-- Custom_gitea_token Field. Type: Password. (joomla) -->
-		<field
-			type="password"
-			name="custom_gitea_token"
-			label="COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_TOKEN_LABEL"
-			size="128"
-			description="COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_TOKEN_DESCRIPTION"
-			message="Error! Please add token here."
-			class="text_area"
-			readonly="false"
-			disabled="false"
-			required="false"
-			filter="STRING"
-			hint="COM_COMPONENTBUILDER_CONFIG_CUSTOM_GITEA_TOKEN_HINT"
-			autocomplete="off"
-			showon="add_custom_gitea_url:2"
-		/>
-		<!-- Super_powers_core_organisation_note Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="super_powers_core_organisation_note" label="COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_ORGANISATION_NOTE_LABEL" description="COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_ORGANISATION_NOTE_DESCRIPTION" heading="h4" class="alert alert-success super_powers_core_organisation_note" showon="add_custom_gitea_url:2" />
-		<!-- Super_powers_core_organisation Field. Type: Text. (joomla) -->
-		<field
-			type="text"
-			name="super_powers_core_organisation"
-			label="COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_ORGANISATION_LABEL"
-			size="70"
-			maxlength="150"
-			default="joomla"
-			description="COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_ORGANISATION_DESCRIPTION"
-			class="text_area"
-			filter="WORD"
-			hint="COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_ORGANISATION_HINT"
-			autocomplete="on"
-			showon="add_custom_gitea_url:2"
-		/>
-		<!-- Super_powers_core Field. Type: Text. (joomla) -->
-		<field
-			type="text"
-			name="super_powers_core"
-			label="COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_LABEL"
-			size="70"
-			maxlength="150"
-			default="joomla/super-powers"
-			class="text_area"
-			filter="PATH"
-			hint="COM_COMPONENTBUILDER_CONFIG_SUPER_POWERS_CORE_HINT"
-			autocomplete="on"
-			showon="add_custom_gitea_url:2"
-		/>
 	</fieldset>
 	<fieldset
 		name="compiler_custom_config"
@@ -915,6 +791,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_BUILDER_GIF_SIZE_LABEL"
 			description="COM_COMPONENTBUILDER_CONFIG_BUILDER_GIF_SIZE_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			default="480-272">
@@ -1040,6 +917,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_ASSETS_TABLE_FIX_LABEL"
 			description="COM_COMPONENTBUILDER_CONFIG_ASSETS_TABLE_FIX_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="2">
 			<!-- Option Set. -->
@@ -1057,6 +935,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_COMPILER_FIELD_BUILDER_TYPE_LABEL"
 			description="COM_COMPONENTBUILDER_CONFIG_COMPILER_FIELD_BUILDER_TYPE_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			filter="INT"
 			required="true"
 			default="2">
@@ -1264,6 +1143,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_SERVER_LABEL"
 			description="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_SERVER_DESCRIPTION"
 			class="list_class"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			default="0"
 			showon="cronjob_backup_type:2"

admin/controller.php

@@ -100,6 +100,7 @@ class ComponentbuilderController extends BaseController
 				'joomla_component' => 'joomla_components',
 				'joomla_module' => 'joomla_modules',
 				'joomla_plugin' => 'joomla_plugins',
+				'joomla_power' => 'joomla_powers',
 				'power' => 'powers',
 				'admin_view' => 'admin_views',
 				'custom_admin_view' => 'custom_admin_views',
@@ -119,6 +120,7 @@ class ComponentbuilderController extends BaseController
 				'language_translation' => 'language_translations',
 				'language' => 'languages',
 				'server' => 'servers',
+				'repository' => 'repositories',
 				'help_document' => 'help_documents',
 				'admin_fields' => 'admins_fields',
 				'admin_fields_conditions' => 'admins_fields_conditions',

admin/controllers/admin_views.php

@@ -21,6 +21,7 @@ use Joomla\CMS\Session\Session;
 use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Uri\Uri;
 
 /**
  * Admin_views Admin Controller
@@ -116,27 +117,40 @@ class ComponentbuilderControllerAdmin_views extends AdminController
 
 
 	/**
-	 * Run the Expansion
+	 * Runs the expansion module.
 	 *
-	 * @return  void
+	 * This function performs several checks and operations:
+	 * 1. It verifies the authenticity of the request to prevent request forgery.
+	 * 2. It checks whether the current user has the necessary permissions to run the expansion module.
+	 * 3. If the user is authorized, it attempts to run the expansion via an API call.
+	 * 4. Depending on the result of the expansion operation, it sets the appropriate success or error message.
+	 * 5. It redirects the user to a specified URL with the result message and status.
+	 *
+	 * @return bool True on successful expansion, false on failure.
 	 */
 	public function runExpansion()
 	{
 		// Check for request forgeries
-		Session::checkToken() or \jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
 		// check if user has the right
 		$user = Factory::getUser();
+
 		// set page redirect
-		$redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=admin_views', false);
+		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=admin_views', false);
+
 		// set massage
 		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
+
 		// check if this user has the right to run expansion
 		if($user->authorise('admin_views.run_expansion', 'com_componentbuilder'))
 		{
 			// set massage
 			$message = Text::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
+
 			// run expansion via API
-			$result = ComponentbuilderHelper::getFileContents(\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			$result = ComponentbuilderHelper::getFileContents(Uri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+
 			// is there a message returned
 			if (!is_numeric($result) && StringHelper::check($result))
 			{
@@ -150,6 +164,7 @@ class ComponentbuilderControllerAdmin_views extends AdminController
 				return true;
 			}
 		}
+
 		$this->setRedirect($redirect_url, $message, 'error');
 		return false;
 	}

admin/controllers/compiler.php

@@ -22,6 +22,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Factory as CFactory;
 use Joomla\CMS\Version;
 use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Uri\Uri;
 
 /**
  * Compiler Admin Controller
@@ -127,7 +128,7 @@ class ComponentbuilderControllerCompiler extends AdminController
 				$redirect_url = Route::_('index.php?option=com_componentbuilder&view=compiler', false);
 				if (($pos = strpos($model->compiler->filepath['component'], "/tmp/")) !== FALSE)
 				{
-				    $url = \JUri::root() . substr($model->compiler->filepath['component'], $pos + 1);
+				    $url = Uri::root() . substr($model->compiler->filepath['component'], $pos + 1);
 				}
 				// check if we have plugins
 				$add_plugin_install = UtilitiesArrayHelper::check($model->compiler->filepath['plugins'], true);
@@ -210,7 +211,7 @@ class ComponentbuilderControllerCompiler extends AdminController
 							$message[] = '<b>Module Path:</b> <code>' . $module_path . '</code><br />';
 							if (($pos = strpos($module_path, "/tmp/")) !== FALSE)
 							{
-								$module_urls[$module_id] = \JUri::root() . substr($module_path, $pos + 1);
+								$module_urls[$module_id] = Uri::root() . substr($module_path, $pos + 1);
 								$message[] = '<b>Module URL:</b> <code>' . $module_urls[$module_id] . '</code><br />';
 							}
 						}
@@ -226,7 +227,7 @@ class ComponentbuilderControllerCompiler extends AdminController
 							$message[] = '<b>Plugin Path:</b> <code>' . $plugin_path . '</code><br />';
 							if (($pos = strpos($plugin_path, "/tmp/")) !== FALSE)
 							{
-								$plugin_urls[$plugin_id] = \JUri::root() . substr($plugin_path, $pos + 1);
+								$plugin_urls[$plugin_id] = Uri::root() . substr($plugin_path, $pos + 1);
 								$message[] = '<b>Plugin URL:</b> <code>' . $plugin_urls[$plugin_id] . '</code><br />';
 							}
 						}
@@ -521,27 +522,40 @@ class ComponentbuilderControllerCompiler extends AdminController
 	}
 
 	/**
-	 * Run the Expansion
+	 * Runs the expansion module.
 	 *
-	 * @return  void
+	 * This function performs several checks and operations:
+	 * 1. It verifies the authenticity of the request to prevent request forgery.
+	 * 2. It checks whether the current user has the necessary permissions to run the expansion module.
+	 * 3. If the user is authorized, it attempts to run the expansion via an API call.
+	 * 4. Depending on the result of the expansion operation, it sets the appropriate success or error message.
+	 * 5. It redirects the user to a specified URL with the result message and status.
+	 *
+	 * @return bool True on successful expansion, false on failure.
 	 */
 	public function runExpansion()
 	{
 		// Check for request forgeries
-		Session::checkToken() or \jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
 		// check if user has the right
 		$user = Factory::getUser();
+
 		// set page redirect
-		$redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=compiler', false);
+		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=compiler', false);
+
 		// set massage
 		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
+
 		// check if this user has the right to run expansion
 		if($user->authorise('compiler.run_expansion', 'com_componentbuilder'))
 		{
 			// set massage
 			$message = Text::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
+
 			// run expansion via API
-			$result = ComponentbuilderHelper::getFileContents(\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			$result = ComponentbuilderHelper::getFileContents(Uri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+
 			// is there a message returned
 			if (!is_numeric($result) && StringHelper::check($result))
 			{
@@ -555,6 +569,7 @@ class ComponentbuilderControllerCompiler extends AdminController
 				return true;
 			}
 		}
+
 		$this->setRedirect($redirect_url, $message, 'error');
 		return false;
 	}

admin/controllers/custom_codes.php

@@ -21,6 +21,7 @@ use Joomla\CMS\Session\Session;
 use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Uri\Uri;
 
 /**
  * Custom_codes Admin Controller
@@ -116,27 +117,40 @@ class ComponentbuilderControllerCustom_codes extends AdminController
 
 
 	/**
-	 * Run the Expansion
+	 * Runs the expansion module.
 	 *
-	 * @return  void
+	 * This function performs several checks and operations:
+	 * 1. It verifies the authenticity of the request to prevent request forgery.
+	 * 2. It checks whether the current user has the necessary permissions to run the expansion module.
+	 * 3. If the user is authorized, it attempts to run the expansion via an API call.
+	 * 4. Depending on the result of the expansion operation, it sets the appropriate success or error message.
+	 * 5. It redirects the user to a specified URL with the result message and status.
+	 *
+	 * @return bool True on successful expansion, false on failure.
 	 */
 	public function runExpansion()
 	{
 		// Check for request forgeries
-		Session::checkToken() or \jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
 		// check if user has the right
 		$user = Factory::getUser();
+
 		// set page redirect
-		$redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=custom_codes', false);
+		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=custom_codes', false);
+
 		// set massage
 		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
+
 		// check if this user has the right to run expansion
 		if($user->authorise('custom_codes.run_expansion', 'com_componentbuilder'))
 		{
 			// set massage
 			$message = Text::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
+
 			// run expansion via API
-			$result = ComponentbuilderHelper::getFileContents(\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			$result = ComponentbuilderHelper::getFileContents(Uri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+
 			// is there a message returned
 			if (!is_numeric($result) && StringHelper::check($result))
 			{
@@ -150,6 +164,7 @@ class ComponentbuilderControllerCustom_codes extends AdminController
 				return true;
 			}
 		}
+
 		$this->setRedirect($redirect_url, $message, 'error');
 		return false;
 	}

admin/controllers/dynamic_gets.php

@@ -21,6 +21,7 @@ use Joomla\CMS\Session\Session;
 use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Uri\Uri;
 
 /**
  * Dynamic_gets Admin Controller
@@ -116,27 +117,40 @@ class ComponentbuilderControllerDynamic_gets extends AdminController
 
 
 	/**
-	 * Run the Expansion
+	 * Runs the expansion module.
 	 *
-	 * @return  void
+	 * This function performs several checks and operations:
+	 * 1. It verifies the authenticity of the request to prevent request forgery.
+	 * 2. It checks whether the current user has the necessary permissions to run the expansion module.
+	 * 3. If the user is authorized, it attempts to run the expansion via an API call.
+	 * 4. Depending on the result of the expansion operation, it sets the appropriate success or error message.
+	 * 5. It redirects the user to a specified URL with the result message and status.
+	 *
+	 * @return bool True on successful expansion, false on failure.
 	 */
 	public function runExpansion()
 	{
 		// Check for request forgeries
-		Session::checkToken() or \jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
 		// check if user has the right
 		$user = Factory::getUser();
+
 		// set page redirect
-		$redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=dynamic_gets', false);
+		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=dynamic_gets', false);
+
 		// set massage
 		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
+
 		// check if this user has the right to run expansion
 		if($user->authorise('dynamic_gets.run_expansion', 'com_componentbuilder'))
 		{
 			// set massage
 			$message = Text::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
+
 			// run expansion via API
-			$result = ComponentbuilderHelper::getFileContents(\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			$result = ComponentbuilderHelper::getFileContents(Uri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+
 			// is there a message returned
 			if (!is_numeric($result) && StringHelper::check($result))
 			{
@@ -150,6 +164,7 @@ class ComponentbuilderControllerDynamic_gets extends AdminController
 				return true;
 			}
 		}
+
 		$this->setRedirect($redirect_url, $message, 'error');
 		return false;
 	}

admin/controllers/fields.php

@@ -21,6 +21,7 @@ use Joomla\CMS\Session\Session;
 use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Uri\Uri;
 
 /**
  * Fields Admin Controller
@@ -116,27 +117,40 @@ class ComponentbuilderControllerFields extends AdminController
 
 
 	/**
-	 * Run the Expansion
+	 * Runs the expansion module.
 	 *
-	 * @return  void
+	 * This function performs several checks and operations:
+	 * 1. It verifies the authenticity of the request to prevent request forgery.
+	 * 2. It checks whether the current user has the necessary permissions to run the expansion module.
+	 * 3. If the user is authorized, it attempts to run the expansion via an API call.
+	 * 4. Depending on the result of the expansion operation, it sets the appropriate success or error message.
+	 * 5. It redirects the user to a specified URL with the result message and status.
+	 *
+	 * @return bool True on successful expansion, false on failure.
 	 */
 	public function runExpansion()
 	{
 		// Check for request forgeries
-		Session::checkToken() or \jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
 		// check if user has the right
 		$user = Factory::getUser();
+
 		// set page redirect
-		$redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=fields', false);
+		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=fields', false);
+
 		// set massage
 		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
+
 		// check if this user has the right to run expansion
 		if($user->authorise('fields.run_expansion', 'com_componentbuilder'))
 		{
 			// set massage
 			$message = Text::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
+
 			// run expansion via API
-			$result = ComponentbuilderHelper::getFileContents(\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			$result = ComponentbuilderHelper::getFileContents(Uri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+
 			// is there a message returned
 			if (!is_numeric($result) && StringHelper::check($result))
 			{
@@ -150,6 +164,7 @@ class ComponentbuilderControllerFields extends AdminController
 				return true;
 			}
 		}
+
 		$this->setRedirect($redirect_url, $message, 'error');
 		return false;
 	}

admin/controllers/joomla_components.php

@@ -22,6 +22,7 @@ use VDM\Joomla\Componentbuilder\Package\Factory as PackageFactory;
 use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Uri\Uri;
 
 /**
  * Joomla_components Admin Controller
@@ -117,27 +118,40 @@ class ComponentbuilderControllerJoomla_components extends AdminController
 
 
 	/**
-	 * Run the Expansion
+	 * Runs the expansion module.
 	 *
-	 * @return  void
+	 * This function performs several checks and operations:
+	 * 1. It verifies the authenticity of the request to prevent request forgery.
+	 * 2. It checks whether the current user has the necessary permissions to run the expansion module.
+	 * 3. If the user is authorized, it attempts to run the expansion via an API call.
+	 * 4. Depending on the result of the expansion operation, it sets the appropriate success or error message.
+	 * 5. It redirects the user to a specified URL with the result message and status.
+	 *
+	 * @return bool True on successful expansion, false on failure.
 	 */
 	public function runExpansion()
 	{
 		// Check for request forgeries
-		Session::checkToken() or \jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
 		// check if user has the right
 		$user = Factory::getUser();
+
 		// set page redirect
-		$redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=joomla_components', false);
+		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=joomla_components', false);
+
 		// set massage
 		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
+
 		// check if this user has the right to run expansion
 		if($user->authorise('joomla_components.run_expansion', 'com_componentbuilder'))
 		{
 			// set massage
 			$message = Text::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
+
 			// run expansion via API
-			$result = ComponentbuilderHelper::getFileContents(\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			$result = ComponentbuilderHelper::getFileContents(Uri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+
 			// is there a message returned
 			if (!is_numeric($result) && StringHelper::check($result))
 			{
@@ -151,6 +165,7 @@ class ComponentbuilderControllerJoomla_components extends AdminController
 				return true;
 			}
 		}
+
 		$this->setRedirect($redirect_url, $message, 'error');
 		return false;
 	}

admin/controllers/joomla_plugins.php

@@ -19,6 +19,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Uri\Uri;
 
 /**
  * Joomla_plugins Admin Controller
@@ -51,27 +52,40 @@ class ComponentbuilderControllerJoomla_plugins extends AdminController
 
 
 	/**
-	 * Run the Expansion
+	 * Runs the expansion module.
 	 *
-	 * @return  void
+	 * This function performs several checks and operations:
+	 * 1. It verifies the authenticity of the request to prevent request forgery.
+	 * 2. It checks whether the current user has the necessary permissions to run the expansion module.
+	 * 3. If the user is authorized, it attempts to run the expansion via an API call.
+	 * 4. Depending on the result of the expansion operation, it sets the appropriate success or error message.
+	 * 5. It redirects the user to a specified URL with the result message and status.
+	 *
+	 * @return bool True on successful expansion, false on failure.
 	 */
 	public function runExpansion()
 	{
 		// Check for request forgeries
-		Session::checkToken() or \jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
 		// check if user has the right
 		$user = Factory::getUser();
+
 		// set page redirect
-		$redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=joomla_plugins', false);
+		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=joomla_plugins', false);
+
 		// set massage
 		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
+
 		// check if this user has the right to run expansion
 		if($user->authorise('joomla_plugins.run_expansion', 'com_componentbuilder'))
 		{
 			// set massage
 			$message = Text::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
+
 			// run expansion via API
-			$result = ComponentbuilderHelper::getFileContents(\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			$result = ComponentbuilderHelper::getFileContents(Uri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+
 			// is there a message returned
 			if (!is_numeric($result) && StringHelper::check($result))
 			{
@@ -85,6 +99,7 @@ class ComponentbuilderControllerJoomla_plugins extends AdminController
 				return true;
 			}
 		}
+
 		$this->setRedirect($redirect_url, $message, 'error');
 		return false;
 	}
@@ -102,7 +117,7 @@ class ComponentbuilderControllerJoomla_plugins extends AdminController
 		// check if user has the right
 		$user = Factory::getUser();
 		// set page redirect
-		$redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=joomla_plugins', false);
+		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=joomla_plugins', false);
 		// set massage
 		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_GET_BOILERPLATE_MODULE');
 		// check if this user has the right to run expansion

admin/controllers/joomla_power.php

@@ -0,0 +1,480 @@
+<?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;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\FormController;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Uri\Uri;
+use VDM\Joomla\Componentbuilder\JoomlaPower\Factory as JoomlaPowerFactory;
+
+/**
+ * Joomla_power Form Controller
+ */
+class ComponentbuilderControllerJoomla_power extends FormController
+{
+	/**
+	 * Current or most recently performed task.
+	 *
+	 * @var    string
+	 * @since  12.2
+	 * @note   Replaces _task.
+	 */
+	protected $task;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
+	public function __construct($config = [])
+	{
+		$this->view_list = 'Joomla_powers'; // safeguard for setting the return view listing to the main view.
+		parent::__construct($config);
+	}
+
+	/**
+	 * Resets the specified Joomla power.
+	 *
+	 * This function performs several checks and operations:
+	 * 1. It verifies the authenticity of the request to prevent request forgery.
+	 * 2. It retrieves the item data posted by the user.
+	 * 3. It checks whether the current user has the necessary permissions to reset the Joomla power.
+	 * 4. It validates the presence of the necessary item identifiers (ID and GUID).
+	 * 5. If the user is authorized and the identifiers are valid, it attempts to reset the specified power.
+	 * 6. Depending on the result of the reset operation, it sets the appropriate success or error message.
+	 * 7. It redirects the user to a specified URL with the result message and status.
+	 *
+	 * @return bool True on successful reset, false on failure.
+	 */
+	public function resetPowers()
+	{
+		// Check for request forgeries
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
+		// get Item posted
+		$item = $this->input->post->get('jform', array(), 'array');
+
+		// check if user has the right
+		$user = Factory::getUser();
+
+		// set default error message
+		$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_PERMISSION_DENIED') . '</h1>';
+		$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RESET_THIS_JOOMLA_POWER') . '</p>';
+		$status = 'error';
+		$success = false;
+
+		// load the ID
+		$id = $item['id'] ?? null;
+		$guid = $item['guid'] ?? null;
+
+		// check if there is any selections
+		if ($id === null || $guid === null)
+		{
+			// set error message
+			$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_NOT_SAVED') . '</h1>';
+			$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_YOU_MUST_FIRST_SAVE_THE_JOOMLA_POWER_BEFORE_YOU_CAN_USE_THIS_FEATURE') . '</p>';
+		}
+		elseif($user->authorise('power.reset', 'com_componentbuilder'))
+		{
+			try {
+				if (JoomlaPowerFactory::_('Joomla.Power.Remote.Get')->reset([$guid]))
+				{
+					// set success message
+					$message = '<h1>'.Text::_('COM_COMPONENTBUILDER_SUCCESS').'</h1>';
+					$message .= '<p>'.Text::_('COM_COMPONENTBUILDER_THE_JOOMLA_POWER_HAS_SUCCESSFULLY_BEEN_RESET').'</p>';
+					$status = 'success';
+					$success = true;
+				}
+				else
+				{
+					$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_RESET_FAILED') . '</h1>';
+					$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_THE_RESET_OF_THIS_JOOMLA_POWER_HAS_FAILED') . '</p>';
+				}
+			} catch (\Exception $e) {
+				$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_RESET_FAILED') . '</h1>';
+				$message .= '<p>' . \htmlspecialchars($e->getMessage()) . '</p>';
+			}
+		}
+
+		// set redirect
+		$redirect_url = Route::_(
+			'index.php?option=com_componentbuilder&view=joomla_power'
+			. $this->getRedirectToItemAppend($id), $success
+		);
+
+		$this->setRedirect($redirect_url, $message, $status);
+
+		return $success;
+	}
+
+	 /**
+	 * Pushes the specified Joomla power.
+	 *
+	 * This function performs several checks and operations:
+	 * 1. It verifies the authenticity of the request to prevent request forgery.
+	 * 2. It retrieves the item data posted by the user.
+	 * 3. It checks whether the current user has the necessary permissions to push the Joomla power.
+	 * 4. It validates the presence of the necessary item identifiers (ID and GUID).
+	 * 5. If the user is authorized and the identifiers are valid, it attempts to push the specified power.
+	 * 6. Depending on the result of the push operation, it sets the appropriate success or error message.
+	 * 7. It redirects the user to a specified URL with the result message and status.
+	 *
+	 * @return bool True on successful push, false on failure.
+	 */
+	public function pushPowers()
+	{
+		// Check for request forgeries
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
+		// get Item posted
+		$item = $this->input->post->get('jform', array(), 'array');
+
+		// check if user has the right
+		$user = Factory::getUser();
+
+		// set default error message
+		$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_PERMISSION_DENIED') . '</h1>';
+		$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_PUSH_THIS_JOOMLA_POWER') . '</p>';
+		$status = 'error';
+		$success = false;
+
+		// load the ID
+		$id = $item['id'] ?? null;
+		$guid = $item['guid'] ?? null;
+
+		// check if there is any selections
+		if ($id === null || $guid === null)
+		{
+			// set error message
+			$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_NOT_SAVED') . '</h1>';
+			$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_YOU_MUST_FIRST_SAVE_THE_JOOMLA_POWER_BEFORE_YOU_CAN_USE_THIS_FEATURE') . '</p>';
+		}
+		elseif($user->authorise('power.push', 'com_componentbuilder'))
+		{
+			try {
+				if (JoomlaPowerFactory::_('Joomla.Power.Remote.Set')->items([$guid]))
+				{
+					// set success message
+					$message = '<h1>'.Text::_('COM_COMPONENTBUILDER_SUCCESS').'</h1>';
+					$message .= '<p>'.Text::_('COM_COMPONENTBUILDER_THE_JOOMLA_POWER_HAS_SUCCESSFULLY_BEEN_PUSHED').'</p>';
+					$status = 'success';
+					$success = true;
+				}
+				else
+				{
+					$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_PUSH_FAILED') . '</h1>';
+					$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_THE_PUSH_OF_THIS_JOOMLA_POWER_HAS_FAILED') . '</p>';
+				}
+			} catch (\Exception $e) {
+				$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_PUSH_FAILED') . '</h1>';
+				$message .= '<p>' . \htmlspecialchars($e->getMessage()) . '</p>';
+			}
+		}
+
+		// set redirect
+		$redirect_url = Route::_(
+			'index.php?option=com_componentbuilder&view=joomla_power'
+			. $this->getRedirectToItemAppend($id), $success
+		);
+
+		$this->setRedirect($redirect_url, $message, $status);
+
+		return $success;
+	}
+
+	/**
+	 * Method override to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowAdd($data = [])
+	{
+		// Get user object.
+		$user = Factory::getUser();
+		// Access check.
+		$access = $user->authorise('joomla_power.access', 'com_componentbuilder');
+		if (!$access)
+		{
+			return false;
+		}
+
+		// In the absence of better information, revert to the component permissions.
+		return $user->authorise('joomla_power.create', $this->option);
+	}
+
+	/**
+	 * Method override to check if you can edit an existing record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = [], $key = 'id')
+	{
+		// get user object.
+		$user = Factory::getUser();
+		// get record id.
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+
+
+		// Access check.
+		$access = ($user->authorise('joomla_power.access', 'com_componentbuilder.joomla_power.' . (int) $recordId) && $user->authorise('joomla_power.access', 'com_componentbuilder'));
+		if (!$access)
+		{
+			return false;
+		}
+
+		if ($recordId)
+		{
+			// The record has been set. Check the record permissions.
+			$permission = $user->authorise('joomla_power.edit', 'com_componentbuilder.joomla_power.' . (int) $recordId);
+			if (!$permission)
+			{
+				if ($user->authorise('joomla_power.edit.own', 'com_componentbuilder.joomla_power.' . $recordId))
+				{
+					// Now test the owner is the user.
+					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
+					if (empty($ownerId))
+					{
+						// Need to do a lookup from the model.
+						$record = $this->getModel()->getItem($recordId);
+
+						if (empty($record))
+						{
+							return false;
+						}
+						$ownerId = $record->created_by;
+					}
+
+					// If the owner matches 'me' then allow.
+					if ($ownerId == $user->id)
+					{
+						if ($user->authorise('joomla_power.edit.own', 'com_componentbuilder'))
+						{
+							return true;
+						}
+					}
+				}
+				return false;
+			}
+		}
+		// Since there is no permission, revert to the component permissions.
+		return $user->authorise('joomla_power.edit', $this->option);
+	}
+
+	/**
+	 * Gets the URL arguments to append to an item redirect.
+	 *
+	 * @param   integer  $recordId  The primary key id for the item.
+	 * @param   string   $urlVar    The name of the URL variable for the id.
+	 *
+	 * @return  string  The arguments to append to the redirect URL.
+	 *
+	 * @since   1.6
+	 */
+	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
+	{
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
+
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
+
+		// set the referral options
+		if ($refid && $ref)
+		{
+			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
+		}
+		elseif ($ref)
+		{
+			$append = '&ref='. (string) $ref . $append;
+		}
+
+		return $append;
+	}
+
+	/**
+	 * Method to run batch operations.
+	 *
+	 * @param   object  $model  The model.
+	 *
+	 * @return  boolean   True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   2.5
+	 */
+	public function batch($model = null)
+	{
+		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+
+		// Set the model
+		$model = $this->getModel('Joomla_power', '', []);
+
+		// Preset the redirect
+		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_powers' . $this->getRedirectToListAppend(), false));
+
+		return parent::batch($model);
+	}
+
+	/**
+	 * Method to cancel an edit.
+	 *
+	 * @param   string  $key  The name of the primary key of the URL variable.
+	 *
+	 * @return  boolean  True if access level checks pass, false otherwise.
+	 *
+	 * @since   12.2
+	 */
+	public function cancel($key = null)
+	{
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+
+		$cancel = parent::cancel($key);
+
+		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
+		{
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				Route::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				Route::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				Route::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		return $cancel;
+	}
+
+	/**
+	 * Method to save a record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @since   12.2
+	 */
+	public function save($key = null, $urlVar = null)
+	{
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
+		{
+			// to make sure the item is checkedin on redirect
+			$this->task = 'save';
+		}
+
+		$saved = parent::save($key, $urlVar);
+
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
+		{
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				Route::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				Route::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string) $this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				Route::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		return $saved;
+	}
+
+	/**
+	 * Function that allows child controller access to model data
+	 * after the data has been saved.
+	 *
+	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   array              $validData  The validated data.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
+	{
+		return;
+	}
+}

admin/controllers/joomla_powers.php

@@ -0,0 +1,266 @@
+<?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;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\AdminController;
+use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use VDM\Joomla\Componentbuilder\JoomlaPower\Factory as JoomlaPowerFactory;
+use VDM\Joomla\Utilities\GetHelper;
+
+/**
+ * Joomla_powers Admin Controller
+ */
+class ComponentbuilderControllerJoomla_powers extends AdminController
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $text_prefix = 'COM_COMPONENTBUILDER_JOOMLA_POWERS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Joomla_power', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Initializes all remote Joomla powers and syncs them with the local database.
+	 *
+	 * This function performs several checks and operations:
+	 * 1. It verifies the authenticity of the request to prevent request forgery.
+	 * 2. It checks whether the current user has the necessary permissions to initialize the Joomla powers.
+	 * 3. If the user is authorized, it attempts to initialize the remote Joomla powers.
+	 * 4. Depending on the result of the initialization operation, it sets the appropriate success or error message.
+	 * 5. It redirects the user to a specified URL with the result message and status.
+	 *
+	 * @return bool True on successful initialization, false on failure.
+	 */
+	public function initPowers()
+	{
+		// Check for request forgeries
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
+		// check if user has the right
+		$user = Factory::getUser();
+
+		// set default error message
+		$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_PERMISSION_DENIED') . '</h1>';
+		$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_INITIALIZE_JOOMLA_POWERS') . '</p>';
+		$status = 'error';
+		$success = false;
+
+		if($user->authorise('power.init', 'com_componentbuilder'))
+		{
+			try {
+				if (JoomlaPowerFactory::_('Joomla.Power.Remote.Get')->init())
+				{
+					// set success message
+					$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_SUCCESSFULLY_INITIALIZED_ALL_REMOTE_JOOMLA_POWERS') . '</h1>';
+					$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_THE_LOCAL_DATABASE_JOOMLA_POWERS_HAS_SUCCESSFULLY_BEEN_SYNCED_WITH_THE_REMOTE_REPOSITORIES') . '</p>';
+
+					$status = 'success';
+					$success = true;
+				}
+				else
+				{
+					$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_INITIALIZATION_FAILED') . '</h1>';
+					$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_THE_INITIALIZATION_OF_THIS_JOOMLA_POWERS_HAS_FAILED') . '</p>';
+				}
+			} catch (\Exception $e) {
+				$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_INITIALIZATION_FAILED') . '</h1>';
+				$message .= '<p>' . \htmlspecialchars($e->getMessage()) . '</p>';
+			}
+		}
+
+		// set redirect
+		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=joomla_powers', $success);
+		$this->setRedirect($redirect_url, $message, $status);
+
+		return $success;
+	}
+
+	/**
+	 * Resets the selected Joomla powers.
+	 *
+	 * This function performs several checks and operations:
+	 * 1. It verifies the authenticity of the request to prevent request forgery.
+	 * 2. It retrieves the IDs of the selected powers from the user input.
+	 * 3. It sanitizes the input by converting the IDs to integers.
+	 * 4. It checks whether any powers have been selected.
+	 * 5. It checks whether the current user has the necessary permissions to reset the selected Joomla powers.
+	 * 6. If the user is authorized and powers are selected, it attempts to reset the selected Joomla powers.
+	 * 7. Depending on the result of the reset operation, it sets the appropriate success or error message.
+	 * 8. It redirects the user to a specified URL with the result message and status.
+	 *
+	 * @return bool True on successful reset, false on failure.
+	 */
+	public function resetPowers()
+	{
+		// Check for request forgeries
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
+		// get IDS of the selected powers
+		$pks = $this->input->post->get('cid', [], 'array');
+
+		// Sanitize the input
+		ArrayHelper::toInteger($pks);
+
+		// check if there is any selections
+		if ($pks === [])
+		{
+			// set error message
+			$message = '<h1>'.Text::_('COM_COMPONENTBUILDER_NO_SELECTION_DETECTED').'</h1>';
+			$message .= '<p>'.Text::_('COM_COMPONENTBUILDER_PLEASE_FIRST_MAKE_A_SELECTION_FROM_THE_LIST').'</p>';
+			// set redirect
+			$redirect_url = Route::_('index.php?option=com_componentbuilder&view=joomla_powers', false);
+			$this->setRedirect($redirect_url, $message, 'error');
+			return false;
+		}
+
+		$status = 'error';
+		$success = false;
+
+		// check if user has the right
+		$user = Factory::getUser();
+		if($user->authorise('power.reset', 'com_componentbuilder'))
+		{
+			$guids = GetHelper::vars('joomla_power', $pks, 'id', 'guid');
+
+			try {
+				if (JoomlaPowerFactory::_('Joomla.Power.Remote.Get')->reset($guids))
+				{
+					// set success message
+					$message = '<h1>'.Text::_('COM_COMPONENTBUILDER_SUCCESS').'</h1>';
+					$message .= '<p>'.Text::_('COM_COMPONENTBUILDER_THESE_JOOMLA_POWERS_HAVE_SUCCESSFULLY_BEEN_RESET').'</p>';
+					$status = 'success';
+					$success = true;
+				}
+				else
+				{
+					$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_RESET_FAILED') . '</h1>';
+					$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_THE_RESET_OF_THESE_JOOMLA_POWERS_HAS_FAILED') . '</p>';
+				}
+			} catch (\Exception $e) {
+				$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_RESET_FAILED') . '</h1>';
+				$message .= '<p>' . \htmlspecialchars($e->getMessage()) . '</p>';
+			}
+
+			// set redirect
+			$redirect_url = Route::_('index.php?option=com_componentbuilder&view=joomla_powers', $success);
+			$this->setRedirect($redirect_url, $message, $status);
+
+			return $success;
+		}
+
+		// set redirect
+		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=joomla_powers', false);
+		$this->setRedirect($redirect_url);
+		return $success;
+	}
+
+	/**
+	 * Pushes the selected Joomla powers.
+	 *
+	 * This function performs several checks and operations:
+	 * 1. It verifies the authenticity of the request to prevent request forgery.
+	 * 2. It retrieves the IDs of the selected powers from the user input.
+	 * 3. It sanitizes the input by converting the IDs to integers.
+	 * 4. It checks whether any powers have been selected.
+	 * 5. It checks whether the current user has the necessary permissions to push the selected Joomla powers.
+	 * 6. If the user is authorized and powers are selected, it attempts to push the selected Joomla powers.
+	 * 7. Depending on the result of the push operation, it sets the appropriate success or error message.
+	 * 8. It redirects the user to a specified URL with the result message and status.
+	 *
+	 * @return bool True on successful push, false on failure.
+	 */
+	public function pushPowers()
+	{
+		// Check for request forgeries
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
+		// get IDS of the selected powers
+		$pks = $this->input->post->get('cid', [], 'array');
+
+		// Sanitize the input
+		ArrayHelper::toInteger($pks);
+
+		// check if there is any selections
+		if ($pks === [])
+		{
+			// set error message
+			$message = '<h1>'.Text::_('COM_COMPONENTBUILDER_NO_SELECTION_DETECTED').'</h1>';
+			$message .= '<p>'.Text::_('COM_COMPONENTBUILDER_PLEASE_FIRST_MAKE_A_SELECTION_FROM_THE_LIST').'</p>';
+			// set redirect
+			$redirect_url = Route::_('index.php?option=com_componentbuilder&view=joomla_powers', false);
+			$this->setRedirect($redirect_url, $message, 'error');
+			return false;
+		}
+
+		$status = 'error';
+		$success = false;
+
+		// check if user has the right
+		$user = Factory::getUser();
+		if($user->authorise('power.push', 'com_componentbuilder'))
+		{
+			$guids = GetHelper::vars('joomla_power', $pks, 'id', 'guid');
+
+			try {
+				if (JoomlaPowerFactory::_('Joomla.Power.Remote.Set')->items($guids))
+				{
+					// set success message
+					$message = '<h1>'.Text::_('COM_COMPONENTBUILDER_SUCCESS').'</h1>';
+					$message .= '<p>'.Text::_('COM_COMPONENTBUILDER_THESE_JOOMLA_POWERS_HAVE_SUCCESSFULLY_BEEN_PUSHED').'</p>';
+					$status = 'success';
+					$success = true;
+				}
+				else
+				{
+					$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_PUSH_FAILED') . '</h1>';
+					$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_THE_PUSH_OF_THESE_JOOMLA_POWERS_HAS_FAILED') . '</p>';
+				}
+			} catch (\Exception $e) {
+				$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_PUSH_FAILED') . '</h1>';
+				$message .= '<p>' . \htmlspecialchars($e->getMessage()) . '</p>';
+			}
+
+			// set redirect
+			$redirect_url = Route::_('index.php?option=com_componentbuilder&view=joomla_powers', $success);
+			$this->setRedirect($redirect_url, $message, $status);
+
+			return $success;
+		}
+
+		// set redirect
+		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=joomla_powers', false);
+		$this->setRedirect($redirect_url);
+		return $success;
+	}
+}

admin/controllers/power.php

@@ -49,6 +49,20 @@ class ComponentbuilderControllerPower extends FormController
 		parent::__construct($config);
 	}
 
+	/**
+	 * Resets the specified power.
+	 *
+	 * This function performs several checks and operations:
+	 * 1. It verifies the authenticity of the request to prevent request forgery.
+	 * 2. It retrieves the item data posted by the user.
+	 * 3. It checks whether the current user has the necessary permissions to reset the power.
+	 * 4. It validates the presence of the necessary item identifiers (ID and GUID).
+	 * 5. If the user is authorized and the identifiers are valid, it attempts to reset the specified power.
+	 * 6. Depending on the result of the reset operation, it sets the appropriate success or error message.
+	 * 7. It redirects the user to a specified URL with the result message and status.
+	 *
+	 * @return bool True on successful reset, false on failure.
+	 */
 	public function resetPowers()
 	{
 		// Check for request forgeries
@@ -79,7 +93,7 @@ class ComponentbuilderControllerPower extends FormController
 		}
 		elseif($user->authorise('power.reset', 'com_componentbuilder'))
 		{
-			if (PowerFactory::_('Superpower')->reset([$guid]))
+			if (PowerFactory::_('Power.Remote.Get')->reset([$guid]))
 			{
 				// set success message
 				$message = '<h1>'.Text::_('COM_COMPONENTBUILDER_SUCCESS').'</h1>';

admin/controllers/powers.php

@@ -20,6 +20,8 @@ use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Power\Factory as PowerFactory;
+use VDM\Joomla\Utilities\GetHelper;
+use Joomla\CMS\Uri\Uri;
 
 /**
  * Powers Admin Controller
@@ -52,27 +54,40 @@ class ComponentbuilderControllerPowers extends AdminController
 
 
 	/**
-	 * Run the Expansion
+	 * Runs the expansion module.
 	 *
-	 * @return  void
+	 * This function performs several checks and operations:
+	 * 1. It verifies the authenticity of the request to prevent request forgery.
+	 * 2. It checks whether the current user has the necessary permissions to run the expansion module.
+	 * 3. If the user is authorized, it attempts to run the expansion via an API call.
+	 * 4. Depending on the result of the expansion operation, it sets the appropriate success or error message.
+	 * 5. It redirects the user to a specified URL with the result message and status.
+	 *
+	 * @return bool True on successful expansion, false on failure.
 	 */
 	public function runExpansion()
 	{
 		// Check for request forgeries
-		Session::checkToken() or \jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
 		// check if user has the right
 		$user = Factory::getUser();
+
 		// set page redirect
-		$redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=powers', false);
+		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=powers', false);
+
 		// set massage
 		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
+
 		// check if this user has the right to run expansion
 		if($user->authorise('powers.run_expansion', 'com_componentbuilder'))
 		{
 			// set massage
 			$message = Text::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
+
 			// run expansion via API
-			$result = ComponentbuilderHelper::getFileContents(\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			$result = ComponentbuilderHelper::getFileContents(Uri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+
 			// is there a message returned
 			if (!is_numeric($result) && StringHelper::check($result))
 			{
@@ -86,10 +101,23 @@ class ComponentbuilderControllerPowers extends AdminController
 				return true;
 			}
 		}
+
 		$this->setRedirect($redirect_url, $message, 'error');
 		return false;
 	}
 
+	/**
+	 * Initializes all remote powers and syncs them with the local database.
+	 *
+	 * This function performs several checks and operations:
+	 * 1. It verifies the authenticity of the request to prevent request forgery.
+	 * 2. It checks whether the current user has the necessary permissions to initialize the powers.
+	 * 3. If the user is authorized, it attempts to initialize the remote powers.
+	 * 4. Depending on the result of the initialization operation, it sets the appropriate success or error message.
+	 * 5. It redirects the user to a specified URL with the result message and status.
+	 *
+	 * @return bool True on successful initialization, false on failure.
+	 */
 	public function initPowers()
 	{
 		// Check for request forgeries
@@ -106,7 +134,7 @@ class ComponentbuilderControllerPowers extends AdminController
 
 		if($user->authorise('power.init', 'com_componentbuilder'))
 		{
-			if (PowerFactory::_('Superpower')->init())
+			if (PowerFactory::_('Power.Remote.Get')->init())
 			{
 				// set success message
 				$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_SUCCESSFULLY_INITIALIZED_ALL_REMOTE_POWERS') . '</h1>';
@@ -129,6 +157,21 @@ class ComponentbuilderControllerPowers extends AdminController
 		return $success;
 	}
 
+	/**
+	 * Resets the selected powers.
+	 *
+	 * This function performs several checks and operations:
+	 * 1. It verifies the authenticity of the request to prevent request forgery.
+	 * 2. It retrieves the IDs of the selected powers from the user input.
+	 * 3. It sanitizes the input by converting the IDs to integers.
+	 * 4. It checks whether any powers have been selected.
+	 * 5. It checks whether the current user has the necessary permissions to reset the selected powers.
+	 * 6. If the user is authorized and powers are selected, it attempts to reset the selected powers.
+	 * 7. Depending on the result of the reset operation, it sets the appropriate success or error message.
+	 * 8. It redirects the user to a specified URL with the result message and status.
+	 *
+	 * @return bool True on successful reset, false on failure.
+	 */
 	public function resetPowers()
 	{
 		// Check for request forgeries
@@ -141,7 +184,7 @@ class ComponentbuilderControllerPowers extends AdminController
 		ArrayHelper::toInteger($pks);
 
 		// check if there is any selections
-		if ($pks == [])
+		if ($pks === [])
 		{
 			// set error message
 			$message = '<h1>'.Text::_('COM_COMPONENTBUILDER_NO_SELECTION_DETECTED').'</h1>';
@@ -152,21 +195,39 @@ class ComponentbuilderControllerPowers extends AdminController
 			return false;
 		}
 
+		$status = 'error';
+		$success = false;
+
 		// check if user has the right
 		$user = Factory::getUser();
 		if($user->authorise('power.reset', 'com_componentbuilder'))
 		{
-			// set success message
-			$message = '<h1>'.Text::_('COM_COMPONENTBUILDER_THIS_RESET_FEATURE_IS_STILL_UNDER_DEVELOPMENT').'</h1>';
-			$message .= '<p>'.Text::sprintf('COM_COMPONENTBUILDER_PLEASE_CHECK_AGAIN_SOON_ANDOR_FOLLOW_THE_PROGRESS_ON_SGITVDMDEVA', '<a href="https://git.vdm.dev/joomla/Component-Builder/issues/984" target="_blank">').'</p>';
+			$guids = GetHelper::vars('power', $pks, 'id', 'guid');
+
+			if (PowerFactory::_('Power.Remote.Get')->reset($guids))
+			{
+				// set success message
+				$message = '<h1>'.Text::_('COM_COMPONENTBUILDER_SUCCESS').'</h1>';
+				$message .= '<p>'.Text::_('COM_COMPONENTBUILDER_THESE_POWERS_HAVE_SUCCESSFULLY_BEEN_RESET').'</p>';
+				$status = 'success';
+				$success = true;
+			}
+			else
+			{
+				$message = '<h1>' . Text::_('COM_COMPONENTBUILDER_RESET_FAILED') . '</h1>';
+				$message .= '<p>' . Text::_('COM_COMPONENTBUILDER_THE_RESET_OF_THESE_POWERS_HAS_FAILED') . '</p>';
+			}
+
 			// set redirect
-			$redirect_url = Route::_('index.php?option=com_componentbuilder&view=powers', false);
-			$this->setRedirect($redirect_url, $message);
-			return true;
+			$redirect_url = Route::_('index.php?option=com_componentbuilder&view=powers', $success);
+			$this->setRedirect($redirect_url, $message, $status);
+
+			return $success;
 		}
+
 		// set redirect
 		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=powers', false);
 		$this->setRedirect($redirect_url);
-		return false;
+		return $success;
 	}
 }

admin/controllers/repositories.php

@@ -0,0 +1,50 @@
+<?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;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\AdminController;
+use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+
+/**
+ * Repositories Admin Controller
+ */
+class ComponentbuilderControllerRepositories extends AdminController
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $text_prefix = 'COM_COMPONENTBUILDER_REPOSITORIES';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Repository', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+}

admin/controllers/repository.php

@@ -0,0 +1,329 @@
+<?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;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\FormController;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Uri\Uri;
+
+/**
+ * Repository Form Controller
+ */
+class ComponentbuilderControllerRepository extends FormController
+{
+	/**
+	 * Current or most recently performed task.
+	 *
+	 * @var    string
+	 * @since  12.2
+	 * @note   Replaces _task.
+	 */
+	protected $task;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
+	public function __construct($config = [])
+	{
+		$this->view_list = 'Repositories'; // safeguard for setting the return view listing to the main view.
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method override to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowAdd($data = [])
+	{
+		// Get user object.
+		$user = Factory::getUser();
+		// Access check.
+		$access = $user->authorise('repository.access', 'com_componentbuilder');
+		if (!$access)
+		{
+			return false;
+		}
+
+		// In the absence of better information, revert to the component permissions.
+		return $user->authorise('repository.create', $this->option);
+	}
+
+	/**
+	 * Method override to check if you can edit an existing record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = [], $key = 'id')
+	{
+		// get user object.
+		$user = Factory::getUser();
+		// get record id.
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+
+
+		// Access check.
+		$access = ($user->authorise('repository.access', 'com_componentbuilder.repository.' . (int) $recordId) && $user->authorise('repository.access', 'com_componentbuilder'));
+		if (!$access)
+		{
+			return false;
+		}
+
+		if ($recordId)
+		{
+			// The record has been set. Check the record permissions.
+			$permission = $user->authorise('repository.edit', 'com_componentbuilder.repository.' . (int) $recordId);
+			if (!$permission)
+			{
+				if ($user->authorise('repository.edit.own', 'com_componentbuilder.repository.' . $recordId))
+				{
+					// Now test the owner is the user.
+					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
+					if (empty($ownerId))
+					{
+						// Need to do a lookup from the model.
+						$record = $this->getModel()->getItem($recordId);
+
+						if (empty($record))
+						{
+							return false;
+						}
+						$ownerId = $record->created_by;
+					}
+
+					// If the owner matches 'me' then allow.
+					if ($ownerId == $user->id)
+					{
+						if ($user->authorise('repository.edit.own', 'com_componentbuilder'))
+						{
+							return true;
+						}
+					}
+				}
+				return false;
+			}
+		}
+		// Since there is no permission, revert to the component permissions.
+		return $user->authorise('repository.edit', $this->option);
+	}
+
+	/**
+	 * Gets the URL arguments to append to an item redirect.
+	 *
+	 * @param   integer  $recordId  The primary key id for the item.
+	 * @param   string   $urlVar    The name of the URL variable for the id.
+	 *
+	 * @return  string  The arguments to append to the redirect URL.
+	 *
+	 * @since   1.6
+	 */
+	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
+	{
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
+
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
+
+		// set the referral options
+		if ($refid && $ref)
+		{
+			$append = '&ref=' . (string) $ref . '&refid='. (int) $refid . $append;
+		}
+		elseif ($ref)
+		{
+			$append = '&ref='. (string) $ref . $append;
+		}
+
+		return $append;
+	}
+
+	/**
+	 * Method to run batch operations.
+	 *
+	 * @param   object  $model  The model.
+	 *
+	 * @return  boolean   True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   2.5
+	 */
+	public function batch($model = null)
+	{
+		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+
+		// Set the model
+		$model = $this->getModel('Repository', '', []);
+
+		// Preset the redirect
+		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=repositories' . $this->getRedirectToListAppend(), false));
+
+		return parent::batch($model);
+	}
+
+	/**
+	 * Method to cancel an edit.
+	 *
+	 * @param   string  $key  The name of the primary key of the URL variable.
+	 *
+	 * @return  boolean  True if access level checks pass, false otherwise.
+	 *
+	 * @since   12.2
+	 */
+	public function cancel($key = null)
+	{
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+
+		$cancel = parent::cancel($key);
+
+		if (!is_null($return) && Uri::isInternal(base64_decode($return)))
+		{
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				Route::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				Route::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				Route::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		return $cancel;
+	}
+
+	/**
+	 * Method to save a record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @since   12.2
+	 */
+	public function save($key = null, $urlVar = null)
+	{
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && Uri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
+		{
+			// to make sure the item is checkedin on redirect
+			$this->task = 'save';
+		}
+
+		$saved = parent::save($key, $urlVar);
+
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
+		{
+			$redirect = base64_decode($return);
+
+			// Redirect to the return value.
+			$this->setRedirect(
+				Route::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string) $this->ref . '&layout=edit&id=' . (int) $this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				Route::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string) $this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				Route::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		return $saved;
+	}
+
+	/**
+	 * Function that allows child controller access to model data
+	 * after the data has been saved.
+	 *
+	 * @param   BaseDatabaseModel  &$model     The data model object.
+	 * @param   array              $validData  The validated data.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
+	{
+		return;
+	}
+}

admin/controllers/validation_rules.php

@@ -21,6 +21,7 @@ use Joomla\CMS\Session\Session;
 use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Uri\Uri;
 
 /**
  * Validation_rules Admin Controller
@@ -116,27 +117,40 @@ class ComponentbuilderControllerValidation_rules extends AdminController
 
 
 	/**
-	 * Run the Expansion
+	 * Runs the expansion module.
 	 *
-	 * @return  void
+	 * This function performs several checks and operations:
+	 * 1. It verifies the authenticity of the request to prevent request forgery.
+	 * 2. It checks whether the current user has the necessary permissions to run the expansion module.
+	 * 3. If the user is authorized, it attempts to run the expansion via an API call.
+	 * 4. Depending on the result of the expansion operation, it sets the appropriate success or error message.
+	 * 5. It redirects the user to a specified URL with the result message and status.
+	 *
+	 * @return bool True on successful expansion, false on failure.
 	 */
 	public function runExpansion()
 	{
 		// Check for request forgeries
-		Session::checkToken() or \jexit(Text::_('JINVALID_TOKEN'));
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
 		// check if user has the right
 		$user = Factory::getUser();
+
 		// set page redirect
-		$redirect_url = \JRoute::_('index.php?option=com_componentbuilder&view=validation_rules', false);
+		$redirect_url = Route::_('index.php?option=com_componentbuilder&view=validation_rules', false);
+
 		// set massage
 		$message = Text::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
+
 		// check if this user has the right to run expansion
 		if($user->authorise('validation_rules.run_expansion', 'com_componentbuilder'))
 		{
 			// set massage
 			$message = Text::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
+
 			// run expansion via API
-			$result = ComponentbuilderHelper::getFileContents(\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			$result = ComponentbuilderHelper::getFileContents(Uri::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+
 			// is there a message returned
 			if (!is_numeric($result) && StringHelper::check($result))
 			{
@@ -150,6 +164,7 @@ class ComponentbuilderControllerValidation_rules extends AdminController
 				return true;
 			}
 		}
+
 		$this->setRedirect($redirect_url, $message, 'error');
 		return false;
 	}

admin/helpers/componentbuilder.php

@@ -12,61 +12,13 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// add the autoloader for the composer classes
-$composer_autoloader = JPATH_LIBRARIES . '/phpseclib3/vendor/autoload.php';
-if (file_exists($composer_autoloader))
+// The power autoloader for this project (JPATH_ADMINISTRATOR) area.
+$power_autoloader = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/powerloader.php';
+if (file_exists($power_autoloader))
 {
-	require_once $composer_autoloader;
+	require_once $power_autoloader;
 }
 
-// register additional namespace
-\spl_autoload_register(function ($class) {
-	// project-specific base directories and namespace prefix
-	$search = [
-		'libraries/jcb_powers/VDM.Joomla.Openai' => 'VDM\\Joomla\\Openai',
-		'libraries/jcb_powers/VDM.Joomla.Gitea' => 'VDM\\Joomla\\Gitea',
-		'libraries/jcb_powers/VDM.Joomla.FOF' => 'VDM\\Joomla\\FOF',
-		'libraries/jcb_powers/VDM.Joomla' => 'VDM\\Joomla',
-		'libraries/jcb_powers/VDM.Minify' => 'VDM\\Minify',
-		'libraries/jcb_powers/VDM.Psr' => 'VDM\\Psr'
-	];
-	// Start the search and load if found
-	$found = false;
-	$found_base_dir = "";
-	$found_len = 0;
-	foreach ($search as $base_dir => $prefix)
-	{
-		// does the class use the namespace prefix?
-		$len = strlen($prefix);
-		if (strncmp($prefix, $class, $len) === 0)
-		{
-			// we have a match so load the values
-			$found = true;
-			$found_base_dir = $base_dir;
-			$found_len = $len;
-			// done here
-			break;
-		}
-	}
-	// check if we found a match
-	if (!$found)
-	{
-		// not found so move to the next registered autoloader
-		return;
-	}
-	// get the relative class name
-	$relative_class = substr($class, $found_len);
-	// replace the namespace prefix with the base directory, replace namespace
-	// separators with directory separators in the relative class name, append
-	// with .php
-	$file = JPATH_ROOT . '/' . $found_base_dir . '/src' . str_replace('\\', '/', $relative_class) . '.php';
-	// if the file exists, require it
-	if (file_exists($file))
-	{
-		require $file;
-	}
-});
-
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Access\Access;
@@ -109,6 +61,7 @@ use VDM\Joomla\Utilities\String\PluginHelper;
 use VDM\Joomla\Utilities\GuidHelper;
 use VDM\Joomla\Utilities\Component\Helper;
 use VDM\Joomla\Utilities\FormHelper;
+use Joomla\CMS\Router\Route;
 
 /**
  * Componentbuilder component helper.
@@ -2257,7 +2210,7 @@ abstract class ComponentbuilderHelper
 	 * @return  array   on success
 	 * 
 	 */
-	public static function getFieldTypeProperties($value, $type, $settings = array(), $xml = null, $dbDefaults = false)
+	public static function getFieldTypeProperties($value, $type, $settings = [], $xml = null, $dbDefaults = false)
 	{
 		// Get a db connection.
 		$db = Factory::getDbo();
@@ -2799,7 +2752,7 @@ abstract class ComponentbuilderHelper
 				// get the global settings
 				if (!ObjectHelper::check(self::$params))
 				{
-					self::$params = \JComponentHelper::getParams('com_componentbuilder');
+					self::$params = ComponentHelper::getParams('com_componentbuilder');
 				}
 				self::$gitHubAccessToken = self::$params->get('github_access_token', null);
 			}
@@ -3302,7 +3255,7 @@ abstract class ComponentbuilderHelper
 			$script['view'][] = PHP_EOL . "</script>";
 			$script['view'][] = "";
 			$script['view'][] = PHP_EOL . "<div id=\"installer-import\" class=\"clearfix\">";
-			$script['view'][] = "<form enctype=\"multipart/form-data\" action=\"<?php echo \JRoute::_('index.php?option=com_[[[-#-#-component]]]&view=import_[[[-#-#-views]]]');?>\" method=\"post\" name=\"adminForm\" id=\"adminForm\" class=\"form-horizontal form-validate\">";
+			$script['view'][] = "<form enctype=\"multipart/form-data\" action=\"<?php echo Route::_('index.php?option=com_[[[-#-#-component]]]&view=import_[[[-#-#-views]]]');?>\" method=\"post\" name=\"adminForm\" id=\"adminForm\" class=\"form-horizontal form-validate\">";
 			$script['view'][] = "";
 			$script['view'][] = PHP_EOL . self::_t(1) . "<?php if (!empty( \$this->sidebar)) : ?>";
 			$script['view'][] = self::_t(2) . "<div id=\"j-sidebar-container\" class=\"span2\">";
@@ -3705,7 +3658,7 @@ abstract class ComponentbuilderHelper
 		// get the global settings
 		if (!ObjectHelper::check(self::$params))
 		{
-			self::$params = \JComponentHelper::getParams('com_componentbuilder');
+			self::$params = ComponentHelper::getParams('com_componentbuilder');
 		}
 		$folderPath = self::$params->get($target, $default);
 		// create the folder if it does not exist
@@ -4934,7 +4887,7 @@ abstract class ComponentbuilderHelper
 			// get the global settings
 			if (!ObjectHelper::check(self::$params))
 			{
-				self::$params = \JComponentHelper::getParams('com_componentbuilder');
+				self::$params = ComponentHelper::getParams('com_componentbuilder');
 			}
 			// get UIKIT version
 			$uikit = self::$params->get('uikit_version', 2);
@@ -5046,7 +4999,7 @@ abstract class ComponentbuilderHelper
 			// get the global settings
 			if (!ObjectHelper::check(self::$params))
 			{
-				self::$params = \JComponentHelper::getParams('com_componentbuilder');
+				self::$params = ComponentHelper::getParams('com_componentbuilder');
 			}
 			// get UIKIT version
 			$uikit = self::$params->get('uikit_version', 2);
@@ -5152,7 +5105,7 @@ abstract class ComponentbuilderHelper
 			// set the edit link
 			if ($jRoute)
 			{
-				return \JRoute::_("index.php?option=" . $component . "&view=" . $views . "&task=" . $view . ".edit&id=" . $record->id . $ref);
+				return Route::_("index.php?option=" . $component . "&view=" . $views . "&task=" . $view . ".edit&id=" . $record->id . $ref);
 			}
 			return "index.php?option=" . $component . "&view=" . $views . "&task=" . $view . ".edit&id=" . $record->id . $ref;
 		}
@@ -6136,6 +6089,10 @@ abstract class ComponentbuilderHelper
 		{
 			\JHtmlSidebar::addEntry(Text::_('COM_COMPONENTBUILDER_SUBMENU_JOOMLA_PLUGINS'), 'index.php?option=com_componentbuilder&view=joomla_plugins', $submenu === 'joomla_plugins');
 		}
+		if ($user->authorise('joomla_power.access', 'com_componentbuilder') && $user->authorise('joomla_power.submenu', 'com_componentbuilder'))
+		{
+			\JHtmlSidebar::addEntry(Text::_('COM_COMPONENTBUILDER_SUBMENU_JOOMLA_POWERS'), 'index.php?option=com_componentbuilder&view=joomla_powers', $submenu === 'joomla_powers');
+		}
 		if ($user->authorise('power.access', 'com_componentbuilder') && $user->authorise('power.submenu', 'com_componentbuilder'))
 		{
 			\JHtmlSidebar::addEntry(Text::_('COM_COMPONENTBUILDER_SUBMENU_POWERS'), 'index.php?option=com_componentbuilder&view=powers', $submenu === 'powers');
@@ -6216,6 +6173,10 @@ abstract class ComponentbuilderHelper
 		{
 			\JHtmlSidebar::addEntry(Text::_('COM_COMPONENTBUILDER_SUBMENU_SERVERS'), 'index.php?option=com_componentbuilder&view=servers', $submenu === 'servers');
 		}
+		if ($user->authorise('repository.access', 'com_componentbuilder') && $user->authorise('repository.submenu', 'com_componentbuilder'))
+		{
+			\JHtmlSidebar::addEntry(Text::_('COM_COMPONENTBUILDER_SUBMENU_REPOSITORIES'), 'index.php?option=com_componentbuilder&view=repositories', $submenu === 'repositories');
+		}
 		if ($user->authorise('help_document.access', 'com_componentbuilder') && $user->authorise('help_document.submenu', 'com_componentbuilder'))
 		{
 			\JHtmlSidebar::addEntry(Text::_('COM_COMPONENTBUILDER_SUBMENU_HELP_DOCUMENTS'), 'index.php?option=com_componentbuilder&view=help_documents', $submenu === 'help_documents');

admin/helpers/powerloader.php

@@ -0,0 +1,67 @@
+<?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;
+
+// add the autoloader for the composer classes
+$composer_autoloader = JPATH_LIBRARIES . '/phpseclib3/vendor/autoload.php';
+if (file_exists($composer_autoloader))
+{
+	require_once $composer_autoloader;
+}
+
+// register additional namespace
+spl_autoload_register(function ($class) {
+	// project-specific base directories and namespace prefix
+	$search = [
+		'libraries/vendor_jcb/VDM.Joomla.Gitea' => 'VDM\\Joomla\\Gitea',
+		'libraries/vendor_jcb/VDM.Joomla.FOF' => 'VDM\\Joomla\\FOF',
+		'libraries/vendor_jcb/VDM.Joomla' => 'VDM\\Joomla',
+		'libraries/vendor_jcb/VDM.Minify' => 'VDM\\Minify',
+		'libraries/vendor_jcb/VDM.Psr' => 'VDM\\Psr'
+	];
+	// Start the search and load if found
+	$found = false;
+	$found_base_dir = "";
+	$found_len = 0;
+	foreach ($search as $base_dir => $prefix)
+	{
+		// does the class use the namespace prefix?
+		$len = strlen($prefix);
+		if (strncmp($prefix, $class, $len) === 0)
+		{
+			// we have a match so load the values
+			$found = true;
+			$found_base_dir = $base_dir;
+			$found_len = $len;
+			// done here
+			break;
+		}
+	}
+	// check if we found a match
+	if (!$found)
+	{
+		// not found so move to the next registered autoloader
+		return;
+	}
+	// get the relative class name
+	$relative_class = substr($class, $found_len);
+	// replace the namespace prefix with the base directory, replace namespace
+	// separators with directory separators in the relative class name, append
+	// with .php
+	$file = JPATH_ROOT . '/' . $found_base_dir . '/src' . str_replace('\\', '/', $relative_class) . '.php';
+	// if the file exists, require it
+	if (file_exists($file))
+	{
+		require $file;
+	}
+});

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

@@ -826,6 +826,34 @@ COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PROPERTIES_BUTTON_ACCESS="Joomla Plugin Prope
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PROPERTIES_BUTTON_ACCESS_DESC="Allows the users in this group to access the properties button."
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_RUN_EXPANSION_BUTTON_ACCESS="Joomla Plugin Run Expansion Button Access"
 COM_COMPONENTBUILDER_JOOMLA_PLUGIN_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_JOOMLA_POWERS_ACCESS="Joomla Powers Access"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_ACCESS_DESC="Allows the users in this group to access access joomla powers"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_BATCH_USE="Joomla Powers Batch Use"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch joomla powers"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_CREATE="Joomla Powers Create"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_CREATE_DESC="Allows the users in this group to create create joomla powers"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_DELETE="Joomla Powers Delete"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_DELETE_DESC="Allows the users in this group to delete delete joomla powers"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT="Joomla Powers Edit"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_CREATED_BY="Joomla Powers Edit Created By"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by joomla powers"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_CREATED_DATE="Joomla Powers Edit Created Date"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created joomla powers"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_DESC="Allows the users in this group to edit the joomla power"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_OWN="Joomla Powers Edit Own"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_OWN_DESC="Allows the users in this group to edit edit own joomla powers created by them"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_STATE="Joomla Powers Edit State"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_STATE_DESC="Allows the users in this group to update the state of the joomla power"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_VERSION="Joomla Powers Edit Version"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version joomla powers"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_SUBMENU="Joomla Powers Submenu"
+COM_COMPONENTBUILDER_JOOMLA_POWERS_SUBMENU_DESC="Allows the users in this group to submenu of joomla power"
+COM_COMPONENTBUILDER_JOOMLA_POWER_INIT_BUTTON_ACCESS="Joomla Power Init Button Access"
+COM_COMPONENTBUILDER_JOOMLA_POWER_INIT_BUTTON_ACCESS_DESC="Allows the users in this group to access the init button."
+COM_COMPONENTBUILDER_JOOMLA_POWER_PUSH_BUTTON_ACCESS="Joomla Power Push Button Access"
+COM_COMPONENTBUILDER_JOOMLA_POWER_PUSH_BUTTON_ACCESS_DESC="Allows the users in this group to access the push button."
+COM_COMPONENTBUILDER_JOOMLA_POWER_RESET_BUTTON_ACCESS="Joomla Power Reset Button Access"
+COM_COMPONENTBUILDER_JOOMLA_POWER_RESET_BUTTON_ACCESS_DESC="Allows the users in this group to access the reset button."
 COM_COMPONENTBUILDER_LANGUAGES_ACCESS="Languages Access"
 COM_COMPONENTBUILDER_LANGUAGES_ACCESS_DESC="Allows the users in this group to access access languages"
 COM_COMPONENTBUILDER_LANGUAGES_BATCH_USE="Languages Batch Use"
@@ -974,6 +1002,7 @@ COM_COMPONENTBUILDER_MENU_HELP_DOCUMENTS="Help Documents"
 COM_COMPONENTBUILDER_MENU_JOOMLA_COMPONENTS="Joomla Components"
 COM_COMPONENTBUILDER_MENU_JOOMLA_MODULES="Joomla Modules"
 COM_COMPONENTBUILDER_MENU_JOOMLA_PLUGINS="Joomla Plugins"
+COM_COMPONENTBUILDER_MENU_JOOMLA_POWERS="Joomla Powers"
 COM_COMPONENTBUILDER_MENU_LANGUAGE_TRANSLATIONS="Language Translations"
 COM_COMPONENTBUILDER_MENU_LAYOUTS="Layouts"
 COM_COMPONENTBUILDER_MENU_LIBRARIES="Libraries"
@@ -1038,6 +1067,30 @@ COM_COMPONENTBUILDER_POWER_RESET_BUTTON_ACCESS="Power Reset Button Access"
 COM_COMPONENTBUILDER_POWER_RESET_BUTTON_ACCESS_DESC="Allows the users in this group to access the reset button."
 COM_COMPONENTBUILDER_POWER_RUN_EXPANSION_BUTTON_ACCESS="Power Run Expansion Button Access"
 COM_COMPONENTBUILDER_POWER_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_REPOSITORIES_ACCESS="Repositories Access"
+COM_COMPONENTBUILDER_REPOSITORIES_ACCESS_DESC="Allows the users in this group to access access repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_BATCH_USE="Repositories Batch Use"
+COM_COMPONENTBUILDER_REPOSITORIES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_CREATE="Repositories Create"
+COM_COMPONENTBUILDER_REPOSITORIES_CREATE_DESC="Allows the users in this group to create create repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_DASHBOARD_LIST="Repositories Dashboard List"
+COM_COMPONENTBUILDER_REPOSITORIES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of repository"
+COM_COMPONENTBUILDER_REPOSITORIES_DELETE="Repositories Delete"
+COM_COMPONENTBUILDER_REPOSITORIES_DELETE_DESC="Allows the users in this group to delete delete repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT="Repositories Edit"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_BY="Repositories Edit Created By"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_DATE="Repositories Edit Created Date"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_DESC="Allows the users in this group to edit the repository"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_OWN="Repositories Edit Own"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_OWN_DESC="Allows the users in this group to edit edit own repositories created by them"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_STATE="Repositories Edit State"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_STATE_DESC="Allows the users in this group to update the state of the repository"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_VERSION="Repositories Edit Version"
+COM_COMPONENTBUILDER_REPOSITORIES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version repositories"
+COM_COMPONENTBUILDER_REPOSITORIES_SUBMENU="Repositories Submenu"
+COM_COMPONENTBUILDER_REPOSITORIES_SUBMENU_DESC="Allows the users in this group to submenu of repository"
 COM_COMPONENTBUILDER_SEARCH_ACCESS="Search Access"
 COM_COMPONENTBUILDER_SEARCH_ACCESS_DESC="Allows the users in this group to access search."
 COM_COMPONENTBUILDER_SEARCH_COMPILER_BUTTON_ACCESS="Search Compiler Button Access"

admin/layouts/field/database_right.php

@@ -31,7 +31,6 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'store',
 	'medium_encryption_note',
 	'basic_encryption_note',
-	'note_whmcs_encryption',
 	'note_expert_field_save_mode',
 	'initiator_on_save_model',
 	'initiator_on_get_model',

admin/layouts/fieldtype/fields_fullwidth.php

@@ -19,7 +19,7 @@ use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 
 // set the defaults
-$items = $displayData->vycfields;
+$items = $displayData->vxsfields;
 $user = Factory::getUser();
 $id = $displayData->item->id;
 // set the edit URL

admin/layouts/joomla_component/dash_install_fullwidth.php

@@ -35,7 +35,9 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'add_php_postflight_update',
 	'php_postflight_update',
 	'add_php_method_uninstall',
-	'php_method_uninstall'
+	'php_method_uninstall',
+	'add_php_method_install',
+	'php_method_install'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: [];

admin/layouts/joomla_component/details_right.php

@@ -30,12 +30,6 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'author',
 	'email',
 	'website',
-	'add_license',
-	'license_type',
-	'note_whmcs_lisencing_note',
-	'whmcs_key',
-	'whmcs_url',
-	'whmcs_buy_link',
 	'license',
 	'bom',
 	'image',

admin/layouts/joomla_component/dynamic_integration_left.php

@@ -40,7 +40,9 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'backup_folder_path',
 	'add_git_folder_path',
 	'note_git_folder_path',
-	'git_folder_path'
+	'git_folder_path',
+	'add_jcb_powers_path',
+	'jcb_powers_path'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: [];

admin/layouts/joomla_power/joomla_power_above.php

@@ -0,0 +1,44 @@
+<?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');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'system_name'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<div class="form-inline form-inline-header">
+	<?php foreach($fields as $field): ?>
+		<?php if (in_array($field, $hiddenFields)) : ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
+</div>
+<?php endif; ?>

admin/layouts/joomla_power/joomla_power_fullwidth.php

@@ -0,0 +1,45 @@
+<?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');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'settings',
+	'description'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<div class="form-vertical">
+	<?php foreach($fields as $field): ?>
+		<?php if (in_array($field, $hiddenFields)) : ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
+</div>
+<?php endif; ?>

admin/layouts/joomla_power/publishing.php

@@ -0,0 +1,47 @@
+<?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');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'guid',
+	'title',
+	'created',
+	'created_by',
+	'modified',
+	'modified_by'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<?php foreach($fields as $field): ?>
+	<?php if (in_array($field, $hiddenFields)) : ?>
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+	<?php endif; ?>
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+<?php endforeach; ?>
+<?php endif; ?>

admin/layouts/joomla_power/publlshing.php

@@ -0,0 +1,47 @@
+<?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');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'published',
+	'ordering',
+	'access',
+	'version',
+	'hits',
+	'id'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<?php foreach($fields as $field): ?>
+	<?php if (in_array($field, $hiddenFields)) : ?>
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+	<?php endif; ?>
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+<?php endforeach; ?>
+<?php endif; ?>

admin/layouts/power/code_left.php

@@ -30,6 +30,8 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'description',
 	'extends',
 	'extends_custom',
+	'extendsinterfaces',
+	'extendsinterfaces_custom',
 	'implements',
 	'implements_custom',
 	'namespace',

admin/layouts/repository/details_above.php

@@ -0,0 +1,46 @@
+<?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');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'system_name',
+	'target',
+	'access_repo'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<div class="form-inline form-inline-header">
+	<?php foreach($fields as $field): ?>
+		<?php if (in_array($field, $hiddenFields)) : ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
+</div>
+<?php endif; ?>

admin/layouts/repository/details_left.php

@@ -0,0 +1,45 @@
+<?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');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'type',
+	'base',
+	'username',
+	'token'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<?php foreach($fields as $field): ?>
+	<?php if (in_array($field, $hiddenFields)) : ?>
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+	<?php endif; ?>
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+<?php endforeach; ?>
+<?php endif; ?>

admin/layouts/repository/details_right.php

@@ -0,0 +1,45 @@
+<?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');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'organisation',
+	'repository',
+	'read_branch',
+	'write_branch'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<?php foreach($fields as $field): ?>
+	<?php if (in_array($field, $hiddenFields)) : ?>
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+	<?php endif; ?>
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+<?php endforeach; ?>
+<?php endif; ?>

admin/layouts/repository/publishing.php

@@ -0,0 +1,47 @@
+<?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');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'guid',
+	'title',
+	'created',
+	'created_by',
+	'modified',
+	'modified_by'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<?php foreach($fields as $field): ?>
+	<?php if (in_array($field, $hiddenFields)) : ?>
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+	<?php endif; ?>
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+<?php endforeach; ?>
+<?php endif; ?>

admin/layouts/repository/publlshing.php

@@ -0,0 +1,47 @@
+<?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');
+
+// get the form
+$form = $displayData->getForm();
+
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
+	'published',
+	'ordering',
+	'access',
+	'version',
+	'hits',
+	'id'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];
+
+?>
+<?php if ($fields && count((array) $fields)) :?>
+<?php foreach($fields as $field): ?>
+	<?php if (in_array($field, $hiddenFields)) : ?>
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+	<?php endif; ?>
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+<?php endforeach; ?>
+<?php endif; ?>

admin/layouts/server/linked_components_fullwidth.php

@@ -1,270 +0,0 @@
-<?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;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\HTML\HTMLHelper as Html;
-use VDM\Joomla\Utilities\StringHelper;
-use VDM\Joomla\Utilities\ArrayHelper;
-use VDM\Joomla\Utilities\GetHelper;
-
-// set the defaults
-$items = $displayData->vymlinked_components;
-$user = Factory::getUser();
-$id = $displayData->item->id;
-// set the edit URL
-$edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";
-// set a return value
-$return = ($id) ? "index.php?option=com_componentbuilder&view=server&layout=edit&id=" . $id : "";
-// check for a return value
-$jinput = Factory::getApplication()->input;
-if ($_return = $jinput->get('return', null, 'base64'))
-{
-	$return .= "&return=" . $_return;
-}
-// check if return value was set
-if (StringHelper::check($return))
-{
-	// set the referral values
-	$ref = ($id) ? "&ref=server&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "&return=" . urlencode(base64_encode($return));
-}
-else
-{
-	$ref = ($id) ? "&ref=server&refid=" . $id : "";
-}
-
-?>
-<div class="form-vertical">
-<?php if (ArrayHelper::check($items)): ?>
-<table class="footable table data joomla_components" data-show-toggle="true" data-toggle-column="first" data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true">
-<thead>
-	<tr>
-		<th data-type="html" data-sort-use="text">
-			<?php echo Text::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SYSTEM_NAME_LABEL'); ?>
-		</th>
-		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
-			<?php echo Text::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_CODE_NAME'); ?>
-		</th>
-		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
-			<?php echo Text::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_DESCRIPTION'); ?>
-		</th>
-		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
-			<?php echo Text::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_COMPANY_DETAILS'); ?>
-		</th>
-		<th width="10" data-breakpoints="xs sm md">
-			<?php echo Text::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_STATUS'); ?>
-		</th>
-		<th width="5" data-type="number" data-breakpoints="xs sm md">
-			<?php echo Text::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ID'); ?>
-		</th>
-	</tr>
-</thead>
-<tbody>
-<?php foreach ($items as $i => $item): ?>
-	<?php
-		$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0;
-		$userChkOut = Factory::getUser($item->checked_out);
-		$canDo = ComponentbuilderHelper::getActions('joomla_component',$item,'joomla_components');
-	?>
-	<tr>
-		<td>
-			<div>
-			<?php if ($canDo->get('joomla_component.edit')): ?>
-				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?><?php echo $ref; ?>"><?php echo $displayData->escape($item->system_name); ?></a>
-				<?php if ($item->checked_out): ?>
-					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'joomla_components.', $canCheckin); ?>
-				<?php endif; ?>
-			<?php else: ?>
-				<?php echo $displayData->escape($item->system_name); ?>
-			<?php endif; ?>
-				- <?php echo $this->escape($item->component_version); ?>
-			</div>
-			<?php
-				// always make sure the $this->return_here is set
-				if (!isset($this->return_here))
-				{
-					$this->return_here = urlencode(base64_encode((string) Uri::getInstance()));
-				}
-				// setup the buttons
-				if (!isset($_buttons) || !ArrayHelper::check($_buttons))
-				{
-					$_buttons = array();
-					$_buttons[0] = array(
-						array(
-							'view' => 'component_admin_views',
-							'views' => 'components_admin_views',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_ADMIN_VIEWS'),
-							'icon' => 'stack'),
-						array(
-							'view' => 'component_custom_admin_views',
-							'views' => 'components_custom_admin_views',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_CUSTOM_ADMIN_VIEWS'),
-							'icon' => 'screen'),
-						array(
-							'view' => 'component_site_views',
-							'views' => 'components_site_views',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_SITE_VIEWS'),
-							'icon' => 'palette'),
-						array(
-							'view' => 'component_router',
-							'views' => 'components_routers',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_SITE_ROUTER'),
-							'icon' => 'tree-2'),
-						array(
-							'view' => 'component_config',
-							'views' => 'components_config',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_CONFIG'),
-							'icon' => 'options')
-						);
-					$_buttons[1] = array(
-						array(
-							'view' => 'component_placeholders',
-							'views' => 'components_placeholders',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_PLACEHOLDERS'),
-							'icon' => 'search'),
-						array(
-							'view' => 'component_updates',
-							'views' => 'components_updates',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_UPDATES'),
-							'icon' => 'database'),
-						array(
-							'view' => 'component_mysql_tweaks',
-							'views' => 'components_mysql_tweaks',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_MYSQL_TWEAKS'),
-							'icon' => 'screwdriver'),
-						array(
-							'view' => 'component_files_folders',
-							'views' => 'components_files_folders',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_FILES_FOLDERS'),
-							'icon' => 'briefcase')
-						);
-					$_buttons[2] = array(
-						array(
-							'view' => 'component_custom_admin_menus',
-							'views' => 'components_custom_admin_menus',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_CUSTOM_ADMIN_MENUS'),
-							'icon' => 'plus'),
-						array(
-							'view' => 'component_dashboard',
-							'views' => 'components_dashboard',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_DASHBOARD'),
-							'icon' => 'dashboard'),
-						array(
-							'view' => 'component_modules',
-							'views' => 'components_modules',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_MODULES'),
-							'icon' => 'cube'),
-						array(
-							'view' => 'component_plugins',
-							'views' => 'components_plugins',
-							'title' => Text::_('COM_COMPONENTBUILDER_THE_COMPONENT_PLUGINS'),
-							'icon' => 'power-cord')
-						);
-				}
-			?>
-			<div class="btn-group" style="margin: 5px 0 0 0;">
-			<?php foreach ($_buttons[0] as $_button): ?>
-				<?php if ($canDo->get($_button['view'].'.edit') && ($id = GetHelper::var($_button['view'], $item->id, 'joomla_component', 'id')) !== false): ?>
-					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&id=<?php echo $id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
-				<?php elseif ($canDo->get($_button['view'].'.create')): ?>
-					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&ref=joomla_component&refid=<?php echo $item->id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
-				<?php endif; ?>
-			<?php endforeach; ?>
-
-			</div>
-		</td>
-		<td>
-			<div>
-			<?php echo $displayData->escape($item->name_code); ?>
-			</div>
-			<div class="btn-group" style="margin: 5px 0 0 0;">
-			<?php foreach ($_buttons[1] as $_button): ?>
-				<?php if ($canDo->get($_button['view'].'.edit') && ($id = GetHelper::var($_button['view'], $item->id, 'joomla_component', 'id')) !== false): ?>
-					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&id=<?php echo $id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
-				<?php elseif ($canDo->get($_button['view'].'.create')): ?>
-					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&ref=joomla_component&refid=<?php echo $item->id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
-				<?php endif; ?>
-			<?php endforeach; ?>
-			</div>
-		</td>
-		<td>
-			<div>
-			<?php echo $displayData->escape($item->short_description); ?>
-			</div>
-			<div class="btn-group" style="margin: 5px 0 0 0;">
-			<?php foreach ($_buttons[2] as $_button): ?>
-				<?php if ($canDo->get($_button['view'].'.edit') && ($id = GetHelper::var($_button['view'], $item->id, 'joomla_component', 'id')) !== false): ?>
-					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&id=<?php echo $id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
-				<?php elseif ($canDo->get($_button['view'].'.create')): ?>
-					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&ref=joomla_component&refid=<?php echo $item->id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
-				<?php endif; ?>
-			<?php endforeach; ?>
-			</div>
-		</td>
-		<td>
-			<div><b><?php echo $this->escape($item->companyname); ?></b><br />
-			<?php if (StringHelper::check($item->author)) : ?>
-				<em><?php echo $this->escape($item->author); ?><em><br />
-			<?php endif; ?>
-			<?php if (StringHelper::check($item->email) && StringHelper::check($item->author)) : ?>
-				<a href="mailto:<?php echo $this->escape($item->email); ?>" title="<?php echo Text::sprintf('COM_COMPONENTBUILDER_EMAIL_S', $item->author); ?>" target="_blank">
-					<?php echo $this->escape($item->email); ?>
-				</a>
-				<br />
-			<?php endif; ?>
-			<?php if (StringHelper::check($item->website) && StringHelper::check($item->author)) : ?>
-				<a href="<?php echo $this->escape($item->website); ?>" title="<?php echo Text::sprintf('COM_COMPONENTBUILDER_WEBSITE_OF_S', $item->companyname); ?>" target="_blank">
-					<?php echo $this->escape($item->website); ?>
-				</a>
-			<?php endif; ?>
-			</div>
-		</td>
-		<?php if ($item->published == 1): ?>
-			<td class="center"  data-sort-value="1">
-				<span class="status-metro status-published" title="<?php echo Text::_('COM_COMPONENTBUILDER_PUBLISHED');  ?>">
-					<?php echo Text::_('COM_COMPONENTBUILDER_PUBLISHED'); ?>
-				</span>
-			</td>
-		<?php elseif ($item->published == 0): ?>
-			<td class="center"  data-sort-value="2">
-				<span class="status-metro status-inactive" title="<?php echo Text::_('COM_COMPONENTBUILDER_INACTIVE');  ?>">
-					<?php echo Text::_('COM_COMPONENTBUILDER_INACTIVE'); ?>
-				</span>
-			</td>
-		<?php elseif ($item->published == 2): ?>
-			<td class="center"  data-sort-value="3">
-				<span class="status-metro status-archived" title="<?php echo Text::_('COM_COMPONENTBUILDER_ARCHIVED');  ?>">
-					<?php echo Text::_('COM_COMPONENTBUILDER_ARCHIVED'); ?>
-				</span>
-			</td>
-		<?php elseif ($item->published == -2): ?>
-			<td class="center"  data-sort-value="4">
-				<span class="status-metro status-trashed" title="<?php echo Text::_('COM_COMPONENTBUILDER_TRASHED');  ?>">
-					<?php echo Text::_('COM_COMPONENTBUILDER_TRASHED'); ?>
-				</span>
-			</td>
-		<?php endif; ?>
-		<td class="nowrap center hidden-phone">
-			<?php echo $item->id; ?>
-		</td>
-	</tr>
-<?php endforeach; ?>
-</tbody>
-</table>
-<?php else: ?>
-	<div class="alert alert-no-items">
-		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-	</div>
-<?php endif; ?>
-</div>

admin/models/admin_fields_relations.php

@@ -86,10 +86,18 @@ class ComponentbuilderModelAdmin_fields_relations extends AdminModel
 
 
 	/**
-	 * get VDM internal session key
+	 * Retrieves or generates a Vast Development Method (VDM) key for the current item.
 	 *
-	 * @return  string  the session key
+	 * This function performs the following operations:
+	 * 1. Checks if the VDM key is already set. If not, it proceeds to generate or retrieve one.
+	 * 2. Determines the item ID based on the presence of a specific argument.
+	 * 3. Attempts to retrieve an existing VDM key from a helper method using the item ID.
+	 * 4. If a VDM key is not found, it generates a new random VDM key.
+	 * 5. Stores the VDM key and associates it with the item ID in a helper method.
+	 * 6. Optionally, stores return and GUID values if available.
+	 * 7. Returns the VDM key.
 	 *
+	 * @return string The VDM key for the current item.
 	 */
 	public function getVDM()
 	{

admin/models/admin_view.php

@@ -235,10 +235,18 @@ class ComponentbuilderModelAdmin_view extends AdminModel
 
 
 	/**
-	 * get VDM internal session key
+	 * Retrieves or generates a Vast Development Method (VDM) key for the current item.
 	 *
-	 * @return  string  the session key
+	 * This function performs the following operations:
+	 * 1. Checks if the VDM key is already set. If not, it proceeds to generate or retrieve one.
+	 * 2. Determines the item ID based on the presence of a specific argument.
+	 * 3. Attempts to retrieve an existing VDM key from a helper method using the item ID.
+	 * 4. If a VDM key is not found, it generates a new random VDM key.
+	 * 5. Stores the VDM key and associates it with the item ID in a helper method.
+	 * 6. Optionally, stores return and GUID values if available.
+	 * 7. Returns the VDM key.
 	 *
+	 * @return string The VDM key for the current item.
 	 */
 	public function getVDM()
 	{
@@ -1496,6 +1504,12 @@ class ComponentbuilderModelAdmin_view extends AdminModel
 		{
 			$data['system_name'] = $data['name_single'];
 		}
+
+		// validate that the list and single view name are not the same
+		if ($data['name_single'] === $data['name_list'])
+		{
+			$data['name_list'] .= '_s';
+		}
 
 		// Set the GUID if empty or not valid
 		if (empty($data['guid']) && $data['id'] > 0)

admin/models/ajax.php

@@ -30,6 +30,7 @@ use VDM\Joomla\Utilities\GetHelper;
 use VDM\Joomla\Utilities\GuidHelper;
 use VDM\Joomla\Utilities\Base64Helper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\FieldHelper;
+use Joomla\CMS\Uri\Uri;
 
 /**
  * Componentbuilder Ajax List Model
@@ -168,7 +169,7 @@ class ComponentbuilderModelAjax extends ListModel
 	protected function componentDetailsDisplay($object)
 	{
 		// set some vars
-		$image = (StringHelper::check($object->image)) ? '<img alt="Joomla Component Image" src="'. \JUri::root() . $object->image . '" style="float: right;">': '';
+		$image = (StringHelper::check($object->image)) ? '<img alt="Joomla Component Image" src="'. Uri::root() . $object->image . '" style="float: right;">': '';
 		$desc = (StringHelper::check($object->description)) ? $object->description : $object->short_description;
 		$placeholder = ($object->add_placeholders == 1) ? '<span class="btn btn-small btn-success"> ' . Text::_('COM_COMPONENTBUILDER_YES') . ' </span>' : '<span class="btn btn-small btn-danger"> ' .Text::_('COM_COMPONENTBUILDER_NO') . ' </span>' ;
 		$debug = ($object->debug_linenr == 1) ? '<span class="btn btn-small btn-success"> ' .Text::_('COM_COMPONENTBUILDER_YES') . '</span>'  : ' <span class="btn btn-small btn-danger"> ' .Text::_('COM_COMPONENTBUILDER_NO') . ' </span>' ;
@@ -206,11 +207,11 @@ class ComponentbuilderModelAjax extends ListModel
 			$result['error'] = '<span style="color: red;">' . Text::sprintf('COM_COMPONENTBUILDER_NO_CRONJOB_PATH_FOUND_FOR_S', $type) . '</span>';
 			if ($this->hasCurl())
 			{
-				$path = '*/5 * * * * curl -s "' .\JUri::root() . 'index.php?option=com_componentbuilder&task=api.backup" >/dev/null 2>&1';
+				$path = '*/5 * * * * curl -s "' .Uri::root() . 'index.php?option=com_componentbuilder&task=api.backup" >/dev/null 2>&1';
 			}
 			else
 			{
-				$path = '*/5 * * * * wget "' .\JUri::root() . 'index.php?option=com_componentbuilder&task=api.backup" >/dev/null 2>&1';
+				$path = '*/5 * * * * wget "' .Uri::root() . 'index.php?option=com_componentbuilder&task=api.backup" >/dev/null 2>&1';
 			}
 			$result['path'] =  '<code>' . $path . '</code>';
 		}
@@ -219,11 +220,11 @@ class ComponentbuilderModelAjax extends ListModel
 			$result['error'] = '<span style="color: red;">' . Text::sprintf('COM_COMPONENTBUILDER_NO_CRONJOB_PATH_FOUND_FOR_S', $type) . '</span>';
 			if ($this->hasCurl())
 			{
-				$path = '* * * * * curl -s "' .\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand" >/dev/null 2>&1';
+				$path = '* * * * * curl -s "' .Uri::root() . 'index.php?option=com_componentbuilder&task=api.expand" >/dev/null 2>&1';
 			}
 			else
 			{
-				$path = '* * * * * wget "' .\JUri::root() . 'index.php?option=com_componentbuilder&task=api.expand" >/dev/null 2>&1';
+				$path = '* * * * * wget "' .Uri::root() . 'index.php?option=com_componentbuilder&task=api.expand" >/dev/null 2>&1';
 			}
 			$result['path'] =  '<code>' . $path . '</code>';
 		}
@@ -314,34 +315,47 @@ class ComponentbuilderModelAjax extends ListModel
 		// do we have tags returned
 		if (isset($tags[0]) && isset($tags[0]->name))
 		{
-			// get the version
+			// get the local version
 			$manifest = ComponentbuilderHelper::manifest();
 			$local_version = (string) $manifest->version;
-			$current_version = trim($tags[0]->name, 'vV');
+			$latest_version = '1.0.0';
+			$download_link = "https://git.vdm.dev/api/v1/joomla/Component-Builder";
+
+			// Filter tags by major version matching the local version's major number
+			$major_version = explode('.', $local_version)[0];
+			$filtered_tags = array_filter($tags, function($tag) use ($major_version) {
+				return strpos($tag->name, "v$major_version") === 0;
+			});
+
+			if (!empty($filtered_tags))
+			{
+				// Sort versions to find the latest one
+				usort($filtered_tags, function($a, $b) {
+					return \version_compare($b->name, $a->name);
+				});
+
+				$latest_version = trim($filtered_tags[0]->name, 'vV');
+
+				// download link of the latest version
+				$download_link = $filtered_tags[0]->zipball_url;
+			}
 
 			// now check if this version is out dated
-			if ($current_version === $local_version)
+			if (\version_compare($local_version, $latest_version) === 0)
 			{
 				return ['notice' => '<small><span style="color:green;"><span class="icon-shield"></span>&nbsp;' . Text::_('COM_COMPONENTBUILDER_UP_TO_DATE') . '</span></small>'];
 			}
 			else
 			{
 				// check if this is beta version
-				$current_array = array_map(function ($v) { return (int) $v; }, (array) explode('.', $current_version));
-				$local_array = array_map(function ($v) { return (int) $v; }, (array) explode('.', $local_version));
-				if (($local_array[0] > $current_array[0]) || 
-					($local_array[0] == $current_array[0] && $local_array[1] > $current_array[1]) || 
-					($local_array[0] == $current_array[0] && $local_array[1] == $current_array[1] && $local_array[2] > $current_array[2]))
+				if (\version_compare($local_version, $latest_version) > 0)
 				{
 					return ['notice' => '<small><span style="color:#F7B033;"><span class="icon-wrench"></span>&nbsp;' . Text::_('COM_COMPONENTBUILDER_PRE_RELEASE') . '</span></small>'];
 				}
 				else
 				{
-					// download link of the latest version
-					$download = "https://git.vdm.dev/api/v1/repos/joomla/Component-Builder/archive/" . $tags[0]->name . ".zip";
-
 					return ['notice' => '<small><span style="color:red;"><span class="icon-warning-circle"></span>&nbsp;' . Text::_('COM_COMPONENTBUILDER_OUT_OF_DATE') . '!</span> <a style="color:green;"  href="' .
-						$download . '" title="' . Text::_('COM_COMPONENTBUILDER_YOU_CAN_DIRECTLY_DOWNLOAD_THE_LATEST_UPDATE_OR_USE_THE_JOOMLA_UPDATE_AREA') . '">' . Text::_('COM_COMPONENTBUILDER_DOWNLOAD_UPDATE') . '!</a></small>'];
+						$download_link . '" title="' . Text::_('COM_COMPONENTBUILDER_YOU_CAN_DIRECTLY_DOWNLOAD_THE_LATEST_UPDATE_OR_USE_THE_JOOMLA_UPDATE_AREA') . '">' . Text::_('COM_COMPONENTBUILDER_DOWNLOAD_UPDATE') . '!</a></small>'];
 				}
 			}
 		}
@@ -1245,7 +1259,7 @@ class ComponentbuilderModelAjax extends ListModel
 				array('table' => 'custom_admin_view', 'tables' => 'custom_admin_views', 'fields' => array('params' => 'custom_admin_view_headers:power_:power', 'system_name' => 'NAME'), 'linked' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW'),
 				array('table' => 'joomla_component', 'tables' => 'joomla_components', 'fields' => array('params' => 'joomla_component_headers:power_:power', 'system_name' => 'NAME'), 'linked' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT'),
 				array('table' => 'component_dashboard', 'tables' => 'components_dashboard', 'fields' => array('params' => 'component_dashboard_headers:power_:power', 'joomla_component' => 'NAME'), 'linked' => 'COM_COMPONENTBUILDER_COMPONENT_DASHBOARD', 'linked_name' => 'system_name'),
-				array('table' => 'power', 'tables' => 'powers', 'fields' => array('extends' => 'GUID', 'implements' => 'ARRAY', 'use_selection' => 'use', 'load_selection' => 'load', 'system_name' => 'NAME'), 'linked' => 'COM_COMPONENTBUILDER_POWER')
+				array('table' => 'power', 'tables' => 'powers', 'fields' => array('extends' => 'GUID', 'extendsinterfaces' => 'ARRAY', 'implements' => 'ARRAY', 'use_selection' => 'use', 'load_selection' => 'load', 'system_name' => 'NAME'), 'linked' => 'COM_COMPONENTBUILDER_POWER')
 			)
 		);
 
@@ -2801,7 +2815,7 @@ class ComponentbuilderModelAjax extends ListModel
 		// #__componentbuilder_joomla_component (a)
 		'joomla_component' => array(
 			'search' => array('id', 'system_name', 'php_preflight_install', 'php_postflight_install',
-				'php_preflight_update', 'php_postflight_update', 'php_method_uninstall',
+				'php_preflight_update', 'php_postflight_update', 'php_method_uninstall', 'php_method_install',
 				'php_helper_admin', 'php_admin_event', 'php_helper_both', 'php_helper_site',
 				'php_site_event', 'javascript', 'readme', 'sql', 'sql_uninstall'),
 			'views' => 'joomla_components',

admin/models/class_extends.php

@@ -90,10 +90,18 @@ class ComponentbuilderModelClass_extends extends AdminModel
 
 
 	/**
-	 * get VDM internal session key
+	 * Retrieves or generates a Vast Development Method (VDM) key for the current item.
 	 *
-	 * @return  string  the session key
+	 * This function performs the following operations:
+	 * 1. Checks if the VDM key is already set. If not, it proceeds to generate or retrieve one.
+	 * 2. Determines the item ID based on the presence of a specific argument.
+	 * 3. Attempts to retrieve an existing VDM key from a helper method using the item ID.
+	 * 4. If a VDM key is not found, it generates a new random VDM key.
+	 * 5. Stores the VDM key and associates it with the item ID in a helper method.
+	 * 6. Optionally, stores return and GUID values if available.
+	 * 7. Returns the VDM key.
 	 *
+	 * @return string The VDM key for the current item.
 	 */
 	public function getVDM()
 	{

admin/models/class_method.php

@@ -94,10 +94,18 @@ class ComponentbuilderModelClass_method extends AdminModel
 
 
 	/**
-	 * get VDM internal session key
+	 * Retrieves or generates a Vast Development Method (VDM) key for the current item.
 	 *
-	 * @return  string  the session key
+	 * This function performs the following operations:
+	 * 1. Checks if the VDM key is already set. If not, it proceeds to generate or retrieve one.
+	 * 2. Determines the item ID based on the presence of a specific argument.
+	 * 3. Attempts to retrieve an existing VDM key from a helper method using the item ID.
+	 * 4. If a VDM key is not found, it generates a new random VDM key.
+	 * 5. Stores the VDM key and associates it with the item ID in a helper method.
+	 * 6. Optionally, stores return and GUID values if available.
+	 * 7. Returns the VDM key.
 	 *
+	 * @return string The VDM key for the current item.
 	 */
 	public function getVDM()
 	{

admin/models/class_property.php

@@ -91,10 +91,18 @@ class ComponentbuilderModelClass_property extends AdminModel
 
 
 	/**
-	 * get VDM internal session key
+	 * Retrieves or generates a Vast Development Method (VDM) key for the current item.
 	 *
-	 * @return  string  the session key
+	 * This function performs the following operations:
+	 * 1. Checks if the VDM key is already set. If not, it proceeds to generate or retrieve one.
+	 * 2. Determines the item ID based on the presence of a specific argument.
+	 * 3. Attempts to retrieve an existing VDM key from a helper method using the item ID.
+	 * 4. If a VDM key is not found, it generates a new random VDM key.
+	 * 5. Stores the VDM key and associates it with the item ID in a helper method.
+	 * 6. Optionally, stores return and GUID values if available.
+	 * 7. Returns the VDM key.
 	 *
+	 * @return string The VDM key for the current item.
 	 */
 	public function getVDM()
 	{

admin/models/component_dashboard.php

@@ -94,10 +94,18 @@ class ComponentbuilderModelComponent_dashboard extends AdminModel
 
 
 	/**
-	 * get VDM internal session key
+	 * Retrieves or generates a Vast Development Method (VDM) key for the current item.
 	 *
-	 * @return  string  the session key
+	 * This function performs the following operations:
+	 * 1. Checks if the VDM key is already set. If not, it proceeds to generate or retrieve one.
+	 * 2. Determines the item ID based on the presence of a specific argument.
+	 * 3. Attempts to retrieve an existing VDM key from a helper method using the item ID.
+	 * 4. If a VDM key is not found, it generates a new random VDM key.
+	 * 5. Stores the VDM key and associates it with the item ID in a helper method.
+	 * 6. Optionally, stores return and GUID values if available.
+	 * 7. Returns the VDM key.
 	 *
+	 * @return string The VDM key for the current item.
 	 */
 	public function getVDM()
 	{

admin/models/component_router.php

@@ -95,10 +95,18 @@ class ComponentbuilderModelComponent_router extends AdminModel
 
 
 	/**
-	 * get VDM internal session key
+	 * Retrieves or generates a Vast Development Method (VDM) key for the current item.
 	 *
-	 * @return  string  the session key
+	 * This function performs the following operations:
+	 * 1. Checks if the VDM key is already set. If not, it proceeds to generate or retrieve one.
+	 * 2. Determines the item ID based on the presence of a specific argument.
+	 * 3. Attempts to retrieve an existing VDM key from a helper method using the item ID.
+	 * 4. If a VDM key is not found, it generates a new random VDM key.
+	 * 5. Stores the VDM key and associates it with the item ID in a helper method.
+	 * 6. Optionally, stores return and GUID values if available.
+	 * 7. Returns the VDM key.
 	 *
+	 * @return string The VDM key for the current item.
 	 */
 	public function getVDM()
 	{

admin/models/componentbuilder.php

@@ -37,7 +37,7 @@ class ComponentbuilderModelComponentbuilder extends ListModel
 		$icons  = [];
 		// view groups array
 		$viewGroups = array(
-			'main' => array('png.compiler', 'png.joomla_components', 'png.joomla_modules', 'png.joomla_plugins', 'png.powers', 'png.search', 'png||importjcbpackages||index.php?option=com_componentbuilder&view=joomla_components&task=joomla_components.smartImport', 'png.admin_views', 'png.custom_admin_views', 'png.site_views', 'png.template.add', 'png.templates', 'png.layouts', 'png.dynamic_get.add', 'png.dynamic_gets', 'png.custom_codes', 'png.placeholders', 'png.libraries', 'png.snippets', 'png.get_snippets', 'png.validation_rules', 'png.field.add', 'png.fields', 'png.fields.catid_qpo0O0oqp_com_componentbuilder_po0O0oq_field', 'png.fieldtypes', 'png.fieldtypes.catid_qpo0O0oqp_com_componentbuilder_po0O0oq_fieldtype', 'png.language_translations', 'png.servers', 'png.help_documents')
+			'main' => array('png.compiler', 'png.joomla_components', 'png.joomla_modules', 'png.joomla_plugins', 'png.powers', 'png.search', 'png||importjcbpackages||index.php?option=com_componentbuilder&view=joomla_components&task=joomla_components.smartImport', 'png.admin_views', 'png.custom_admin_views', 'png.site_views', 'png.template.add', 'png.templates', 'png.layouts', 'png.dynamic_get.add', 'png.dynamic_gets', 'png.custom_codes', 'png.placeholders', 'png.libraries', 'png.snippets', 'png.get_snippets', 'png.validation_rules', 'png.field.add', 'png.fields', 'png.fields.catid_qpo0O0oqp_com_componentbuilder_po0O0oq_field', 'png.fieldtypes', 'png.fieldtypes.catid_qpo0O0oqp_com_componentbuilder_po0O0oq_fieldtype', 'png.language_translations', 'png.servers', 'png.repositories', 'png.help_documents')
 		);
 		// view access array
 		$viewAccess = [
@@ -63,6 +63,10 @@ class ComponentbuilderModelComponentbuilder extends ListModel
 			'joomla_plugin.access' => 'joomla_plugin.access',
 			'joomla_plugins.submenu' => 'joomla_plugin.submenu',
 			'joomla_plugins.dashboard_list' => 'joomla_plugin.dashboard_list',
+			'joomla_power.create' => 'joomla_power.create',
+			'joomla_powers.access' => 'joomla_power.access',
+			'joomla_power.access' => 'joomla_power.access',
+			'joomla_powers.submenu' => 'joomla_power.submenu',
 			'power.create' => 'power.create',
 			'powers.access' => 'power.access',
 			'power.access' => 'power.access',
@@ -151,6 +155,11 @@ class ComponentbuilderModelComponentbuilder extends ListModel
 			'server.access' => 'server.access',
 			'servers.submenu' => 'server.submenu',
 			'servers.dashboard_list' => 'server.dashboard_list',
+			'repository.create' => 'repository.create',
+			'repositories.access' => 'repository.access',
+			'repository.access' => 'repository.access',
+			'repositories.submenu' => 'repository.submenu',
+			'repositories.dashboard_list' => 'repository.dashboard_list',
 			'help_document.create' => 'help_document.create',
 			'help_documents.access' => 'help_document.access',
 			'help_document.access' => 'help_document.access',

admin/models/custom_admin_view.php

@@ -152,10 +152,18 @@ class ComponentbuilderModelCustom_admin_view extends AdminModel
 
 
 	/**
-	 * get VDM internal session key
+	 * Retrieves or generates a Vast Development Method (VDM) key for the current item.
 	 *
-	 * @return  string  the session key
+	 * This function performs the following operations:
+	 * 1. Checks if the VDM key is already set. If not, it proceeds to generate or retrieve one.
+	 * 2. Determines the item ID based on the presence of a specific argument.
+	 * 3. Attempts to retrieve an existing VDM key from a helper method using the item ID.
+	 * 4. If a VDM key is not found, it generates a new random VDM key.
+	 * 5. Stores the VDM key and associates it with the item ID in a helper method.
+	 * 6. Optionally, stores return and GUID values if available.
+	 * 7. Returns the VDM key.
 	 *
+	 * @return string The VDM key for the current item.
 	 */
 	public function getVDM()
 	{

admin/models/custom_code.php

@@ -106,10 +106,18 @@ class ComponentbuilderModelCustom_code extends AdminModel
 
 
 	/**
-	 * get VDM internal session key
+	 * Retrieves or generates a Vast Development Method (VDM) key for the current item.
 	 *
-	 * @return  string  the session key
+	 * This function performs the following operations:
+	 * 1. Checks if the VDM key is already set. If not, it proceeds to generate or retrieve one.
+	 * 2. Determines the item ID based on the presence of a specific argument.
+	 * 3. Attempts to retrieve an existing VDM key from a helper method using the item ID.
+	 * 4. If a VDM key is not found, it generates a new random VDM key.
+	 * 5. Stores the VDM key and associates it with the item ID in a helper method.
+	 * 6. Optionally, stores return and GUID values if available.
+	 * 7. Returns the VDM key.
 	 *
+	 * @return string The VDM key for the current item.
 	 */
 	public function getVDM()
 	{

admin/models/dynamic_get.php

@@ -146,10 +146,18 @@ class ComponentbuilderModelDynamic_get extends AdminModel
 
 
 	/**
-	 * get VDM internal session key
+	 * Retrieves or generates a Vast Development Method (VDM) key for the current item.
 	 *
-	 * @return  string  the session key
+	 * This function performs the following operations:
+	 * 1. Checks if the VDM key is already set. If not, it proceeds to generate or retrieve one.
+	 * 2. Determines the item ID based on the presence of a specific argument.
+	 * 3. Attempts to retrieve an existing VDM key from a helper method using the item ID.
+	 * 4. If a VDM key is not found, it generates a new random VDM key.
+	 * 5. Stores the VDM key and associates it with the item ID in a helper method.
+	 * 6. Optionally, stores return and GUID values if available.
+	 * 7. Returns the VDM key.
 	 *
+	 * @return string The VDM key for the current item.
 	 */
 	public function getVDM()
 	{

admin/models/field.php

@@ -71,7 +71,6 @@ class ComponentbuilderModelField extends AdminModel
 				'store',
 				'medium_encryption_note',
 				'basic_encryption_note',
-				'note_whmcs_encryption',
 				'note_expert_field_save_mode',
 				'initiator_on_save_model',
 				'initiator_on_get_model',
@@ -140,10 +139,18 @@ class ComponentbuilderModelField extends AdminModel
 
 
 	/**
-	 * get VDM internal session key
+	 * Retrieves or generates a Vast Development Method (VDM) key for the current item.
 	 *
-	 * @return  string  the session key
+	 * This function performs the following operations:
+	 * 1. Checks if the VDM key is already set. If not, it proceeds to generate or retrieve one.
+	 * 2. Determines the item ID based on the presence of a specific argument.
+	 * 3. Attempts to retrieve an existing VDM key from a helper method using the item ID.
+	 * 4. If a VDM key is not found, it generates a new random VDM key.
+	 * 5. Stores the VDM key and associates it with the item ID in a helper method.
+	 * 6. Optionally, stores return and GUID values if available.
+	 * 7. Returns the VDM key.
 	 *
+	 * @return string The VDM key for the current item.
 	 */
 	public function getVDM()
 	{
@@ -215,6 +222,12 @@ class ComponentbuilderModelField extends AdminModel
 				$item->metadata = $registry->toArray();
 			}
 
+			if (!empty($item->on_get_model_field))
+			{
+				// base64 Decode on_get_model_field.
+				$item->on_get_model_field = base64_decode($item->on_get_model_field);
+			}
+
 			if (!empty($item->on_save_model_field))
 			{
 				// base64 Decode on_save_model_field.
@@ -227,10 +240,10 @@ class ComponentbuilderModelField extends AdminModel
 				$item->initiator_on_get_model = base64_decode($item->initiator_on_get_model);
 			}
 
-			if (!empty($item->initiator_on_save_model))
+			if (!empty($item->javascript_view_footer))
 			{
-				// base64 Decode initiator_on_save_model.
-				$item->initiator_on_save_model = base64_decode($item->initiator_on_save_model);
+				// base64 Decode javascript_view_footer.
+				$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
 			}
 
 			if (!empty($item->css_views))
@@ -245,24 +258,18 @@ class ComponentbuilderModelField extends AdminModel
 				$item->css_view = base64_decode($item->css_view);
 			}
 
-			if (!empty($item->on_get_model_field))
-			{
-				// base64 Decode on_get_model_field.
-				$item->on_get_model_field = base64_decode($item->on_get_model_field);
-			}
-
-			if (!empty($item->javascript_view_footer))
-			{
-				// base64 Decode javascript_view_footer.
-				$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
-			}
-
 			if (!empty($item->javascript_views_footer))
 			{
 				// base64 Decode javascript_views_footer.
 				$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
 			}
 
+			if (!empty($item->initiator_on_save_model))
+			{
+				// base64 Decode initiator_on_save_model.
+				$item->initiator_on_save_model = base64_decode($item->initiator_on_save_model);
+			}
+
 			if (!empty($item->xml))
 			{
 				// JSON Decode xml.
@@ -1172,6 +1179,12 @@ class ComponentbuilderModelField extends AdminModel
 			$data['xml'] = (string) json_encode($data['xml']);
 		}
 
+		// Set the on_get_model_field string to base64 string.
+		if (isset($data['on_get_model_field']))
+		{
+			$data['on_get_model_field'] = base64_encode($data['on_get_model_field']);
+		}
+
 		// Set the on_save_model_field string to base64 string.
 		if (isset($data['on_save_model_field']))
 		{
@@ -1184,10 +1197,10 @@ class ComponentbuilderModelField extends AdminModel
 			$data['initiator_on_get_model'] = base64_encode($data['initiator_on_get_model']);
 		}
 
-		// Set the initiator_on_save_model string to base64 string.
-		if (isset($data['initiator_on_save_model']))
+		// Set the javascript_view_footer string to base64 string.
+		if (isset($data['javascript_view_footer']))
 		{
-			$data['initiator_on_save_model'] = base64_encode($data['initiator_on_save_model']);
+			$data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
 		}
 
 		// Set the css_views string to base64 string.
@@ -1202,24 +1215,18 @@ class ComponentbuilderModelField extends AdminModel
 			$data['css_view'] = base64_encode($data['css_view']);
 		}
 
-		// Set the on_get_model_field string to base64 string.
-		if (isset($data['on_get_model_field']))
-		{
-			$data['on_get_model_field'] = base64_encode($data['on_get_model_field']);
-		}
-
-		// Set the javascript_view_footer string to base64 string.
-		if (isset($data['javascript_view_footer']))
-		{
-			$data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
-		}
-
 		// Set the javascript_views_footer string to base64 string.
 		if (isset($data['javascript_views_footer']))
 		{
 			$data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']);
 		}
 
+		// Set the initiator_on_save_model string to base64 string.
+		if (isset($data['initiator_on_save_model']))
+		{
+			$data['initiator_on_save_model'] = base64_encode($data['initiator_on_save_model']);
+		}
+
 		// Set the Params Items to data
 		if (isset($data['params']) && is_array($data['params']))
 		{

admin/models/fields.php

@@ -346,7 +346,6 @@ class ComponentbuilderModelFields extends ListModel
 				2 => 'COM_COMPONENTBUILDER_FIELD_BASE64',
 				3 => 'COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALDBKEY',
 				5 => 'COM_COMPONENTBUILDER_FIELD_MEDIUM_ENCRYPTION_LOCALFILEKEY',
-				4 => 'COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION',
 				6 => 'COM_COMPONENTBUILDER_FIELD_EXPERT_MODE_CUSTOM'
 			);
 			// Now check if value is found in this array
@@ -721,22 +720,22 @@ class ComponentbuilderModelFields extends ListModel
 							continue;
 						}
 
+						// decode on_get_model_field
+						$item->on_get_model_field = base64_decode($item->on_get_model_field);
 						// decode on_save_model_field
 						$item->on_save_model_field = base64_decode($item->on_save_model_field);
 						// decode initiator_on_get_model
 						$item->initiator_on_get_model = base64_decode($item->initiator_on_get_model);
-						// decode initiator_on_save_model
-						$item->initiator_on_save_model = base64_decode($item->initiator_on_save_model);
+						// decode javascript_view_footer
+						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
 						// decode css_views
 						$item->css_views = base64_decode($item->css_views);
 						// decode css_view
 						$item->css_view = base64_decode($item->css_view);
-						// decode on_get_model_field
-						$item->on_get_model_field = base64_decode($item->on_get_model_field);
-						// decode javascript_view_footer
-						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
 						// decode javascript_views_footer
 						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
+						// decode initiator_on_save_model
+						$item->initiator_on_save_model = base64_decode($item->initiator_on_save_model);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);

admin/models/fields/customfolderlist.php

@@ -15,6 +15,8 @@ defined('_JEXEC') or die('Restricted access');
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Filesystem\Folder;
 
 // import the list field type
 jimport('joomla.form.helper');
@@ -40,24 +42,21 @@ class JFormFieldCustomfolderlist extends JFormFieldList
 	protected function getOptions()
 	{
 		// get custom folder folder
-		$localfolder = JComponentHelper::getParams('com_componentbuilder')->get('custom_folder_path', JPATH_COMPONENT_ADMINISTRATOR.'/custom');
+		$localfolder = ComponentHelper::getParams('com_componentbuilder')->get('custom_folder_path', JPATH_COMPONENT_ADMINISTRATOR.'/custom');
 		// set the default
-		$options[] = JHtml::_('select.option', '', JText::sprintf('COM_COMPONENTBUILDER_PLEASE_ADD_FOLDERS_TO_S',$localfolder));
-		// import all needed classes
-		jimport('joomla.filesystem.file');
-		jimport('joomla.filesystem.folder');
+		$options[] = Html::_('select.option', '', Text::sprintf('COM_COMPONENTBUILDER_PLEASE_ADD_FOLDERS_TO_S',$localfolder));
 		// setup the folder if it does not exist
-		if (!JFolder::exists($localfolder))
+		if (!Folder::exists($localfolder))
 		{
-			JFolder::create($localfolder);
+			Folder::create($localfolder);
 		}
 		// now check if there are files in the folder
-		if ($folders = JFolder::folders($localfolder))
+		if ($folders = Folder::folders($localfolder))
 		{
-			$options = array();
+			$options = [];
 			foreach ($folders as $folder)
 			{
-				$options[] = JHtml::_('select.option', $folder, $folder);
+				$options[] = Html::_('select.option', $folder, $folder);
 			}
 		}
 		return $options;

admin/models/fields/dynamicget.php

@@ -143,25 +143,29 @@ class JFormFieldDynamicget extends JFormFieldList
 	 */
 	protected function getOptions()
 	{
-		$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.name','a.gettype'),array('id','dynamic_get_name','type')));
-		$query->from($db->quoteName('#__componentbuilder_dynamic_get', 'a'));
-		$query->where($db->quoteName('a.published') . ' = 1');
-$query->order('a.name ASC');
-		$db->setQuery((string)$query);
-		$items = $db->loadObjectList();
-		$options = array();
-		if ($items)
-		{
-			$options[] = JHtml::_('select.option', '', 'Select an option');
-			$model = ComponentbuilderHelper::getModel('dynamic_gets');
-			foreach($items as $item)
-			{
-				$type = $model->selectionTranslation($item->type,'gettype');
-				$options[] = JHtml::_('select.option', $item->id, $item->dynamic_get_name . ' (' . JText::_($type) . ')' );
-			}
-		}
+		// Get the database object.
+		$db = Factory::getDBO();
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('a.id','a.name','a.gettype'),array('id','dynamic_get_name','type')));
+		$query->from($db->quoteName('#__componentbuilder_dynamic_get', 'a'));
+		$query->where($db->quoteName('a.published') . ' = 1');
+		$query->order('a.name ASC');
+		$db->setQuery((string)$query);
+		$items = $db->loadObjectList();
+		$options = [];
+		if ($items)
+		{
+			if ($this->multiple === false)
+			{
+				$options[] = Html::_('select.option', '', Text::_('COM_COMPONENTBUILDER_SELECT_AN_OPTION'));
+			}
+			$model = ComponentbuilderHelper::getModel('dynamic_gets');
+			foreach($items as $item)
+			{
+				$type = $model->selectionTranslation($item->type,'gettype');
+				$options[] = Html::_('select.option', $item->id, $item->dynamic_get_name . ' (' . Text::_($type) . ')' );
+			}
+		}
 		return $options;
 	}
 }

admin/models/fields/dynamicgets.php

@@ -39,24 +39,25 @@ class JFormFieldDynamicgets extends JFormFieldList
 	 */
 	protected function getOptions()
 	{
-		$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.name','a.gettype'),array('id','dynamic_get_name','type')));
-		$query->from($db->quoteName('#__componentbuilder_dynamic_get', 'a'));
-		$query->where($db->quoteName('a.published') . ' = 1');
-$query->order('a.name ASC');
-		$db->setQuery((string)$query);
-		$items = $db->loadObjectList();
-		$options = array();
-		if ($items)
-		{
-			$model = ComponentbuilderHelper::getModel('dynamic_gets');
-			foreach($items as $item)
-			{
-				$type = $model->selectionTranslation($item->type,'gettype');
-				$options[] = JHtml::_('select.option', $item->id, $item->dynamic_get_name . ' (' . JText::_($type) . ')' );
-			}
-		}
-		return $options;
+		$db = JFactory::getDBO();
+$query = $db->getQuery(true);
+$query->select($db->quoteName(array('a.id','a.name','a.gettype'),array('id','dynamic_get_name','type')));
+$query->from($db->quoteName('#__componentbuilder_dynamic_get', 'a'));
+$query->where($db->quoteName('a.published') . ' = 1');
+$query->order('a.name ASC');
+$db->setQuery((string)$query);
+$items = $db->loadObjectList();
+$options = array();
+if ($items)
+{
+	$model = ComponentbuilderHelper::getModel('dynamic_gets');
+	foreach($items as $item)
+	{
+				$type = $model->selectionTranslation($item->type,'gettype');
+		$options[] = JHtml::_('select.option', $item->id, $item->dynamic_get_name . ' (' . JText::_($type) . ')' );
+	}
+}
+
+return $options;
 	}
 }

admin/models/fields/filebehaviour.php

@@ -52,7 +52,7 @@ class JFormFieldFilebehaviour extends JFormFieldList
 		}
 		$options[] = JHtml::_('select.option', '2', JText::_('COM_COMPONENTBUILDER_CONDITIONS'));
 		$options[] = JHtml::_('select.option', '3', JText::_('COM_COMPONENTBUILDER_CUSTOM_SCRIPT'));
-		$options[] = JHtml::_('select.option', '0', JText::_('COM_COMPONENTBUILDER_DO_NOT_ADD'));
-		return $options;
+		$options[] = JHtml::_('select.option', '0', JText::_('COM_COMPONENTBUILDER_DO_NOT_ADD'));
+return $options;
 	}
 }

admin/models/fields/interfacepowers.php

@@ -144,11 +144,11 @@ class JFormFieldInterfacepowers extends JFormFieldList
 	protected function getOptions()
 	{
 		// Get the user object.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		// Get the databse object.
-		$db = JFactory::getDBO();
+		$db = Factory::getDBO();
 		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.guid','a.name','a.system_name','a.type','a.power_version'),array('guid','implements_name','system_name','type','version')));
+		$query->select($db->quoteName(array('a.guid','a.name','a.system_name','a.type','a.power_version'),array('guid','extendsinterfaces_name','system_name','type','version')));
 		$query->from($db->quoteName('#__componentbuilder_power', 'a'));
 		$query->where($db->quoteName('a.published') . ' >= 1');
 		$query->where($db->quoteName('a.type') . ' = ' . $db->quote('interface'));
@@ -165,7 +165,7 @@ class JFormFieldInterfacepowers extends JFormFieldList
 			}
 		}
 		// get the input
-		$jinput = JFactory::getApplication()->input;
+		$jinput = Factory::getApplication()->input;
 		// get the id
 		$power_id = $jinput->getInt('id', 0);
 		// if we have an id we remove all classes of the same namespace and name
@@ -176,19 +176,24 @@ class JFormFieldInterfacepowers extends JFormFieldList
 		$db->setQuery((string)$query);
 		$items = $db->loadObjectList();
 		$options = array();
-		// set the other option to enter text
-		$options[] = JHtml::_('select.option', -1, JText::_('COM_COMPONENTBUILDER_SET_CUSTOM'));
+		// if none was found, we add this to set an alternative to set custom
+		if (!$items)
+		{
+			$options[] = Html::_('select.option', '', Text::_('COM_COMPONENTBUILDER_NONE_FOUND'));
+		}
 		if ($items)
 		{
 			if ($this->multiple === false)
 			{
-				$options[] = JHtml::_('select.option', '', JText::_('COM_COMPONENTBUILDER_SELECT_AN_OPTION'));
+				$options[] = Html::_('select.option', '', Text::_('COM_COMPONENTBUILDER_SELECT_AN_OPTION'));
 			}
 			foreach($items as $item)
 			{
-				$options[] = JHtml::_('select.option', $item->guid, $item->system_name . ' (v' . $item->version . ') [' . $item->type . ' ' . $item->implements_name . ']');
+				$options[] = Html::_('select.option', $item->guid, $item->system_name . ' [' . $item->type . ' ' . $item->extendsinterfaces_name . '] (v' . $item->version . ')');
 			}
 		}
+		// set the other option to enter text
+		$options[] = Html::_('select.option', -1, Text::_('COM_COMPONENTBUILDER_SET_CUSTOM'));
 		return $options;
 	}
 }

admin/models/fields/libraryreadonly.php

@@ -39,22 +39,23 @@ class JFormFieldLibraryreadonly extends JFormFieldList
 	 */
 	protected function getOptions()
 	{
-		$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.name'),array('id','library_name')));
-		$query->from($db->quoteName('#__componentbuilder_library', 'a'));
-		$query->order('a.name ASC');
-		$db->setQuery((string)$query);
-		$items = $db->loadObjectList();
-		$options = array();
-		if ($items)
-		{
-			$options[] = JHtml::_('select.option', '', 'Select an option');
-			foreach($items as $item)
-			{
-				$options[] = JHtml::_('select.option', $item->id, $item->library_name);
-			}
-		}
-		return $options;
+		$db = JFactory::getDBO();
+$query = $db->getQuery(true);
+$query->select($db->quoteName(array('a.id','a.name'),array('id','library_name')));
+$query->from($db->quoteName('#__componentbuilder_library', 'a'));
+$query->order('a.name ASC');
+$db->setQuery((string)$query);
+$items = $db->loadObjectList();
+$options = array();
+if ($items)
+{
+	$options[] = JHtml::_('select.option', '', 'Select an option');
+	foreach($items as $item)
+	{
+		$options[] = JHtml::_('select.option', $item->id, $item->library_name);
+	}
+}
+
+return $options;
 	}
 }

admin/models/fields/maingets.php

@@ -143,25 +143,25 @@ class JFormFieldMaingets extends JFormFieldList
 	 */
 	protected function getOptions()
 	{
-		$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.name','a.gettype'),array('id','main_get_name','type')));
-		$query->from($db->quoteName('#__componentbuilder_dynamic_get', 'a'));
-		$query->where($db->quoteName('a.published') . ' = 1');
+		$db = JFactory::getDBO();
+$query = $db->getQuery(true);
+$query->select($db->quoteName(array('a.id','a.name','a.gettype'),array('id','main_get_name','type')));
+$query->from($db->quoteName('#__componentbuilder_dynamic_get', 'a'));
+$query->where($db->quoteName('a.published') . ' = 1');
 		$query->where('( '.$db->quoteName('a.gettype') . ' = 1 OR ' . $db->quoteName('a.gettype') . ' = 2 )');
-		$query->order('a.name ASC');
-		$db->setQuery((string)$query);
-		$items = $db->loadObjectList();
-		$options = array();
-		if ($items)
-		{
-			$model = ComponentbuilderHelper::getModel('dynamic_gets');
-			foreach($items as $item)
-			{
-				$type = $model->selectionTranslation($item->type,'gettype');
-				$options[] = JHtml::_('select.option', $item->id, $item->main_get_name . ' (' . JText::_($type) . ')' );
-			}
-		}
-		return $options;
+		$query->order('a.name ASC');
+$db->setQuery((string)$query);
+$items = $db->loadObjectList();
+$options = array();
+if ($items)
+{
+	$model = ComponentbuilderHelper::getModel('dynamic_gets');
+	foreach($items as $item)
+	{
+				$type = $model->selectionTranslation($item->type,'gettype');
+		$options[] = JHtml::_('select.option', $item->id, $item->main_get_name . ' (' . JText::_($type) . ')' );
+	}
+}
+return $options;
 	}
 }

admin/models/fields/pluginsclassmethods.php

@@ -62,12 +62,17 @@ class JFormFieldPluginsclassmethods extends JFormFieldList
 		}
 		$db->setQuery((string)$query);
 		$items = $db->loadObjectList();
-		$options = array();
+		$options = [];
 		if ($items)
 		{
 			$options[] = Html::_('select.option', '', 'Select a method');
 			foreach($items as $item)
 			{
+				if (!isset($item->visibility))
+				{
+					continue;
+				}
+
 				// we are using this code in more then one field JCB custom_code
 				if ('method' === 'method')
 				{
@@ -77,6 +82,7 @@ class JFormFieldPluginsclassmethods extends JFormFieldList
 				{
 					$select = $item->visibility  . ' $' . $item->method_name;
 				}
+
 				$options[] = Html::_('select.option', $item->id, $select);
 			}
 		}

admin/models/fields/pluginsclassproperties.php

@@ -62,12 +62,17 @@ class JFormFieldPluginsclassproperties extends JFormFieldList
 		}
 		$db->setQuery((string)$query);
 		$items = $db->loadObjectList();
-		$options = array();
+		$options = [];
 		if ($items)
 		{
 			$options[] = Html::_('select.option', '', 'Select a property');
 			foreach($items as $item)
 			{
+				if (!isset($item->visibility))
+				{
+					continue;
+				}
+
 				// we are using this code in more then one field JCB custom_code
 				if ('method' === 'property')
 				{
@@ -77,6 +82,7 @@ class JFormFieldPluginsclassproperties extends JFormFieldList
 				{
 					$select = $item->visibility  . ' $' . $item->property_name;
 				}
+
 				$options[] = Html::_('select.option', $item->id, $select);
 			}
 		}

admin/models/fields/powersclassmethods.php

@@ -62,12 +62,17 @@ class JFormFieldPowersclassmethods extends JFormFieldList
 		}
 		$db->setQuery((string)$query);
 		$items = $db->loadObjectList();
-		$options = array();
+		$options = [];
 		if ($items)
 		{
 			$options[] = Html::_('select.option', '', 'Select a method');
 			foreach($items as $item)
 			{
+				if (!isset($item->visibility))
+				{
+					continue;
+				}
+
 				// we are using this code in more then one field JCB custom_code
 				if ('method' === 'method')
 				{
@@ -77,6 +82,7 @@ class JFormFieldPowersclassmethods extends JFormFieldList
 				{
 					$select = $item->visibility  . ' $' . $item->method_name;
 				}
+
 				$options[] = Html::_('select.option', $item->id, $select);
 			}
 		}

admin/models/fields/powersclassproperties.php

@@ -62,12 +62,17 @@ class JFormFieldPowersclassproperties extends JFormFieldList
 		}
 		$db->setQuery((string)$query);
 		$items = $db->loadObjectList();
-		$options = array();
+		$options = [];
 		if ($items)
 		{
 			$options[] = Html::_('select.option', '', 'Select a property');
 			foreach($items as $item)
 			{
+				if (!isset($item->visibility))
+				{
+					continue;
+				}
+
 				// we are using this code in more then one field JCB custom_code
 				if ('method' === 'property')
 				{
@@ -77,6 +82,7 @@ class JFormFieldPowersclassproperties extends JFormFieldList
 				{
 					$select = $item->visibility  . ' $' . $item->property_name;
 				}
+
 				$options[] = Html::_('select.option', $item->id, $select);
 			}
 		}

admin/models/fields/repositoriesfilterbase.php

@@ -0,0 +1,71 @@
+<?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;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Repositoriesfilterbase Form Field class for the Componentbuilder component
+ */
+class JFormFieldRepositoriesfilterbase extends JFormFieldList
+{
+	/**
+	 * The repositoriesfilterbase field type.
+	 *
+	 * @var        string
+	 */
+	public $type = 'repositoriesfilterbase';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return    array    An array of Html options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = Factory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('base'));
+		$query->from($db->quoteName('#__componentbuilder_repository'));
+		$query->order($db->quoteName('base') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$_results = $db->loadColumn();
+		$_filter = [];
+		$_filter[] = Html::_('select.option', '', '- ' . Text::_('COM_COMPONENTBUILDER_FILTER_SELECT_BASE_URL') . ' -');
+
+		if ($_results)
+		{
+			$_results = array_unique($_results);
+			foreach ($_results as $base)
+			{
+				// Now add the base and its text to the options array
+				$_filter[] = Html::_('select.option', $base, $base);
+			}
+		}
+		return $_filter;
+	}
+}

admin/models/fields/repositoriesfilterorganisation.php

@@ -0,0 +1,71 @@
+<?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;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Repositoriesfilterorganisation Form Field class for the Componentbuilder component
+ */
+class JFormFieldRepositoriesfilterorganisation extends JFormFieldList
+{
+	/**
+	 * The repositoriesfilterorganisation field type.
+	 *
+	 * @var        string
+	 */
+	public $type = 'repositoriesfilterorganisation';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return    array    An array of Html options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = Factory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('organisation'));
+		$query->from($db->quoteName('#__componentbuilder_repository'));
+		$query->order($db->quoteName('organisation') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$_results = $db->loadColumn();
+		$_filter = [];
+		$_filter[] = Html::_('select.option', '', '- ' . Text::_('COM_COMPONENTBUILDER_FILTER_SELECT_ORGANISATION') . ' -');
+
+		if ($_results)
+		{
+			$_results = array_unique($_results);
+			foreach ($_results as $organisation)
+			{
+				// Now add the organisation and its text to the options array
+				$_filter[] = Html::_('select.option', $organisation, $organisation);
+			}
+		}
+		return $_filter;
+	}
+}

admin/models/fields/repositoriesfilterrepository.php

@@ -0,0 +1,71 @@
+<?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;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Repositoriesfilterrepository Form Field class for the Componentbuilder component
+ */
+class JFormFieldRepositoriesfilterrepository extends JFormFieldList
+{
+	/**
+	 * The repositoriesfilterrepository field type.
+	 *
+	 * @var        string
+	 */
+	public $type = 'repositoriesfilterrepository';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return    array    An array of Html options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = Factory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('repository'));
+		$query->from($db->quoteName('#__componentbuilder_repository'));
+		$query->order($db->quoteName('repository') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$_results = $db->loadColumn();
+		$_filter = [];
+		$_filter[] = Html::_('select.option', '', '- ' . Text::_('COM_COMPONENTBUILDER_FILTER_SELECT_REPOSITORY') . ' -');
+
+		if ($_results)
+		{
+			$_results = array_unique($_results);
+			foreach ($_results as $repository)
+			{
+				// Now add the repository and its text to the options array
+				$_filter[] = Html::_('select.option', $repository, $repository);
+			}
+		}
+		return $_filter;
+	}
+}