Release of v5.0.0-rc1

Improved the Schema Table update engine (more). Fix autoloader timing, and loading. Implement the Joomla Powers in JCB code, to move away from JClasses.

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v5.0.0-rc1
+
+- Improved the Schema Table update engine (more).
+- Fix autoloader timing, and loading.
+- Implement the Joomla Powers in JCB code, to move away from JClasses.
+
 # v5.0.0-beta5
 
 - Fix the media field size limitation. #1109
@@ -48,9 +54,9 @@
 - Add power path override option on component level.
 - Fix the sql build feature. #1032
 
-# v4.0.0-beta3
+# v4.0.0-rc1
 
-- Add Joomla powers for namespace dynamic management.
+- Improved the Schema Table update engine (more).
 
 # v3.2.0
 

ComponentbuilderInstallerScript.php

@@ -1493,7 +1493,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 
 
 			// Fix the assets table rules column size.
-			$this->setDatabaseAssetsRulesFix(101600, "MEDIUMTEXT");
+			$this->setDatabaseAssetsRulesFix(93920, "MEDIUMTEXT");
 			// Install the global extension params.
 			$this->setExtensionsParams(
 				'{"autorName":"Llewellyn van der Merwe","autorEmail":"joomla@vdm.io","subform_layouts":"default","editor":"none","manage_jcb_package_directories":"2","set_browser_storage":"1","storage_time_to_live":"global","super_powers_documentation":"0","powers_repository":"0","super_powers_repositories":"0","approved_paths":"default","add_custom_gitea_url":"1","custom_gitea_url":"https://git.vdm.dev","super_powers_core_organisation":"joomla","super_powers_core":"joomla/super-powers","builder_gif_size":"480-272","compiler_plugin":["componentbuilderactionlogcompiler","componentbuilderfieldorderingcompiler","componentbuilderheaderscompiler","componentbuilderpowersautoloadercompiler","componentbuilderprivacycompiler"],"add_menu_prefix":"1","menu_prefix":"»","namespace_prefix":"JCB","minify":"0","language":"en-GB","percentagelanguageadd":"30","assets_table_fix":"2","compiler_field_builder_type":"2","field_name_builder":"1","type_name_builder":"1","import_guid_only":"1","export_language_strings":"1","development_method":"1","expansion":"0","return_options_build":"2","cronjob_backup_type":"1","cronjob_backup_server":"0","backup_package_name":"JCB_Backup_[YEAR]_[MONTH]_[DAY]","export_license":"GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html","export_copyright":"Copyright (C) 2015. All Rights Reserved","check_in":"-1 day","save_history":"1","history_limit":"10","add_jquery_framework":"1","uikit_load":"1","uikit_min":"","uikit_style":""}'
@@ -3210,7 +3210,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 			echo '<div style="background-color: #fff;" class="alert alert-info"><a target="_blank" href="https://dev.vdm.io" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 5.0.0-beta5 Was Successful! Let us know if anything is not working as expected.</h3></div>';
+				<h3>Upgrade to Version 5.0.0-rc1 Was Successful! Let us know if anything is not working as expected.</h3></div>';
 
 			// Add/Update component in the action logs extensions table.
 			$this->setActionLogsExtensions();
@@ -4997,7 +4997,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 		if (!class_exists($nameClass, true))
 		{
 			// The power autoloader for this project admin area.
-			$power_autoloader = JPATH_ADMINISTRATOR . '/componenents/com_componentbuilder/src/Helper/PowerloaderHelper.php';
+			$power_autoloader = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/src/Helper/PowerloaderHelper.php';
 			if (file_exists($power_autoloader))
 			{
 				require_once $power_autoloader;

README.md

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.0.0-beta5) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.0.0-rc1) 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*: 24th April, 2024
++ *Last Build*: 27th April, 2024
-+ *Version*: 5.0.0-beta5
++ *Version*: 5.0.0-rc1
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **755378**
++ *Line count*: **745920**
 + *Field count*: **2097**
-+ *File count*: **5299**
++ *File count*: **5293**
-+ *Folder count*: **531**
++ *Folder count*: **528**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)

admin/README.txt

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.0.0-beta5) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.0.0-rc1) 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*: 24th April, 2024
++ *Last Build*: 27th April, 2024
-+ *Version*: 5.0.0-beta5
++ *Version*: 5.0.0-rc1
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **755378**
++ *Line count*: **745920**
 + *Field count*: **2097**
-+ *File count*: **5299**
++ *File count*: **5293**
-+ *Folder count*: **531**
++ *Folder count*: **528**
 
 > 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

@@ -4,8 +4,6 @@
 		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
 		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
 		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
-		<action name="core.export" title="COM_COMPONENTBUILDER_EXPORT_DATA" description="COM_COMPONENTBUILDER_EXPORT_DATA_DESC" />
-		<action name="core.import" title="COM_COMPONENTBUILDER_IMPORT_DATA" description="COM_COMPONENTBUILDER_IMPORT_DATA_DESC" />
 		<action name="core.batch" title="COM_COMPONENTBUILDER_USE_BATCH" description="COM_COMPONENTBUILDER_USE_BATCH_DESC" />
 		<action name="core.version" title="COM_COMPONENTBUILDER_EDIT_VERSIONS" description="COM_COMPONENTBUILDER_EDIT_VERSIONS_DESC" />
 		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
@@ -27,8 +25,6 @@
 		<action name="admin_view.edit.own" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN_DESC" />
 		<action name="admin_view.edit.state" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE_DESC" />
 		<action name="admin_view.version" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION_DESC" />
-		<action name="admin_view.export" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT_DESC" />
-		<action name="admin_view.import" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_IMPORT" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_IMPORT_DESC" />
 		<action name="admin_view.submenu" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU_DESC" />
 		<action name="admin_custom_tabs.access" title="COM_COMPONENTBUILDER_ADMINS_CUSTOM_TABS_ACCESS" description="COM_COMPONENTBUILDER_ADMINS_CUSTOM_TABS_ACCESS_DESC" />
 		<action name="admin_custom_tabs.batch" title="COM_COMPONENTBUILDER_ADMINS_CUSTOM_TABS_BATCH_USE" description="COM_COMPONENTBUILDER_ADMINS_CUSTOM_TABS_BATCH_USE_DESC" />
@@ -90,8 +86,6 @@
 		<action name="class_method.edit.own" title="COM_COMPONENTBUILDER_CLASS_METHODS_EDIT_OWN" description="COM_COMPONENTBUILDER_CLASS_METHODS_EDIT_OWN_DESC" />
 		<action name="class_method.edit.state" title="COM_COMPONENTBUILDER_CLASS_METHODS_EDIT_STATE" description="COM_COMPONENTBUILDER_CLASS_METHODS_EDIT_STATE_DESC" />
 		<action name="class_method.version" title="COM_COMPONENTBUILDER_CLASS_METHODS_EDIT_VERSION" description="COM_COMPONENTBUILDER_CLASS_METHODS_EDIT_VERSION_DESC" />
-		<action name="class_method.export" title="COM_COMPONENTBUILDER_CLASS_METHODS_EXPORT" description="COM_COMPONENTBUILDER_CLASS_METHODS_EXPORT_DESC" />
-		<action name="class_method.import" title="COM_COMPONENTBUILDER_CLASS_METHODS_IMPORT" description="COM_COMPONENTBUILDER_CLASS_METHODS_IMPORT_DESC" />
 		<action name="class_property.access" title="COM_COMPONENTBUILDER_CLASS_PROPERTIES_ACCESS" description="COM_COMPONENTBUILDER_CLASS_PROPERTIES_ACCESS_DESC" />
 		<action name="class_property.batch" title="COM_COMPONENTBUILDER_CLASS_PROPERTIES_BATCH_USE" description="COM_COMPONENTBUILDER_CLASS_PROPERTIES_BATCH_USE_DESC" />
 		<action name="class_property.create" title="COM_COMPONENTBUILDER_CLASS_PROPERTIES_CREATE" description="COM_COMPONENTBUILDER_CLASS_PROPERTIES_CREATE_DESC" />
@@ -102,15 +96,11 @@
 		<action name="class_property.edit.own" title="COM_COMPONENTBUILDER_CLASS_PROPERTIES_EDIT_OWN" description="COM_COMPONENTBUILDER_CLASS_PROPERTIES_EDIT_OWN_DESC" />
 		<action name="class_property.edit.state" title="COM_COMPONENTBUILDER_CLASS_PROPERTIES_EDIT_STATE" description="COM_COMPONENTBUILDER_CLASS_PROPERTIES_EDIT_STATE_DESC" />
 		<action name="class_property.version" title="COM_COMPONENTBUILDER_CLASS_PROPERTIES_EDIT_VERSION" description="COM_COMPONENTBUILDER_CLASS_PROPERTIES_EDIT_VERSION_DESC" />
-		<action name="class_property.export" title="COM_COMPONENTBUILDER_CLASS_PROPERTIES_EXPORT" description="COM_COMPONENTBUILDER_CLASS_PROPERTIES_EXPORT_DESC" />
-		<action name="class_property.import" title="COM_COMPONENTBUILDER_CLASS_PROPERTIES_IMPORT" description="COM_COMPONENTBUILDER_CLASS_PROPERTIES_IMPORT_DESC" />
 		<action name="compiler.access" title="COM_COMPONENTBUILDER_COMPILER_ACCESS" description="COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC" />
 		<action name="compiler.clear_tmp" title="COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS_DESC" />
 		<action name="compiler.compiler_animations" title="COM_COMPONENTBUILDER_COMPILER_COMPILER_ANIMATIONS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_COMPILER_COMPILER_ANIMATIONS_BUTTON_ACCESS_DESC" />
 		<action name="compiler.dashboard_list" title="COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST_DESC" />
-		<action name="compiler.run_expansion" title="COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="compiler.submenu" title="COM_COMPONENTBUILDER_COMPILER_SUBMENU" description="COM_COMPONENTBUILDER_COMPILER_SUBMENU_DESC" />
-		<action name="compiler.translate" title="COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS_DESC" />
 		<action name="component_admin_views.access" title="COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_ACCESS" description="COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_ACCESS_DESC" />
 		<action name="component_admin_views.batch" title="COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_BATCH_USE" description="COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_BATCH_USE_DESC" />
 		<action name="component_admin_views.create" title="COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_CREATE" description="COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_CREATE_DESC" />
@@ -246,8 +236,6 @@
 		<action name="custom_admin_view.batch" title="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_BATCH_USE" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_BATCH_USE_DESC" />
 		<action name="custom_admin_view.dashboard_list" title="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DASHBOARD_LIST_DESC" />
 		<action name="custom_admin_view.version" title="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EDIT_VERSION" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EDIT_VERSION_DESC" />
-		<action name="custom_admin_view.export" title="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EXPORT" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EXPORT_DESC" />
-		<action name="custom_admin_view.import" title="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_IMPORT" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_IMPORT_DESC" />
 		<action name="custom_admin_view.submenu" title="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_SUBMENU" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_SUBMENU_DESC" />
 		<action name="custom_code.run_expansion" title="COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="custom_code.access" title="COM_COMPONENTBUILDER_CUSTOM_CODES_ACCESS" description="COM_COMPONENTBUILDER_CUSTOM_CODES_ACCESS_DESC" />
@@ -261,8 +249,6 @@
 		<action name="custom_code.edit.own" title="COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_OWN" description="COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_OWN_DESC" />
 		<action name="custom_code.edit.state" title="COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_STATE" description="COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_STATE_DESC" />
 		<action name="custom_code.version" title="COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_VERSION" description="COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_VERSION_DESC" />
-		<action name="custom_code.export" title="COM_COMPONENTBUILDER_CUSTOM_CODES_EXPORT" description="COM_COMPONENTBUILDER_CUSTOM_CODES_EXPORT_DESC" />
-		<action name="custom_code.import" title="COM_COMPONENTBUILDER_CUSTOM_CODES_IMPORT" description="COM_COMPONENTBUILDER_CUSTOM_CODES_IMPORT_DESC" />
 		<action name="custom_code.submenu" title="COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU" description="COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU_DESC" />
 		<action name="dynamic_get.run_expansion" title="COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="dynamic_get.access" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS_DESC" />
@@ -275,8 +261,6 @@
 		<action name="dynamic_get.edit.own" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_OWN" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_OWN_DESC" />
 		<action name="dynamic_get.edit.state" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_STATE" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_STATE_DESC" />
 		<action name="dynamic_get.version" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_VERSION" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_VERSION_DESC" />
-		<action name="dynamic_get.export" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_EXPORT" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_EXPORT_DESC" />
-		<action name="dynamic_get.import" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_IMPORT" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_IMPORT_DESC" />
 		<action name="dynamic_get.submenu" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU_DESC" />
 		<action name="field.run_expansion" title="COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="field.access" title="COM_COMPONENTBUILDER_FIELDS_ACCESS" description="COM_COMPONENTBUILDER_FIELDS_ACCESS_DESC" />
@@ -289,8 +273,6 @@
 		<action name="field.edit.own" title="COM_COMPONENTBUILDER_FIELDS_EDIT_OWN" description="COM_COMPONENTBUILDER_FIELDS_EDIT_OWN_DESC" />
 		<action name="field.edit.state" title="COM_COMPONENTBUILDER_FIELDS_EDIT_STATE" description="COM_COMPONENTBUILDER_FIELDS_EDIT_STATE_DESC" />
 		<action name="field.version" title="COM_COMPONENTBUILDER_FIELDS_EDIT_VERSION" description="COM_COMPONENTBUILDER_FIELDS_EDIT_VERSION_DESC" />
-		<action name="field.export" title="COM_COMPONENTBUILDER_FIELDS_EXPORT" description="COM_COMPONENTBUILDER_FIELDS_EXPORT_DESC" />
-		<action name="field.import" title="COM_COMPONENTBUILDER_FIELDS_IMPORT" description="COM_COMPONENTBUILDER_FIELDS_IMPORT_DESC" />
 		<action name="field.submenu" title="COM_COMPONENTBUILDER_FIELDS_SUBMENU" description="COM_COMPONENTBUILDER_FIELDS_SUBMENU_DESC" />
 		<action name="fieldtype.access" title="COM_COMPONENTBUILDER_FIELDTYPES_ACCESS" description="COM_COMPONENTBUILDER_FIELDTYPES_ACCESS_DESC" />
 		<action name="fieldtype.batch" title="COM_COMPONENTBUILDER_FIELDTYPES_BATCH_USE" description="COM_COMPONENTBUILDER_FIELDTYPES_BATCH_USE_DESC" />
@@ -301,17 +283,13 @@
 		<action name="fieldtype.edit.own" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN_DESC" />
 		<action name="fieldtype.edit.state" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE_DESC" />
 		<action name="fieldtype.version" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION_DESC" />
-		<action name="fieldtype.export" title="COM_COMPONENTBUILDER_FIELDTYPES_EXPORT" description="COM_COMPONENTBUILDER_FIELDTYPES_EXPORT_DESC" />
-		<action name="fieldtype.import" title="COM_COMPONENTBUILDER_FIELDTYPES_IMPORT" description="COM_COMPONENTBUILDER_FIELDTYPES_IMPORT_DESC" />
 		<action name="fieldtype.submenu" title="COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU" description="COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU_DESC" />
 		<action name="get_snippets.access" title="COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS" description="COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS_DESC" />
 		<action name="get_snippets.custom_admin_views" title="COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS_DESC" />
-		<action name="get_snippets.dashboard_list" title="COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST_DESC" />
 		<action name="get_snippets.layouts" title="COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS_DESC" />
 		<action name="get_snippets.libraries" title="COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS_DESC" />
 		<action name="get_snippets.site_views" title="COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS_DESC" />
 		<action name="get_snippets.snippets" title="COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS_DESC" />
-		<action name="get_snippets.submenu" title="COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU" description="COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU_DESC" />
 		<action name="get_snippets.templates" title="COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS_DESC" />
 		<action name="help_document.access" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_ACCESS" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_ACCESS_DESC" />
 		<action name="help_document.batch" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_BATCH_USE" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_BATCH_USE_DESC" />
@@ -322,15 +300,8 @@
 		<action name="help_document.edit.own" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_OWN" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_OWN_DESC" />
 		<action name="help_document.edit.state" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_STATE" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_STATE_DESC" />
 		<action name="help_document.version" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_VERSION" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_VERSION_DESC" />
-		<action name="help_document.export" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EXPORT" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EXPORT_DESC" />
-		<action name="help_document.import" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_IMPORT" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_IMPORT_DESC" />
 		<action name="help_document.submenu" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU_DESC" />
-		<action name="joomla_component.backup" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS_DESC" />
 		<action name="joomla_component.clear_tmp" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS_DESC" />
-		<action name="joomla_component.clone" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS_DESC" />
-		<action name="joomla_component.export_jcb_packages" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC" />
-		<action name="joomla_component.import_jcb_packages" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC" />
-		<action name="joomla_component.run_expansion" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="joomla_component.access" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS_DESC" />
 		<action name="joomla_component.batch" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_USE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_USE_DESC" />
 		<action name="joomla_component.create" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_CREATE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_CREATE_DESC" />
@@ -356,7 +327,6 @@
 		<action name="joomla_module.edit.own" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_EDIT_OWN" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_EDIT_OWN_DESC" />
 		<action name="joomla_module.edit.state" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_EDIT_STATE" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_EDIT_STATE_DESC" />
 		<action name="joomla_module.version" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_EDIT_VERSION" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_EDIT_VERSION_DESC" />
-		<action name="joomla_module.export" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_EXPORT" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_EXPORT_DESC" />
 		<action name="joomla_module_files_folders_urls.access" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_ACCESS_DESC" />
 		<action name="joomla_module_files_folders_urls.batch" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_BATCH_USE" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_BATCH_USE_DESC" />
 		<action name="joomla_module_files_folders_urls.create" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_CREATE" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_CREATE_DESC" />
@@ -367,7 +337,6 @@
 		<action name="joomla_module_files_folders_urls.edit.own" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_EDIT_OWN" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_EDIT_OWN_DESC" />
 		<action name="joomla_module_files_folders_urls.edit.state" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_EDIT_STATE" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_EDIT_STATE_DESC" />
 		<action name="joomla_module_files_folders_urls.version" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_EDIT_VERSION" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_EDIT_VERSION_DESC" />
-		<action name="joomla_module.import" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_IMPORT" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_IMPORT_DESC" />
 		<action name="joomla_module.submenu" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_SUBMENU" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_SUBMENU_DESC" />
 		<action name="joomla_module_updates.access" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_UPDATES_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_UPDATES_ACCESS_DESC" />
 		<action name="joomla_module_updates.batch" title="COM_COMPONENTBUILDER_JOOMLA_MODULES_UPDATES_BATCH_USE" description="COM_COMPONENTBUILDER_JOOMLA_MODULES_UPDATES_BATCH_USE_DESC" />
@@ -441,27 +410,22 @@
 		<action name="language_translation.edit.own" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_OWN" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_OWN_DESC" />
 		<action name="language_translation.edit.state" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_STATE" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_STATE_DESC" />
 		<action name="language_translation.version" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_VERSION" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_VERSION_DESC" />
-		<action name="language_translation.export" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EXPORT" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EXPORT_DESC" />
-		<action name="language_translation.import" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_IMPORT" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_IMPORT_DESC" />
 		<action name="language_translation.submenu" title="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_SUBMENU" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_SUBMENU_DESC" />
 		<action name="language.access" title="COM_COMPONENTBUILDER_LANGUAGES_ACCESS" description="COM_COMPONENTBUILDER_LANGUAGES_ACCESS_DESC" />
 		<action name="language.batch" title="COM_COMPONENTBUILDER_LANGUAGES_BATCH_USE" description="COM_COMPONENTBUILDER_LANGUAGES_BATCH_USE_DESC" />
 		<action name="language.create" title="COM_COMPONENTBUILDER_LANGUAGES_CREATE" description="COM_COMPONENTBUILDER_LANGUAGES_CREATE_DESC" />
+		<action name="language.dashboard_list" title="COM_COMPONENTBUILDER_LANGUAGES_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_LANGUAGES_DASHBOARD_LIST_DESC" />
 		<action name="language.delete" title="COM_COMPONENTBUILDER_LANGUAGES_DELETE" description="COM_COMPONENTBUILDER_LANGUAGES_DELETE_DESC" />
 		<action name="language.edit" title="COM_COMPONENTBUILDER_LANGUAGES_EDIT" description="COM_COMPONENTBUILDER_LANGUAGES_EDIT_DESC" />
 		<action name="language.edit.own" title="COM_COMPONENTBUILDER_LANGUAGES_EDIT_OWN" description="COM_COMPONENTBUILDER_LANGUAGES_EDIT_OWN_DESC" />
 		<action name="language.edit.state" title="COM_COMPONENTBUILDER_LANGUAGES_EDIT_STATE" description="COM_COMPONENTBUILDER_LANGUAGES_EDIT_STATE_DESC" />
 		<action name="language.version" title="COM_COMPONENTBUILDER_LANGUAGES_EDIT_VERSION" description="COM_COMPONENTBUILDER_LANGUAGES_EDIT_VERSION_DESC" />
-		<action name="language.export" title="COM_COMPONENTBUILDER_LANGUAGES_EXPORT" description="COM_COMPONENTBUILDER_LANGUAGES_EXPORT_DESC" />
-		<action name="language.import" title="COM_COMPONENTBUILDER_LANGUAGES_IMPORT" description="COM_COMPONENTBUILDER_LANGUAGES_IMPORT_DESC" />
 		<action name="language.submenu" title="COM_COMPONENTBUILDER_LANGUAGES_SUBMENU" description="COM_COMPONENTBUILDER_LANGUAGES_SUBMENU_DESC" />
 		<action name="layout.get_snippets" title="COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS_DESC" />
 		<action name="layout.access" title="COM_COMPONENTBUILDER_LAYOUTS_ACCESS" description="COM_COMPONENTBUILDER_LAYOUTS_ACCESS_DESC" />
 		<action name="layout.batch" title="COM_COMPONENTBUILDER_LAYOUTS_BATCH_USE" description="COM_COMPONENTBUILDER_LAYOUTS_BATCH_USE_DESC" />
 		<action name="layout.dashboard_list" title="COM_COMPONENTBUILDER_LAYOUTS_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_LAYOUTS_DASHBOARD_LIST_DESC" />
 		<action name="layout.version" title="COM_COMPONENTBUILDER_LAYOUTS_EDIT_VERSION" description="COM_COMPONENTBUILDER_LAYOUTS_EDIT_VERSION_DESC" />
-		<action name="layout.export" title="COM_COMPONENTBUILDER_LAYOUTS_EXPORT" description="COM_COMPONENTBUILDER_LAYOUTS_EXPORT_DESC" />
-		<action name="layout.import" title="COM_COMPONENTBUILDER_LAYOUTS_IMPORT" description="COM_COMPONENTBUILDER_LAYOUTS_IMPORT_DESC" />
 		<action name="layout.submenu" title="COM_COMPONENTBUILDER_LAYOUTS_SUBMENU" description="COM_COMPONENTBUILDER_LAYOUTS_SUBMENU_DESC" />
 		<action name="library.access" title="COM_COMPONENTBUILDER_LIBRARIES_ACCESS" description="COM_COMPONENTBUILDER_LIBRARIES_ACCESS_DESC" />
 		<action name="library.batch" title="COM_COMPONENTBUILDER_LIBRARIES_BATCH_USE" description="COM_COMPONENTBUILDER_LIBRARIES_BATCH_USE_DESC" />
@@ -503,8 +467,6 @@
 		<action name="placeholder.edit.own" title="COM_COMPONENTBUILDER_PLACEHOLDERS_EDIT_OWN" description="COM_COMPONENTBUILDER_PLACEHOLDERS_EDIT_OWN_DESC" />
 		<action name="placeholder.edit.state" title="COM_COMPONENTBUILDER_PLACEHOLDERS_EDIT_STATE" description="COM_COMPONENTBUILDER_PLACEHOLDERS_EDIT_STATE_DESC" />
 		<action name="placeholder.version" title="COM_COMPONENTBUILDER_PLACEHOLDERS_EDIT_VERSION" description="COM_COMPONENTBUILDER_PLACEHOLDERS_EDIT_VERSION_DESC" />
-		<action name="placeholder.export" title="COM_COMPONENTBUILDER_PLACEHOLDERS_EXPORT" description="COM_COMPONENTBUILDER_PLACEHOLDERS_EXPORT_DESC" />
-		<action name="placeholder.import" title="COM_COMPONENTBUILDER_PLACEHOLDERS_IMPORT" description="COM_COMPONENTBUILDER_PLACEHOLDERS_IMPORT_DESC" />
 		<action name="placeholder.submenu" title="COM_COMPONENTBUILDER_PLACEHOLDERS_SUBMENU" description="COM_COMPONENTBUILDER_PLACEHOLDERS_SUBMENU_DESC" />
 		<action name="power.init" title="COM_COMPONENTBUILDER_POWER_INIT_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_POWER_INIT_BUTTON_ACCESS_DESC" />
 		<action name="power.reset" title="COM_COMPONENTBUILDER_POWER_RESET_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_POWER_RESET_BUTTON_ACCESS_DESC" />
@@ -536,16 +498,12 @@
 		<action name="server.edit.own" title="COM_COMPONENTBUILDER_SERVERS_EDIT_OWN" description="COM_COMPONENTBUILDER_SERVERS_EDIT_OWN_DESC" />
 		<action name="server.edit.state" title="COM_COMPONENTBUILDER_SERVERS_EDIT_STATE" description="COM_COMPONENTBUILDER_SERVERS_EDIT_STATE_DESC" />
 		<action name="server.version" title="COM_COMPONENTBUILDER_SERVERS_EDIT_VERSION" description="COM_COMPONENTBUILDER_SERVERS_EDIT_VERSION_DESC" />
-		<action name="server.export" title="COM_COMPONENTBUILDER_SERVERS_EXPORT" description="COM_COMPONENTBUILDER_SERVERS_EXPORT_DESC" />
-		<action name="server.import" title="COM_COMPONENTBUILDER_SERVERS_IMPORT" description="COM_COMPONENTBUILDER_SERVERS_IMPORT_DESC" />
 		<action name="server.submenu" title="COM_COMPONENTBUILDER_SERVERS_SUBMENU" description="COM_COMPONENTBUILDER_SERVERS_SUBMENU_DESC" />
 		<action name="site_view.get_snippets" title="COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC" />
 		<action name="site_view.access" title="COM_COMPONENTBUILDER_SITE_VIEWS_ACCESS" description="COM_COMPONENTBUILDER_SITE_VIEWS_ACCESS_DESC" />
 		<action name="site_view.batch" title="COM_COMPONENTBUILDER_SITE_VIEWS_BATCH_USE" description="COM_COMPONENTBUILDER_SITE_VIEWS_BATCH_USE_DESC" />
 		<action name="site_view.dashboard_list" title="COM_COMPONENTBUILDER_SITE_VIEWS_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_SITE_VIEWS_DASHBOARD_LIST_DESC" />
 		<action name="site_view.version" title="COM_COMPONENTBUILDER_SITE_VIEWS_EDIT_VERSION" description="COM_COMPONENTBUILDER_SITE_VIEWS_EDIT_VERSION_DESC" />
-		<action name="site_view.export" title="COM_COMPONENTBUILDER_SITE_VIEWS_EXPORT" description="COM_COMPONENTBUILDER_SITE_VIEWS_EXPORT_DESC" />
-		<action name="site_view.import" title="COM_COMPONENTBUILDER_SITE_VIEWS_IMPORT" description="COM_COMPONENTBUILDER_SITE_VIEWS_IMPORT_DESC" />
 		<action name="site_view.submenu" title="COM_COMPONENTBUILDER_SITE_VIEWS_SUBMENU" description="COM_COMPONENTBUILDER_SITE_VIEWS_SUBMENU_DESC" />
 		<action name="snippet.get_snippets" title="COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS_DESC" />
 		<action name="snippet.share_snippets" title="COM_COMPONENTBUILDER_SNIPPET_SHARE_SNIPPETS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_SNIPPET_SHARE_SNIPPETS_BUTTON_ACCESS_DESC" />
@@ -561,8 +519,6 @@
 		<action name="snippet.batch" title="COM_COMPONENTBUILDER_SNIPPETS_BATCH_USE" description="COM_COMPONENTBUILDER_SNIPPETS_BATCH_USE_DESC" />
 		<action name="snippet.dashboard_list" title="COM_COMPONENTBUILDER_SNIPPETS_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_SNIPPETS_DASHBOARD_LIST_DESC" />
 		<action name="snippet.version" title="COM_COMPONENTBUILDER_SNIPPETS_EDIT_VERSION" description="COM_COMPONENTBUILDER_SNIPPETS_EDIT_VERSION_DESC" />
-		<action name="snippet.export" title="COM_COMPONENTBUILDER_SNIPPETS_EXPORT" description="COM_COMPONENTBUILDER_SNIPPETS_EXPORT_DESC" />
-		<action name="snippet.import" title="COM_COMPONENTBUILDER_SNIPPETS_IMPORT" description="COM_COMPONENTBUILDER_SNIPPETS_IMPORT_DESC" />
 		<action name="snippet.submenu" title="COM_COMPONENTBUILDER_SNIPPETS_SUBMENU" description="COM_COMPONENTBUILDER_SNIPPETS_SUBMENU_DESC" />
 		<action name="template.get_snippets" title="COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS_DESC" />
 		<action name="template.access" title="COM_COMPONENTBUILDER_TEMPLATES_ACCESS" description="COM_COMPONENTBUILDER_TEMPLATES_ACCESS_DESC" />
@@ -570,8 +526,6 @@
 		<action name="template.dashboard_add" title="COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_ADD" description="COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_ADD_DESC" />
 		<action name="template.dashboard_list" title="COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_TEMPLATES_DASHBOARD_LIST_DESC" />
 		<action name="template.version" title="COM_COMPONENTBUILDER_TEMPLATES_EDIT_VERSION" description="COM_COMPONENTBUILDER_TEMPLATES_EDIT_VERSION_DESC" />
-		<action name="template.export" title="COM_COMPONENTBUILDER_TEMPLATES_EXPORT" description="COM_COMPONENTBUILDER_TEMPLATES_EXPORT_DESC" />
-		<action name="template.import" title="COM_COMPONENTBUILDER_TEMPLATES_IMPORT" description="COM_COMPONENTBUILDER_TEMPLATES_IMPORT_DESC" />
 		<action name="template.submenu" title="COM_COMPONENTBUILDER_TEMPLATES_SUBMENU" description="COM_COMPONENTBUILDER_TEMPLATES_SUBMENU_DESC" />
 		<action name="validation_rule.run_expansion" title="COM_COMPONENTBUILDER_VALIDATION_RULE_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_VALIDATION_RULE_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="validation_rule.access" title="COM_COMPONENTBUILDER_VALIDATION_RULES_ACCESS" description="COM_COMPONENTBUILDER_VALIDATION_RULES_ACCESS_DESC" />
@@ -583,8 +537,6 @@
 		<action name="validation_rule.edit.own" title="COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_OWN" description="COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_OWN_DESC" />
 		<action name="validation_rule.edit.state" title="COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_STATE" description="COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_STATE_DESC" />
 		<action name="validation_rule.version" title="COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_VERSION" description="COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_VERSION_DESC" />
-		<action name="validation_rule.export" title="COM_COMPONENTBUILDER_VALIDATION_RULES_EXPORT" description="COM_COMPONENTBUILDER_VALIDATION_RULES_EXPORT_DESC" />
-		<action name="validation_rule.import" title="COM_COMPONENTBUILDER_VALIDATION_RULES_IMPORT" description="COM_COMPONENTBUILDER_VALIDATION_RULES_IMPORT_DESC" />
 		<action name="validation_rule.submenu" title="COM_COMPONENTBUILDER_VALIDATION_RULES_SUBMENU" description="COM_COMPONENTBUILDER_VALIDATION_RULES_SUBMENU_DESC" />
 	</section>
 	<section name="joomla_component">

admin/compiler/joomla_3/Helper.php

@@ -17,12 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// The power autoloader for this project admin area.
+###CUSTOM_POWER_AUTOLOADER###
-$power_autoloader = JPATH_ADMINISTRATOR . '/components/com_###component###/helpers/powerloader.php';
-if (file_exists($power_autoloader))
-{
-	require_once $power_autoloader;
-}
 
 ###ADMIN_HELPER_CLASS_HEADER###
 

admin/compiler/joomla_3/Helper_site.php

@@ -17,12 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// The power autoloader for this project site area.
+###SITE_CUSTOM_POWER_AUTOLOADER###
-$power_autoloader = JPATH_SITE . '/components/com_###component###/helpers/powerloader.php';
-if (file_exists($power_autoloader))
-{
-	require_once $power_autoloader;
-}
 
 ###SITE_HELPER_CLASS_HEADER###
 

admin/compiler/joomla_3/component_admin.php

@@ -17,12 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// The power autoloader for this project admin area.
+###CUSTOM_POWER_AUTOLOADER###
-$power_autoloader = JPATH_ADMINISTRATOR . '/components/com_###component###/helpers/powerloader.php';
-if (file_exists($power_autoloader))
-{
-	require_once $power_autoloader;
-}
 
 ###ADMIN_COMPONENT_HEADER###
 

admin/compiler/joomla_3/component_site.php

@@ -17,12 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// The power autoloader for this project site area.
+###SITE_CUSTOM_POWER_AUTOLOADER###
-$power_autoloader = JPATH_SITE . '/components/com_###component###/helpers/powerloader.php';
-if (file_exists($power_autoloader))
-{
-	require_once $power_autoloader;
-}
 
 ###SITE_COMPONENT_HEADER###
 

admin/compiler/joomla_4/ADMIN_HELPER_CLASS.php

@@ -15,12 +15,7 @@ defined('_JCB_TEMPLATE') or die;
 ###BOM###
 namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator\Helper;
 
-// The power autoloader for this project admin area.
+###CUSTOM_POWER_AUTOLOADER###
-$power_autoloader = JPATH_ADMINISTRATOR . '/components/com_###component###/src/Helper/PowerloaderHelper.php';
-if (file_exists($power_autoloader))
-{
-	require_once $power_autoloader;
-}
 
 ###ADMIN_HELPER_CLASS_HEADER###
 

admin/compiler/joomla_4/ADMIN_PROVIDER.php

@@ -14,12 +14,7 @@ defined('_JCB_TEMPLATE') or die;
 ?>
 ###BOM###
 
-// The power autoloader for this project admin area.
+###CUSTOM_POWER_AUTOLOADER###
-$power_autoloader = JPATH_ADMINISTRATOR . '/components/com_###component###/src/Helper/PowerloaderHelper.php';
-if (file_exists($power_autoloader))
-{
-	require_once $power_autoloader;
-}
 
 // (soon) use Joomla\CMS\Association\AssociationExtensionInterface;
 use Joomla\CMS\Categories\CategoryFactoryInterface;

admin/compiler/joomla_4/SITE_HELPER_CLASS.php

@@ -15,12 +15,7 @@ defined('_JCB_TEMPLATE') or die;
 ###BOM###
 namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\Helper;
 
-// The power autoloader for this project site area.
+###SITE_CUSTOM_POWER_AUTOLOADER###
-$power_autoloader = JPATH_SITE . '/components/com_###component###/src/Helper/PowerloaderHelper.php';
-if (file_exists($power_autoloader))
-{
-	require_once $power_autoloader;
-}
 
 ###SITE_HELPER_CLASS_HEADER###
 

admin/forms/joomla_component.xml

@@ -206,8 +206,8 @@
 			syntax="php"
 			editor="codemirror|none"
 			filter="raw"
-			required="add_admin_event:1"
 			validate="code"
+			showon="add_admin_event:1"
 		/>
 		<!-- Note_git_folder_path Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_git_folder_path" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_GIT_FOLDER_PATH_LABEL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_GIT_FOLDER_PATH_DESCRIPTION" heading="h4" class="alert alert-info note_git_folder_path" showon="add_git_folder_path:1" />
@@ -643,6 +643,7 @@
 			editor="codemirror|none"
 			filter="raw"
 			validate="code"
+			showon="add_css_site:1"
 		/>
 		<!-- Whmcs_buy_link Field. Type: Url. (joomla) -->
 		<field

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

@@ -452,10 +452,6 @@ COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION_DESC="Allows the users in this gro
 COM_COMPONENTBUILDER_ADMIN_VIEWS_EMPTYSTATE_BUTTON_ADD="Add your first admin view"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_EMPTYSTATE_CONTENT=""
 COM_COMPONENTBUILDER_ADMIN_VIEWS_EMPTYSTATE_TITLE="No admin views have been created yet."
-COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT="Admin Views Export"
-COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT_DESC="Allows the users in this group to export export admin views"
-COM_COMPONENTBUILDER_ADMIN_VIEWS_IMPORT="Admin Views Import"
-COM_COMPONENTBUILDER_ADMIN_VIEWS_IMPORT_DESC="Allows the users in this group to import import admin views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_NAMES="Names"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_N_ITEMS_ARCHIVED="%s Admin Views archived."
 COM_COMPONENTBUILDER_ADMIN_VIEWS_N_ITEMS_ARCHIVED_1="%s Admin View archived."
@@ -1335,7 +1331,6 @@ COM_COMPONENTBUILDER_AVAILABLE_LIBRARIES="Available Libraries"
 COM_COMPONENTBUILDER_A_METHOD_S_WAS_ADDED_TO_THE_INSTALL_BSB_OF_THIS_PACKAGE_TO_INSURE_THAT_THE_FOLDERS_ARE_COPIED_INTO_THE_CORRECT_PLACE_WHEN_THIS_COMPONENT_IS_INSTALLED="A method (%s) was added to the install <b>%s</b> of this package to insure that the folder(s) are copied into the correct place when this component is installed!"
 COM_COMPONENTBUILDER_A_S_SPAN_CLASSICONFLAG_SPANREPORT_BROKEN_PACKAGEA="<a %s ><span class="icon-flag"> </span>Report Broken Package</a>"
 COM_COMPONENTBUILDER_BACK="Back"
-COM_COMPONENTBUILDER_BACKUP="Backup"
 COM_COMPONENTBUILDER_BACKUP_FAILED_PLEASE_TRY_AGAIN_IF_THE_ERROR_CONTINUE_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR="Backup failed, please try again. If the error continue, please contact your system administrator."
 COM_COMPONENTBUILDER_BACKUP_LOCAL_DATA_FIRST="Backup Local Data First"
 COM_COMPONENTBUILDER_BACKUP_WAS_DONE_SUCCESSFULLY="Backup was done successfully"
@@ -1490,10 +1485,6 @@ COM_COMPONENTBUILDER_CLASS_METHODS_EDIT_VERSION_DESC="Allows the users in this g
 COM_COMPONENTBUILDER_CLASS_METHODS_EMPTYSTATE_BUTTON_ADD="Add your first class method"
 COM_COMPONENTBUILDER_CLASS_METHODS_EMPTYSTATE_CONTENT="Class Methods"
 COM_COMPONENTBUILDER_CLASS_METHODS_EMPTYSTATE_TITLE="No class methods have been created yet."
-COM_COMPONENTBUILDER_CLASS_METHODS_EXPORT="Class Methods Export"
-COM_COMPONENTBUILDER_CLASS_METHODS_EXPORT_DESC="Allows the users in this group to export export class methods"
-COM_COMPONENTBUILDER_CLASS_METHODS_IMPORT="Class Methods Import"
-COM_COMPONENTBUILDER_CLASS_METHODS_IMPORT_DESC="Allows the users in this group to import import class methods"
 COM_COMPONENTBUILDER_CLASS_METHODS_N_ITEMS_ARCHIVED="%s Class Methods archived."
 COM_COMPONENTBUILDER_CLASS_METHODS_N_ITEMS_ARCHIVED_1="%s Class Method archived."
 COM_COMPONENTBUILDER_CLASS_METHODS_N_ITEMS_CHECKED_IN_0="No Class Method successfully checked in."
@@ -1591,10 +1582,6 @@ COM_COMPONENTBUILDER_CLASS_PROPERTIES_EDIT_VERSION_DESC="Allows the users in thi
 COM_COMPONENTBUILDER_CLASS_PROPERTIES_EMPTYSTATE_BUTTON_ADD="Add your first class property"
 COM_COMPONENTBUILDER_CLASS_PROPERTIES_EMPTYSTATE_CONTENT="Class Properties"
 COM_COMPONENTBUILDER_CLASS_PROPERTIES_EMPTYSTATE_TITLE="No class properties have been created yet."
-COM_COMPONENTBUILDER_CLASS_PROPERTIES_EXPORT="Class Properties Export"
-COM_COMPONENTBUILDER_CLASS_PROPERTIES_EXPORT_DESC="Allows the users in this group to export export class properties"
-COM_COMPONENTBUILDER_CLASS_PROPERTIES_IMPORT="Class Properties Import"
-COM_COMPONENTBUILDER_CLASS_PROPERTIES_IMPORT_DESC="Allows the users in this group to import import class properties"
 COM_COMPONENTBUILDER_CLASS_PROPERTIES_N_ITEMS_ARCHIVED="%s Class Properties archived."
 COM_COMPONENTBUILDER_CLASS_PROPERTIES_N_ITEMS_ARCHIVED_1="%s Class Property archived."
 COM_COMPONENTBUILDER_CLASS_PROPERTIES_N_ITEMS_CHECKED_IN_0="No Class Property successfully checked in."
@@ -1668,7 +1655,6 @@ COM_COMPONENTBUILDER_CLASS_PROPERTY_VISIBILITY_DESCRIPTION="The visibility of a
 COM_COMPONENTBUILDER_CLASS_PROPERTY_VISIBILITY_LABEL="Visibility"
 COM_COMPONENTBUILDER_CLEAR="Clear"
 COM_COMPONENTBUILDER_CLEAR_TMP="Clear tmp"
-COM_COMPONENTBUILDER_CLONE="Clone"
 COM_COMPONENTBUILDER_CLONE_FAILED="Clone failed!"
 COM_COMPONENTBUILDER_CLOSE_NEW="Close & New"
 COM_COMPONENTBUILDER_CODE="Code"
@@ -1688,12 +1674,8 @@ COM_COMPONENTBUILDER_COMPILER_COMPILER_ANIMATIONS_BUTTON_ACCESS_DESC="Allows the
 COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST="Compiler Dashboard List"
 COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Compiler"
 COM_COMPONENTBUILDER_COMPILER_DESC="The compiler"
-COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS="Compiler Run Expansion Button Access"
-COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_COMPILER_SUBMENU="Compiler Submenu"
 COM_COMPONENTBUILDER_COMPILER_SUBMENU_DESC="Allows the users in this group to submenu of Compiler"
-COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS="Compiler Translate Button Access"
-COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS_DESC="Allows the users in this group to access the translate button."
 COM_COMPONENTBUILDER_COMPILE_COMPONENT="Compile Component"
 COM_COMPONENTBUILDER_COMPONENT="Component"
 COM_COMPONENTBUILDER_COMPONENTS="Components"
@@ -3765,10 +3747,6 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EDIT_VERSION_DESC="Allows the users in t
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EMPTYSTATE_BUTTON_ADD="Add your first custom admin view"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EMPTYSTATE_CONTENT="The custom admin views used in a component is build here"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EMPTYSTATE_TITLE="No custom admin views have been created yet."
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EXPORT="Custom Admin Views Export"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EXPORT_DESC="Allows the users in this group to export export custom admin views"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_IMPORT="Custom Admin Views Import"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_IMPORT_DESC="Allows the users in this group to import import custom admin views"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_NAMES="Names"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_N_ITEMS_ARCHIVED="%s Custom Admin Views archived."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_N_ITEMS_ARCHIVED_1="%s Custom Admin View archived."
@@ -4195,10 +4173,6 @@ COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_VERSION_DESC="Allows the users in this gr
 COM_COMPONENTBUILDER_CUSTOM_CODES_EMPTYSTATE_BUTTON_ADD="Add your first custom code"
 COM_COMPONENTBUILDER_CUSTOM_CODES_EMPTYSTATE_CONTENT="Custom code added during development"
 COM_COMPONENTBUILDER_CUSTOM_CODES_EMPTYSTATE_TITLE="No custom codes have been created yet."
-COM_COMPONENTBUILDER_CUSTOM_CODES_EXPORT="Custom Codes Export"
-COM_COMPONENTBUILDER_CUSTOM_CODES_EXPORT_DESC="Allows the users in this group to export export custom codes"
-COM_COMPONENTBUILDER_CUSTOM_CODES_IMPORT="Custom Codes Import"
-COM_COMPONENTBUILDER_CUSTOM_CODES_IMPORT_DESC="Allows the users in this group to import import custom codes"
 COM_COMPONENTBUILDER_CUSTOM_CODES_N_ITEMS_ARCHIVED="%s Custom Codes archived."
 COM_COMPONENTBUILDER_CUSTOM_CODES_N_ITEMS_ARCHIVED_1="%s Custom Code archived."
 COM_COMPONENTBUILDER_CUSTOM_CODES_N_ITEMS_CHECKED_IN_0="No Custom Code successfully checked in."
@@ -4307,12 +4281,11 @@ COM_COMPONENTBUILDER_DASHBOARD_FIELDS_CATID="Categories&nbsp;For<br />Fields"
 COM_COMPONENTBUILDER_DASHBOARD_FIELDTYPES="Fieldtypes<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_FIELDTYPES_CATID="Categories&nbsp;For<br />Fieldtypes"
 COM_COMPONENTBUILDER_DASHBOARD_FIELD_ADD="Add&nbsp;Field<br /><br />"
-COM_COMPONENTBUILDER_DASHBOARD_GET_SNIPPETS="Get Snippets<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_HELP_DOCUMENTS="Help Documents<br /><br />"
-COM_COMPONENTBUILDER_DASHBOARD_IMPORTJCBPACKAGES="Import JCB Packages<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_JOOMLA_COMPONENTS="Joomla Components<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_JOOMLA_MODULES="Joomla Modules<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_JOOMLA_PLUGINS="Joomla Plugins<br /><br />"
+COM_COMPONENTBUILDER_DASHBOARD_LANGUAGES="Languages<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_LANGUAGE_TRANSLATIONS="Language Translations<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_LAYOUTS="Layouts<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_LIBRARIES="Libraries<br /><br />"
@@ -4375,10 +4348,6 @@ COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_VERSION_DESC="Allows the users in this gr
 COM_COMPONENTBUILDER_DYNAMIC_GETS_EMPTYSTATE_BUTTON_ADD="Add your first dynamic get"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_EMPTYSTATE_CONTENT=""
 COM_COMPONENTBUILDER_DYNAMIC_GETS_EMPTYSTATE_TITLE="No dynamic gets have been created yet."
-COM_COMPONENTBUILDER_DYNAMIC_GETS_EXPORT="Dynamic Gets Export"
-COM_COMPONENTBUILDER_DYNAMIC_GETS_EXPORT_DESC="Allows the users in this group to export export dynamic gets"
-COM_COMPONENTBUILDER_DYNAMIC_GETS_IMPORT="Dynamic Gets Import"
-COM_COMPONENTBUILDER_DYNAMIC_GETS_IMPORT_DESC="Allows the users in this group to import import dynamic gets"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_N_ITEMS_ARCHIVED="%s Dynamic Gets archived."
 COM_COMPONENTBUILDER_DYNAMIC_GETS_N_ITEMS_ARCHIVED_1="%s Dynamic Get archived."
 COM_COMPONENTBUILDER_DYNAMIC_GETS_N_ITEMS_CHECKED_IN_0="No Dynamic Get successfully checked in."
@@ -4690,11 +4659,7 @@ COM_COMPONENTBUILDER_EXIT_TRASH="Exit trash"
 COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB="Expansion failed, please check your settings in the global options of JCB under the Development Method tab!"
 COM_COMPONENTBUILDER_EXPORTIMPORT_DATA="Export/Import Data"
 COM_COMPONENTBUILDER_EXPORT_COMPLETED="Export Completed!"
-COM_COMPONENTBUILDER_EXPORT_DATA="Export Data"
-COM_COMPONENTBUILDER_EXPORT_DATA_DESC="Allows users in this group to export data."
-COM_COMPONENTBUILDER_EXPORT_FAILED="Export Failed"
 COM_COMPONENTBUILDER_EXPORT_FAILED_PLEASE_TRY_AGAIN_LATTER="Export failed, please try again latter!"
-COM_COMPONENTBUILDER_EXPORT_JCB_PACKAGES="Export JCB Packages"
 COM_COMPONENTBUILDER_EXTENDS="Extends"
 COM_COMPONENTBUILDER_EXTRA_PROPERTIES_LIKE_LISTCLASS_ESCAPE_DISPLAY_VALIDATEBR_SMALLHERE_YOU_CAN_SET_THE_EXTRA_PROPERTIES_FOR_THIS_FIELDSMALL="Extra properties like (listclass, escape, display, validate)<br /><small>Here you can set the extra properties for this field</small>"
 COM_COMPONENTBUILDER_FADE_IN="Fade In"
@@ -4725,10 +4690,6 @@ COM_COMPONENTBUILDER_FIELDS_EDIT_VERSION_DESC="Allows the users in this group to
 COM_COMPONENTBUILDER_FIELDS_EMPTYSTATE_BUTTON_ADD="Add your first field"
 COM_COMPONENTBUILDER_FIELDS_EMPTYSTATE_CONTENT=""
 COM_COMPONENTBUILDER_FIELDS_EMPTYSTATE_TITLE="No fields have been created yet."
-COM_COMPONENTBUILDER_FIELDS_EXPORT="Fields Export"
-COM_COMPONENTBUILDER_FIELDS_EXPORT_DESC="Allows the users in this group to export export fields"
-COM_COMPONENTBUILDER_FIELDS_IMPORT="Fields Import"
-COM_COMPONENTBUILDER_FIELDS_IMPORT_DESC="Allows the users in this group to import import fields"
 COM_COMPONENTBUILDER_FIELDS_N_ITEMS_ARCHIVED="%s Fields archived."
 COM_COMPONENTBUILDER_FIELDS_N_ITEMS_ARCHIVED_1="%s Field archived."
 COM_COMPONENTBUILDER_FIELDS_N_ITEMS_CHECKED_IN_0="No Field successfully checked in."
@@ -4776,10 +4737,6 @@ COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION_DESC="Allows the users in this grou
 COM_COMPONENTBUILDER_FIELDTYPES_EMPTYSTATE_BUTTON_ADD="Add your first fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EMPTYSTATE_CONTENT=""
 COM_COMPONENTBUILDER_FIELDTYPES_EMPTYSTATE_TITLE="No fieldtypes have been created yet."
-COM_COMPONENTBUILDER_FIELDTYPES_EXPORT="Fieldtypes Export"
-COM_COMPONENTBUILDER_FIELDTYPES_EXPORT_DESC="Allows the users in this group to export export fieldtypes"
-COM_COMPONENTBUILDER_FIELDTYPES_IMPORT="Fieldtypes Import"
-COM_COMPONENTBUILDER_FIELDTYPES_IMPORT_DESC="Allows the users in this group to import import fieldtypes"
 COM_COMPONENTBUILDER_FIELDTYPES_N_ITEMS_ARCHIVED="%s Fieldtypes archived."
 COM_COMPONENTBUILDER_FIELDTYPES_N_ITEMS_ARCHIVED_1="%s Fieldtype archived."
 COM_COMPONENTBUILDER_FIELDTYPES_N_ITEMS_CHECKED_IN_0="No Fieldtype successfully checked in."
@@ -5344,8 +5301,6 @@ COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS="Get Snippets Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS_DESC="Allows the users in this group to access get snippets."
 COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS="Get Snippets Custom Admin Views Button Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS_DESC="Allows the users in this group to access the custom admin views button."
-COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST="Get Snippets Dashboard List"
-COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Get Snippets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_DESC="Get the sinppets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS="Get Snippets Layouts Button Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS_DESC="Allows the users in this group to access the layouts button."
@@ -5355,8 +5310,6 @@ COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS="Get Snippets Site Vi
 COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS_DESC="Allows the users in this group to access the site views button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS="Get Snippets Snippets Button Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the snippets button."
-COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU="Get Snippets Submenu"
-COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU_DESC="Allows the users in this group to submenu of Get Snippets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS="Get Snippets Templates Button Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS_DESC="Allows the users in this group to access the templates button."
 COM_COMPONENTBUILDER_GET_THE_SNIPPET_FROM_GITHUB_AND_INSTALL_IT_LOCALLY="Get the snippet from gitHub and install it locally"
@@ -5397,10 +5350,6 @@ COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_VERSION_DESC="Allows the users in this
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_EMPTYSTATE_BUTTON_ADD="Add your first help document"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_EMPTYSTATE_CONTENT="The help documentation of this component"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_EMPTYSTATE_TITLE="No help documents have been created yet."
-COM_COMPONENTBUILDER_HELP_DOCUMENTS_EXPORT="Help Documents Export"
-COM_COMPONENTBUILDER_HELP_DOCUMENTS_EXPORT_DESC="Allows the users in this group to export export help documents"
-COM_COMPONENTBUILDER_HELP_DOCUMENTS_IMPORT="Help Documents Import"
-COM_COMPONENTBUILDER_HELP_DOCUMENTS_IMPORT_DESC="Allows the users in this group to import import help documents"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_N_ITEMS_ARCHIVED="%s Help Documents archived."
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_N_ITEMS_ARCHIVED_1="%s Help Document archived."
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_N_ITEMS_CHECKED_IN_0="No Help Document successfully checked in."
@@ -5523,63 +5472,10 @@ COM_COMPONENTBUILDER_ID="id"
 COM_COMPONENTBUILDER_ID_MISMATCH_WAS_DETECTED_WITH_THE_SSSS_GUI_CODE_FIELD_SO_THE_PLACEHOLDER_WAS_NOT_SET="ID mismatch was detected with the %s.%s.%s.%s GUI code field. So the placeholder was not set."
 COM_COMPONENTBUILDER_IEMAILI_BSB="<i>Email:</i> <b>%s</b>"
 COM_COMPONENTBUILDER_IMPORT_BY_GUID_ONLY="Import by GUID only!"
-COM_COMPONENTBUILDER_IMPORT_CONTINUE="Continue"
-COM_COMPONENTBUILDER_IMPORT_DATA="Import Data"
-COM_COMPONENTBUILDER_IMPORT_DATA_DESC="Allows users in this group to import data."
-COM_COMPONENTBUILDER_IMPORT_ERROR="Import error."
-COM_COMPONENTBUILDER_IMPORT_FAILED="Import Failed"
-COM_COMPONENTBUILDER_IMPORT_FILE_COLUMNS="File Columns"
-COM_COMPONENTBUILDER_IMPORT_FORMATS_ACCEPTED="formats accepted"
-COM_COMPONENTBUILDER_IMPORT_FROM_DIRECTORY="Directory"
-COM_COMPONENTBUILDER_IMPORT_FROM_UPLOAD="Upload"
-COM_COMPONENTBUILDER_IMPORT_FROM_URL="URL"
-COM_COMPONENTBUILDER_IMPORT_GET_BOTTON="Get File"
-COM_COMPONENTBUILDER_IMPORT_IGNORE_COLUMN="-- Ignore This Column --"
-COM_COMPONENTBUILDER_IMPORT_JCB_PACKAGES="Import JCB Packages"
-COM_COMPONENTBUILDER_IMPORT_LINK_FILE_TO_TABLE_COLUMNS="Link File to Table Columns"
-COM_COMPONENTBUILDER_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE="Does not have a valid file type."
-COM_COMPONENTBUILDER_IMPORT_MSG_ENTER_A_URL="Please enter a url."
-COM_COMPONENTBUILDER_IMPORT_MSG_INVALID_URL="Invalid url."
-COM_COMPONENTBUILDER_IMPORT_MSG_NO_FILE_SELECTED="No import file selected."
-COM_COMPONENTBUILDER_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE="Path does not have a valid file."
-COM_COMPONENTBUILDER_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY="Please enter the file directory."
-COM_COMPONENTBUILDER_IMPORT_MSG_PLEASE_SELECT_ALL_COLUMNS="Please link all columns."
-COM_COMPONENTBUILDER_IMPORT_MSG_PLEASE_SELECT_A_DIRECTORY="Please enter the file directory."
-COM_COMPONENTBUILDER_IMPORT_MSG_PLEASE_SELECT_A_FILE="Please select a file to import."
-COM_COMPONENTBUILDER_IMPORT_MSG_WARNIMPORTFILE="Warning, import file error."
-COM_COMPONENTBUILDER_IMPORT_MSG_WARNIMPORTUPLOADERROR="Warning, import upload error."
-COM_COMPONENTBUILDER_IMPORT_NO_IMPORT_TYPE_FOUND="Import type not found."
-COM_COMPONENTBUILDER_IMPORT_PLEASE_SELECT_COLUMN="-- Please Select Column --"
 COM_COMPONENTBUILDER_IMPORT_S="Import %s"
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE="Select File"
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_DIRECTORY="Set the path to file"
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_ADMIN_VIEWS="Select the file to import data to admin_views."
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_CLASS_METHODS="Select the file to import data to class_methods."
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_CLASS_PROPERTIES="Select the file to import data to class_properties."
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_CUSTOM_ADMIN_VIEWS="Select the file to import data to custom_admin_views."
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_CUSTOM_CODES="Select the file to import data to custom_codes."
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_DYNAMIC_GETS="Select the file to import data to dynamic_gets."
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_FIELDS="Select the file to import data to fields."
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_FIELDTYPES="Select the file to import data to fieldtypes."
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_HELP_DOCUMENTS="Select the file to import data to help_documents."
 COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_JOOMLA_COMPONENTS="Select the file to import data to joomla_components."
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_JOOMLA_MODULES="Select the file to import data to joomla_modules."
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LANGUAGES="Select the file to import data to languages."
 COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LANGUAGE_TRANSLATIONS="Select the file to import data to language_translations."
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LAYOUTS="Select the file to import data to layouts."
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_PLACEHOLDERS="Select the file to import data to placeholders."
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_SERVERS="Select the file to import data to servers."
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_SITE_VIEWS="Select the file to import data to site_views."
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_SNIPPETS="Select the file to import data to snippets."
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_TEMPLATES="Select the file to import data to templates."
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_VALIDATION_RULES="Select the file to import data to validation_rules."
-COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_URL="Enter file URL"
 COM_COMPONENTBUILDER_IMPORT_SUCCESS="Import Success!"
-COM_COMPONENTBUILDER_IMPORT_TABLE_COLUMNS="Table Columns"
-COM_COMPONENTBUILDER_IMPORT_TITLE="Data Importer"
-COM_COMPONENTBUILDER_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE="Package to import not found."
-COM_COMPONENTBUILDER_IMPORT_UPDATE_DATA="Import Data"
-COM_COMPONENTBUILDER_IMPORT_UPLOAD_BOTTON="Upload File"
 COM_COMPONENTBUILDER_INACTIVE="Inactive"
 COM_COMPONENTBUILDER_INDENTATION_OPTIONS="Indentation Options"
 COM_COMPONENTBUILDER_INIT="Init"
@@ -5762,8 +5658,6 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_HINT="Author Name &amp; Surname Her
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_LABEL="Author"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_MESSAGE="Error! Please add author name here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACK="Back"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS="Joomla Component Backup Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS_DESC="Allows the users in this group to access the backup button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_FOLDER_PATH_DESCRIPTION="Here you can set the path to the backup folder."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_FOLDER_PATH_HINT="/home/user/backup"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_FOLDER_PATH_LABEL="Backup Folder Path"
@@ -5780,8 +5674,6 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDER_BACKUP_KEY="Joomla Component Build
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDER_JCB_IS_A_CRUCIAL_TOOL_FOR_PHP_PROGRAMMERS_WHO_USE_JOOMLA_TO_EARN_A_LIVING_BY_MAKING_A_BFINANCIAL_DONATIONB_YOU_CAN_SUPPORT_THE_GROWTH_AND_CONTINUITY_OF_THIS_VITAL_RESOURCE_AND_ENSURE_ITS_RELEVANCE_FOR_YEARS_TO_COME_YOUR_CONTRIBUTION_NO_MATTER_HOW_BIG_OR_SMALL_WILL_BE_DEEPLY_APPRECIATED_BY_THE_PROJECTS_TEAM_AND_THE_WIDER_COMMUNITY="Joomla Component Builder (JCB) is a crucial tool for PHP programmers who use Joomla to earn a living. By making a <b>financial donation</b>, you can support the growth and continuity of this vital resource and ensure its relevance for years to come. Your contribution, no matter how big or small, will be deeply appreciated by the project's team and the wider community."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS="Joomla Component Clear tmp Button Access"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS_DESC="Allows the users in this group to access the clear tmp button."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS="Joomla Component Clone Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS_DESC="Allows the users in this group to access the clone button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_DESCRIPTION="Enter Company Name Here"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_HINT="Company Name Here"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_LABEL="Company Name"
@@ -5849,8 +5741,6 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_DESCRIPTION="Enter link wh
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_HINT="http://www.example.com/buy-keys"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_LABEL="Buy Link<br /><small>(to get key)</small>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_MESSAGE="Error! Please add link here."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS="Joomla Component Export JCB Packages Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC="Allows the users in this group to access the export jcb packages button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_DESCRIPTION="The key used to lock the data during export."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_HINT="Export Key Here"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_LABEL="Export Key<br /><small>(encrypted field)</small>"
@@ -5867,8 +5757,6 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_GUID_LABEL="GUID"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ID="Id"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_DESCRIPTION="The component image (product box) for the dashboard and install page, must be 300px X 300px."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_LABEL="Component Image"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS="Joomla Component Import JCB Packages Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC="Allows the users in this group to access the import jcb packages button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_INTELLIGENT_ADDREMOVEIF="Intelligent (add&remove+if)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_DESCRIPTION="Add JavaScript for the entire back-end. Do not add the script tags."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_LABEL="Javascript"
@@ -5997,8 +5885,6 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README="Readme"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README_LABEL="README.md"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_REMOVE_LINE_BREAKS_DESCRIPTION="Should we remove all line breaks (&quot;\r&quot;, &quot;\n&quot;) from all language strings in this component."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_REMOVE_LINE_BREAKS_LABEL="Remove line breaks<br /><small>from language strings</small>"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS="Joomla Component Run Expansion Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_DESCRIPTION="Select your sales server for this component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_LABEL="Sales Server"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Joomla Component to customise the alias."
@@ -6103,8 +5989,6 @@ COM_COMPONENTBUILDER_JOOMLA_MODULES_EDIT_VERSION_DESC="Allows the users in this
 COM_COMPONENTBUILDER_JOOMLA_MODULES_EMPTYSTATE_BUTTON_ADD="Add your first joomla module"
 COM_COMPONENTBUILDER_JOOMLA_MODULES_EMPTYSTATE_CONTENT="Joomla Modules"
 COM_COMPONENTBUILDER_JOOMLA_MODULES_EMPTYSTATE_TITLE="No joomla modules have been created yet."
-COM_COMPONENTBUILDER_JOOMLA_MODULES_EXPORT="Joomla Modules Export"
-COM_COMPONENTBUILDER_JOOMLA_MODULES_EXPORT_DESC="Allows the users in this group to export export joomla modules"
 COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS="Joomla Modules Files, Folders & URLs"
 COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_ACCESS="Joomla Modules Files Folders  Urls Access"
 COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_ACCESS_DESC="Allows the users in this group to access access joomla modules files folders  urls"
@@ -6150,8 +6034,6 @@ COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_N_ITEMS_UNFEATURED="%s Jo
 COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_N_ITEMS_UNFEATURED_1="%s Joomla Module Files, Folders & URLs unfeatured."
 COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_N_ITEMS_UNPUBLISHED="%s Joomla Modules Files, Folders & URLs unpublished."
 COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_N_ITEMS_UNPUBLISHED_1="%s Joomla Module Files, Folders & URLs unpublished."
-COM_COMPONENTBUILDER_JOOMLA_MODULES_IMPORT="Joomla Modules Import"
-COM_COMPONENTBUILDER_JOOMLA_MODULES_IMPORT_DESC="Allows the users in this group to import import joomla modules"
 COM_COMPONENTBUILDER_JOOMLA_MODULES_N_ITEMS_ARCHIVED="%s Joomla Modules archived."
 COM_COMPONENTBUILDER_JOOMLA_MODULES_N_ITEMS_ARCHIVED_1="%s Joomla Module archived."
 COM_COMPONENTBUILDER_JOOMLA_MODULES_N_ITEMS_CHECKED_IN_0="No Joomla Module successfully checked in."
@@ -7087,6 +6969,8 @@ COM_COMPONENTBUILDER_LANGUAGES_BATCH_USE="Languages Batch Use"
 COM_COMPONENTBUILDER_LANGUAGES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch languages"
 COM_COMPONENTBUILDER_LANGUAGES_CREATE="Languages Create"
 COM_COMPONENTBUILDER_LANGUAGES_CREATE_DESC="Allows the users in this group to create create languages"
+COM_COMPONENTBUILDER_LANGUAGES_DASHBOARD_LIST="Languages Dashboard List"
+COM_COMPONENTBUILDER_LANGUAGES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of language"
 COM_COMPONENTBUILDER_LANGUAGES_DELETE="Languages Delete"
 COM_COMPONENTBUILDER_LANGUAGES_DELETE_DESC="Allows the users in this group to delete delete languages"
 COM_COMPONENTBUILDER_LANGUAGES_EDIT="Languages Edit"
@@ -7100,10 +6984,6 @@ COM_COMPONENTBUILDER_LANGUAGES_EDIT_VERSION_DESC="Allows the users in this group
 COM_COMPONENTBUILDER_LANGUAGES_EMPTYSTATE_BUTTON_ADD="Add your first language"
 COM_COMPONENTBUILDER_LANGUAGES_EMPTYSTATE_CONTENT="A list of languages."
 COM_COMPONENTBUILDER_LANGUAGES_EMPTYSTATE_TITLE="No languages have been created yet."
-COM_COMPONENTBUILDER_LANGUAGES_EXPORT="Languages Export"
-COM_COMPONENTBUILDER_LANGUAGES_EXPORT_DESC="Allows the users in this group to export export languages"
-COM_COMPONENTBUILDER_LANGUAGES_IMPORT="Languages Import"
-COM_COMPONENTBUILDER_LANGUAGES_IMPORT_DESC="Allows the users in this group to import import languages"
 COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_ARCHIVED="%s Languages archived."
 COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_ARCHIVED_1="%s Language archived."
 COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_CHECKED_IN_0="No Language successfully checked in."
@@ -7179,10 +7059,6 @@ COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_VERSION_DESC="Allows the users i
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EMPTYSTATE_BUTTON_ADD="Add your first language translation"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EMPTYSTATE_CONTENT="A list of language translations."
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EMPTYSTATE_TITLE="No language translations have been created yet."
-COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EXPORT="Language Translations Export"
-COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EXPORT_DESC="Allows the users in this group to export export language translations"
-COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_IMPORT="Language Translations Import"
-COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_IMPORT_DESC="Allows the users in this group to import import language translations"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_ARCHIVED="%s Language Translations archived."
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_ARCHIVED_1="%s Language Translation archived."
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_CHECKED_IN_0="No Language Translation successfully checked in."
@@ -7265,10 +7141,6 @@ COM_COMPONENTBUILDER_LAYOUTS_EDIT_VERSION_DESC="Allows the users in this group t
 COM_COMPONENTBUILDER_LAYOUTS_EMPTYSTATE_BUTTON_ADD="Add your first layout"
 COM_COMPONENTBUILDER_LAYOUTS_EMPTYSTATE_CONTENT=""
 COM_COMPONENTBUILDER_LAYOUTS_EMPTYSTATE_TITLE="No layouts have been created yet."
-COM_COMPONENTBUILDER_LAYOUTS_EXPORT="Layouts Export"
-COM_COMPONENTBUILDER_LAYOUTS_EXPORT_DESC="Allows the users in this group to export export layouts"
-COM_COMPONENTBUILDER_LAYOUTS_IMPORT="Layouts Import"
-COM_COMPONENTBUILDER_LAYOUTS_IMPORT_DESC="Allows the users in this group to import import layouts"
 COM_COMPONENTBUILDER_LAYOUTS_NAMES="Names"
 COM_COMPONENTBUILDER_LAYOUTS_N_ITEMS_ARCHIVED="%s Layouts archived."
 COM_COMPONENTBUILDER_LAYOUTS_N_ITEMS_ARCHIVED_1="%s Layout archived."
@@ -7842,10 +7714,6 @@ COM_COMPONENTBUILDER_PLACEHOLDERS_EDIT_VERSION_DESC="Allows the users in this gr
 COM_COMPONENTBUILDER_PLACEHOLDERS_EMPTYSTATE_BUTTON_ADD="Add your first placeholder"
 COM_COMPONENTBUILDER_PLACEHOLDERS_EMPTYSTATE_CONTENT=""
 COM_COMPONENTBUILDER_PLACEHOLDERS_EMPTYSTATE_TITLE="No placeholders have been created yet."
-COM_COMPONENTBUILDER_PLACEHOLDERS_EXPORT="Placeholders Export"
-COM_COMPONENTBUILDER_PLACEHOLDERS_EXPORT_DESC="Allows the users in this group to export export placeholders"
-COM_COMPONENTBUILDER_PLACEHOLDERS_IMPORT="Placeholders Import"
-COM_COMPONENTBUILDER_PLACEHOLDERS_IMPORT_DESC="Allows the users in this group to import import placeholders"
 COM_COMPONENTBUILDER_PLACEHOLDERS_N_ITEMS_ARCHIVED="%s Placeholders archived."
 COM_COMPONENTBUILDER_PLACEHOLDERS_N_ITEMS_ARCHIVED_1="%s Placeholder archived."
 COM_COMPONENTBUILDER_PLACEHOLDERS_N_ITEMS_CHECKED_IN_0="No Placeholder successfully checked in."
@@ -8193,10 +8061,6 @@ COM_COMPONENTBUILDER_SERVERS_EDIT_VERSION_DESC="Allows the users in this group t
 COM_COMPONENTBUILDER_SERVERS_EMPTYSTATE_BUTTON_ADD="Add your first server"
 COM_COMPONENTBUILDER_SERVERS_EMPTYSTATE_CONTENT=""
 COM_COMPONENTBUILDER_SERVERS_EMPTYSTATE_TITLE="No servers have been created yet."
-COM_COMPONENTBUILDER_SERVERS_EXPORT="Servers Export"
-COM_COMPONENTBUILDER_SERVERS_EXPORT_DESC="Allows the users in this group to export export servers"
-COM_COMPONENTBUILDER_SERVERS_IMPORT="Servers Import"
-COM_COMPONENTBUILDER_SERVERS_IMPORT_DESC="Allows the users in this group to import import servers"
 COM_COMPONENTBUILDER_SERVERS_N_ITEMS_ARCHIVED="%s Servers archived."
 COM_COMPONENTBUILDER_SERVERS_N_ITEMS_ARCHIVED_1="%s Server archived."
 COM_COMPONENTBUILDER_SERVERS_N_ITEMS_CHECKED_IN_0="No Server successfully checked in."
@@ -8236,7 +8100,6 @@ COM_COMPONENTBUILDER_SERVER_HOST_HINT="yourhost.com"
 COM_COMPONENTBUILDER_SERVER_HOST_LABEL="Host/IP<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_SERVER_HOST_MESSAGE="Error! Please add server host name here."
 COM_COMPONENTBUILDER_SERVER_ID="Id"
-COM_COMPONENTBUILDER_SERVER_LINKED_COMPONENTS="Linked Components"
 COM_COMPONENTBUILDER_SERVER_MODIFIED_BY_DESC="The last user that modified this Server."
 COM_COMPONENTBUILDER_SERVER_MODIFIED_BY_LABEL="Modified By"
 COM_COMPONENTBUILDER_SERVER_MODIFIED_DATE_DESC="The date this Server was modified."
@@ -8337,10 +8200,6 @@ COM_COMPONENTBUILDER_SITE_VIEWS_EDIT_VERSION_DESC="Allows the users in this grou
 COM_COMPONENTBUILDER_SITE_VIEWS_EMPTYSTATE_BUTTON_ADD="Add your first site view"
 COM_COMPONENTBUILDER_SITE_VIEWS_EMPTYSTATE_CONTENT=""
 COM_COMPONENTBUILDER_SITE_VIEWS_EMPTYSTATE_TITLE="No site views have been created yet."
-COM_COMPONENTBUILDER_SITE_VIEWS_EXPORT="Site Views Export"
-COM_COMPONENTBUILDER_SITE_VIEWS_EXPORT_DESC="Allows the users in this group to export export site views"
-COM_COMPONENTBUILDER_SITE_VIEWS_IMPORT="Site Views Import"
-COM_COMPONENTBUILDER_SITE_VIEWS_IMPORT_DESC="Allows the users in this group to import import site views"
 COM_COMPONENTBUILDER_SITE_VIEWS_NAMES="Names"
 COM_COMPONENTBUILDER_SITE_VIEWS_N_ITEMS_ARCHIVED="%s Site Views archived."
 COM_COMPONENTBUILDER_SITE_VIEWS_N_ITEMS_ARCHIVED_1="%s Site View archived."
@@ -8771,10 +8630,6 @@ COM_COMPONENTBUILDER_SNIPPETS_EDIT_VERSION_DESC="Allows the users in this group
 COM_COMPONENTBUILDER_SNIPPETS_EMPTYSTATE_BUTTON_ADD="Add your first snippet"
 COM_COMPONENTBUILDER_SNIPPETS_EMPTYSTATE_CONTENT=""
 COM_COMPONENTBUILDER_SNIPPETS_EMPTYSTATE_TITLE="No snippets have been created yet."
-COM_COMPONENTBUILDER_SNIPPETS_EXPORT="Snippets Export"
-COM_COMPONENTBUILDER_SNIPPETS_EXPORT_DESC="Allows the users in this group to export export snippets"
-COM_COMPONENTBUILDER_SNIPPETS_IMPORT="Snippets Import"
-COM_COMPONENTBUILDER_SNIPPETS_IMPORT_DESC="Allows the users in this group to import import snippets"
 COM_COMPONENTBUILDER_SNIPPETS_N_ITEMS_ARCHIVED="%s Snippets archived."
 COM_COMPONENTBUILDER_SNIPPETS_N_ITEMS_ARCHIVED_1="%s Snippet archived."
 COM_COMPONENTBUILDER_SNIPPETS_N_ITEMS_CHECKED_IN_0="No Snippet successfully checked in."
@@ -8960,7 +8815,6 @@ COM_COMPONENTBUILDER_SUBMENU_DASHBOARD="Dashboard"
 COM_COMPONENTBUILDER_SUBMENU_DYNAMIC_GETS="Dynamic Gets"
 COM_COMPONENTBUILDER_SUBMENU_FIELDS="Fields"
 COM_COMPONENTBUILDER_SUBMENU_FIELDTYPES="Fieldtypes"
-COM_COMPONENTBUILDER_SUBMENU_GET_SNIPPETS="Get Snippets"
 COM_COMPONENTBUILDER_SUBMENU_HELP_DOCUMENTS="Help Documents"
 COM_COMPONENTBUILDER_SUBMENU_JOOMLA_COMPONENTS="Joomla Components"
 COM_COMPONENTBUILDER_SUBMENU_JOOMLA_MODULES="Joomla Modules"
@@ -9032,10 +8886,6 @@ COM_COMPONENTBUILDER_TEMPLATES_EDIT_VERSION_DESC="Allows the users in this group
 COM_COMPONENTBUILDER_TEMPLATES_EMPTYSTATE_BUTTON_ADD="Add your first template"
 COM_COMPONENTBUILDER_TEMPLATES_EMPTYSTATE_CONTENT=""
 COM_COMPONENTBUILDER_TEMPLATES_EMPTYSTATE_TITLE="No templates have been created yet."
-COM_COMPONENTBUILDER_TEMPLATES_EXPORT="Templates Export"
-COM_COMPONENTBUILDER_TEMPLATES_EXPORT_DESC="Allows the users in this group to export export templates"
-COM_COMPONENTBUILDER_TEMPLATES_IMPORT="Templates Import"
-COM_COMPONENTBUILDER_TEMPLATES_IMPORT_DESC="Allows the users in this group to import import templates"
 COM_COMPONENTBUILDER_TEMPLATES_NAMES="Names"
 COM_COMPONENTBUILDER_TEMPLATES_N_ITEMS_ARCHIVED="%s Templates archived."
 COM_COMPONENTBUILDER_TEMPLATES_N_ITEMS_ARCHIVED_1="%s Template archived."
@@ -9231,7 +9081,6 @@ COM_COMPONENTBUILDER_TO_CHANGE_THE_PACKAGE_OWNER_DEFAULTS_OPEN_THE_BJCB_GLOBAL_O
 COM_COMPONENTBUILDER_TO_CHANGE_THE_PACKAGE_OWNER_DEFAULTS_OPEN_THE_JCB_GLOBAL_OPTIONS_GO_TO_THE_COMPANY_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE="To change the package owner defaults. Open the JCB Global Options, go to the Company tab and add the correct company details there."
 COM_COMPONENTBUILDER_TO_SHARE_THESE_SNIPPETS_WITH_THE_REST_OF_THE_JCB_COMMUNITY="To share these snippets with the rest of the JCB community,"
 COM_COMPONENTBUILDER_TO_SHARE_THIS_SNIPPET_WITH_THE_REST_OF_THE_JCB_COMMUNITY="To share this snippet with the rest of the JCB community,"
-COM_COMPONENTBUILDER_TRANSLATE="Translate"
 COM_COMPONENTBUILDER_TRANSLATED_IN="Translated in"
 COM_COMPONENTBUILDER_TRANSLATION_FAILED_SINCE_THERE_ARE_NO_COMPONENTS_LINKED_WITH_TRANSLATION_TOOLS="Translation failed, since there are no components linked with translation tools!"
 COM_COMPONENTBUILDER_TRASHED="Trashed"
@@ -9337,10 +9186,6 @@ COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_VERSION_DESC="Allows the users in thi
 COM_COMPONENTBUILDER_VALIDATION_RULES_EMPTYSTATE_BUTTON_ADD="Add your first validation rule"
 COM_COMPONENTBUILDER_VALIDATION_RULES_EMPTYSTATE_CONTENT=""
 COM_COMPONENTBUILDER_VALIDATION_RULES_EMPTYSTATE_TITLE="No validation rules have been created yet."
-COM_COMPONENTBUILDER_VALIDATION_RULES_EXPORT="Validation Rules Export"
-COM_COMPONENTBUILDER_VALIDATION_RULES_EXPORT_DESC="Allows the users in this group to export export validation rules"
-COM_COMPONENTBUILDER_VALIDATION_RULES_IMPORT="Validation Rules Import"
-COM_COMPONENTBUILDER_VALIDATION_RULES_IMPORT_DESC="Allows the users in this group to import import validation rules"
 COM_COMPONENTBUILDER_VALIDATION_RULES_N_ITEMS_ARCHIVED="%s Validation Rules archived."
 COM_COMPONENTBUILDER_VALIDATION_RULES_N_ITEMS_ARCHIVED_1="%s Validation Rule archived."
 COM_COMPONENTBUILDER_VALIDATION_RULES_N_ITEMS_CHECKED_IN_0="No Validation Rule successfully checked in."

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

@@ -101,10 +101,6 @@ COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE="Admin Views Edit State"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin view"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION="Admin Views Edit Version"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version admin views"
-COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT="Admin Views Export"
-COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT_DESC="Allows the users in this group to export export admin views"
-COM_COMPONENTBUILDER_ADMIN_VIEWS_IMPORT="Admin Views Import"
-COM_COMPONENTBUILDER_ADMIN_VIEWS_IMPORT_DESC="Allows the users in this group to import import admin views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU="Admin Views Submenu"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU_DESC="Allows the users in this group to submenu of admin view"
 COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS="Admin View Run Expansion Button Access"
@@ -149,10 +145,6 @@ COM_COMPONENTBUILDER_CLASS_METHODS_EDIT_STATE="Class Methods Edit State"
 COM_COMPONENTBUILDER_CLASS_METHODS_EDIT_STATE_DESC="Allows the users in this group to update the state of the class method"
 COM_COMPONENTBUILDER_CLASS_METHODS_EDIT_VERSION="Class Methods Edit Version"
 COM_COMPONENTBUILDER_CLASS_METHODS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version class methods"
-COM_COMPONENTBUILDER_CLASS_METHODS_EXPORT="Class Methods Export"
-COM_COMPONENTBUILDER_CLASS_METHODS_EXPORT_DESC="Allows the users in this group to export export class methods"
-COM_COMPONENTBUILDER_CLASS_METHODS_IMPORT="Class Methods Import"
-COM_COMPONENTBUILDER_CLASS_METHODS_IMPORT_DESC="Allows the users in this group to import import class methods"
 COM_COMPONENTBUILDER_CLASS_PROPERTIES_ACCESS="Class Properties Access"
 COM_COMPONENTBUILDER_CLASS_PROPERTIES_ACCESS_DESC="Allows the users in this group to access access class properties"
 COM_COMPONENTBUILDER_CLASS_PROPERTIES_BATCH_USE="Class Properties Batch Use"
@@ -173,10 +165,6 @@ COM_COMPONENTBUILDER_CLASS_PROPERTIES_EDIT_STATE="Class Properties Edit State"
 COM_COMPONENTBUILDER_CLASS_PROPERTIES_EDIT_STATE_DESC="Allows the users in this group to update the state of the class property"
 COM_COMPONENTBUILDER_CLASS_PROPERTIES_EDIT_VERSION="Class Properties Edit Version"
 COM_COMPONENTBUILDER_CLASS_PROPERTIES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version class properties"
-COM_COMPONENTBUILDER_CLASS_PROPERTIES_EXPORT="Class Properties Export"
-COM_COMPONENTBUILDER_CLASS_PROPERTIES_EXPORT_DESC="Allows the users in this group to export export class properties"
-COM_COMPONENTBUILDER_CLASS_PROPERTIES_IMPORT="Class Properties Import"
-COM_COMPONENTBUILDER_CLASS_PROPERTIES_IMPORT_DESC="Allows the users in this group to import import class properties"
 COM_COMPONENTBUILDER_COMPILER_ACCESS="Compiler Access"
 COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC="Allows the users in this group to access compiler."
 COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS="Compiler Clear tmp Button Access"
@@ -185,12 +173,8 @@ COM_COMPONENTBUILDER_COMPILER_COMPILER_ANIMATIONS_BUTTON_ACCESS="Compiler Compil
 COM_COMPONENTBUILDER_COMPILER_COMPILER_ANIMATIONS_BUTTON_ACCESS_DESC="Allows the users in this group to access the compiler animations button."
 COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST="Compiler Dashboard List"
 COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Compiler"
-COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS="Compiler Run Expansion Button Access"
-COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_COMPILER_SUBMENU="Compiler Submenu"
 COM_COMPONENTBUILDER_COMPILER_SUBMENU_DESC="Allows the users in this group to submenu of Compiler"
-COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS="Compiler Translate Button Access"
-COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS_DESC="Allows the users in this group to access the translate button."
 COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_ACCESS="Components Admin Views Access"
 COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_ACCESS_DESC="Allows the users in this group to access access components admin views"
 COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_BATCH_USE="Components Admin Views Batch Use"
@@ -470,10 +454,6 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EDIT_STATE="Custom Admin Views Edit Stat
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EDIT_STATE_DESC="Allows the users in this group to update the state of the custom admin view"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EDIT_VERSION="Custom Admin Views Edit Version"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version custom admin views"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EXPORT="Custom Admin Views Export"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EXPORT_DESC="Allows the users in this group to export export custom admin views"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_IMPORT="Custom Admin Views Import"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_IMPORT_DESC="Allows the users in this group to import import custom admin views"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_SUBMENU="Custom Admin Views Submenu"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_SUBMENU_DESC="Allows the users in this group to submenu of custom admin view"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GET_SNIPPETS_BUTTON_ACCESS="Custom Admin View Get Snippets Button Access"
@@ -500,10 +480,6 @@ COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_STATE="Custom Codes Edit State"
 COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_STATE_DESC="Allows the users in this group to update the state of the custom code"
 COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_VERSION="Custom Codes Edit Version"
 COM_COMPONENTBUILDER_CUSTOM_CODES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version custom codes"
-COM_COMPONENTBUILDER_CUSTOM_CODES_EXPORT="Custom Codes Export"
-COM_COMPONENTBUILDER_CUSTOM_CODES_EXPORT_DESC="Allows the users in this group to export export custom codes"
-COM_COMPONENTBUILDER_CUSTOM_CODES_IMPORT="Custom Codes Import"
-COM_COMPONENTBUILDER_CUSTOM_CODES_IMPORT_DESC="Allows the users in this group to import import custom codes"
 COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU="Custom Codes Submenu"
 COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU_DESC="Allows the users in this group to submenu of custom code"
 COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS="Custom Code Run Expansion Button Access"
@@ -528,10 +504,6 @@ COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_STATE="Dynamic Gets Edit State"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_STATE_DESC="Allows the users in this group to update the state of the dynamic get"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_VERSION="Dynamic Gets Edit Version"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version dynamic gets"
-COM_COMPONENTBUILDER_DYNAMIC_GETS_EXPORT="Dynamic Gets Export"
-COM_COMPONENTBUILDER_DYNAMIC_GETS_EXPORT_DESC="Allows the users in this group to export export dynamic gets"
-COM_COMPONENTBUILDER_DYNAMIC_GETS_IMPORT="Dynamic Gets Import"
-COM_COMPONENTBUILDER_DYNAMIC_GETS_IMPORT_DESC="Allows the users in this group to import import dynamic gets"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU="Dynamic Gets Submenu"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU_DESC="Allows the users in this group to submenu of dynamic get"
 COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS="Dynamic Get Run Expansion Button Access"
@@ -542,8 +514,6 @@ COM_COMPONENTBUILDER_EDIT_CREATED_DATE="Edit Created Date"
 COM_COMPONENTBUILDER_EDIT_CREATED_DATE_DESC="Allows users in this group to edit created date."
 COM_COMPONENTBUILDER_EDIT_VERSIONS="Edit Version"
 COM_COMPONENTBUILDER_EDIT_VERSIONS_DESC="Allows users in this group to edit versions."
-COM_COMPONENTBUILDER_EXPORT_DATA="Export Data"
-COM_COMPONENTBUILDER_EXPORT_DATA_DESC="Allows users in this group to export data."
 COM_COMPONENTBUILDER_FIELDS_ACCESS="Fields Access"
 COM_COMPONENTBUILDER_FIELDS_ACCESS_DESC="Allows the users in this group to access access fields"
 COM_COMPONENTBUILDER_FIELDS_BATCH_USE="Fields Batch Use"
@@ -564,10 +534,6 @@ COM_COMPONENTBUILDER_FIELDS_EDIT_STATE="Fields Edit State"
 COM_COMPONENTBUILDER_FIELDS_EDIT_STATE_DESC="Allows the users in this group to update the state of the field"
 COM_COMPONENTBUILDER_FIELDS_EDIT_VERSION="Fields Edit Version"
 COM_COMPONENTBUILDER_FIELDS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version fields"
-COM_COMPONENTBUILDER_FIELDS_EXPORT="Fields Export"
-COM_COMPONENTBUILDER_FIELDS_EXPORT_DESC="Allows the users in this group to export export fields"
-COM_COMPONENTBUILDER_FIELDS_IMPORT="Fields Import"
-COM_COMPONENTBUILDER_FIELDS_IMPORT_DESC="Allows the users in this group to import import fields"
 COM_COMPONENTBUILDER_FIELDS_SUBMENU="Fields Submenu"
 COM_COMPONENTBUILDER_FIELDS_SUBMENU_DESC="Allows the users in this group to submenu of field"
 COM_COMPONENTBUILDER_FIELDTYPES_ACCESS="Fieldtypes Access"
@@ -588,10 +554,6 @@ COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE="Fieldtypes Edit State"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE_DESC="Allows the users in this group to update the state of the fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION="Fieldtypes Edit Version"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version fieldtypes"
-COM_COMPONENTBUILDER_FIELDTYPES_EXPORT="Fieldtypes Export"
-COM_COMPONENTBUILDER_FIELDTYPES_EXPORT_DESC="Allows the users in this group to export export fieldtypes"
-COM_COMPONENTBUILDER_FIELDTYPES_IMPORT="Fieldtypes Import"
-COM_COMPONENTBUILDER_FIELDTYPES_IMPORT_DESC="Allows the users in this group to import import fieldtypes"
 COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU="Fieldtypes Submenu"
 COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU_DESC="Allows the users in this group to submenu of fieldtype"
 COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS="Field Run Expansion Button Access"
@@ -600,8 +562,6 @@ COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS="Get Snippets Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS_DESC="Allows the users in this group to access get snippets."
 COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS="Get Snippets Custom Admin Views Button Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS_DESC="Allows the users in this group to access the custom admin views button."
-COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST="Get Snippets Dashboard List"
-COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Get Snippets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS="Get Snippets Layouts Button Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS_DESC="Allows the users in this group to access the layouts button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS="Get Snippets Libraries Button Access"
@@ -610,8 +570,6 @@ COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS="Get Snippets Site Vi
 COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS_DESC="Allows the users in this group to access the site views button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS="Get Snippets Snippets Button Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the snippets button."
-COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU="Get Snippets Submenu"
-COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU_DESC="Allows the users in this group to submenu of Get Snippets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS="Get Snippets Templates Button Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS_DESC="Allows the users in this group to access the templates button."
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_ACCESS="Help Documents Access"
@@ -632,14 +590,8 @@ COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_STATE="Help Documents Edit State"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_STATE_DESC="Allows the users in this group to update the state of the help document"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_VERSION="Help Documents Edit Version"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version help documents"
-COM_COMPONENTBUILDER_HELP_DOCUMENTS_EXPORT="Help Documents Export"
-COM_COMPONENTBUILDER_HELP_DOCUMENTS_EXPORT_DESC="Allows the users in this group to export export help documents"
-COM_COMPONENTBUILDER_HELP_DOCUMENTS_IMPORT="Help Documents Import"
-COM_COMPONENTBUILDER_HELP_DOCUMENTS_IMPORT_DESC="Allows the users in this group to import import help documents"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU="Help Documents Submenu"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to submenu of help document"
-COM_COMPONENTBUILDER_IMPORT_DATA="Import Data"
-COM_COMPONENTBUILDER_IMPORT_DATA_DESC="Allows users in this group to import data."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS="Joomla Components Access"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS_DESC="Allows the users in this group to access access joomla components"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_USE="Joomla Components Batch Use"
@@ -664,18 +616,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION="Joomla Components Edit Vers
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version joomla components"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU="Joomla Components Submenu"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU_DESC="Allows the users in this group to submenu of joomla component"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS="Joomla Component Backup Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS_DESC="Allows the users in this group to access the backup button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS="Joomla Component Clear tmp Button Access"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS_DESC="Allows the users in this group to access the clear tmp button."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS="Joomla Component Clone Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS_DESC="Allows the users in this group to access the clone button."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS="Joomla Component Export JCB Packages Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC="Allows the users in this group to access the export jcb packages button."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS="Joomla Component Import JCB Packages Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC="Allows the users in this group to access the import jcb packages button."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS="Joomla Component Run Expansion Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_JOOMLA_MODULES_ACCESS="Joomla Modules Access"
 COM_COMPONENTBUILDER_JOOMLA_MODULES_ACCESS_DESC="Allows the users in this group to access access joomla modules"
 COM_COMPONENTBUILDER_JOOMLA_MODULES_BATCH_USE="Joomla Modules Batch Use"
@@ -698,8 +640,6 @@ COM_COMPONENTBUILDER_JOOMLA_MODULES_EDIT_STATE="Joomla Modules Edit State"
 COM_COMPONENTBUILDER_JOOMLA_MODULES_EDIT_STATE_DESC="Allows the users in this group to update the state of the joomla module"
 COM_COMPONENTBUILDER_JOOMLA_MODULES_EDIT_VERSION="Joomla Modules Edit Version"
 COM_COMPONENTBUILDER_JOOMLA_MODULES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version joomla modules"
-COM_COMPONENTBUILDER_JOOMLA_MODULES_EXPORT="Joomla Modules Export"
-COM_COMPONENTBUILDER_JOOMLA_MODULES_EXPORT_DESC="Allows the users in this group to export export joomla modules"
 COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_ACCESS="Joomla Modules Files Folders  Urls Access"
 COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_ACCESS_DESC="Allows the users in this group to access access joomla modules files folders  urls"
 COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_BATCH_USE="Joomla Modules Files Folders  Urls Batch Use"
@@ -720,8 +660,6 @@ COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_EDIT_STATE="Joomla Module
 COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_EDIT_STATE_DESC="Allows the users in this group to update the state of the joomla module files folders  urls"
 COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_EDIT_VERSION="Joomla Modules Files Folders  Urls Edit Version"
 COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version joomla modules files folders  urls"
-COM_COMPONENTBUILDER_JOOMLA_MODULES_IMPORT="Joomla Modules Import"
-COM_COMPONENTBUILDER_JOOMLA_MODULES_IMPORT_DESC="Allows the users in this group to import import joomla modules"
 COM_COMPONENTBUILDER_JOOMLA_MODULES_SUBMENU="Joomla Modules Submenu"
 COM_COMPONENTBUILDER_JOOMLA_MODULES_SUBMENU_DESC="Allows the users in this group to submenu of joomla module"
 COM_COMPONENTBUILDER_JOOMLA_MODULES_UPDATES_ACCESS="Joomla Modules Updates Access"
@@ -858,6 +796,8 @@ COM_COMPONENTBUILDER_LANGUAGES_BATCH_USE="Languages Batch Use"
 COM_COMPONENTBUILDER_LANGUAGES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch languages"
 COM_COMPONENTBUILDER_LANGUAGES_CREATE="Languages Create"
 COM_COMPONENTBUILDER_LANGUAGES_CREATE_DESC="Allows the users in this group to create create languages"
+COM_COMPONENTBUILDER_LANGUAGES_DASHBOARD_LIST="Languages Dashboard List"
+COM_COMPONENTBUILDER_LANGUAGES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of language"
 COM_COMPONENTBUILDER_LANGUAGES_DELETE="Languages Delete"
 COM_COMPONENTBUILDER_LANGUAGES_DELETE_DESC="Allows the users in this group to delete delete languages"
 COM_COMPONENTBUILDER_LANGUAGES_EDIT="Languages Edit"
@@ -868,10 +808,6 @@ COM_COMPONENTBUILDER_LANGUAGES_EDIT_STATE="Languages Edit State"
 COM_COMPONENTBUILDER_LANGUAGES_EDIT_STATE_DESC="Allows the users in this group to update the state of the language"
 COM_COMPONENTBUILDER_LANGUAGES_EDIT_VERSION="Languages Edit Version"
 COM_COMPONENTBUILDER_LANGUAGES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version languages"
-COM_COMPONENTBUILDER_LANGUAGES_EXPORT="Languages Export"
-COM_COMPONENTBUILDER_LANGUAGES_EXPORT_DESC="Allows the users in this group to export export languages"
-COM_COMPONENTBUILDER_LANGUAGES_IMPORT="Languages Import"
-COM_COMPONENTBUILDER_LANGUAGES_IMPORT_DESC="Allows the users in this group to import import languages"
 COM_COMPONENTBUILDER_LANGUAGES_SUBMENU="Languages Submenu"
 COM_COMPONENTBUILDER_LANGUAGES_SUBMENU_DESC="Allows the users in this group to submenu of language"
 COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS="Language Build Button Access"
@@ -894,10 +830,6 @@ COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_STATE="Language Translations Edi
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_STATE_DESC="Allows the users in this group to update the state of the language translation"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_VERSION="Language Translations Edit Version"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version language translations"
-COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EXPORT="Language Translations Export"
-COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EXPORT_DESC="Allows the users in this group to export export language translations"
-COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_IMPORT="Language Translations Import"
-COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_IMPORT_DESC="Allows the users in this group to import import language translations"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_SUBMENU="Language Translations Submenu"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_SUBMENU_DESC="Allows the users in this group to submenu of language translation"
 COM_COMPONENTBUILDER_LAYOUTS_ACCESS="Layouts Access"
@@ -918,10 +850,6 @@ COM_COMPONENTBUILDER_LAYOUTS_EDIT_STATE="Layouts Edit State"
 COM_COMPONENTBUILDER_LAYOUTS_EDIT_STATE_DESC="Allows the users in this group to update the state of the layout"
 COM_COMPONENTBUILDER_LAYOUTS_EDIT_VERSION="Layouts Edit Version"
 COM_COMPONENTBUILDER_LAYOUTS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version layouts"
-COM_COMPONENTBUILDER_LAYOUTS_EXPORT="Layouts Export"
-COM_COMPONENTBUILDER_LAYOUTS_EXPORT_DESC="Allows the users in this group to export export layouts"
-COM_COMPONENTBUILDER_LAYOUTS_IMPORT="Layouts Import"
-COM_COMPONENTBUILDER_LAYOUTS_IMPORT_DESC="Allows the users in this group to import import layouts"
 COM_COMPONENTBUILDER_LAYOUTS_SUBMENU="Layouts Submenu"
 COM_COMPONENTBUILDER_LAYOUTS_SUBMENU_DESC="Allows the users in this group to submenu of layout"
 COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS="Layout Get Snippets Button Access"
@@ -997,18 +925,19 @@ COM_COMPONENTBUILDER_MENU_DASHBOARD="Dashboard"
 COM_COMPONENTBUILDER_MENU_DYNAMIC_GETS="Dynamic Gets"
 COM_COMPONENTBUILDER_MENU_FIELDS="Fields"
 COM_COMPONENTBUILDER_MENU_FIELDTYPES="Fieldtypes"
-COM_COMPONENTBUILDER_MENU_GET_SNIPPETS="Get Snippets"
 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_LANGUAGES="Languages"
 COM_COMPONENTBUILDER_MENU_LANGUAGE_TRANSLATIONS="Language Translations"
 COM_COMPONENTBUILDER_MENU_LAYOUTS="Layouts"
 COM_COMPONENTBUILDER_MENU_LIBRARIES="Libraries"
 COM_COMPONENTBUILDER_MENU_PLACEHOLDERS="Placeholders"
 COM_COMPONENTBUILDER_MENU_POWERS="Powers"
 COM_COMPONENTBUILDER_MENU_SEARCH="Search"
+COM_COMPONENTBUILDER_MENU_SERVERS="Servers"
 COM_COMPONENTBUILDER_MENU_SITE_VIEWS="Site Views"
 COM_COMPONENTBUILDER_MENU_SNIPPETS="Snippets"
 COM_COMPONENTBUILDER_MENU_TEMPLATES="Templates"
@@ -1031,10 +960,6 @@ COM_COMPONENTBUILDER_PLACEHOLDERS_EDIT_STATE="Placeholders Edit State"
 COM_COMPONENTBUILDER_PLACEHOLDERS_EDIT_STATE_DESC="Allows the users in this group to update the state of the placeholder"
 COM_COMPONENTBUILDER_PLACEHOLDERS_EDIT_VERSION="Placeholders Edit Version"
 COM_COMPONENTBUILDER_PLACEHOLDERS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version placeholders"
-COM_COMPONENTBUILDER_PLACEHOLDERS_EXPORT="Placeholders Export"
-COM_COMPONENTBUILDER_PLACEHOLDERS_EXPORT_DESC="Allows the users in this group to export export placeholders"
-COM_COMPONENTBUILDER_PLACEHOLDERS_IMPORT="Placeholders Import"
-COM_COMPONENTBUILDER_PLACEHOLDERS_IMPORT_DESC="Allows the users in this group to import import placeholders"
 COM_COMPONENTBUILDER_PLACEHOLDERS_SUBMENU="Placeholders Submenu"
 COM_COMPONENTBUILDER_PLACEHOLDERS_SUBMENU_DESC="Allows the users in this group to submenu of placeholder"
 COM_COMPONENTBUILDER_POWERS_ACCESS="Powers Access"
@@ -1097,10 +1022,6 @@ COM_COMPONENTBUILDER_SERVERS_EDIT_STATE="Servers Edit State"
 COM_COMPONENTBUILDER_SERVERS_EDIT_STATE_DESC="Allows the users in this group to update the state of the server"
 COM_COMPONENTBUILDER_SERVERS_EDIT_VERSION="Servers Edit Version"
 COM_COMPONENTBUILDER_SERVERS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version servers"
-COM_COMPONENTBUILDER_SERVERS_EXPORT="Servers Export"
-COM_COMPONENTBUILDER_SERVERS_EXPORT_DESC="Allows the users in this group to export export servers"
-COM_COMPONENTBUILDER_SERVERS_IMPORT="Servers Import"
-COM_COMPONENTBUILDER_SERVERS_IMPORT_DESC="Allows the users in this group to import import servers"
 COM_COMPONENTBUILDER_SERVERS_SUBMENU="Servers Submenu"
 COM_COMPONENTBUILDER_SERVERS_SUBMENU_DESC="Allows the users in this group to submenu of server"
 COM_COMPONENTBUILDER_SITE_VIEWS_ACCESS="Site Views Access"
@@ -1121,10 +1042,6 @@ COM_COMPONENTBUILDER_SITE_VIEWS_EDIT_STATE="Site Views Edit State"
 COM_COMPONENTBUILDER_SITE_VIEWS_EDIT_STATE_DESC="Allows the users in this group to update the state of the site view"
 COM_COMPONENTBUILDER_SITE_VIEWS_EDIT_VERSION="Site Views Edit Version"
 COM_COMPONENTBUILDER_SITE_VIEWS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version site views"
-COM_COMPONENTBUILDER_SITE_VIEWS_EXPORT="Site Views Export"
-COM_COMPONENTBUILDER_SITE_VIEWS_EXPORT_DESC="Allows the users in this group to export export site views"
-COM_COMPONENTBUILDER_SITE_VIEWS_IMPORT="Site Views Import"
-COM_COMPONENTBUILDER_SITE_VIEWS_IMPORT_DESC="Allows the users in this group to import import site views"
 COM_COMPONENTBUILDER_SITE_VIEWS_SUBMENU="Site Views Submenu"
 COM_COMPONENTBUILDER_SITE_VIEWS_SUBMENU_DESC="Allows the users in this group to submenu of site view"
 COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS="Site View Get Snippets Button Access"
@@ -1147,10 +1064,6 @@ COM_COMPONENTBUILDER_SNIPPETS_EDIT_STATE="Snippets Edit State"
 COM_COMPONENTBUILDER_SNIPPETS_EDIT_STATE_DESC="Allows the users in this group to update the state of the snippet"
 COM_COMPONENTBUILDER_SNIPPETS_EDIT_VERSION="Snippets Edit Version"
 COM_COMPONENTBUILDER_SNIPPETS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version snippets"
-COM_COMPONENTBUILDER_SNIPPETS_EXPORT="Snippets Export"
-COM_COMPONENTBUILDER_SNIPPETS_EXPORT_DESC="Allows the users in this group to export export snippets"
-COM_COMPONENTBUILDER_SNIPPETS_IMPORT="Snippets Import"
-COM_COMPONENTBUILDER_SNIPPETS_IMPORT_DESC="Allows the users in this group to import import snippets"
 COM_COMPONENTBUILDER_SNIPPETS_SUBMENU="Snippets Submenu"
 COM_COMPONENTBUILDER_SNIPPETS_SUBMENU_DESC="Allows the users in this group to submenu of snippet"
 COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS="Snippet Get Snippets Button Access"
@@ -1193,10 +1106,6 @@ COM_COMPONENTBUILDER_TEMPLATES_EDIT_STATE="Templates Edit State"
 COM_COMPONENTBUILDER_TEMPLATES_EDIT_STATE_DESC="Allows the users in this group to update the state of the template"
 COM_COMPONENTBUILDER_TEMPLATES_EDIT_VERSION="Templates Edit Version"
 COM_COMPONENTBUILDER_TEMPLATES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version templates"
-COM_COMPONENTBUILDER_TEMPLATES_EXPORT="Templates Export"
-COM_COMPONENTBUILDER_TEMPLATES_EXPORT_DESC="Allows the users in this group to export export templates"
-COM_COMPONENTBUILDER_TEMPLATES_IMPORT="Templates Import"
-COM_COMPONENTBUILDER_TEMPLATES_IMPORT_DESC="Allows the users in this group to import import templates"
 COM_COMPONENTBUILDER_TEMPLATES_SUBMENU="Templates Submenu"
 COM_COMPONENTBUILDER_TEMPLATES_SUBMENU_DESC="Allows the users in this group to submenu of template"
 COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS="Template Get Snippets Button Access"
@@ -1221,10 +1130,6 @@ COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_STATE="Validation Rules Edit State"
 COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_STATE_DESC="Allows the users in this group to update the state of the validation rule"
 COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_VERSION="Validation Rules Edit Version"
 COM_COMPONENTBUILDER_VALIDATION_RULES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version validation rules"
-COM_COMPONENTBUILDER_VALIDATION_RULES_EXPORT="Validation Rules Export"
-COM_COMPONENTBUILDER_VALIDATION_RULES_EXPORT_DESC="Allows the users in this group to export export validation rules"
-COM_COMPONENTBUILDER_VALIDATION_RULES_IMPORT="Validation Rules Import"
-COM_COMPONENTBUILDER_VALIDATION_RULES_IMPORT_DESC="Allows the users in this group to import import validation rules"
 COM_COMPONENTBUILDER_VALIDATION_RULES_SUBMENU="Validation Rules Submenu"
 COM_COMPONENTBUILDER_VALIDATION_RULES_SUBMENU_DESC="Allows the users in this group to submenu of validation rule"
 COM_COMPONENTBUILDER_VALIDATION_RULE_RUN_EXPANSION_BUTTON_ACCESS="Validation Rule Run Expansion Button Access"

admin/layouts/fieldtype/fields_fullwidth.php

@@ -20,7 +20,7 @@ use VDM\Joomla\Utilities\ArrayHelper;
 defined('_JEXEC') or die;
 
 // set the defaults
-$items = $displayData->vxtfields;
+$items = $displayData->vxsfields;
 $user = Factory::getApplication()->getIdentity();
 $id = $displayData->item->id;
 // set the edit URL

admin/layouts/server/linked_components_fullwidth.php

@@ -1,273 +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
- */
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\HTML\HTMLHelper as Html;
-use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\StringHelper;
-use VDM\Joomla\Utilities\ArrayHelper;
-use VDM\Joomla\Utilities\GetHelper;
-
-// No direct access to this file
-defined('_JEXEC') or die;
-
-// set the defaults
-$items = $displayData->vydlinked_components;
-$user = Factory::getApplication()->getIdentity();
-$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::getContainer()->
-			get(\Joomla\CMS\User\UserFactoryInterface::class)->
-				loadUserById($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/services/provider.php

@@ -9,7 +9,7 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-// The power autoloader for this project admin area.
+// The power autoloader for this project (JPATH_ADMINISTRATOR) area.
 $power_autoloader = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/src/Helper/PowerloaderHelper.php';
 if (file_exists($power_autoloader))
 {

admin/sql/updates/mysql/5.0.0-beta5.sql

@@ -0,0 +1 @@
+

admin/src/Controller/Admin_viewsController.php

@@ -17,9 +17,8 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -55,69 +54,6 @@ class Admin_viewsController extends AdminController
 		return parent::getModel($name, $prefix, $config);
 	}
 
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('admin_view.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Admin_views');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Admin_views_'.$date->format('jS_F_Y'),'Admin views exported ('.$date->format('jS F, Y').')','admin views');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=admin_views', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('admin_view.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Admin_views');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('admin_view_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'admin_views');
-				$session->set('dataType_VDM_IMPORTINTO', 'admin_view');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_ADMIN_VIEWS');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=admin_views', false), $message, 'error');
-		return;
-	}
-
 
 	/**
 	 * Run the Expansion
@@ -131,7 +67,7 @@ class Admin_viewsController extends AdminController
 		// 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
@@ -140,7 +76,7 @@ class Admin_viewsController extends AdminController
 			// 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))
 			{

admin/src/Controller/Class_methodsController.php

@@ -17,8 +17,6 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -53,67 +51,4 @@ class Class_methodsController extends AdminController
 	{
 		return parent::getModel($name, $prefix, $config);
 	}
-
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('class_method.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Class_methods');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Class_methods_'.$date->format('jS_F_Y'),'Class methods exported ('.$date->format('jS F, Y').')','class methods');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=class_methods', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('class_method.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Class_methods');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('class_method_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'class_methods');
-				$session->set('dataType_VDM_IMPORTINTO', 'class_method');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_CLASS_METHODS');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=class_methods', false), $message, 'error');
-		return;
-	}
 }

admin/src/Controller/Class_propertiesController.php

@@ -17,8 +17,6 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -53,67 +51,4 @@ class Class_propertiesController extends AdminController
 	{
 		return parent::getModel($name, $prefix, $config);
 	}
-
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('class_property.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Class_properties');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Class_properties_'.$date->format('jS_F_Y'),'Class properties exported ('.$date->format('jS F, Y').')','class properties');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=class_properties', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('class_property.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Class_properties');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('class_property_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'class_properties');
-				$session->set('dataType_VDM_IMPORTINTO', 'class_property');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_CLASS_PROPERTIES');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=class_properties', false), $message, 'error');
-		return;
-	}
 }

admin/src/Controller/CompilerController.php

@@ -21,6 +21,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;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -142,7 +143,7 @@ class CompilerController 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);
@@ -225,7 +226,7 @@ class CompilerController 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 />';
 							}
 						}
@@ -241,7 +242,7 @@ class CompilerController 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 />';
 							}
 						}
@@ -547,7 +548,7 @@ class CompilerController extends AdminController
 		// 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
@@ -556,7 +557,7 @@ class CompilerController extends AdminController
 			// 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))
 			{

admin/src/Controller/Custom_admin_viewsController.php

@@ -17,8 +17,6 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -54,69 +52,6 @@ class Custom_admin_viewsController extends AdminController
 		return parent::getModel($name, $prefix, $config);
 	}
 
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('custom_admin_view.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Custom_admin_views');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Custom_admin_views_'.$date->format('jS_F_Y'),'Custom admin views exported ('.$date->format('jS F, Y').')','custom admin views');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=custom_admin_views', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('custom_admin_view.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Custom_admin_views');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('custom_admin_view_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'custom_admin_views');
-				$session->set('dataType_VDM_IMPORTINTO', 'custom_admin_view');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_CUSTOM_ADMIN_VIEWS');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=custom_admin_views', false), $message, 'error');
-		return;
-	}
-
 	public function getSnippets()
 	{
 		// Check for request forgeries

admin/src/Controller/Custom_codesController.php

@@ -17,9 +17,8 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -55,69 +54,6 @@ class Custom_codesController extends AdminController
 		return parent::getModel($name, $prefix, $config);
 	}
 
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('custom_code.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Custom_codes');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Custom_codes_'.$date->format('jS_F_Y'),'Custom codes exported ('.$date->format('jS F, Y').')','custom codes');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=custom_codes', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('custom_code.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Custom_codes');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('custom_code_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'custom_codes');
-				$session->set('dataType_VDM_IMPORTINTO', 'custom_code');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_CUSTOM_CODES');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=custom_codes', false), $message, 'error');
-		return;
-	}
-
 
 	/**
 	 * Run the Expansion
@@ -131,7 +67,7 @@ class Custom_codesController extends AdminController
 		// 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
@@ -140,7 +76,7 @@ class Custom_codesController extends AdminController
 			// 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))
 			{

admin/src/Controller/Dynamic_getsController.php

@@ -17,9 +17,8 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -55,69 +54,6 @@ class Dynamic_getsController extends AdminController
 		return parent::getModel($name, $prefix, $config);
 	}
 
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('dynamic_get.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Dynamic_gets');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Dynamic_gets_'.$date->format('jS_F_Y'),'Dynamic gets exported ('.$date->format('jS F, Y').')','dynamic gets');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=dynamic_gets', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('dynamic_get.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Dynamic_gets');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('dynamic_get_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'dynamic_gets');
-				$session->set('dataType_VDM_IMPORTINTO', 'dynamic_get');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_DYNAMIC_GETS');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=dynamic_gets', false), $message, 'error');
-		return;
-	}
-
 
 	/**
 	 * Run the Expansion
@@ -131,7 +67,7 @@ class Dynamic_getsController extends AdminController
 		// 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
@@ -140,7 +76,7 @@ class Dynamic_getsController extends AdminController
 			// 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))
 			{

admin/src/Controller/FieldsController.php

@@ -17,9 +17,8 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -55,69 +54,6 @@ class FieldsController extends AdminController
 		return parent::getModel($name, $prefix, $config);
 	}
 
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('field.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Fields');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Fields_'.$date->format('jS_F_Y'),'Fields exported ('.$date->format('jS F, Y').')','fields');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=fields', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('field.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Fields');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('field_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'fields');
-				$session->set('dataType_VDM_IMPORTINTO', 'field');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_FIELDS');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=fields', false), $message, 'error');
-		return;
-	}
-
 
 	/**
 	 * Run the Expansion
@@ -131,7 +67,7 @@ class FieldsController extends AdminController
 		// 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
@@ -140,7 +76,7 @@ class FieldsController extends AdminController
 			// 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))
 			{

admin/src/Controller/FieldtypesController.php

@@ -17,8 +17,6 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -53,67 +51,4 @@ class FieldtypesController extends AdminController
 	{
 		return parent::getModel($name, $prefix, $config);
 	}
-
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('fieldtype.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Fieldtypes');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Fieldtypes_'.$date->format('jS_F_Y'),'Fieldtypes exported ('.$date->format('jS F, Y').')','fieldtypes');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=fieldtypes', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('fieldtype.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Fieldtypes');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('fieldtype_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'fieldtypes');
-				$session->set('dataType_VDM_IMPORTINTO', 'fieldtype');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_FIELDTYPES');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=fieldtypes', false), $message, 'error');
-		return;
-	}
 }

admin/src/Controller/Help_documentsController.php

@@ -17,8 +17,6 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -53,67 +51,4 @@ class Help_documentsController extends AdminController
 	{
 		return parent::getModel($name, $prefix, $config);
 	}
-
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('help_document.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Help_documents');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Help_documents_'.$date->format('jS_F_Y'),'Help documents exported ('.$date->format('jS F, Y').')','help documents');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=help_documents', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('help_document.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Help_documents');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('help_document_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'help_documents');
-				$session->set('dataType_VDM_IMPORTINTO', 'help_document');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_HELP_DOCUMENTS');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=help_documents', false), $message, 'error');
-		return;
-	}
 }

admin/src/Controller/ImportController.php

@@ -1,64 +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
- */
-namespace VDM\Component\Componentbuilder\Administrator\Controller;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\Utilities\ArrayHelper;
-use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-
-// No direct access to this file
-\defined('_JEXEC') or die;
-
-/**
- * Componentbuilder Import Base Controller
- *
- * @since  1.6
- */
-class ImportController extends BaseController
-{
-	/**
-	 * Import an spreadsheet.
-	 *
-	 * @return  void
-	 */
-	public function import()
-	{
-		// Check for request forgeries
-		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
-
-		$model = $this->getModel('import');
-		if ($model->import())
-		{
-			$cache = Factory::getCache('mod_menu');
-			$cache->clean();
-			// TODO: Reset the users acl here as well to kill off any missing bits
-		}
-
-		$app = Factory::getApplication();
-		$redirect_url = $app->getUserState('com_componentbuilder.redirect_url');
-		if (empty($redirect_url))
-		{
-			$redirect_url = Route::_('index.php?option=com_componentbuilder&view=import', false);
-		}
-		else
-		{
-			// wipe out the user state when we're going to redirect
-			$app->setUserState('com_componentbuilder.redirect_url', '');
-			$app->setUserState('com_componentbuilder.message', '');
-			$app->setUserState('com_componentbuilder.extension_message', '');
-		}
-		$this->setRedirect($redirect_url);
-	}
-}

admin/src/Controller/Joomla_componentsController.php

@@ -21,6 +21,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;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -132,7 +133,7 @@ class Joomla_componentsController extends AdminController
 		// 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
@@ -141,7 +142,7 @@ class Joomla_componentsController extends AdminController
 			// 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))
 			{

admin/src/Controller/Joomla_modulesController.php

@@ -17,8 +17,6 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -54,69 +52,6 @@ class Joomla_modulesController extends AdminController
 		return parent::getModel($name, $prefix, $config);
 	}
 
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('joomla_module.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Joomla_modules');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Joomla_modules_'.$date->format('jS_F_Y'),'Joomla modules exported ('.$date->format('jS F, Y').')','joomla modules');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_modules', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('joomla_module.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Joomla_modules');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('joomla_module_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'joomla_modules');
-				$session->set('dataType_VDM_IMPORTINTO', 'joomla_module');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_JOOMLA_MODULES');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=joomla_modules', false), $message, 'error');
-		return;
-	}
-
 	public function getSnippets()
 	{
 		// Check for request forgeries

admin/src/Controller/Joomla_pluginsController.php

@@ -18,6 +18,7 @@ use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -66,7 +67,7 @@ class Joomla_pluginsController 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_EXPANSION_MODULE');
 		// check if this user has the right to run expansion
@@ -75,7 +76,7 @@ class Joomla_pluginsController extends AdminController
 			// 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))
 			{
@@ -106,7 +107,7 @@ class Joomla_pluginsController 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/src/Controller/LanguagesController.php

@@ -17,8 +17,6 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -54,69 +52,6 @@ class LanguagesController extends AdminController
 		return parent::getModel($name, $prefix, $config);
 	}
 
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('language.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Languages');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Languages_'.$date->format('jS_F_Y'),'Languages exported ('.$date->format('jS F, Y').')','languages');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=languages', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('language.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Languages');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('language_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'languages');
-				$session->set('dataType_VDM_IMPORTINTO', 'language');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LANGUAGES');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=languages', false), $message, 'error');
-		return;
-	}
-
 	public function buildLanguages()
 	{
 		// Check for request forgeries

admin/src/Controller/LayoutsController.php

@@ -17,8 +17,6 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -54,69 +52,6 @@ class LayoutsController extends AdminController
 		return parent::getModel($name, $prefix, $config);
 	}
 
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('layout.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Layouts');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Layouts_'.$date->format('jS_F_Y'),'Layouts exported ('.$date->format('jS F, Y').')','layouts');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=layouts', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('layout.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Layouts');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('layout_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'layouts');
-				$session->set('dataType_VDM_IMPORTINTO', 'layout');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LAYOUTS');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=layouts', false), $message, 'error');
-		return;
-	}
-
 	public function getSnippets()
 	{
 		// Check for request forgeries

admin/src/Controller/PlaceholdersController.php

@@ -17,8 +17,6 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -53,67 +51,4 @@ class PlaceholdersController extends AdminController
 	{
 		return parent::getModel($name, $prefix, $config);
 	}
-
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('placeholder.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Placeholders');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Placeholders_'.$date->format('jS_F_Y'),'Placeholders exported ('.$date->format('jS F, Y').')','placeholders');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=placeholders', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('placeholder.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Placeholders');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('placeholder_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'placeholders');
-				$session->set('dataType_VDM_IMPORTINTO', 'placeholder');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_PLACEHOLDERS');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=placeholders', false), $message, 'error');
-		return;
-	}
 }

admin/src/Controller/PowersController.php

@@ -20,6 +20,7 @@ use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Power\Factory as PowerFactory;
 use VDM\Joomla\Utilities\GetHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -68,7 +69,7 @@ class PowersController extends AdminController
 		// 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
@@ -77,7 +78,7 @@ class PowersController extends AdminController
 			// 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))
 			{

admin/src/Controller/ServersController.php

@@ -17,8 +17,6 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -53,67 +51,4 @@ class ServersController extends AdminController
 	{
 		return parent::getModel($name, $prefix, $config);
 	}
-
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('server.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Servers');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Servers_'.$date->format('jS_F_Y'),'Servers exported ('.$date->format('jS F, Y').')','servers');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=servers', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('server.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Servers');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('server_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'servers');
-				$session->set('dataType_VDM_IMPORTINTO', 'server');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_SERVERS');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=servers', false), $message, 'error');
-		return;
-	}
 }

admin/src/Controller/Site_viewsController.php

@@ -17,8 +17,6 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -54,69 +52,6 @@ class Site_viewsController extends AdminController
 		return parent::getModel($name, $prefix, $config);
 	}
 
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('site_view.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Site_views');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Site_views_'.$date->format('jS_F_Y'),'Site views exported ('.$date->format('jS F, Y').')','site views');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=site_views', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('site_view.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Site_views');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('site_view_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'site_views');
-				$session->set('dataType_VDM_IMPORTINTO', 'site_view');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_SITE_VIEWS');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=site_views', false), $message, 'error');
-		return;
-	}
-
 	public function getSnippets()
 	{
 		// Check for request forgeries

admin/src/Controller/SnippetsController.php

@@ -18,7 +18,6 @@ use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -54,69 +53,6 @@ class SnippetsController extends AdminController
 		return parent::getModel($name, $prefix, $config);
 	}
 
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('snippet.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Snippets');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Snippets_'.$date->format('jS_F_Y'),'Snippets exported ('.$date->format('jS F, Y').')','snippets');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=snippets', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('snippet.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Snippets');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('snippet_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'snippets');
-				$session->set('dataType_VDM_IMPORTINTO', 'snippet');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_SNIPPETS');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=snippets', false), $message, 'error');
-		return;
-	}
-
 	public function getSnippets()
 	{
 		// Check for request forgeries

admin/src/Controller/TemplatesController.php

@@ -17,8 +17,6 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -54,69 +52,6 @@ class TemplatesController extends AdminController
 		return parent::getModel($name, $prefix, $config);
 	}
 
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('template.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Templates');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Templates_'.$date->format('jS_F_Y'),'Templates exported ('.$date->format('jS F, Y').')','templates');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=templates', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('template.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Templates');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('template_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'templates');
-				$session->set('dataType_VDM_IMPORTINTO', 'template');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_TEMPLATES');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=templates', false), $message, 'error');
-		return;
-	}
-
 	public function getSnippets()
 	{
 		// Check for request forgeries

admin/src/Controller/Validation_rulesController.php

@@ -17,9 +17,8 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Uri\Uri;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -55,69 +54,6 @@ class Validation_rulesController extends AdminController
 		return parent::getModel($name, $prefix, $config);
 	}
 
-	public function exportData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if export is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('validation_rule.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder'))
-		{
-			// Get the input
-			$input = Factory::getApplication()->input;
-			$pks = $input->post->get('cid', array(), 'array');
-			// Sanitize the input
-			$pks = ArrayHelper::toInteger($pks);
-			// Get the model
-			$model = $this->getModel('Validation_rules');
-			// get the data to export
-			$data = $model->getExportData($pks);
-			if (UtilitiesArrayHelper::check($data))
-			{
-				// now set the data to the spreadsheet
-				$date = Factory::getDate();
-				ComponentbuilderHelper::xls($data,'Validation_rules_'.$date->format('jS_F_Y'),'Validation rules exported ('.$date->format('jS F, Y').')','validation rules');
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_EXPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=validation_rules', false), $message, 'error');
-		return;
-	}
-
-
-	public function importData()
-	{
-		// Check for request forgeries
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		// check if import is allowed for this user.
-		$user = Factory::getApplication()->getIdentity();
-		if ($user->authorise('validation_rule.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-		{
-			// Get the import model
-			$model = $this->getModel('Validation_rules');
-			// get the headers to import
-			$headers = $model->getExImPortHeaders();
-			if (ObjectHelper::check($headers))
-			{
-				// Load headers to session.
-				$session = Factory::getSession();
-				$headers = json_encode($headers);
-				$session->set('validation_rule_VDM_IMPORTHEADERS', $headers);
-				$session->set('backto_VDM_IMPORT', 'validation_rules');
-				$session->set('dataType_VDM_IMPORTINTO', 'validation_rule');
-				// Redirect to import view.
-				$message = Text::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_VALIDATION_RULES');
-				$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=import', false), $message);
-				return;
-			}
-		}
-		// Redirect to the list screen with error.
-		$message = Text::_('COM_COMPONENTBUILDER_IMPORT_FAILED');
-		$this->setRedirect(Route::_('index.php?option=com_componentbuilder&view=validation_rules', false), $message, 'error');
-		return;
-	}
-
 
 	/**
 	 * Run the Expansion
@@ -131,7 +67,7 @@ class Validation_rulesController extends AdminController
 		// 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
@@ -140,7 +76,7 @@ class Validation_rulesController extends AdminController
 			// 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))
 			{

admin/src/Helper/ComponentbuilderHelper.php

@@ -10,7 +10,7 @@
  */
 namespace VDM\Component\Componentbuilder\Administrator\Helper;
 
-// The power autoloader for this project admin area.
+// The power autoloader for this project (JPATH_ADMINISTRATOR) area.
 $power_autoloader = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/src/Helper/PowerloaderHelper.php';
 if (file_exists($power_autoloader))
 {
@@ -34,9 +34,6 @@ use Joomla\Database\DatabaseInterface;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
-use PhpOffice\PhpSpreadsheet\IOFactory;
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 use Joomla\Archive\Archive;
 use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Filesystem\Path;
@@ -60,6 +57,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;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -2755,7 +2753,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);
 			}
@@ -3258,7 +3256,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\">";
@@ -3661,7 +3659,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
@@ -4890,7 +4888,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);
@@ -5002,7 +5000,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);
@@ -5108,7 +5106,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;
 		}
@@ -6145,11 +6143,6 @@ abstract class ComponentbuilderHelper
 		{
 			\JHtmlSidebar::addEntry(Text::_('COM_COMPONENTBUILDER_SUBMENU_SNIPPETS'), 'index.php?option=com_componentbuilder&view=snippets', $submenu === 'snippets');
 		}
-		// Access control (get_snippets.submenu).
-		if ($user->authorise('get_snippets.submenu', 'com_componentbuilder'))
-		{
-			\JHtmlSidebar::addEntry(Text::_('COM_COMPONENTBUILDER_SUBMENU_GET_SNIPPETS'), 'index.php?option=com_componentbuilder&view=get_snippets', $submenu === 'get_snippets');
-		}
 		if ($user->authorise('validation_rule.access', 'com_componentbuilder') && $user->authorise('validation_rule.submenu', 'com_componentbuilder'))
 		{
 			\JHtmlSidebar::addEntry(Text::_('COM_COMPONENTBUILDER_SUBMENU_VALIDATION_RULES'), 'index.php?option=com_componentbuilder&view=validation_rules', $submenu === 'validation_rules');
@@ -6284,224 +6277,6 @@ abstract class ComponentbuilderHelper
 		return false;
 	}
 
-	/**
-	* Prepares the xml document
-	*/
-	public static function xls($rows, $fileName = null, $title = null, $subjectTab = null, $creator = 'Vast Development Method', $description = null, $category = null,$keywords = null, $modified = null)
-	{
-		// set the user
-		// set fileName if not set
-		if (!$fileName)
-		{
-			$fileName = 'exported_'.Factory::getDate()->format('jS_F_Y');
-		}
-		// set modified if not set
-		if (!$modified)
-		{
-			$modified = $user->name;
-		}
-		// set title if not set
-		if (!$title)
-		{
-			$title = 'Book1';
-		}
-		// set tab name if not set
-		if (!$subjectTab)
-		{
-			$subjectTab = 'Sheet1';
-		}
-
-		// make sure we have the composer classes loaded
-		self::composerAutoload('phpspreadsheet');
-
-		// Create new Spreadsheet object
-		$spreadsheet = new Spreadsheet();
-
-		// Set document properties
-		$spreadsheet->getProperties()
-			->setCreator($creator)
-			->setCompany('Vast Development Method')
-			->setLastModifiedBy($modified)
-			->setTitle($title)
-			->setSubject($subjectTab);
-		// The file type
-		$file_type = 'Xls';
-		// set description
-		if ($description)
-		{
-			$spreadsheet->getProperties()->setDescription($description);
-		}
-		// set keywords
-		if ($keywords)
-		{
-			$spreadsheet->getProperties()->setKeywords($keywords);
-		}
-		// set category
-		if ($category)
-		{
-			$spreadsheet->getProperties()->setCategory($category);
-		}
-
-		// Some styles
-		$headerStyles = array(
-			'font'  => array(
-				'bold'  => true,
-				'color' => array('rgb' => '1171A3'),
-				'size'  => 12,
-				'name'  => 'Verdana'
-		));
-		$sideStyles = array(
-			'font'  => array(
-				'bold'  => true,
-				'color' => array('rgb' => '444444'),
-				'size'  => 11,
-				'name'  => 'Verdana'
-		));
-		$normalStyles = array(
-			'font'  => array(
-				'color' => array('rgb' => '444444'),
-				'size'  => 11,
-				'name'  => 'Verdana'
-		));
-
-		// Add some data
-		if (($size = UtilitiesArrayHelper::check($rows)) !== false)
-		{
-			$i = 1;
-
-			// Based on data size we adapt the behaviour.
-			$xls_mode = 1;
-			if ($size > 3000)
-			{
-				$xls_mode = 3;
-				$file_type = 'Csv';
-			}
-			elseif ($size > 2000)
-			{
-				$xls_mode = 2;
-			}
-
-			// Set active sheet and get it.
-			$active_sheet = $spreadsheet->setActiveSheetIndex(0);
-			foreach ($rows as $array)
-			{
-				$a = 'A';
-				foreach ($array as $value)
-				{
-					$active_sheet->setCellValue($a.$i, $value);
-					if ($xls_mode != 3)
-					{
-						if ($i == 1)
-						{
-							$active_sheet->getColumnDimension($a)->setAutoSize(true);
-							$active_sheet->getStyle($a.$i)->applyFromArray($headerStyles);
-							$active_sheet->getStyle($a.$i)->getAlignment()->setHorizontal(PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
-						}
-						elseif ($a === 'A')
-						{
-							$active_sheet->getStyle($a.$i)->applyFromArray($sideStyles);
-						}
-						elseif ($xls_mode == 1)
-						{
-							$active_sheet->getStyle($a.$i)->applyFromArray($normalStyles);
-						}
-					}
-					$a++;
-				}
-				$i++;
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		// Rename worksheet
-		$spreadsheet->getActiveSheet()->setTitle($subjectTab);
-
-		// Set active sheet index to the first sheet, so Excel opens this as the first sheet
-		$spreadsheet->setActiveSheetIndex(0);
-
-		// Redirect output to a client's web browser (Excel5)
-		header('Content-Type: application/vnd.ms-excel');
-		header('Content-Disposition: attachment;filename="' . $fileName . '.' . strtolower($file_type) .'"');
-		header('Cache-Control: max-age=0');
-		// If you're serving to IE 9, then the following may be needed
-		header('Cache-Control: max-age=1');
-
-		// If you're serving to IE over SSL, then the following may be needed
-		header ('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); // Date in the past
-		header ('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); // always modified
-		header ('Cache-Control: cache, must-revalidate'); // HTTP/1.1
-		header ('Pragma: public'); // HTTP/1.0
-
-		$writer = IOFactory::createWriter($spreadsheet, $file_type);
-		$writer->save('php://output');
-		jexit();
-	}
-
-	/**
-	* Get CSV Headers
-	*/
-	public static function getFileHeaders($dataType)
-	{
-		// make sure we have the composer classes loaded
-		self::composerAutoload('phpspreadsheet');
-		// get session object
-		$session = Factory::getSession();
-		$package = $session->get('package', null);
-		$package = json_decode($package, true);
-		// set the headers
-		if(isset($package['dir']))
-		{
-			// only load first three rows
-			$chunkFilter = new PhpOffice\PhpSpreadsheet\Reader\chunkReadFilter(2,1);
-			// identify the file type
-			$inputFileType = IOFactory::identify($package['dir']);
-			// create the reader for this file type
-			$excelReader = IOFactory::createReader($inputFileType);
-			// load the limiting filter
-			$excelReader->setReadFilter($chunkFilter);
-			$excelReader->setReadDataOnly(true);
-			// load the rows (only first three)
-			$excelObj = $excelReader->load($package['dir']);
-			$headers = [];
-			foreach ($excelObj->getActiveSheet()->getRowIterator() as $row)
-			{
-				if($row->getRowIndex() == 1)
-				{
-					$cellIterator = $row->getCellIterator();
-					$cellIterator->setIterateOnlyExistingCells(false);
-					foreach ($cellIterator as $cell)
-					{
-						if (!is_null($cell))
-						{
-							$headers[$cell->getColumn()] = $cell->getValue();
-						}
-					}
-					$excelObj->disconnectWorksheets();
-					unset($excelObj);
-					break;
-				}
-			}
-			return $headers;
-		}
-		return false;
-	}
-
-	/**
-	* Load the Composer Vendor phpspreadsheet
-	*/
-	protected static function composephpspreadsheet()
-	{
-		// load the autoloader for phpspreadsheet
-		require_once JPATH_SITE . '/libraries/phpspreadsheet/vendor/autoload.php';
-		// do not load again
-		self::$composer['phpspreadsheet'] = true;
-
-		return  true;
-	}
-
 	/**
 	 * Get a Variable
 	 *

admin/src/Helper/PowerloaderHelper.php

@@ -20,7 +20,7 @@ if (file_exists($composer_autoloader))
 }
 
 // register additional namespace
-\spl_autoload_register(function ($class) {
+spl_autoload_register(function ($class) {
 	// project-specific base directories and namespace prefix
 	$search = [
 		'libraries/vendor_jcb/VDM.Joomla.Gitea' => 'VDM\\Joomla\\Gitea',

admin/src/Model/Admin_viewsModel.php

@@ -598,223 +598,6 @@ class Admin_viewsModel extends ListModel
 		return $query;
 	}
 
-	/**
-	 * Method to get list export data.
-	 *
-	 * @param   array  $pks  The ids of the items to get
-	 * @param   JUser  $user  The user making the request
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getExportData($pks, $user = null)
-	{
-		// setup the query
-		if (($pks_size = UtilitiesArrayHelper::check($pks)) !== false || 'bulk' === $pks)
-		{
-			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
-			$_export = true;
-			// Get the user object if not set.
-			if (!isset($user) || !ObjectHelper::check($user))
-			{
-				$user = $this->getCurrentUser();
-			}
-			// Create a new query object.
-			$db = $this->getDatabase();
-			$query = $db->getQuery(true);
-
-			// Select some fields
-			$query->select('a.*');
-
-			// From the componentbuilder_admin_view table
-			$query->from($db->quoteName('#__componentbuilder_admin_view', 'a'));
-			// The bulk export path
-			if ('bulk' === $pks)
-			{
-				$query->where('a.id > 0');
-			}
-			// A large array of ID's will not work out well
-			elseif ($pks_size > 500)
-			{
-				// Use lowest ID
-				$query->where('a.id >= ' . (int) min($pks));
-				// Use highest ID
-				$query->where('a.id <= ' . (int) max($pks));
-			}
-			// The normal default path
-			else
-			{
-				$query->where('a.id IN (' . implode(',',$pks) . ')');
-			}
-
-			// do not use these filters in the export method
-		if (!isset($_export) || !$_export)
-		{
-			// Filtering "joomla components"
-			$filter_joomla_component = $this->state->get("filter.joomla_component");
-			if ($filter_joomla_component !== null && !empty($filter_joomla_component))
-			{
-				if (($ids = JCBFilterHelper::linked((int) $filter_joomla_component, 'joomla_component_admin_views')) !== null)
-				{
-					$query->where($db->quoteName('a.id') . ' IN (' . implode(',', $ids) . ')');
-				}
-				else
-				{
-					// there is none
-					$query->where($db->quoteName('a.id') . ' = ' . 0);
-				}
-			}
-		}
-			// Implement View Level Access
-			if (!$user->authorise('core.options', 'com_componentbuilder'))
-			{
-				$groups = implode(',', $user->getAuthorisedViewLevels());
-				$query->where('a.access IN (' . $groups . ')');
-			}
-
-			// Order the results by ordering
-			$query->order('a.id desc');
-
-			// Load the items
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				$items = $db->loadObjectList();
-
-				// Set values to display correctly.
-				if (UtilitiesArrayHelper::check($items))
-				{
-					foreach ($items as $nr => &$item)
-					{
-						// Remove items the user can't access.
-						$access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder'));
-						if (!$access)
-						{
-							unset($items[$nr]);
-							continue;
-						}
-
-						// decode php_allowedit
-						$item->php_allowedit = base64_decode($item->php_allowedit);
-						// decode php_postsavehook
-						$item->php_postsavehook = base64_decode($item->php_postsavehook);
-						// decode php_before_save
-						$item->php_before_save = base64_decode($item->php_before_save);
-						// decode php_getlistquery
-						$item->php_getlistquery = base64_decode($item->php_getlistquery);
-						// decode php_import_ext
-						$item->php_import_ext = base64_decode($item->php_import_ext);
-						// decode php_after_publish
-						$item->php_after_publish = base64_decode($item->php_after_publish);
-						// decode php_after_cancel
-						$item->php_after_cancel = base64_decode($item->php_after_cancel);
-						// decode php_batchmove
-						$item->php_batchmove = base64_decode($item->php_batchmove);
-						// decode php_after_delete
-						$item->php_after_delete = base64_decode($item->php_after_delete);
-						// decode php_import
-						$item->php_import = base64_decode($item->php_import);
-						// decode php_getitems_after_all
-						$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
-						// decode php_getform
-						$item->php_getform = base64_decode($item->php_getform);
-						// decode php_save
-						$item->php_save = base64_decode($item->php_save);
-						// decode php_allowadd
-						$item->php_allowadd = base64_decode($item->php_allowadd);
-						// decode php_before_cancel
-						$item->php_before_cancel = base64_decode($item->php_before_cancel);
-						// decode php_batchcopy
-						$item->php_batchcopy = base64_decode($item->php_batchcopy);
-						// decode php_before_publish
-						$item->php_before_publish = base64_decode($item->php_before_publish);
-						// decode php_before_delete
-						$item->php_before_delete = base64_decode($item->php_before_delete);
-						// decode php_document
-						$item->php_document = base64_decode($item->php_document);
-						// decode sql
-						$item->sql = base64_decode($item->sql);
-						// decode php_import_display
-						$item->php_import_display = base64_decode($item->php_import_display);
-						// decode php_import_setdata
-						$item->php_import_setdata = base64_decode($item->php_import_setdata);
-						// decode css_view
-						$item->css_view = base64_decode($item->css_view);
-						// decode css_views
-						$item->css_views = base64_decode($item->css_views);
-						// decode javascript_view_file
-						$item->javascript_view_file = base64_decode($item->javascript_view_file);
-						// decode javascript_view_footer
-						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
-						// decode javascript_views_file
-						$item->javascript_views_file = base64_decode($item->javascript_views_file);
-						// decode javascript_views_footer
-						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
-						// decode php_controller
-						$item->php_controller = base64_decode($item->php_controller);
-						// decode php_model
-						$item->php_model = base64_decode($item->php_model);
-						// decode php_controller_list
-						$item->php_controller_list = base64_decode($item->php_controller_list);
-						// decode php_model_list
-						$item->php_model_list = base64_decode($item->php_model_list);
-						// decode php_ajaxmethod
-						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
-						// decode html_import_view
-						$item->html_import_view = base64_decode($item->html_import_view);
-						// decode php_getitem
-						$item->php_getitem = base64_decode($item->php_getitem);
-						// decode php_import_headers
-						$item->php_import_headers = base64_decode($item->php_import_headers);
-						// decode php_import_save
-						$item->php_import_save = base64_decode($item->php_import_save);
-						// decode php_getitems
-						$item->php_getitems = base64_decode($item->php_getitems);
-						// unset the values we don't want exported.
-						unset($item->asset_id);
-						unset($item->checked_out);
-						unset($item->checked_out_time);
-					}
-				}
-				// Add headers to items array.
-				$headers = $this->getExImPortHeaders();
-				if (ObjectHelper::check($headers))
-				{
-					array_unshift($items,$headers);
-				}
-				return $items;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = Factory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_admin_view");
-		if (UtilitiesArrayHelper::check($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new \stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/src/Model/AjaxModel.php

@@ -205,7 +205,7 @@ class AjaxModel 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>' ;
@@ -243,11 +243,11 @@ class AjaxModel 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>';
 		}
@@ -256,11 +256,11 @@ class AjaxModel 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>';
 		}

admin/src/Model/Class_methodsModel.php

@@ -385,134 +385,6 @@ class Class_methodsModel extends ListModel
 		return $query;
 	}
 
-	/**
-	 * Method to get list export data.
-	 *
-	 * @param   array  $pks  The ids of the items to get
-	 * @param   JUser  $user  The user making the request
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getExportData($pks, $user = null)
-	{
-		// setup the query
-		if (($pks_size = UtilitiesArrayHelper::check($pks)) !== false || 'bulk' === $pks)
-		{
-			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
-			$_export = true;
-			// Get the user object if not set.
-			if (!isset($user) || !ObjectHelper::check($user))
-			{
-				$user = $this->getCurrentUser();
-			}
-			// Create a new query object.
-			$db = $this->getDatabase();
-			$query = $db->getQuery(true);
-
-			// Select some fields
-			$query->select('a.*');
-
-			// From the componentbuilder_class_method table
-			$query->from($db->quoteName('#__componentbuilder_class_method', 'a'));
-			// The bulk export path
-			if ('bulk' === $pks)
-			{
-				$query->where('a.id > 0');
-			}
-			// A large array of ID's will not work out well
-			elseif ($pks_size > 500)
-			{
-				// Use lowest ID
-				$query->where('a.id >= ' . (int) min($pks));
-				// Use highest ID
-				$query->where('a.id <= ' . (int) max($pks));
-			}
-			// The normal default path
-			else
-			{
-				$query->where('a.id IN (' . implode(',',$pks) . ')');
-			}
-			// Implement View Level Access
-			if (!$user->authorise('core.options', 'com_componentbuilder'))
-			{
-				$groups = implode(',', $user->getAuthorisedViewLevels());
-				$query->where('a.access IN (' . $groups . ')');
-			}
-
-			// Order the results by ordering
-			$query->order('a.id desc');
-
-			// Load the items
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				$items = $db->loadObjectList();
-
-				// Set values to display correctly.
-				if (UtilitiesArrayHelper::check($items))
-				{
-					foreach ($items as $nr => &$item)
-					{
-						// Remove items the user can't access.
-						$access = ($user->authorise('class_method.access', 'com_componentbuilder.class_method.' . (int) $item->id) && $user->authorise('class_method.access', 'com_componentbuilder'));
-						if (!$access)
-						{
-							unset($items[$nr]);
-							continue;
-						}
-
-						// decode code
-						$item->code = base64_decode($item->code);
-						// decode comment
-						$item->comment = base64_decode($item->comment);
-						// decode arguments
-						$item->arguments = base64_decode($item->arguments);
-						// unset the values we don't want exported.
-						unset($item->asset_id);
-						unset($item->checked_out);
-						unset($item->checked_out_time);
-					}
-				}
-				// Add headers to items array.
-				$headers = $this->getExImPortHeaders();
-				if (ObjectHelper::check($headers))
-				{
-					array_unshift($items,$headers);
-				}
-				return $items;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = Factory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_class_method");
-		if (UtilitiesArrayHelper::check($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new \stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/src/Model/Class_propertiesModel.php

@@ -383,132 +383,6 @@ class Class_propertiesModel extends ListModel
 		return $query;
 	}
 
-	/**
-	 * Method to get list export data.
-	 *
-	 * @param   array  $pks  The ids of the items to get
-	 * @param   JUser  $user  The user making the request
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getExportData($pks, $user = null)
-	{
-		// setup the query
-		if (($pks_size = UtilitiesArrayHelper::check($pks)) !== false || 'bulk' === $pks)
-		{
-			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
-			$_export = true;
-			// Get the user object if not set.
-			if (!isset($user) || !ObjectHelper::check($user))
-			{
-				$user = $this->getCurrentUser();
-			}
-			// Create a new query object.
-			$db = $this->getDatabase();
-			$query = $db->getQuery(true);
-
-			// Select some fields
-			$query->select('a.*');
-
-			// From the componentbuilder_class_property table
-			$query->from($db->quoteName('#__componentbuilder_class_property', 'a'));
-			// The bulk export path
-			if ('bulk' === $pks)
-			{
-				$query->where('a.id > 0');
-			}
-			// A large array of ID's will not work out well
-			elseif ($pks_size > 500)
-			{
-				// Use lowest ID
-				$query->where('a.id >= ' . (int) min($pks));
-				// Use highest ID
-				$query->where('a.id <= ' . (int) max($pks));
-			}
-			// The normal default path
-			else
-			{
-				$query->where('a.id IN (' . implode(',',$pks) . ')');
-			}
-			// Implement View Level Access
-			if (!$user->authorise('core.options', 'com_componentbuilder'))
-			{
-				$groups = implode(',', $user->getAuthorisedViewLevels());
-				$query->where('a.access IN (' . $groups . ')');
-			}
-
-			// Order the results by ordering
-			$query->order('a.id desc');
-
-			// Load the items
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				$items = $db->loadObjectList();
-
-				// Set values to display correctly.
-				if (UtilitiesArrayHelper::check($items))
-				{
-					foreach ($items as $nr => &$item)
-					{
-						// Remove items the user can't access.
-						$access = ($user->authorise('class_property.access', 'com_componentbuilder.class_property.' . (int) $item->id) && $user->authorise('class_property.access', 'com_componentbuilder'));
-						if (!$access)
-						{
-							unset($items[$nr]);
-							continue;
-						}
-
-						// decode comment
-						$item->comment = base64_decode($item->comment);
-						// decode default
-						$item->default = base64_decode($item->default);
-						// unset the values we don't want exported.
-						unset($item->asset_id);
-						unset($item->checked_out);
-						unset($item->checked_out_time);
-					}
-				}
-				// Add headers to items array.
-				$headers = $this->getExImPortHeaders();
-				if (ObjectHelper::check($headers))
-				{
-					array_unshift($items,$headers);
-				}
-				return $items;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = Factory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_class_property");
-		if (UtilitiesArrayHelper::check($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new \stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/src/Model/ComponentbuilderModel.php

@@ -46,7 +46,7 @@ class ComponentbuilderModel 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.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.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.languages', 'png.servers', 'png.help_documents')
 		);
 		// view access array
 		$viewAccess = [
@@ -55,8 +55,6 @@ class ComponentbuilderModel extends ListModel
 			'search.access' => 'search.access',
 			'search.submenu' => 'search.submenu',
 			'search.dashboard_list' => 'search.dashboard_list',
-			'get_snippets.submenu' => 'get_snippets.submenu',
-			'get_snippets.dashboard_list' => 'get_snippets.dashboard_list',
 			'joomla_component.create' => 'joomla_component.create',
 			'joomla_components.access' => 'joomla_component.access',
 			'joomla_component.access' => 'joomla_component.access',
@@ -159,6 +157,7 @@ class ComponentbuilderModel extends ListModel
 			'languages.access' => 'language.access',
 			'language.access' => 'language.access',
 			'languages.submenu' => 'language.submenu',
+			'languages.dashboard_list' => 'language.dashboard_list',
 			'server.create' => 'server.create',
 			'servers.access' => 'server.access',
 			'server.access' => 'server.access',

admin/src/Model/Custom_admin_viewsModel.php

@@ -506,171 +506,6 @@ class Custom_admin_viewsModel extends ListModel
 		return $query;
 	}
 
-	/**
-	 * Method to get list export data.
-	 *
-	 * @param   array  $pks  The ids of the items to get
-	 * @param   JUser  $user  The user making the request
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getExportData($pks, $user = null)
-	{
-		// setup the query
-		if (($pks_size = UtilitiesArrayHelper::check($pks)) !== false || 'bulk' === $pks)
-		{
-			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
-			$_export = true;
-			// Get the user object if not set.
-			if (!isset($user) || !ObjectHelper::check($user))
-			{
-				$user = $this->getCurrentUser();
-			}
-			// Create a new query object.
-			$db = $this->getDatabase();
-			$query = $db->getQuery(true);
-
-			// Select some fields
-			$query->select('a.*');
-
-			// From the componentbuilder_custom_admin_view table
-			$query->from($db->quoteName('#__componentbuilder_custom_admin_view', 'a'));
-			// The bulk export path
-			if ('bulk' === $pks)
-			{
-				$query->where('a.id > 0');
-			}
-			// A large array of ID's will not work out well
-			elseif ($pks_size > 500)
-			{
-				// Use lowest ID
-				$query->where('a.id >= ' . (int) min($pks));
-				// Use highest ID
-				$query->where('a.id <= ' . (int) max($pks));
-			}
-			// The normal default path
-			else
-			{
-				$query->where('a.id IN (' . implode(',',$pks) . ')');
-			}
-
-			// do not use these filters in the export method
-		if (!isset($_export) || !$_export)
-		{
-			// Filtering "joomla components"
-			$filter_joomla_component = $this->state->get("filter.joomla_component");
-			if ($filter_joomla_component !== null && !empty($filter_joomla_component))
-			{
-				if (($ids = JCBFilterHelper::linked((int) $filter_joomla_component, 'joomla_component_custom_admin_views')) !== null)
-				{
-					$query->where($db->quoteName('a.id') . ' IN (' . implode(',', $ids) . ')');
-				}
-				else
-				{
-					// there is none
-					$query->where($db->quoteName('a.id') . ' = ' . 0);
-				}
-			}
-		}
-			// Implement View Level Access
-			if (!$user->authorise('core.options', 'com_componentbuilder'))
-			{
-				$groups = implode(',', $user->getAuthorisedViewLevels());
-				$query->where('a.access IN (' . $groups . ')');
-			}
-
-			// Order the results by ordering
-			$query->order('a.id desc');
-
-			// Load the items
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				$items = $db->loadObjectList();
-
-				// Set values to display correctly.
-				if (UtilitiesArrayHelper::check($items))
-				{
-					foreach ($items as $nr => &$item)
-					{
-						// Remove items the user can't access.
-						$access = ($user->authorise('custom_admin_view.access', 'com_componentbuilder.custom_admin_view.' . (int) $item->id) && $user->authorise('custom_admin_view.access', 'com_componentbuilder'));
-						if (!$access)
-						{
-							unset($items[$nr]);
-							continue;
-						}
-
-						// decode css_document
-						$item->css_document = base64_decode($item->css_document);
-						// decode css
-						$item->css = base64_decode($item->css);
-						// decode js_document
-						$item->js_document = base64_decode($item->js_document);
-						// decode javascript_file
-						$item->javascript_file = base64_decode($item->javascript_file);
-						// decode default
-						$item->default = base64_decode($item->default);
-						// decode php_ajaxmethod
-						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
-						// decode php_document
-						$item->php_document = base64_decode($item->php_document);
-						// decode php_view
-						$item->php_view = base64_decode($item->php_view);
-						// decode php_jview_display
-						$item->php_jview_display = base64_decode($item->php_jview_display);
-						// decode php_jview
-						$item->php_jview = base64_decode($item->php_jview);
-						// decode php_controller
-						$item->php_controller = base64_decode($item->php_controller);
-						// decode php_model
-						$item->php_model = base64_decode($item->php_model);
-						// unset the values we don't want exported.
-						unset($item->asset_id);
-						unset($item->checked_out);
-						unset($item->checked_out_time);
-					}
-				}
-				// Add headers to items array.
-				$headers = $this->getExImPortHeaders();
-				if (ObjectHelper::check($headers))
-				{
-					array_unshift($items,$headers);
-				}
-				return $items;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = Factory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_custom_admin_view");
-		if (UtilitiesArrayHelper::check($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new \stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/src/Model/Custom_codesModel.php

@@ -468,149 +468,6 @@ class Custom_codesModel extends ListModel
 		return $query;
 	}
 
-	/**
-	 * Method to get list export data.
-	 *
-	 * @param   array  $pks  The ids of the items to get
-	 * @param   JUser  $user  The user making the request
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getExportData($pks, $user = null)
-	{
-		// setup the query
-		if (($pks_size = UtilitiesArrayHelper::check($pks)) !== false || 'bulk' === $pks)
-		{
-			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
-			$_export = true;
-			// Get the user object if not set.
-			if (!isset($user) || !ObjectHelper::check($user))
-			{
-				$user = $this->getCurrentUser();
-			}
-			// Create a new query object.
-			$db = $this->getDatabase();
-			$query = $db->getQuery(true);
-
-			// Select some fields
-			$query->select('a.*');
-
-			// From the componentbuilder_custom_code table
-			$query->from($db->quoteName('#__componentbuilder_custom_code', 'a'));
-			// The bulk export path
-			if ('bulk' === $pks)
-			{
-				$query->where('a.id > 0');
-			}
-			// A large array of ID's will not work out well
-			elseif ($pks_size > 500)
-			{
-				// Use lowest ID
-				$query->where('a.id >= ' . (int) min($pks));
-				// Use highest ID
-				$query->where('a.id <= ' . (int) max($pks));
-			}
-			// The normal default path
-			else
-			{
-				$query->where('a.id IN (' . implode(',',$pks) . ')');
-			}
-			// Implement View Level Access
-			if (!$user->authorise('core.options', 'com_componentbuilder'))
-			{
-				$groups = implode(',', $user->getAuthorisedViewLevels());
-				$query->where('a.access IN (' . $groups . ')');
-			}
-
-			// Order the results by ordering
-			$query->order('a.id desc');
-
-			// Load the items
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				$items = $db->loadObjectList();
-
-				// Set values to display correctly.
-				if (UtilitiesArrayHelper::check($items))
-				{
-					foreach ($items as $nr => &$item)
-					{
-						// Remove items the user can't access.
-						$access = ($user->authorise('custom_code.access', 'com_componentbuilder.custom_code.' . (int) $item->id) && $user->authorise('custom_code.access', 'com_componentbuilder'));
-						if (!$access)
-						{
-							unset($items[$nr]);
-							continue;
-						}
-
-						// [1641]=> Target (code action)
-						$item->target_code = $item->target;
-						// decode code
-						$item->code = base64_decode($item->code);
-						// unset the values we don't want exported.
-						unset($item->asset_id);
-						unset($item->checked_out);
-						unset($item->checked_out_time);
-					}
-				}
-				// Add headers to items array.
-				$headers = $this->getExImPortHeaders();
-				if (ObjectHelper::check($headers))
-				{
-					array_unshift($items,$headers);
-				}
-
-				if (UtilitiesArrayHelper::check($items) && !isset($_export))
-		{
-			foreach ($items as $nr => &$item) 
-			{
-				if ($item->target == 2)
-				{
-					$item->component_system_name = $item->system_name;
-					$item->path = '[CUSTO'.'MCODE='.$item->id.']'; // so it is not detected
-					if (StringHelper::check($item->function_name))
-					{
-						$item->path =  '[CUSTO'.'MCODE='.$item->function_name.']'; // so it is not detected
-					}
-					$item->type = 2;
-				}
-			}
-		}
-				return $items;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = Factory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_custom_code");
-		if (UtilitiesArrayHelper::check($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new \stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/src/Model/Dynamic_getsModel.php

@@ -376,144 +376,6 @@ class Dynamic_getsModel extends ListModel
 		return $query;
 	}
 
-	/**
-	 * Method to get list export data.
-	 *
-	 * @param   array  $pks  The ids of the items to get
-	 * @param   JUser  $user  The user making the request
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getExportData($pks, $user = null)
-	{
-		// setup the query
-		if (($pks_size = UtilitiesArrayHelper::check($pks)) !== false || 'bulk' === $pks)
-		{
-			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
-			$_export = true;
-			// Get the user object if not set.
-			if (!isset($user) || !ObjectHelper::check($user))
-			{
-				$user = $this->getCurrentUser();
-			}
-			// Create a new query object.
-			$db = $this->getDatabase();
-			$query = $db->getQuery(true);
-
-			// Select some fields
-			$query->select('a.*');
-
-			// From the componentbuilder_dynamic_get table
-			$query->from($db->quoteName('#__componentbuilder_dynamic_get', 'a'));
-			// The bulk export path
-			if ('bulk' === $pks)
-			{
-				$query->where('a.id > 0');
-			}
-			// A large array of ID's will not work out well
-			elseif ($pks_size > 500)
-			{
-				// Use lowest ID
-				$query->where('a.id >= ' . (int) min($pks));
-				// Use highest ID
-				$query->where('a.id <= ' . (int) max($pks));
-			}
-			// The normal default path
-			else
-			{
-				$query->where('a.id IN (' . implode(',',$pks) . ')');
-			}
-			// Implement View Level Access
-			if (!$user->authorise('core.options', 'com_componentbuilder'))
-			{
-				$groups = implode(',', $user->getAuthorisedViewLevels());
-				$query->where('a.access IN (' . $groups . ')');
-			}
-
-			// Order the results by ordering
-			$query->order('a.id desc');
-
-			// Load the items
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				$items = $db->loadObjectList();
-
-				// Set values to display correctly.
-				if (UtilitiesArrayHelper::check($items))
-				{
-					foreach ($items as $nr => &$item)
-					{
-						// Remove items the user can't access.
-						$access = ($user->authorise('dynamic_get.access', 'com_componentbuilder.dynamic_get.' . (int) $item->id) && $user->authorise('dynamic_get.access', 'com_componentbuilder'));
-						if (!$access)
-						{
-							unset($items[$nr]);
-							continue;
-						}
-
-						// decode php_calculation
-						$item->php_calculation = base64_decode($item->php_calculation);
-						// decode php_router_parse
-						$item->php_router_parse = base64_decode($item->php_router_parse);
-						// decode php_custom_get
-						$item->php_custom_get = base64_decode($item->php_custom_get);
-						// decode php_before_getitem
-						$item->php_before_getitem = base64_decode($item->php_before_getitem);
-						// decode php_after_getitem
-						$item->php_after_getitem = base64_decode($item->php_after_getitem);
-						// decode php_getlistquery
-						$item->php_getlistquery = base64_decode($item->php_getlistquery);
-						// decode php_before_getitems
-						$item->php_before_getitems = base64_decode($item->php_before_getitems);
-						// decode php_after_getitems
-						$item->php_after_getitems = base64_decode($item->php_after_getitems);
-						// unset the values we don't want exported.
-						unset($item->asset_id);
-						unset($item->checked_out);
-						unset($item->checked_out_time);
-					}
-				}
-				// Add headers to items array.
-				$headers = $this->getExImPortHeaders();
-				if (ObjectHelper::check($headers))
-				{
-					array_unshift($items,$headers);
-				}
-				return $items;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = Factory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_dynamic_get");
-		if (UtilitiesArrayHelper::check($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new \stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/src/Model/FieldsModel.php

@@ -649,190 +649,6 @@ class FieldsModel extends ListModel
 		return $query;
 	}
 
-	/**
-	 * Method to get list export data.
-	 *
-	 * @param   array  $pks  The ids of the items to get
-	 * @param   JUser  $user  The user making the request
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getExportData($pks, $user = null)
-	{
-		// setup the query
-		if (($pks_size = UtilitiesArrayHelper::check($pks)) !== false || 'bulk' === $pks)
-		{
-			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
-			$_export = true;
-			// Get the user object if not set.
-			if (!isset($user) || !ObjectHelper::check($user))
-			{
-				$user = $this->getCurrentUser();
-			}
-			// Create a new query object.
-			$db = $this->getDatabase();
-			$query = $db->getQuery(true);
-
-			// Select some fields
-			$query->select('a.*');
-
-			// From the componentbuilder_field table
-			$query->from($db->quoteName('#__componentbuilder_field', 'a'));
-			// The bulk export path
-			if ('bulk' === $pks)
-			{
-				$query->where('a.id > 0');
-			}
-			// A large array of ID's will not work out well
-			elseif ($pks_size > 500)
-			{
-				// Use lowest ID
-				$query->where('a.id >= ' . (int) min($pks));
-				// Use highest ID
-				$query->where('a.id <= ' . (int) max($pks));
-			}
-			// The normal default path
-			else
-			{
-				$query->where('a.id IN (' . implode(',',$pks) . ')');
-			}
-
-			// do not use these filters in the export method
-		if (!isset($_export) || !$_export)
-		{
-			// Filtering "extension"
-			$filter_extension = $this->state->get("filter.extension");
-			$field_ids = array();
-			$get_ids = true;
-			if ($get_ids && $filter_extension !== null && !empty($filter_extension))
-			{
-				// column name, and id
-				$type_extension = explode('__', $filter_extension);
-				if (($ids = JCBFilterHelper::linked((int) $type_extension[1], (string) $type_extension[0])) !== null)
-				{
-					$field_ids = $ids;
-				}
-				else
-				{
-					// there is none
-					$query->where($db->quoteName('a.id') . ' = ' . 0);
-					$get_ids = false;
-				}
-			}
-
-			// Filtering "admin_view"
-			$filter_admin_view = $this->state->get("filter.admin_view");
-			if ($get_ids && $filter_admin_view !== null && !empty($filter_admin_view))
-			{
-				if (($ids = JCBFilterHelper::linked((int) $filter_admin_view, 'admin_view')) !== null)
-				{
-					// view will return less fields, so we ignore the component
-					$field_ids = $ids;
-				}
-				else
-				{
-					// there is none
-					$query->where($db->quoteName('a.id') . ' = ' . 0);
-					$get_ids = false;
-				}
-			}
-			// now check if we have IDs
-			if ($get_ids && UtilitiesArrayHelper::check($field_ids))
-			{
-				$query->where($db->quoteName('a.id') . ' IN (' . implode(',', $field_ids) . ')');
-			}
-		}
-			// Implement View Level Access
-			if (!$user->authorise('core.options', 'com_componentbuilder'))
-			{
-				$groups = implode(',', $user->getAuthorisedViewLevels());
-				$query->where('a.access IN (' . $groups . ')');
-			}
-
-			// Order the results by ordering
-			$query->order('a.id desc');
-
-			// Load the items
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				$items = $db->loadObjectList();
-
-				// Set values to display correctly.
-				if (UtilitiesArrayHelper::check($items))
-				{
-					foreach ($items as $nr => &$item)
-					{
-						// Remove items the user can't access.
-						$access = ($user->authorise('field.access', 'com_componentbuilder.field.' . (int) $item->id) && $user->authorise('field.access', 'com_componentbuilder'));
-						if (!$access)
-						{
-							unset($items[$nr]);
-							continue;
-						}
-
-						// 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 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);
-						// unset the values we don't want exported.
-						unset($item->asset_id);
-						unset($item->checked_out);
-						unset($item->checked_out_time);
-					}
-				}
-				// Add headers to items array.
-				$headers = $this->getExImPortHeaders();
-				if (ObjectHelper::check($headers))
-				{
-					array_unshift($items,$headers);
-				}
-				return $items;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = Factory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_field");
-		if (UtilitiesArrayHelper::check($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new \stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/src/Model/FieldtypeModel.php

@@ -289,7 +289,7 @@ class FieldtypeModel extends AdminModel
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getVxtfields()
+	public function getVxsfields()
 	{
 		// Get the user object.
 		$user = Factory::getApplication()->getIdentity();
@@ -431,13 +431,13 @@ class FieldtypeModel extends AdminModel
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationVxtfields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationVxsfields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationVxtfields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationVxsfields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationVxtfields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationVxsfields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationVxtfields($item->store, 'store');
+					$item->store = $this->selectionTranslationVxsfields($item->store, 'store');
 				}
 			}
 
@@ -451,7 +451,7 @@ class FieldtypeModel extends AdminModel
 	 *
 	 * @return  string   The translatable string.
 	 */
-	public function selectionTranslationVxtfields($value,$name)
+	public function selectionTranslationVxsfields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')

admin/src/Model/FieldtypesModel.php

@@ -321,128 +321,6 @@ class FieldtypesModel extends ListModel
 		return $query;
 	}
 
-	/**
-	 * Method to get list export data.
-	 *
-	 * @param   array  $pks  The ids of the items to get
-	 * @param   JUser  $user  The user making the request
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getExportData($pks, $user = null)
-	{
-		// setup the query
-		if (($pks_size = UtilitiesArrayHelper::check($pks)) !== false || 'bulk' === $pks)
-		{
-			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
-			$_export = true;
-			// Get the user object if not set.
-			if (!isset($user) || !ObjectHelper::check($user))
-			{
-				$user = $this->getCurrentUser();
-			}
-			// Create a new query object.
-			$db = $this->getDatabase();
-			$query = $db->getQuery(true);
-
-			// Select some fields
-			$query->select('a.*');
-
-			// From the componentbuilder_fieldtype table
-			$query->from($db->quoteName('#__componentbuilder_fieldtype', 'a'));
-			// The bulk export path
-			if ('bulk' === $pks)
-			{
-				$query->where('a.id > 0');
-			}
-			// A large array of ID's will not work out well
-			elseif ($pks_size > 500)
-			{
-				// Use lowest ID
-				$query->where('a.id >= ' . (int) min($pks));
-				// Use highest ID
-				$query->where('a.id <= ' . (int) max($pks));
-			}
-			// The normal default path
-			else
-			{
-				$query->where('a.id IN (' . implode(',',$pks) . ')');
-			}
-			// Implement View Level Access
-			if (!$user->authorise('core.options', 'com_componentbuilder'))
-			{
-				$groups = implode(',', $user->getAuthorisedViewLevels());
-				$query->where('a.access IN (' . $groups . ')');
-			}
-
-			// Order the results by ordering
-			$query->order('a.ordering  ASC');
-
-			// Load the items
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				$items = $db->loadObjectList();
-
-				// Set values to display correctly.
-				if (UtilitiesArrayHelper::check($items))
-				{
-					foreach ($items as $nr => &$item)
-					{
-						// Remove items the user can't access.
-						$access = ($user->authorise('fieldtype.access', 'com_componentbuilder.fieldtype.' . (int) $item->id) && $user->authorise('fieldtype.access', 'com_componentbuilder'));
-						if (!$access)
-						{
-							unset($items[$nr]);
-							continue;
-						}
-
-						// unset the values we don't want exported.
-						unset($item->asset_id);
-						unset($item->checked_out);
-						unset($item->checked_out_time);
-					}
-				}
-				// Add headers to items array.
-				$headers = $this->getExImPortHeaders();
-				if (ObjectHelper::check($headers))
-				{
-					array_unshift($items,$headers);
-				}
-				return $items;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = Factory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_fieldtype");
-		if (UtilitiesArrayHelper::check($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new \stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/src/Model/Help_documentsModel.php

@@ -403,122 +403,6 @@ class Help_documentsModel extends ListModel
 		return $query;
 	}
 
-	/**
-	 * Method to get list export data.
-	 *
-	 * @param   array  $pks  The ids of the items to get
-	 * @param   JUser  $user  The user making the request
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getExportData($pks, $user = null)
-	{
-		// setup the query
-		if (($pks_size = UtilitiesArrayHelper::check($pks)) !== false || 'bulk' === $pks)
-		{
-			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
-			$_export = true;
-			// Get the user object if not set.
-			if (!isset($user) || !ObjectHelper::check($user))
-			{
-				$user = $this->getCurrentUser();
-			}
-			// Create a new query object.
-			$db = $this->getDatabase();
-			$query = $db->getQuery(true);
-
-			// Select some fields
-			$query->select('a.*');
-
-			// From the componentbuilder_help_document table
-			$query->from($db->quoteName('#__componentbuilder_help_document', 'a'));
-			// The bulk export path
-			if ('bulk' === $pks)
-			{
-				$query->where('a.id > 0');
-			}
-			// A large array of ID's will not work out well
-			elseif ($pks_size > 500)
-			{
-				// Use lowest ID
-				$query->where('a.id >= ' . (int) min($pks));
-				// Use highest ID
-				$query->where('a.id <= ' . (int) max($pks));
-			}
-			// The normal default path
-			else
-			{
-				$query->where('a.id IN (' . implode(',',$pks) . ')');
-			}
-
-			// Order the results by ordering
-			$query->order('a.ordering  ASC');
-
-			// Load the items
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				$items = $db->loadObjectList();
-
-				// Set values to display correctly.
-				if (UtilitiesArrayHelper::check($items))
-				{
-					foreach ($items as $nr => &$item)
-					{
-						// Remove items the user can't access.
-						$access = ($user->authorise('help_document.access', 'com_componentbuilder.help_document.' . (int) $item->id) && $user->authorise('help_document.access', 'com_componentbuilder'));
-						if (!$access)
-						{
-							unset($items[$nr]);
-							continue;
-						}
-
-						// unset the values we don't want exported.
-						unset($item->asset_id);
-						unset($item->checked_out);
-						unset($item->checked_out_time);
-					}
-				}
-				// Add headers to items array.
-				$headers = $this->getExImPortHeaders();
-				if (ObjectHelper::check($headers))
-				{
-					array_unshift($items,$headers);
-				}
-				return $items;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = Factory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_help_document");
-		if (UtilitiesArrayHelper::check($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new \stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/src/Model/ImportModel.php

@@ -1,752 +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
- */
-namespace VDM\Component\Componentbuilder\Administrator\Model;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Filesystem\File;
-use Joomla\CMS\Filesystem\Folder;
-use Joomla\CMS\Filesystem\Path;
-use Joomla\CMS\Filter\OutputFilter;
-use Joomla\CMS\Installer\InstallerHelper;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\String\StringHelper;
-use Joomla\Utilities\ArrayHelper;
-use PhpOffice\PhpSpreadsheet\IOFactory;
-use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-
-// No direct access to this file
-\defined('_JEXEC') or die;
-
-/***
- * Componentbuilder Import Base Database Model
- *
- * @since  1.6
- */
-class ImportModel extends BaseDatabaseModel
-{
-	// set uploading values
-	protected $use_streams = false;
-	protected $allow_unsafe = false;
-	protected $safeFileOptions = [];
-
-	/**
-	 * @var object JTable object
-	 */
-	protected $_table = null;
-
-	/**
-	 * @var object JTable object
-	 */
-	protected $_url = null;
-
-	/**
-	 * Model context string.
-	 *
-	 * @var        string
-	 */
-	protected $_context = 'com_componentbuilder.import';
-
-	/**
-	 * Import Settings
-	 */
-	protected $getType     = NULL;
-	protected $dataType    = NULL;
-
-	/**
-	 * Method to auto-populate the model state.
-	 *
-	 * Note. Calling getState in this method will result in recursion.
-	 *
-	 * @return  void
-	 *
-	 */
-	protected function populateState()
-	{
-		$app = Factory::getApplication('administrator');
-
-		$this->setState('message', $app->getUserState('com_componentbuilder.message'));
-		$app->setUserState('com_componentbuilder.message', '');
-
-		// Recall the 'Import from Directory' path.
-		$path = $app->getUserStateFromRequest($this->_context . '.import_directory', 'import_directory', $app->get('tmp_path'));
-		$this->setState('import.directory', $path);
-		parent::populateState();
-	}
-
-	/**
-	 * Import an spreadsheet from either folder, url or upload.
-	 *
-	 * @return  boolean result of import
-	 *
-	 */
-	public function import()
-	{
-		$this->setState('action', 'import');
-		$app = Factory::getApplication();
-		$session = Factory::getSession();
-		$package = null;
-		$continue = false;
-		// get import type
-		$this->getType = $app->input->getString('gettype', NULL);
-		// get import type
-		$this->dataType    = $session->get('dataType_VDM_IMPORTINTO', NULL);
-
-		if ($package === null)
-		{
-			switch ($this->getType)
-			{
-				case 'folder':
-					// Remember the 'Import from Directory' path.
-					$app->getUserStateFromRequest($this->_context . '.import_directory', 'import_directory');
-					$package = $this->_getPackageFromFolder();
-					break;
-
-				case 'upload':
-					$package = $this->_getPackageFromUpload();
-					break;
-
-				case 'url':
-					$package = $this->_getPackageFromUrl();
-					break;
-
-				case 'continue':
-					$continue     = true;
-					$package    = $session->get('package', null);
-					$package    = json_decode($package, true);
-					// clear session
-					$session->clear('package');
-					$session->clear('dataType');
-					$session->clear('hasPackage');
-					break;
-
-				default:
-					$app->setUserState('com_componentbuilder.message', Text::_('COM_COMPONENTBUILDER_IMPORT_NO_IMPORT_TYPE_FOUND'));
-
-					return false;
-					break;
-			}
-		}
-		// Was the package valid?
-		if (!$package || !$package['type'])
-		{
-			if (in_array($this->getType, array('upload', 'url')))
-			{
-				$this->remove($package['packagename']);
-			}
-
-			$app->setUserState('com_componentbuilder.message', Text::_('COM_COMPONENTBUILDER_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE'));
-			return false;
-		}
-
-		// first link data to table headers
-		if(!$continue){
-			$package = json_encode($package);
-			$session->set('package', $package);
-			$session->set('dataType', $this->dataType);
-			$session->set('hasPackage', true);
-			return true;
-		}
-
-		// set the data
-		$headerList = json_decode($session->get($this->dataType.'_VDM_IMPORTHEADERS', false), true);
-		if (!$this->setData($package,$this->dataType,$headerList))
-		{
-			// There was an error importing the package
-			$msg = Text::_('COM_COMPONENTBUILDER_IMPORT_ERROR');
-			$back = $session->get('backto_VDM_IMPORT', NULL);
-			if ($back)
-			{
-				$app->setUserState('com_componentbuilder.redirect_url', 'index.php?option=com_componentbuilder&view='.$back);
-				$session->clear('backto_VDM_IMPORT');
-			}
-			$result = false;
-		}
-		else
-		{
-			// Package imported sucessfully
-			$msg = Text::sprintf('COM_COMPONENTBUILDER_IMPORT_SUCCESS', $package['packagename']);
-			$back = $session->get('backto_VDM_IMPORT', NULL);
-			if ($back)
-			{
-				$app->setUserState('com_componentbuilder.redirect_url', 'index.php?option=com_componentbuilder&view='.$back);
-				$session->clear('backto_VDM_IMPORT');
-			}
-			$result = true;
-		}
-
-		// Set some model state values
-		$app->enqueueMessage($msg);
-
-		// remove file after import
-		$this->remove($package['packagename']);
-		$session->clear($this->getType.'_VDM_IMPORTHEADERS');
-
-		return $result;
-	}
-
-	/**
-	 * Works out an importation spreadsheet from a HTTP upload
-	 *
-	 * @return spreadsheet definition or false on failure
-	 */
-	protected function _getPackageFromUpload()
-	{
-		// Get the uploaded file information
-		$app = Factory::getApplication();
-		$input = $app->input;
-
-		// Do not change the filter type 'raw'. We need this to let files containing PHP code to upload. See JInputFiles::get.
-		$userfile = $input->files->get('import_package', null, 'raw');
-
-		// Make sure that file uploads are enabled in php
-		if (!(bool) ini_get('file_uploads'))
-		{
-			$app->enqueueMessage(Text::_('COM_COMPONENTBUILDER_IMPORT_MSG_WARNIMPORTFILE'), 'warning');
-			return false;
-		}
-
-		// If there is no uploaded file, we have a problem...
-		if (!is_array($userfile))
-		{
-			$app->enqueueMessage(Text::_('COM_COMPONENTBUILDER_IMPORT_MSG_NO_FILE_SELECTED'), 'warning');
-			return false;
-		}
-
-		// Check if there was a problem uploading the file.
-		if ($userfile['error'] || $userfile['size'] < 1)
-		{
-			$app->enqueueMessage(Text::_('COM_COMPONENTBUILDER_IMPORT_MSG_WARNIMPORTUPLOADERROR'), 'warning');
-			return false;
-		}
-
-		// Build the appropriate paths
-		$config = Factory::getConfig();
-		$tmp_dest = $config->get('tmp_path') . '/' . $userfile['name'];
-		$tmp_src = $userfile['tmp_name'];
-
-		// Move uploaded file
-		$p_file = File::upload($tmp_src, $tmp_dest, $this->use_streams, $this->allow_unsafe, $this->safeFileOptions);
-
-		// Was the package downloaded?
-		if (!$p_file)
-		{
-			$session = Factory::getSession();
-			$session->clear('package');
-			$session->clear('dataType');
-			$session->clear('hasPackage');
-			// was not uploaded
-			return false;
-		}
-
-		// check that this is a valid spreadsheet
-		$package = $this->check($userfile['name']);
-
-		return $package;
-	}
-
-	/**
-	 * Import an spreadsheet from a directory
-	 *
-	 * @return  array  Spreadsheet details or false on failure
-	 *
-	 */
-	protected function _getPackageFromFolder()
-	{
-		$app = Factory::getApplication();
-		$input = $app->input;
-
-		// Get the path to the package to import
-		$p_dir = $input->getString('import_directory');
-		$p_dir = Path::clean($p_dir);
-		// Did you give us a valid path?
-		if (!file_exists($p_dir))
-		{
-			$app->enqueueMessage(Text::_('COM_COMPONENTBUILDER_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'), 'warning');
-			return false;
-		}
-
-		// Detect the package type
-		$type = $this->getType;
-
-		// Did you give us a valid package?
-		if (!$type)
-		{
-			$app->enqueueMessage(Text::_('COM_COMPONENTBUILDER_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'), 'warning');
-		}
-
-		// check the extention
-		if(!$this->checkExtension($p_dir))
-		{
-			// set error message
-			$app->enqueueMessage(Text::_('COM_COMPONENTBUILDER_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
-			return false;
-		}
-
-		$package['packagename'] = null;
-		$package['dir'] = $p_dir;
-		$package['type'] = $type;
-
-		return $package;
-	}
-
-	/**
-	 * Import an spreadsheet from a URL
-	 *
-	 * @return  Package details or false on failure
-	 *
-	 */
-	protected function _getPackageFromUrl()
-	{
-		$app = Factory::getApplication();
-		$input = $app->input;
-
-		// Get the URL of the package to import
-		$url = $input->getString('import_url');
-
-		// Did you give us a URL?
-		if (!$url)
-		{
-			$app->enqueueMessage(Text::_('COM_COMPONENTBUILDER_IMPORT_MSG_ENTER_A_URL'), 'warning');
-			return false;
-		}
-
-		// Download the package at the URL given
-		$p_file = InstallerHelper::downloadPackage($url);
-
-		// Was the package downloaded?
-		if (!$p_file)
-		{
-			$app->enqueueMessage(Text::_('COM_COMPONENTBUILDER_IMPORT_MSG_INVALID_URL'), 'warning');
-			return false;
-		}
-
-		// check that this is a valid spreadsheet
-		$package = $this->check($p_file);
-
-		return $package;
-	}
-
-	/**
-	 * Check a file and verifies it as a spreadsheet file
-	 * Supports .csv .xlsx .xls and .ods
-	 *
-	 * @param   string  $p_filename  The uploaded package filename or import directory
-	 *
-	 * @return  array  of elements
-	 *
-	 */
-	protected function check($archivename)
-	{
-		$app = Factory::getApplication();
-		// Clean the name
-		$archivename = Path::clean($archivename);
-
-		// check the extention
-		if(!$this->checkExtension($archivename))
-		{
-			// Cleanup the import files
-			$this->remove($archivename);
-			$app->enqueueMessage(Text::_('COM_COMPONENTBUILDER_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
-			return false;
-		}
-
-		$config = Factory::getConfig();
-		// set Package Name
-		$check['packagename'] = $archivename;
-
-		// set directory
-		$check['dir'] = $config->get('tmp_path'). '/' .$archivename;
-
-		// set type
-		$check['type'] = $this->getType;
-
-		return $check;
-	}
-
-	/**
-	 * Check the extension
-	 *
-	 * @param   string  $file    Name of the uploaded file
-	 *
-	 * @return  boolean  True on success
-	 *
-	 */
-	protected function checkExtension($file)
-	{
-		// check the extention
-		switch(strtolower(pathinfo($file, PATHINFO_EXTENSION)))
-		{
-			case 'xls':
-			case 'ods':
-			case 'csv':
-			return true;
-			break;
-		}
-		return false;
-	}
-
-	/**
-	 * Clean up temporary uploaded spreadsheet
-	 *
-	 * @param   string  $package    Name of the uploaded spreadsheet file
-	 *
-	 * @return  boolean  True on success
-	 *
-	 */
-	protected function remove($package)
-	{
-		jimport('joomla.filesystem.file');
-
-		$config = Factory::getConfig();
-		$package = $config->get('tmp_path'). '/' .$package;
-
-		// Is the package file a valid file?
-		if (is_file($package))
-		{
-			File::delete($package);
-		}
-		elseif (is_file(Path::clean($package)))
-		{
-			// It might also be just a base filename
-			File::delete(Path::clean($package));
-		}
-	}
-
-	/**
-	* Set the data from the spreadsheet to the database
-	*
-	* @param string  $package Paths to the uploaded package file
-	*
-	* @return  boolean false on failure
-	*
-	**/
-	protected function setData($package,$table,$target_headers)
-	{
-		if (UtilitiesArrayHelper::check($target_headers))
-		{
-			// make sure the file is loaded
-			ComponentbuilderHelper::composerAutoload('phpspreadsheet');
-			$jinput = Factory::getApplication()->input;
-			foreach($target_headers as $header)
-			{
-				if (($column = $jinput->getString($header, false)) !== false ||
-					($column = $jinput->getString(strtolower($header), false)) !== false)
-				{
-					$data['target_headers'][$header] = $column;
-				}
-				else
-				{
-					$data['target_headers'][$header] = null;
-				}
-			}
-			// set the data
-			if(isset($package['dir']))
-			{
-				$inputFileType = IOFactory::identify($package['dir']);
-				$excelReader = IOFactory::createReader($inputFileType);
-				$excelReader->setReadDataOnly(true);
-				$excelObj = $excelReader->load($package['dir']);
-				$data['array'] = $excelObj->getActiveSheet()->toArray(null, true,true,true);
-				$excelObj->disconnectWorksheets();
-				unset($excelObj);
-				return $this->save($data, $table);
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Save the data from the file to the database
-	*
-	* @param string  $package Paths to the uploaded package file
-	*
-	* @return  boolean false on failure
-	*
-	**/
-	protected function save($data,$table)
-	{
-		// import the data if there is any
-		if(UtilitiesArrayHelper::check($data['array']))
-		{
-			// get user object
-			$user		= Factory::getUser();
-			// remove header if it has headers
-			$id_key	= $data['target_headers']['id'];
-			$published_key	= $data['target_headers']['published'];
-			$ordering_key	= $data['target_headers']['ordering'];
-			// get the first array set
-			$firstSet = reset($data['array']);
-
-			// check if first array is a header array and remove if true
-			if($firstSet[$id_key] == 'id' || $firstSet[$published_key] == 'published' || $firstSet[$ordering_key] == 'ordering')
-			{
-				array_shift($data['array']);
-			}
-			
-			// make sure there is still values in array and that it was not only headers
-			if(UtilitiesArrayHelper::check($data['array']) && $user->authorise($table.'.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
-			{
-				// set target.
-				$target	= array_flip($data['target_headers']);
-				// Get a db connection.
-				$db = Factory::getDbo();
-				// set some defaults
-				$todayDate		= Factory::getDate()->toSql();
-				// get global action permissions
-				$canDo			= ComponentbuilderHelper::getActions($table);
-				$canEdit		= $canDo->get('core.edit');
-				$canState		= $canDo->get('core.edit.state');
-				$canCreate		= $canDo->get('core.create');
-				$hasAlias		= $this->getAliasesUsed($table);
-				// prosses the data
-				foreach($data['array'] as $row)
-				{
-					$found = false;
-					if (isset($row[$id_key]) && is_numeric($row[$id_key]) && $row[$id_key] > 0)
-					{
-						// raw items import & update!
-						$query = $db->getQuery(true);
-						$query
-							->select('version')
-							->from($db->quoteName('#__componentbuilder_'.$table))
-							->where($db->quoteName('id') . ' = '. $db->quote($row[$id_key]));
-						// Reset the query using our newly populated query object.
-						$db->setQuery($query);
-						$db->execute();
-						$found = $db->getNumRows();
-					}
-					
-					if($found && $canEdit)
-					{
-						// update item
-						$id		= $row[$id_key];
-						$version	= $db->loadResult();
-						// reset all buckets
-						$query		= $db->getQuery(true);
-						$fields	= array();
-						// Fields to update.
-						foreach($row as $key => $cell)
-						{
-							// ignore column
-							if ('IGNORE' == $target[$key])
-							{
-								continue;
-							}
-							// update modified
-							if ('modified_by' == $target[$key])
-							{
-								continue;
-							}
-							// update modified
-							if ('modified' == $target[$key])
-							{
-								continue;
-							}
-							// update version
-							if ('version' == $target[$key])
-							{
-								$cell = (int) $version + 1;
-							}
-							// verify publish authority
-							if ('published' == $target[$key] && !$canState)
-							{
-								continue;
-							}
-							// set to update array
-							if(in_array($key, $data['target_headers']) && is_numeric($cell))
-							{
-								$fields[] = $db->quoteName($target[$key]) . ' = ' . $cell;
-							}
-							elseif(in_array($key, $data['target_headers']) && is_string($cell))
-							{
-								$fields[] = $db->quoteName($target[$key]) . ' = ' . $db->quote($cell);
-							}
-							elseif(in_array($key, $data['target_headers']) && is_null($cell))
-							{
-								// if import data is null then set empty
-								$fields[] = $db->quoteName($target[$key]) . " = ''";
-							}
-						}
-						// load the defaults
-						$fields[]	= $db->quoteName('modified_by') . ' = ' . $db->quote($user->id);
-						$fields[]	= $db->quoteName('modified') . ' = ' . $db->quote($todayDate);
-						// Conditions for which records should be updated.
-						$conditions = array(
-							$db->quoteName('id') . ' = ' . $id
-						);
-						
-						$query->update($db->quoteName('#__componentbuilder_'.$table))->set($fields)->where($conditions);
-						$db->setQuery($query);
-						$db->execute();
-					}
-					elseif ($canCreate)
-					{
-						// insert item
-						$query = $db->getQuery(true);
-						// reset all buckets
-						$columns	= array();
-						$values	= array();
-						$version	= false;
-						// Insert columns. Insert values.
-						foreach($row as $key => $cell)
-						{
-							// ignore column
-							if ('IGNORE' == $target[$key])
-							{
-								continue;
-							}
-							// remove id
-							if ('id' == $target[$key])
-							{
-								continue;
-							}
-							// update created
-							if ('created_by' == $target[$key])
-							{
-								continue;
-							}
-							// update created
-							if ('created' == $target[$key])
-							{
-								continue;
-							}
-							// Make sure the alias is incremented
-							if ('alias' == $target[$key])
-							{
-								$cell = $this->getAlias($cell,$table);
-							}
-							// update version
-							if ('version' == $target[$key])
-							{
-								$cell = 1;
-								$version = true;
-							}
-							// set to insert array
-							if(in_array($key, $data['target_headers']) && is_numeric($cell))
-							{
-								$columns[]	= $target[$key];
-								$values[]	= $cell;
-							}
-							elseif(in_array($key, $data['target_headers']) && is_string($cell))
-							{
-								$columns[]	= $target[$key];
-								$values[]	= $db->quote($cell);
-							}
-							elseif(in_array($key, $data['target_headers']) && is_null($cell))
-							{
-								// if import data is null then set empty
-								$columns[]	= $target[$key];
-								$values[]	= "''";
-							}
-						}
-						// load the defaults
-						$columns[]	= 'created_by';
-						$values[]	= $db->quote($user->id);
-						$columns[]	= 'created';
-						$values[]	= $db->quote($todayDate);
-						if (!$version)
-						{
-							$columns[]	= 'version';
-							$values[]	= 1;
-						}
-						// Prepare the insert query.
-						$query
-							->insert($db->quoteName('#__componentbuilder_'.$table))
-							->columns($db->quoteName($columns))
-							->values(implode(',', $values));
-						// Set the query using our newly populated query object and execute it.
-						$db->setQuery($query);
-						$done = $db->execute();
-						if ($done)
-						{
-							$aId = $db->insertid();
-							// make sure the access of asset is set
-							ComponentbuilderHelper::setAsset($aId,$table);
-						}
-					}
-					else
-					{
-						return false;
-					}
-				}
-				return true;
-			}
-		}
-		return false;
-	}
-
-	protected function getAlias($name,$type = false)
-	{
-		// sanitize the name to an alias
-		if (Factory::getConfig()->get('unicodeslugs') == 1)
-		{
-			$alias = OutputFilter::stringURLUnicodeSlug($name);
-		}
-		else
-		{
-			$alias = OutputFilter::stringURLSafe($name);
-		}
-		// must be a uniqe alias
-		if ($type)
-		{
-			return $this->getUniqe($alias,'alias',$type);
-		}
-		return $alias;
-	}
-
-	/**
-	 * Method to generate a uniqe value.
-	 *
-	 * @param   string  $field name.
-	 * @param   string  $value data.
-	 * @param   string  $type table.
-	 *
-	 * @return  string  New value.
-	 */
-	protected function getUniqe($value,$field,$type)
-	{
-		// insure the filed is always uniqe
-		while (isset($this->uniqeValueArray[$type][$field][$value]))
-		{
-			$value = StringHelper::increment($value, 'dash');
-		}
-		$this->uniqeValueArray[$type][$field][$value] = $value;
-		return $value;
-	}
-
-	protected function getAliasesUsed($table)
-	{
-		// Get a db connection.
-		$db = $this->getDatabase();
-		// first we check if there is a alias column
-		$columns = $db->getTableColumns('#__componentbuilder_'.$table);
-		if(isset($columns['alias'])){
-			// Create a new query object.
-			$query = $db->getQuery(true);
-			$query->select($db->quoteName(array('alias')));
-			$query->from($db->quoteName('#__componentbuilder_'.$table));
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				$aliases = $db->loadColumn();
-				foreach($aliases as $alias)
-				{
-					$this->uniqeValueArray[$table]['alias'][$alias] = $alias;
-				}
-			}
-			return true;
-		}
-		return false;
-	}
-}

admin/src/Model/Joomla_componentModel.php

@@ -1469,11 +1469,9 @@ class Joomla_componentModel extends AdminModel
 		{
 			$data['system_name'] = $data['name'];
 		}
+
 		// make sure that the component code name is safe.
-		if (isset($data['name_code']) && is_string($data['name_code']))
+		$data['name_code'] = ComponentCodeNameHelper::safe($data['name_code']);
-		{
-			$data['name_code'] = ComponentCodeNameHelper::safe($data['name_code']);
-		}
 
 		// Set the GUID if empty or not valid
 		if (empty($data['guid']) && $data['id'] > 0)

admin/src/Model/Joomla_modulesModel.php

@@ -340,156 +340,6 @@ class Joomla_modulesModel extends ListModel
 		return $query;
 	}
 
-	/**
-	 * Method to get list export data.
-	 *
-	 * @param   array  $pks  The ids of the items to get
-	 * @param   JUser  $user  The user making the request
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getExportData($pks, $user = null)
-	{
-		// setup the query
-		if (($pks_size = UtilitiesArrayHelper::check($pks)) !== false || 'bulk' === $pks)
-		{
-			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
-			$_export = true;
-			// Get the user object if not set.
-			if (!isset($user) || !ObjectHelper::check($user))
-			{
-				$user = $this->getCurrentUser();
-			}
-			// Create a new query object.
-			$db = $this->getDatabase();
-			$query = $db->getQuery(true);
-
-			// Select some fields
-			$query->select('a.*');
-
-			// From the componentbuilder_joomla_module table
-			$query->from($db->quoteName('#__componentbuilder_joomla_module', 'a'));
-			// The bulk export path
-			if ('bulk' === $pks)
-			{
-				$query->where('a.id > 0');
-			}
-			// A large array of ID's will not work out well
-			elseif ($pks_size > 500)
-			{
-				// Use lowest ID
-				$query->where('a.id >= ' . (int) min($pks));
-				// Use highest ID
-				$query->where('a.id <= ' . (int) max($pks));
-			}
-			// The normal default path
-			else
-			{
-				$query->where('a.id IN (' . implode(',',$pks) . ')');
-			}
-			// Implement View Level Access
-			if (!$user->authorise('core.options', 'com_componentbuilder'))
-			{
-				$groups = implode(',', $user->getAuthorisedViewLevels());
-				$query->where('a.access IN (' . $groups . ')');
-			}
-
-			// Order the results by ordering
-			$query->order('a.id desc');
-
-			// Load the items
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				$items = $db->loadObjectList();
-
-				// Set values to display correctly.
-				if (UtilitiesArrayHelper::check($items))
-				{
-					foreach ($items as $nr => &$item)
-					{
-						// Remove items the user can't access.
-						$access = ($user->authorise('joomla_module.access', 'com_componentbuilder.joomla_module.' . (int) $item->id) && $user->authorise('joomla_module.access', 'com_componentbuilder'));
-						if (!$access)
-						{
-							unset($items[$nr]);
-							continue;
-						}
-
-						// decode default
-						$item->default = base64_decode($item->default);
-						// decode php_preflight_update
-						$item->php_preflight_update = base64_decode($item->php_preflight_update);
-						// decode php_preflight_uninstall
-						$item->php_preflight_uninstall = base64_decode($item->php_preflight_uninstall);
-						// decode mod_code
-						$item->mod_code = base64_decode($item->mod_code);
-						// decode php_postflight_install
-						$item->php_postflight_install = base64_decode($item->php_postflight_install);
-						// decode php_postflight_update
-						$item->php_postflight_update = base64_decode($item->php_postflight_update);
-						// decode php_method_uninstall
-						$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
-						// decode class_helper_header
-						$item->class_helper_header = base64_decode($item->class_helper_header);
-						// decode sql
-						$item->sql = base64_decode($item->sql);
-						// decode class_helper_code
-						$item->class_helper_code = base64_decode($item->class_helper_code);
-						// decode sql_uninstall
-						$item->sql_uninstall = base64_decode($item->sql_uninstall);
-						// decode readme
-						$item->readme = base64_decode($item->readme);
-						// decode php_script_construct
-						$item->php_script_construct = base64_decode($item->php_script_construct);
-						// decode php_preflight_install
-						$item->php_preflight_install = base64_decode($item->php_preflight_install);
-						// unset the values we don't want exported.
-						unset($item->asset_id);
-						unset($item->checked_out);
-						unset($item->checked_out_time);
-					}
-				}
-				// Add headers to items array.
-				$headers = $this->getExImPortHeaders();
-				if (ObjectHelper::check($headers))
-				{
-					array_unshift($items,$headers);
-				}
-				return $items;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = Factory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_joomla_module");
-		if (UtilitiesArrayHelper::check($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new \stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/src/Model/LanguagesModel.php

@@ -27,6 +27,7 @@ use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 use VDM\Joomla\Utilities\GetHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Http\Http;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -150,7 +151,7 @@ class LanguagesModel extends ListModel
 	{
 		$updateSite = $this->getUpdateSite();
 
-		$http = new JHttp;
+		$http = new Http;
 
 		try
 		{
@@ -405,128 +406,6 @@ class LanguagesModel extends ListModel
 		return $query;
 	}
 
-	/**
-	 * Method to get list export data.
-	 *
-	 * @param   array  $pks  The ids of the items to get
-	 * @param   JUser  $user  The user making the request
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getExportData($pks, $user = null)
-	{
-		// setup the query
-		if (($pks_size = UtilitiesArrayHelper::check($pks)) !== false || 'bulk' === $pks)
-		{
-			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
-			$_export = true;
-			// Get the user object if not set.
-			if (!isset($user) || !ObjectHelper::check($user))
-			{
-				$user = $this->getCurrentUser();
-			}
-			// Create a new query object.
-			$db = $this->getDatabase();
-			$query = $db->getQuery(true);
-
-			// Select some fields
-			$query->select('a.*');
-
-			// From the componentbuilder_language table
-			$query->from($db->quoteName('#__componentbuilder_language', 'a'));
-			// The bulk export path
-			if ('bulk' === $pks)
-			{
-				$query->where('a.id > 0');
-			}
-			// A large array of ID's will not work out well
-			elseif ($pks_size > 500)
-			{
-				// Use lowest ID
-				$query->where('a.id >= ' . (int) min($pks));
-				// Use highest ID
-				$query->where('a.id <= ' . (int) max($pks));
-			}
-			// The normal default path
-			else
-			{
-				$query->where('a.id IN (' . implode(',',$pks) . ')');
-			}
-			// Implement View Level Access
-			if (!$user->authorise('core.options', 'com_componentbuilder'))
-			{
-				$groups = implode(',', $user->getAuthorisedViewLevels());
-				$query->where('a.access IN (' . $groups . ')');
-			}
-
-			// Order the results by ordering
-			$query->order('a.ordering  ASC');
-
-			// Load the items
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				$items = $db->loadObjectList();
-
-				// Set values to display correctly.
-				if (UtilitiesArrayHelper::check($items))
-				{
-					foreach ($items as $nr => &$item)
-					{
-						// Remove items the user can't access.
-						$access = ($user->authorise('language.access', 'com_componentbuilder.language.' . (int) $item->id) && $user->authorise('language.access', 'com_componentbuilder'));
-						if (!$access)
-						{
-							unset($items[$nr]);
-							continue;
-						}
-
-						// unset the values we don't want exported.
-						unset($item->asset_id);
-						unset($item->checked_out);
-						unset($item->checked_out_time);
-					}
-				}
-				// Add headers to items array.
-				$headers = $this->getExImPortHeaders();
-				if (ObjectHelper::check($headers))
-				{
-					array_unshift($items,$headers);
-				}
-				return $items;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = Factory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_language");
-		if (UtilitiesArrayHelper::check($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new \stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/src/Model/LayoutsModel.php

@@ -369,132 +369,6 @@ class LayoutsModel extends ListModel
 		return $query;
 	}
 
-	/**
-	 * Method to get list export data.
-	 *
-	 * @param   array  $pks  The ids of the items to get
-	 * @param   JUser  $user  The user making the request
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getExportData($pks, $user = null)
-	{
-		// setup the query
-		if (($pks_size = UtilitiesArrayHelper::check($pks)) !== false || 'bulk' === $pks)
-		{
-			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
-			$_export = true;
-			// Get the user object if not set.
-			if (!isset($user) || !ObjectHelper::check($user))
-			{
-				$user = $this->getCurrentUser();
-			}
-			// Create a new query object.
-			$db = $this->getDatabase();
-			$query = $db->getQuery(true);
-
-			// Select some fields
-			$query->select('a.*');
-
-			// From the componentbuilder_layout table
-			$query->from($db->quoteName('#__componentbuilder_layout', 'a'));
-			// The bulk export path
-			if ('bulk' === $pks)
-			{
-				$query->where('a.id > 0');
-			}
-			// A large array of ID's will not work out well
-			elseif ($pks_size > 500)
-			{
-				// Use lowest ID
-				$query->where('a.id >= ' . (int) min($pks));
-				// Use highest ID
-				$query->where('a.id <= ' . (int) max($pks));
-			}
-			// The normal default path
-			else
-			{
-				$query->where('a.id IN (' . implode(',',$pks) . ')');
-			}
-			// Implement View Level Access
-			if (!$user->authorise('core.options', 'com_componentbuilder'))
-			{
-				$groups = implode(',', $user->getAuthorisedViewLevels());
-				$query->where('a.access IN (' . $groups . ')');
-			}
-
-			// Order the results by ordering
-			$query->order('a.id desc');
-
-			// Load the items
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				$items = $db->loadObjectList();
-
-				// Set values to display correctly.
-				if (UtilitiesArrayHelper::check($items))
-				{
-					foreach ($items as $nr => &$item)
-					{
-						// Remove items the user can't access.
-						$access = ($user->authorise('layout.access', 'com_componentbuilder.layout.' . (int) $item->id) && $user->authorise('layout.access', 'com_componentbuilder'));
-						if (!$access)
-						{
-							unset($items[$nr]);
-							continue;
-						}
-
-						// decode php_view
-						$item->php_view = base64_decode($item->php_view);
-						// decode layout
-						$item->layout = base64_decode($item->layout);
-						// unset the values we don't want exported.
-						unset($item->asset_id);
-						unset($item->checked_out);
-						unset($item->checked_out_time);
-					}
-				}
-				// Add headers to items array.
-				$headers = $this->getExImPortHeaders();
-				if (ObjectHelper::check($headers))
-				{
-					array_unshift($items,$headers);
-				}
-				return $items;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = Factory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_layout");
-		if (UtilitiesArrayHelper::check($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new \stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/src/Model/PlaceholdersModel.php

@@ -283,130 +283,6 @@ class PlaceholdersModel extends ListModel
 		return $query;
 	}
 
-	/**
-	 * Method to get list export data.
-	 *
-	 * @param   array  $pks  The ids of the items to get
-	 * @param   JUser  $user  The user making the request
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getExportData($pks, $user = null)
-	{
-		// setup the query
-		if (($pks_size = UtilitiesArrayHelper::check($pks)) !== false || 'bulk' === $pks)
-		{
-			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
-			$_export = true;
-			// Get the user object if not set.
-			if (!isset($user) || !ObjectHelper::check($user))
-			{
-				$user = $this->getCurrentUser();
-			}
-			// Create a new query object.
-			$db = $this->getDatabase();
-			$query = $db->getQuery(true);
-
-			// Select some fields
-			$query->select('a.*');
-
-			// From the componentbuilder_placeholder table
-			$query->from($db->quoteName('#__componentbuilder_placeholder', 'a'));
-			// The bulk export path
-			if ('bulk' === $pks)
-			{
-				$query->where('a.id > 0');
-			}
-			// A large array of ID's will not work out well
-			elseif ($pks_size > 500)
-			{
-				// Use lowest ID
-				$query->where('a.id >= ' . (int) min($pks));
-				// Use highest ID
-				$query->where('a.id <= ' . (int) max($pks));
-			}
-			// The normal default path
-			else
-			{
-				$query->where('a.id IN (' . implode(',',$pks) . ')');
-			}
-			// Implement View Level Access
-			if (!$user->authorise('core.options', 'com_componentbuilder'))
-			{
-				$groups = implode(',', $user->getAuthorisedViewLevels());
-				$query->where('a.access IN (' . $groups . ')');
-			}
-
-			// Order the results by ordering
-			$query->order('a.id desc');
-
-			// Load the items
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				$items = $db->loadObjectList();
-
-				// Set values to display correctly.
-				if (UtilitiesArrayHelper::check($items))
-				{
-					foreach ($items as $nr => &$item)
-					{
-						// Remove items the user can't access.
-						$access = ($user->authorise('placeholder.access', 'com_componentbuilder.placeholder.' . (int) $item->id) && $user->authorise('placeholder.access', 'com_componentbuilder'));
-						if (!$access)
-						{
-							unset($items[$nr]);
-							continue;
-						}
-
-						// decode value
-						$item->value = base64_decode($item->value);
-						// unset the values we don't want exported.
-						unset($item->asset_id);
-						unset($item->checked_out);
-						unset($item->checked_out_time);
-					}
-				}
-				// Add headers to items array.
-				$headers = $this->getExImPortHeaders();
-				if (ObjectHelper::check($headers))
-				{
-					array_unshift($items,$headers);
-				}
-				return $items;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = Factory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_placeholder");
-		if (UtilitiesArrayHelper::check($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new \stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/src/Model/ServerModel.php

@@ -30,9 +30,8 @@ use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
 use VDM\Joomla\FOF\Encrypt\AES;
-use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
-use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
+use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -220,104 +219,10 @@ class ServerModel extends AdminModel
 				$item->username = rtrim($basic->decryptString($item->username), "\0");
 			}
 		}
-		$this->sales_serverupdate_servervvvw = $item->id;
 
 		return $item;
 	}
 
-	/**
-	 * Method to get list data.
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getVydlinked_components()
-	{
-		// Get the user object.
-		$user = Factory::getApplication()->getIdentity();
-		// Create a new query object.
-		$db = $this->getDatabase();
-		$query = $db->getQuery(true);
-
-		// Select some fields
-		$query->select('a.*');
-
-		// From the componentbuilder_joomla_component table
-		$query->from($db->quoteName('#__componentbuilder_joomla_component', 'a'));
-
-		// Filter by sales_serverupdate_servervvvw global.
-		$sales_serverupdate_servervvvw = $this->sales_serverupdate_servervvvw;
-		if (is_numeric($sales_serverupdate_servervvvw ))
-		{
-			$query->where('a.sales_server = ' . (int) $sales_serverupdate_servervvvw . ' OR a.update_server = ' . (int) $sales_serverupdate_servervvvw, ' OR');
-		}
-		elseif (is_string($sales_serverupdate_servervvvw))
-		{
-			$query->where('a.sales_server = ' . $db->quote($sales_serverupdate_servervvvw) . ' OR a.update_server = ' . $db->quote($sales_serverupdate_servervvvw), ' OR');
-		}
-		else
-		{
-			$query->where('a.update_server = -5');
-		}
-
-		// Join over the asset groups.
-		$query->select('ag.title AS access_level');
-		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
-		// Filter by access level.
-		$_access = $this->getState('filter.access');
-		if ($_access && is_numeric($_access))
-		{
-			$query->where('a.access = ' . (int) $_access);
-		}
-		elseif (UtilitiesArrayHelper::check($_access))
-		{
-			// Secure the array for the query
-			$_access = ArrayHelper::toInteger($_access);
-			// Filter by the Access Array.
-			$query->where('a.access IN (' . implode(',', $_access) . ')');
-		}
-		// Implement View Level Access
-		if (!$user->authorise('core.options', 'com_componentbuilder'))
-		{
-			$groups = implode(',', $user->getAuthorisedViewLevels());
-			$query->where('a.access IN (' . $groups . ')');
-		}
-
-		// Order the results by ordering
-		$query->order('a.published  ASC');
-		$query->order('a.ordering  ASC');
-
-		// Load the items
-		$db->setQuery($query);
-		$db->execute();
-		if ($db->getNumRows())
-		{
-			$items = $db->loadObjectList();
-
-			// Set values to display correctly.
-			if (UtilitiesArrayHelper::check($items))
-			{
-				// Get the user object if not set.
-				if (!isset($user) || !ObjectHelper::check($user))
-				{
-					$user = $this->getCurrentUser();
-				}
-				foreach ($items as $nr => &$item)
-				{
-					// Remove items the user can't access.
-					$access = ($user->authorise('joomla_component.access', 'com_componentbuilder.joomla_component.' . (int) $item->id) && $user->authorise('joomla_component.access', 'com_componentbuilder'));
-					if (!$access)
-					{
-						unset($items[$nr]);
-						continue;
-					}
-
-				}
-			}
-			return $items;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get the record form.
 	 *

admin/src/Model/ServersModel.php

@@ -26,7 +26,6 @@ use Joomla\CMS\Helper\TagsHelper;
 use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\StringHelper;
-use VDM\Joomla\FOF\Encrypt\AES;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -351,178 +350,6 @@ class ServersModel extends ListModel
 		return $query;
 	}
 
-	/**
-	 * Method to get list export data.
-	 *
-	 * @param   array  $pks  The ids of the items to get
-	 * @param   JUser  $user  The user making the request
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getExportData($pks, $user = null)
-	{
-		// setup the query
-		if (($pks_size = UtilitiesArrayHelper::check($pks)) !== false || 'bulk' === $pks)
-		{
-			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
-			$_export = true;
-			// Get the user object if not set.
-			if (!isset($user) || !ObjectHelper::check($user))
-			{
-				$user = $this->getCurrentUser();
-			}
-			// Create a new query object.
-			$db = $this->getDatabase();
-			$query = $db->getQuery(true);
-
-			// Select some fields
-			$query->select('a.*');
-
-			// From the componentbuilder_server table
-			$query->from($db->quoteName('#__componentbuilder_server', 'a'));
-			// The bulk export path
-			if ('bulk' === $pks)
-			{
-				$query->where('a.id > 0');
-			}
-			// A large array of ID's will not work out well
-			elseif ($pks_size > 500)
-			{
-				// Use lowest ID
-				$query->where('a.id >= ' . (int) min($pks));
-				// Use highest ID
-				$query->where('a.id <= ' . (int) max($pks));
-			}
-			// The normal default path
-			else
-			{
-				$query->where('a.id IN (' . implode(',',$pks) . ')');
-			}
-			// Implement View Level Access
-			if (!$user->authorise('core.options', 'com_componentbuilder'))
-			{
-				$groups = implode(',', $user->getAuthorisedViewLevels());
-				$query->where('a.access IN (' . $groups . ')');
-			}
-
-			// Order the results by ordering
-			$query->order('a.ordering  ASC');
-
-			// Load the items
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				$items = $db->loadObjectList();
-
-				// Get the basic encryption key.
-				$basickey = ComponentbuilderHelper::getCryptKey('basic');
-				// Get the encryption object.
-				$basic = new AES($basickey);
-
-				// Set values to display correctly.
-				if (UtilitiesArrayHelper::check($items))
-				{
-					foreach ($items as $nr => &$item)
-					{
-						// Remove items the user can't access.
-						$access = ($user->authorise('server.access', 'com_componentbuilder.server.' . (int) $item->id) && $user->authorise('server.access', 'com_componentbuilder'));
-						if (!$access)
-						{
-							unset($items[$nr]);
-							continue;
-						}
-
-						if ($basickey && !is_numeric($item->signature) && $item->signature === base64_encode(base64_decode($item->signature, true)))
-						{
-							// decrypt signature
-							$item->signature = $basic->decryptString($item->signature);
-						}
-						if ($basickey && !is_numeric($item->private_key) && $item->private_key === base64_encode(base64_decode($item->private_key, true)))
-						{
-							// decrypt private_key
-							$item->private_key = $basic->decryptString($item->private_key);
-						}
-						if ($basickey && !is_numeric($item->secret) && $item->secret === base64_encode(base64_decode($item->secret, true)))
-						{
-							// decrypt secret
-							$item->secret = $basic->decryptString($item->secret);
-						}
-						if ($basickey && !is_numeric($item->password) && $item->password === base64_encode(base64_decode($item->password, true)))
-						{
-							// decrypt password
-							$item->password = $basic->decryptString($item->password);
-						}
-						if ($basickey && !is_numeric($item->private) && $item->private === base64_encode(base64_decode($item->private, true)))
-						{
-							// decrypt private
-							$item->private = $basic->decryptString($item->private);
-						}
-						if ($basickey && !is_numeric($item->path) && $item->path === base64_encode(base64_decode($item->path, true)))
-						{
-							// decrypt path
-							$item->path = $basic->decryptString($item->path);
-						}
-						if ($basickey && !is_numeric($item->port) && $item->port === base64_encode(base64_decode($item->port, true)))
-						{
-							// decrypt port
-							$item->port = $basic->decryptString($item->port);
-						}
-						if ($basickey && !is_numeric($item->host) && $item->host === base64_encode(base64_decode($item->host, true)))
-						{
-							// decrypt host
-							$item->host = $basic->decryptString($item->host);
-						}
-						if ($basickey && !is_numeric($item->username) && $item->username === base64_encode(base64_decode($item->username, true)))
-						{
-							// decrypt username
-							$item->username = $basic->decryptString($item->username);
-						}
-						// unset the values we don't want exported.
-						unset($item->asset_id);
-						unset($item->checked_out);
-						unset($item->checked_out_time);
-					}
-				}
-				// Add headers to items array.
-				$headers = $this->getExImPortHeaders();
-				if (ObjectHelper::check($headers))
-				{
-					array_unshift($items,$headers);
-				}
-				return $items;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = Factory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_server");
-		if (UtilitiesArrayHelper::check($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new \stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/src/Model/Site_viewsModel.php

@@ -514,171 +514,6 @@ class Site_viewsModel extends ListModel
 		return $query;
 	}
 
-	/**
-	 * Method to get list export data.
-	 *
-	 * @param   array  $pks  The ids of the items to get
-	 * @param   JUser  $user  The user making the request
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getExportData($pks, $user = null)
-	{
-		// setup the query
-		if (($pks_size = UtilitiesArrayHelper::check($pks)) !== false || 'bulk' === $pks)
-		{
-			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
-			$_export = true;
-			// Get the user object if not set.
-			if (!isset($user) || !ObjectHelper::check($user))
-			{
-				$user = $this->getCurrentUser();
-			}
-			// Create a new query object.
-			$db = $this->getDatabase();
-			$query = $db->getQuery(true);
-
-			// Select some fields
-			$query->select('a.*');
-
-			// From the componentbuilder_site_view table
-			$query->from($db->quoteName('#__componentbuilder_site_view', 'a'));
-			// The bulk export path
-			if ('bulk' === $pks)
-			{
-				$query->where('a.id > 0');
-			}
-			// A large array of ID's will not work out well
-			elseif ($pks_size > 500)
-			{
-				// Use lowest ID
-				$query->where('a.id >= ' . (int) min($pks));
-				// Use highest ID
-				$query->where('a.id <= ' . (int) max($pks));
-			}
-			// The normal default path
-			else
-			{
-				$query->where('a.id IN (' . implode(',',$pks) . ')');
-			}
-
-			// do not use these filters in the export method
-		if (!isset($_export) || !$_export)
-		{
-			// Filtering "joomla components"
-			$filter_joomla_component = $this->state->get("filter.joomla_component");
-			if ($filter_joomla_component !== null && !empty($filter_joomla_component))
-			{
-				if (($ids = JCBFilterHelper::linked((int) $filter_joomla_component, 'joomla_component_site_views')) !== null)
-				{
-					$query->where($db->quoteName('a.id') . ' IN (' . implode(',', $ids) . ')');
-				}
-				else
-				{
-					// there is none
-					$query->where($db->quoteName('a.id') . ' = ' . 0);
-				}
-			}
-		}
-			// Implement View Level Access
-			if (!$user->authorise('core.options', 'com_componentbuilder'))
-			{
-				$groups = implode(',', $user->getAuthorisedViewLevels());
-				$query->where('a.access IN (' . $groups . ')');
-			}
-
-			// Order the results by ordering
-			$query->order('a.id desc');
-
-			// Load the items
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				$items = $db->loadObjectList();
-
-				// Set values to display correctly.
-				if (UtilitiesArrayHelper::check($items))
-				{
-					foreach ($items as $nr => &$item)
-					{
-						// Remove items the user can't access.
-						$access = ($user->authorise('site_view.access', 'com_componentbuilder.site_view.' . (int) $item->id) && $user->authorise('site_view.access', 'com_componentbuilder'));
-						if (!$access)
-						{
-							unset($items[$nr]);
-							continue;
-						}
-
-						// decode js_document
-						$item->js_document = base64_decode($item->js_document);
-						// decode javascript_file
-						$item->javascript_file = base64_decode($item->javascript_file);
-						// decode default
-						$item->default = base64_decode($item->default);
-						// decode css_document
-						$item->css_document = base64_decode($item->css_document);
-						// decode css
-						$item->css = base64_decode($item->css);
-						// decode php_ajaxmethod
-						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
-						// decode php_document
-						$item->php_document = base64_decode($item->php_document);
-						// decode php_view
-						$item->php_view = base64_decode($item->php_view);
-						// decode php_jview_display
-						$item->php_jview_display = base64_decode($item->php_jview_display);
-						// decode php_jview
-						$item->php_jview = base64_decode($item->php_jview);
-						// decode php_controller
-						$item->php_controller = base64_decode($item->php_controller);
-						// decode php_model
-						$item->php_model = base64_decode($item->php_model);
-						// unset the values we don't want exported.
-						unset($item->asset_id);
-						unset($item->checked_out);
-						unset($item->checked_out_time);
-					}
-				}
-				// Add headers to items array.
-				$headers = $this->getExImPortHeaders();
-				if (ObjectHelper::check($headers))
-				{
-					array_unshift($items,$headers);
-				}
-				return $items;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = Factory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_site_view");
-		if (UtilitiesArrayHelper::check($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new \stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/src/Model/SnippetsModel.php

@@ -461,130 +461,6 @@ class SnippetsModel extends ListModel
 		return $query;
 	}
 
-	/**
-	 * Method to get list export data.
-	 *
-	 * @param   array  $pks  The ids of the items to get
-	 * @param   JUser  $user  The user making the request
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getExportData($pks, $user = null)
-	{
-		// setup the query
-		if (($pks_size = UtilitiesArrayHelper::check($pks)) !== false || 'bulk' === $pks)
-		{
-			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
-			$_export = true;
-			// Get the user object if not set.
-			if (!isset($user) || !ObjectHelper::check($user))
-			{
-				$user = $this->getCurrentUser();
-			}
-			// Create a new query object.
-			$db = $this->getDatabase();
-			$query = $db->getQuery(true);
-
-			// Select some fields
-			$query->select('a.*');
-
-			// From the componentbuilder_snippet table
-			$query->from($db->quoteName('#__componentbuilder_snippet', 'a'));
-			// The bulk export path
-			if ('bulk' === $pks)
-			{
-				$query->where('a.id > 0');
-			}
-			// A large array of ID's will not work out well
-			elseif ($pks_size > 500)
-			{
-				// Use lowest ID
-				$query->where('a.id >= ' . (int) min($pks));
-				// Use highest ID
-				$query->where('a.id <= ' . (int) max($pks));
-			}
-			// The normal default path
-			else
-			{
-				$query->where('a.id IN (' . implode(',',$pks) . ')');
-			}
-			// Implement View Level Access
-			if (!$user->authorise('core.options', 'com_componentbuilder'))
-			{
-				$groups = implode(',', $user->getAuthorisedViewLevels());
-				$query->where('a.access IN (' . $groups . ')');
-			}
-
-			// Order the results by ordering
-			$query->order('a.id desc');
-
-			// Load the items
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				$items = $db->loadObjectList();
-
-				// Set values to display correctly.
-				if (UtilitiesArrayHelper::check($items))
-				{
-					foreach ($items as $nr => &$item)
-					{
-						// Remove items the user can't access.
-						$access = ($user->authorise('snippet.access', 'com_componentbuilder.snippet.' . (int) $item->id) && $user->authorise('snippet.access', 'com_componentbuilder'));
-						if (!$access)
-						{
-							unset($items[$nr]);
-							continue;
-						}
-
-						// decode snippet
-						$item->snippet = base64_decode($item->snippet);
-						// unset the values we don't want exported.
-						unset($item->asset_id);
-						unset($item->checked_out);
-						unset($item->checked_out_time);
-					}
-				}
-				// Add headers to items array.
-				$headers = $this->getExImPortHeaders();
-				if (ObjectHelper::check($headers))
-				{
-					array_unshift($items,$headers);
-				}
-				return $items;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = Factory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_snippet");
-		if (UtilitiesArrayHelper::check($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new \stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/src/Model/TemplatesModel.php

@@ -369,132 +369,6 @@ class TemplatesModel extends ListModel
 		return $query;
 	}
 
-	/**
-	 * Method to get list export data.
-	 *
-	 * @param   array  $pks  The ids of the items to get
-	 * @param   JUser  $user  The user making the request
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getExportData($pks, $user = null)
-	{
-		// setup the query
-		if (($pks_size = UtilitiesArrayHelper::check($pks)) !== false || 'bulk' === $pks)
-		{
-			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
-			$_export = true;
-			// Get the user object if not set.
-			if (!isset($user) || !ObjectHelper::check($user))
-			{
-				$user = $this->getCurrentUser();
-			}
-			// Create a new query object.
-			$db = $this->getDatabase();
-			$query = $db->getQuery(true);
-
-			// Select some fields
-			$query->select('a.*');
-
-			// From the componentbuilder_template table
-			$query->from($db->quoteName('#__componentbuilder_template', 'a'));
-			// The bulk export path
-			if ('bulk' === $pks)
-			{
-				$query->where('a.id > 0');
-			}
-			// A large array of ID's will not work out well
-			elseif ($pks_size > 500)
-			{
-				// Use lowest ID
-				$query->where('a.id >= ' . (int) min($pks));
-				// Use highest ID
-				$query->where('a.id <= ' . (int) max($pks));
-			}
-			// The normal default path
-			else
-			{
-				$query->where('a.id IN (' . implode(',',$pks) . ')');
-			}
-			// Implement View Level Access
-			if (!$user->authorise('core.options', 'com_componentbuilder'))
-			{
-				$groups = implode(',', $user->getAuthorisedViewLevels());
-				$query->where('a.access IN (' . $groups . ')');
-			}
-
-			// Order the results by ordering
-			$query->order('a.id desc');
-
-			// Load the items
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				$items = $db->loadObjectList();
-
-				// Set values to display correctly.
-				if (UtilitiesArrayHelper::check($items))
-				{
-					foreach ($items as $nr => &$item)
-					{
-						// Remove items the user can't access.
-						$access = ($user->authorise('template.access', 'com_componentbuilder.template.' . (int) $item->id) && $user->authorise('template.access', 'com_componentbuilder'));
-						if (!$access)
-						{
-							unset($items[$nr]);
-							continue;
-						}
-
-						// decode php_view
-						$item->php_view = base64_decode($item->php_view);
-						// decode template
-						$item->template = base64_decode($item->template);
-						// unset the values we don't want exported.
-						unset($item->asset_id);
-						unset($item->checked_out);
-						unset($item->checked_out_time);
-					}
-				}
-				// Add headers to items array.
-				$headers = $this->getExImPortHeaders();
-				if (ObjectHelper::check($headers))
-				{
-					array_unshift($items,$headers);
-				}
-				return $items;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = Factory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_template");
-		if (UtilitiesArrayHelper::check($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new \stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/src/Model/Validation_rulesModel.php

@@ -281,130 +281,6 @@ class Validation_rulesModel extends ListModel
 		return $query;
 	}
 
-	/**
-	 * Method to get list export data.
-	 *
-	 * @param   array  $pks  The ids of the items to get
-	 * @param   JUser  $user  The user making the request
-	 *
-	 * @return mixed  An array of data items on success, false on failure.
-	 */
-	public function getExportData($pks, $user = null)
-	{
-		// setup the query
-		if (($pks_size = UtilitiesArrayHelper::check($pks)) !== false || 'bulk' === $pks)
-		{
-			// Set a value to know this is export method. (USE IN CUSTOM CODE TO ALTER OUTCOME)
-			$_export = true;
-			// Get the user object if not set.
-			if (!isset($user) || !ObjectHelper::check($user))
-			{
-				$user = $this->getCurrentUser();
-			}
-			// Create a new query object.
-			$db = $this->getDatabase();
-			$query = $db->getQuery(true);
-
-			// Select some fields
-			$query->select('a.*');
-
-			// From the componentbuilder_validation_rule table
-			$query->from($db->quoteName('#__componentbuilder_validation_rule', 'a'));
-			// The bulk export path
-			if ('bulk' === $pks)
-			{
-				$query->where('a.id > 0');
-			}
-			// A large array of ID's will not work out well
-			elseif ($pks_size > 500)
-			{
-				// Use lowest ID
-				$query->where('a.id >= ' . (int) min($pks));
-				// Use highest ID
-				$query->where('a.id <= ' . (int) max($pks));
-			}
-			// The normal default path
-			else
-			{
-				$query->where('a.id IN (' . implode(',',$pks) . ')');
-			}
-			// Implement View Level Access
-			if (!$user->authorise('core.options', 'com_componentbuilder'))
-			{
-				$groups = implode(',', $user->getAuthorisedViewLevels());
-				$query->where('a.access IN (' . $groups . ')');
-			}
-
-			// Order the results by ordering
-			$query->order('a.id desc');
-
-			// Load the items
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				$items = $db->loadObjectList();
-
-				// Set values to display correctly.
-				if (UtilitiesArrayHelper::check($items))
-				{
-					foreach ($items as $nr => &$item)
-					{
-						// Remove items the user can't access.
-						$access = ($user->authorise('validation_rule.access', 'com_componentbuilder.validation_rule.' . (int) $item->id) && $user->authorise('validation_rule.access', 'com_componentbuilder'));
-						if (!$access)
-						{
-							unset($items[$nr]);
-							continue;
-						}
-
-						// decode php
-						$item->php = base64_decode($item->php);
-						// unset the values we don't want exported.
-						unset($item->asset_id);
-						unset($item->checked_out);
-						unset($item->checked_out_time);
-					}
-				}
-				// Add headers to items array.
-				$headers = $this->getExImPortHeaders();
-				if (ObjectHelper::check($headers))
-				{
-					array_unshift($items,$headers);
-				}
-				return $items;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Method to get header.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getExImPortHeaders()
-	{
-		// Get a db connection.
-		$db = Factory::getDbo();
-		// get the columns
-		$columns = $db->getTableColumns("#__componentbuilder_validation_rule");
-		if (UtilitiesArrayHelper::check($columns))
-		{
-			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
-			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
-			$headers = new \stdClass();
-			foreach ($columns as $column => $type)
-			{
-				$headers->{$column} = $column;
-			}
-			return $headers;
-		}
-		return false;
-	}
-
 	/**
 	 * Method to get a store id based on model configuration state.
 	 *

admin/src/View/Admin_fields_relations/HtmlView.php

@@ -238,6 +238,6 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 	}
 }

admin/src/View/Admin_view/HtmlView.php

@@ -244,6 +244,6 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 	}
 }

admin/src/View/Class_extends/HtmlView.php

@@ -244,6 +244,6 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 	}
 }

admin/src/View/Class_method/HtmlView.php

@@ -244,6 +244,6 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 	}
 }

admin/src/View/Class_property/HtmlView.php

@@ -244,6 +244,6 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 	}
 }

admin/src/View/Compiler/HtmlView.php

@@ -762,16 +762,6 @@ class HtmlView extends BaseHtmlView
 		ToolbarHelper::title(Text::_('COM_COMPONENTBUILDER_COMPILER'),'cogs');
 		// add cpanel button
 		ToolbarHelper::custom('compiler.dashboard', 'grid-2', '', 'COM_COMPONENTBUILDER_DASH', false);
-		if ($this->canDo->get('compiler.run_expansion'))
-		{
-			// add Run Expansion button.
-			ToolbarHelper::custom('compiler.runExpansion', 'expand-2 custom-button-runexpansion', '', 'COM_COMPONENTBUILDER_RUN_EXPANSION', false);
-		}
-		if ($this->canDo->get('compiler.translate'))
-		{
-			// add Translate button.
-			ToolbarHelper::custom('compiler.runTranslator', 'comments-2 custom-button-runtranslator', '', 'COM_COMPONENTBUILDER_TRANSLATE', false);
-		}
 		if ($this->canDo->get('compiler.compiler_animations'))
 		{
 			// add Compiler Animations button.

admin/src/View/Component_dashboard/HtmlView.php

@@ -244,6 +244,6 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 	}
 }

admin/src/View/Custom_admin_view/HtmlView.php

@@ -244,6 +244,6 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 	}
 }

admin/src/View/Custom_code/HtmlView.php

@@ -244,7 +244,7 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		// need to add some language strings
 		Text::script('COM_COMPONENTBUILDER_FUNCTION_NAME_ALREADY_TAKEN_PLEASE_TRY_AGAIN');
 		Text::script('COM_COMPONENTBUILDER_YOU_MUST_ADD_AN_UNIQUE_FUNCTION_NAME');

admin/src/View/Dynamic_get/HtmlView.php

@@ -244,6 +244,6 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 	}
 }

admin/src/View/Field/HtmlView.php

@@ -244,7 +244,7 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		// add the libs for subform (since not adding it via xml but ajax)
 		Factory::getApplication()
 			->getDocument()

admin/src/View/Fieldtype/HtmlView.php

@@ -82,7 +82,7 @@ class HtmlView extends BaseHtmlView
 		}
 
 		// Get Linked view data
-		$this->vxtfields = $this->get('Vxtfields');
+		$this->vxsfields = $this->get('Vxsfields');
 
 		// Set the toolbar
 		$this->addToolBar();
@@ -295,6 +295,6 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 	}
 }

admin/src/View/Get_snippets/HtmlView.php

@@ -24,6 +24,7 @@ use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Filesystem\File;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Session\Session;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -197,7 +198,7 @@ class HtmlView extends BaseHtmlView
 		$this->document->addScriptDeclaration("var snippetPath = '". ComponentbuilderHelper::$snippetPath ."';");
 		$this->document->addScriptDeclaration("var snippetsPath = '". ComponentbuilderHelper::$snippetsPath ."';");
 		// token
-		$this->document->addScriptDeclaration("var token = '". \JSession::getFormToken() ."';");
+		$this->document->addScriptDeclaration("var token = '". Session::getFormToken() ."';");
 		// add some global items buckets for bulk updating
 		$this->document->addScriptDeclaration("var bulkItems = {};");
 		$this->document->addScriptDeclaration("bulkItems.new = [];");

admin/src/View/Import/HtmlView.php

@@ -1,106 +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
- */
-namespace VDM\Component\Componentbuilder\Administrator\View\Import;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Toolbar\ToolbarHelper;
-use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Utilities\StringHelper;
-
-// No direct access to this file
-\defined('_JEXEC') or die;
-
-/**
- * Componentbuilder Import Html View
- *
- * @since  1.6
- */
-class HtmlView extends BaseHtmlView
-{
-	protected $headerList;
-	protected $hasPackage = false;
-	protected $headers;
-	protected $hasHeader = 0;
-	protected $dataType;
-
-	/**
-	 * Display the view
-	 *
-	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
-	 *
-	 * @return  void
-	 * @since  1.6
-	 */
-	public function display($tpl = null)
-	{
-		$paths = new \StdClass;
-		$paths->first = '';
-		$state = $this->get('state');
-
-		$this->paths = &$paths;
-		$this->state = &$state;
-		// get global action permissions
-		$this->canDo = ComponentbuilderHelper::getActions('import');
-
-		// We don't need toolbar in the modal window.
-		if ($this->getLayout() !== 'modal')
-		{
-			$this->addToolbar();
-		}
-
-		// get the session object
-		$session = Factory::getSession();
-		// check if it has package
-		$this->hasPackage     = $session->get('hasPackage', false);
-		$this->dataType     = $session->get('dataType', false);
-		if($this->hasPackage && $this->dataType)
-		{
-			$this->headerList     = json_decode($session->get($this->dataType.'_VDM_IMPORTHEADERS', false),true);
-			$this->headers         = ComponentbuilderHelper::getFileHeaders($this->dataType);
-			// clear the data type
-			$session->clear('dataType');
-		}
-
-		// Check for errors.
-		if (count($errors = $this->get('Errors')))
-		{
-			throw new \Exception(implode("\n", $errors), 500);
-		}
-
-		// Display the template
-		parent::display($tpl);
-	}
-
-	/**
-	 * Add the page title and toolbar.
-	 *
-	 * @return  void
-	 * @since   1.6
-	 */
-	protected function addToolbar(): void
-	{
-		ToolbarHelper::title(Text::_('COM_COMPONENTBUILDER_IMPORT_TITLE'), 'upload');
-
-		if ($this->canDo->get('core.admin') || $this->canDo->get('core.options'))
-		{
-			ToolbarHelper::preferences('com_componentbuilder');
-		}
-
-		// set help url for this view if found
-		$this->help_url = ComponentbuilderHelper::getHelpUrl('import');
-		if (StringHelper::check($this->help_url))
-		{
-			ToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $this->help_url);
-		}
-	}
-}

admin/src/View/Import/index.html

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

admin/src/View/Import_joomla_componentsimport/HtmlView.php

@@ -21,6 +21,7 @@ use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use VDM\Joomla\Utilities\FormHelper as UtilitiesFormHelper;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Session\Session;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -169,7 +170,7 @@ class HtmlView extends BaseHtmlView
 		$this->document->addScriptDeclaration("var expire = ". (int) $expire.";");
 		$this->document->addScriptDeclaration("var all_is_good = '".Text::_('COM_COMPONENTBUILDER_ALL_IS_GOOD_THERE_IS_NO_NOTICE_AT_THIS_TIME')."';"); 
 		// add a token on the page for javascript
-		$this->document->addScriptDeclaration("var token = '".\JSession::getFormToken()."';"); 
+		$this->document->addScriptDeclaration("var token = '".Session::getFormToken()."';"); 
 
 
 		// add the Uikit v2 style sheets

admin/src/View/Joomla_component/HtmlView.php

@@ -244,6 +244,6 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->getDocument()->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 	}
 }

admin/src/View/Joomla_components/HtmlView.php

@@ -131,16 +131,6 @@ class HtmlView extends BaseHtmlView
 					ToolbarHelper::checkin('joomla_components.checkin');
 				}
 			}
-			if ($this->user->authorise('joomla_component.clone', 'com_componentbuilder'))
-			{
-				// add Clone button.
-				ToolbarHelper::custom('joomla_components.cloner', 'save-copy custom-button-cloner', '', 'COM_COMPONENTBUILDER_CLONE', 'true');
-			}
-			if ($this->user->authorise('joomla_component.export_jcb_packages', 'com_componentbuilder'))
-			{
-				// add Export JCB Packages button.
-				ToolbarHelper::custom('joomla_components.smartExport', 'download custom-button-smartexport', '', 'COM_COMPONENTBUILDER_EXPORT_JCB_PACKAGES', 'true');
-			}
 
 			if ($this->state->get('filter.published') == -2 && ($this->canState && $this->canDelete))
 			{
@@ -151,21 +141,6 @@ class HtmlView extends BaseHtmlView
 				ToolbarHelper::trash('joomla_components.trash');
 			}
 		}
-		if ($this->user->authorise('joomla_component.import_jcb_packages', 'com_componentbuilder'))
-		{
-			// add Import JCB Packages button.
-			ToolbarHelper::custom('joomla_components.smartImport', 'upload custom-button-smartimport', '', 'COM_COMPONENTBUILDER_IMPORT_JCB_PACKAGES', false);
-		}
-		if ($this->user->authorise('joomla_component.run_expansion', 'com_componentbuilder'))
-		{
-			// add Run Expansion button.
-			ToolbarHelper::custom('joomla_components.runExpansion', 'expand-2 custom-button-runexpansion', '', 'COM_COMPONENTBUILDER_RUN_EXPANSION', false);
-		}
-		if ($this->user->authorise('joomla_component.backup', 'com_componentbuilder'))
-		{
-			// add Backup button.
-			ToolbarHelper::custom('joomla_components.backup', 'archive custom-button-backup', '', 'COM_COMPONENTBUILDER_BACKUP', false);
-		}
 		if ($this->user->authorise('joomla_component.clear_tmp', 'com_componentbuilder'))
 		{
 			// add Clear tmp button.

admin/src/View/Joomla_module/HtmlView.php

@@ -248,7 +248,7 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		// check if we should use browser storage
 		$setBrowserStorage = $this->params->get('set_browser_storage', null);
 		if ($setBrowserStorage)

admin/src/View/Joomla_plugin/HtmlView.php

@@ -249,7 +249,7 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		// set some lang
 		Text::script('COM_COMPONENTBUILDER_ALREADY_SELECTED_TRY_ANOTHER');
 		Text::script('COM_COMPONENTBUILDER_TYPE_OR_SELECT_SOME_OPTIONS');

admin/src/View/Layout/HtmlView.php

@@ -244,6 +244,6 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 	}
 }

admin/src/View/Library/HtmlView.php

@@ -244,6 +244,6 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 	}
 }

admin/src/View/Placeholder/HtmlView.php

@@ -247,6 +247,6 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 	}
 }

admin/src/View/Power/HtmlView.php

@@ -253,7 +253,7 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		// set some lang
 		Text::script('COM_COMPONENTBUILDER_ALREADY_SELECTED_TRY_ANOTHER');
 		Text::script('COM_COMPONENTBUILDER_TYPE_OR_SELECT_SOME_OPTIONS');

admin/src/View/Server/HtmlView.php

@@ -81,9 +81,6 @@ class HtmlView extends BaseHtmlView
 			$this->referral .= '&return=' . (string) $return;
 		}
 
-		// Get Linked view data
-		$this->vydlinked_components = $this->get('Vydlinked_components');
-
 		// Set the toolbar
 		$this->addToolBar();
 
@@ -225,16 +222,6 @@ class HtmlView extends BaseHtmlView
 		{
 			Html::_('stylesheet', $style, ['version' => 'auto']);
 		}
-
-		// Add the CSS for Footable
-		Html::_('stylesheet', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css', ['version' => 'auto']);
-		Html::_('stylesheet', 'media/com_componentbuilder/footable-v3/css/footable.standalone.min.css', ['version' => 'auto']);
-		// Add the JavaScript for Footable (adding all functions)
-		Html::_('script', 'media/com_componentbuilder/footable-v3/js/footable.min.js', ['version' => 'auto']);
-
-		$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable();});});";
-		$this->getDocument()->addScriptDeclaration($footable);
-
 		// add scripts
 		foreach ($this->scripts as $script)
 		{

admin/src/View/Site_view/HtmlView.php

@@ -244,6 +244,6 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 	}
 }

admin/src/View/Template/HtmlView.php

@@ -244,6 +244,6 @@ class HtmlView extends BaseHtmlView
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '" . $this->get('VDM') . "';");
 		// add return_here
-		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) \JUri::getInstance())) . "';");
+		$this->document->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 	}
 }