From d789ef249e1a6af7cda03a92b00583900beed196 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Wed, 25 May 2022 10:30:55 +0200 Subject: [PATCH] Moved the MVC to extend the CMS MVC via namespace. --- README.md | 4 +- admin/README.txt | 4 +- ...ontrollerAdmin.php => AdminController.php} | 4 +- ...Admin.php => AdminControllerDashboard.php} | 4 +- ...n.php => AdminController_custom_admin.php} | 13 +- .../{JModelAdmin.php => AdminModel.php} | 4 +- ...odelAdmin_site.php => AdminModel_site.php} | 4 +- ...ontrollerLegacy.php => BaseController.php} | 3 +- ...rLegacyAjax.php => BaseControllerAjax.php} | 5 +- ...jaxSite.php => BaseControllerAjaxSite.php} | 5 +- ...rLegacyHelp.php => BaseControllerHelp.php} | 5 +- ...p_site.php => BaseControllerHelp_site.php} | 5 +- ...rLegacySITE.php => BaseControllerSITE.php} | 5 +- ...in.php => BaseController_custom_admin.php} | 4 +- ...y_import.php => BaseController_import.php} | 5 +- ...m.php => BaseController_import_custom.php} | 5 +- ...mport.php => BaseDatabaseModel_import.php} | 5 +- ...hp => BaseDatabaseModel_import_custom.php} | 5 +- ...JControllerForm.php => FormController.php} | 4 +- ...ite.php => FormController_custom_site.php} | 4 +- ...rForm_site.php => FormController_site.php} | 4 +- ...om_admin.php => HtmlView_custom_admin.php} | 6 +- ...JViewLegacy_edit.php => HtmlView_edit.php} | 6 +- ...y_edit_site.php => HtmlView_edit_site.php} | 6 +- ...wLegacy_import.php => HtmlView_import.php} | 6 +- ..._custom.php => HtmlView_import_custom.php} | 6 +- ...JViewLegacy_list.php => HtmlView_list.php} | 6 +- ...min.php => HtmlView_list_custom_admin.php} | 6 +- ...y_list_site.php => HtmlView_list_site.php} | 6 +- ...JViewLegacy_site.php => HtmlView_site.php} | 6 +- ...m_admin.php => ItemModel_custom_admin.php} | 4 +- ...JModelItem_site.php => ItemModel_site.php} | 4 +- .../{JModelList.php => ListModel.php} | 4 +- .../{JModelListAjax.php => ListModelAjax.php} | 4 +- ...ListAjaxSite.php => ListModelAjaxSite.php} | 4 +- .../{DASHJModelList.php => ListModelDASH.php} | 4 +- ...m_admin.php => ListModel_custom_admin.php} | 4 +- ...JModelList_site.php => ListModel_site.php} | 4 +- .../joomla_3/{JTable.php => Table.php} | 3 +- admin/compiler/joomla_3/settings.json | 114 +++++++++--------- .../joomla_3/settings_componentbuilder.json | 114 +++++++++--------- admin/controller.php | 3 +- admin/controllers/admin_custom_tabs.php | 5 +- admin/controllers/admin_fields.php | 5 +- admin/controllers/admin_fields_conditions.php | 5 +- admin/controllers/admin_fields_relations.php | 5 +- admin/controllers/admin_view.php | 5 +- admin/controllers/admin_views.php | 5 +- admin/controllers/admins_custom_tabs.php | 5 +- admin/controllers/admins_fields.php | 5 +- .../controllers/admins_fields_conditions.php | 5 +- admin/controllers/admins_fields_relations.php | 5 +- admin/controllers/ajax.json.php | 5 +- admin/controllers/class_extendings.php | 5 +- admin/controllers/class_extends.php | 5 +- admin/controllers/class_method.php | 5 +- admin/controllers/class_methods.php | 5 +- admin/controllers/class_properties.php | 5 +- admin/controllers/class_property.php | 5 +- admin/controllers/compiler.php | 14 ++- admin/controllers/component_admin_views.php | 5 +- admin/controllers/component_config.php | 5 +- .../component_custom_admin_menus.php | 5 +- .../component_custom_admin_views.php | 5 +- admin/controllers/component_dashboard.php | 5 +- admin/controllers/component_files_folders.php | 5 +- admin/controllers/component_modules.php | 5 +- admin/controllers/component_mysql_tweaks.php | 5 +- admin/controllers/component_placeholders.php | 5 +- admin/controllers/component_plugins.php | 5 +- admin/controllers/component_site_views.php | 5 +- admin/controllers/component_updates.php | 5 +- admin/controllers/componentbuilder.php | 7 +- admin/controllers/components_admin_views.php | 5 +- admin/controllers/components_config.php | 5 +- .../components_custom_admin_menus.php | 5 +- .../components_custom_admin_views.php | 5 +- admin/controllers/components_dashboard.php | 5 +- .../controllers/components_files_folders.php | 5 +- admin/controllers/components_modules.php | 5 +- admin/controllers/components_mysql_tweaks.php | 5 +- admin/controllers/components_placeholders.php | 5 +- admin/controllers/components_plugins.php | 5 +- admin/controllers/components_site_views.php | 5 +- admin/controllers/components_updates.php | 5 +- admin/controllers/custom_admin_view.php | 5 +- admin/controllers/custom_admin_views.php | 5 +- admin/controllers/custom_code.php | 5 +- admin/controllers/custom_codes.php | 5 +- admin/controllers/dynamic_get.php | 5 +- admin/controllers/dynamic_gets.php | 5 +- admin/controllers/field.php | 5 +- admin/controllers/fields.php | 5 +- admin/controllers/fieldtype.php | 5 +- admin/controllers/fieldtypes.php | 5 +- admin/controllers/get_snippets.php | 14 ++- admin/controllers/help.php | 5 +- admin/controllers/help_document.php | 5 +- admin/controllers/help_documents.php | 5 +- admin/controllers/import.php | 5 +- .../controllers/import_joomla_components.php | 5 +- .../import_language_translations.php | 5 +- admin/controllers/joomla_component.php | 5 +- admin/controllers/joomla_components.php | 5 +- admin/controllers/joomla_module.php | 5 +- .../joomla_module_files_folders_urls.php | 5 +- admin/controllers/joomla_module_updates.php | 5 +- admin/controllers/joomla_modules.php | 5 +- .../joomla_modules_files_folders_urls.php | 5 +- admin/controllers/joomla_modules_updates.php | 5 +- admin/controllers/joomla_plugin.php | 5 +- .../joomla_plugin_files_folders_urls.php | 5 +- admin/controllers/joomla_plugin_group.php | 5 +- admin/controllers/joomla_plugin_groups.php | 5 +- admin/controllers/joomla_plugin_updates.php | 5 +- admin/controllers/joomla_plugins.php | 5 +- .../joomla_plugins_files_folders_urls.php | 5 +- admin/controllers/joomla_plugins_updates.php | 5 +- admin/controllers/language.php | 5 +- admin/controllers/language_translation.php | 5 +- admin/controllers/language_translations.php | 5 +- admin/controllers/languages.php | 5 +- admin/controllers/layout.php | 5 +- admin/controllers/layouts.php | 5 +- admin/controllers/libraries.php | 5 +- admin/controllers/libraries_config.php | 5 +- .../libraries_files_folders_urls.php | 5 +- admin/controllers/library.php | 5 +- admin/controllers/library_config.php | 5 +- .../library_files_folders_urls.php | 5 +- admin/controllers/placeholder.php | 5 +- admin/controllers/placeholders.php | 5 +- admin/controllers/server.php | 5 +- admin/controllers/servers.php | 5 +- admin/controllers/site_view.php | 5 +- admin/controllers/site_views.php | 5 +- admin/controllers/snippet.php | 5 +- admin/controllers/snippet_type.php | 5 +- admin/controllers/snippet_types.php | 5 +- admin/controllers/snippets.php | 5 +- admin/controllers/template.php | 5 +- admin/controllers/templates.php | 5 +- admin/controllers/validation_rule.php | 5 +- admin/controllers/validation_rules.php | 5 +- admin/helpers/compiler/e_Interpretation.php | 83 ++++++++----- admin/models/admin_custom_tabs.php | 5 +- admin/models/admin_fields.php | 5 +- admin/models/admin_fields_conditions.php | 5 +- admin/models/admin_fields_relations.php | 5 +- admin/models/admin_view.php | 5 +- admin/models/admin_views.php | 5 +- admin/models/admins_custom_tabs.php | 5 +- admin/models/admins_fields.php | 5 +- admin/models/admins_fields_conditions.php | 5 +- admin/models/admins_fields_relations.php | 5 +- admin/models/ajax.php | 42 +++++-- admin/models/class_extendings.php | 5 +- admin/models/class_extends.php | 5 +- admin/models/class_method.php | 5 +- admin/models/class_methods.php | 5 +- admin/models/class_properties.php | 5 +- admin/models/class_property.php | 5 +- admin/models/compiler.php | 5 +- admin/models/component_admin_views.php | 5 +- admin/models/component_config.php | 5 +- admin/models/component_custom_admin_menus.php | 5 +- admin/models/component_custom_admin_views.php | 5 +- admin/models/component_dashboard.php | 5 +- admin/models/component_files_folders.php | 5 +- admin/models/component_modules.php | 5 +- admin/models/component_mysql_tweaks.php | 5 +- admin/models/component_placeholders.php | 5 +- admin/models/component_plugins.php | 5 +- admin/models/component_site_views.php | 5 +- admin/models/component_updates.php | 5 +- admin/models/componentbuilder.php | 7 +- admin/models/components_admin_views.php | 5 +- admin/models/components_config.php | 5 +- .../models/components_custom_admin_menus.php | 5 +- .../models/components_custom_admin_views.php | 5 +- admin/models/components_dashboard.php | 5 +- admin/models/components_files_folders.php | 5 +- admin/models/components_modules.php | 5 +- admin/models/components_mysql_tweaks.php | 5 +- admin/models/components_placeholders.php | 5 +- admin/models/components_plugins.php | 5 +- admin/models/components_site_views.php | 5 +- admin/models/components_updates.php | 5 +- admin/models/custom_admin_view.php | 5 +- admin/models/custom_admin_views.php | 5 +- admin/models/custom_code.php | 5 +- admin/models/custom_codes.php | 5 +- admin/models/dynamic_get.php | 5 +- admin/models/dynamic_gets.php | 5 +- admin/models/field.php | 5 +- admin/models/fields.php | 5 +- admin/models/fieldtype.php | 5 +- admin/models/fieldtypes.php | 5 +- admin/models/get_snippets.php | 5 +- admin/models/help_document.php | 5 +- admin/models/help_documents.php | 5 +- admin/models/import.php | 5 +- admin/models/import_joomla_components.php | 5 +- admin/models/import_language_translations.php | 5 +- admin/models/joomla_component.php | 5 +- admin/models/joomla_components.php | 10 +- admin/models/joomla_module.php | 5 +- .../joomla_module_files_folders_urls.php | 5 +- admin/models/joomla_module_updates.php | 5 +- admin/models/joomla_modules.php | 5 +- .../joomla_modules_files_folders_urls.php | 5 +- admin/models/joomla_modules_updates.php | 5 +- admin/models/joomla_plugin.php | 5 +- .../joomla_plugin_files_folders_urls.php | 5 +- admin/models/joomla_plugin_group.php | 5 +- admin/models/joomla_plugin_groups.php | 5 +- admin/models/joomla_plugin_updates.php | 5 +- admin/models/joomla_plugins.php | 5 +- .../joomla_plugins_files_folders_urls.php | 5 +- admin/models/joomla_plugins_updates.php | 5 +- admin/models/language.php | 5 +- admin/models/language_translation.php | 5 +- admin/models/language_translations.php | 5 +- admin/models/languages.php | 5 +- admin/models/layout.php | 5 +- admin/models/layouts.php | 5 +- admin/models/libraries.php | 5 +- admin/models/libraries_config.php | 5 +- admin/models/libraries_files_folders_urls.php | 5 +- admin/models/library.php | 5 +- admin/models/library_config.php | 5 +- admin/models/library_files_folders_urls.php | 5 +- admin/models/placeholder.php | 5 +- admin/models/placeholders.php | 5 +- admin/models/server.php | 5 +- admin/models/servers.php | 5 +- admin/models/site_view.php | 5 +- admin/models/site_views.php | 5 +- admin/models/snippet.php | 5 +- admin/models/snippet_type.php | 5 +- admin/models/snippet_types.php | 5 +- admin/models/snippets.php | 5 +- admin/models/template.php | 5 +- admin/models/templates.php | 5 +- admin/models/validation_rule.php | 5 +- admin/models/validation_rules.php | 5 +- admin/tables/admin_custom_tabs.php | 3 +- admin/tables/admin_fields.php | 3 +- admin/tables/admin_fields_conditions.php | 3 +- admin/tables/admin_fields_relations.php | 3 +- admin/tables/admin_view.php | 3 +- admin/tables/class_extends.php | 3 +- admin/tables/class_method.php | 3 +- admin/tables/class_property.php | 3 +- admin/tables/component_admin_views.php | 3 +- admin/tables/component_config.php | 3 +- admin/tables/component_custom_admin_menus.php | 3 +- admin/tables/component_custom_admin_views.php | 3 +- admin/tables/component_dashboard.php | 3 +- admin/tables/component_files_folders.php | 3 +- admin/tables/component_modules.php | 3 +- admin/tables/component_mysql_tweaks.php | 3 +- admin/tables/component_placeholders.php | 3 +- admin/tables/component_plugins.php | 3 +- admin/tables/component_site_views.php | 3 +- admin/tables/component_updates.php | 3 +- admin/tables/custom_admin_view.php | 3 +- admin/tables/custom_code.php | 3 +- admin/tables/dynamic_get.php | 3 +- admin/tables/field.php | 3 +- admin/tables/fieldtype.php | 3 +- admin/tables/help_document.php | 3 +- admin/tables/joomla_component.php | 3 +- admin/tables/joomla_module.php | 3 +- .../joomla_module_files_folders_urls.php | 3 +- admin/tables/joomla_module_updates.php | 3 +- admin/tables/joomla_plugin.php | 3 +- .../joomla_plugin_files_folders_urls.php | 3 +- admin/tables/joomla_plugin_group.php | 3 +- admin/tables/joomla_plugin_updates.php | 3 +- admin/tables/language.php | 3 +- admin/tables/language_translation.php | 3 +- admin/tables/layout.php | 3 +- admin/tables/library.php | 3 +- admin/tables/library_config.php | 3 +- admin/tables/library_files_folders_urls.php | 3 +- admin/tables/placeholder.php | 3 +- admin/tables/server.php | 3 +- admin/tables/site_view.php | 3 +- admin/tables/snippet.php | 3 +- admin/tables/snippet_type.php | 3 +- admin/tables/template.php | 3 +- admin/tables/validation_rule.php | 3 +- admin/views/admin_custom_tabs/view.html.php | 6 +- admin/views/admin_fields/view.html.php | 6 +- .../admin_fields_conditions/view.html.php | 6 +- .../admin_fields_relations/view.html.php | 6 +- admin/views/admin_view/view.html.php | 6 +- admin/views/admin_views/view.html.php | 6 +- admin/views/admins_custom_tabs/view.html.php | 6 +- admin/views/admins_fields/view.html.php | 6 +- .../admins_fields_conditions/view.html.php | 6 +- .../admins_fields_relations/view.html.php | 6 +- admin/views/class_extendings/view.html.php | 6 +- admin/views/class_extends/view.html.php | 6 +- admin/views/class_method/view.html.php | 6 +- admin/views/class_methods/view.html.php | 6 +- admin/views/class_properties/view.html.php | 6 +- admin/views/class_property/view.html.php | 6 +- admin/views/compiler/view.html.php | 13 +- .../views/component_admin_views/view.html.php | 6 +- admin/views/component_config/view.html.php | 6 +- .../view.html.php | 6 +- .../view.html.php | 6 +- admin/views/component_dashboard/view.html.php | 6 +- .../component_files_folders/view.html.php | 6 +- admin/views/component_modules/view.html.php | 6 +- .../component_mysql_tweaks/view.html.php | 6 +- .../component_placeholders/view.html.php | 6 +- admin/views/component_plugins/view.html.php | 6 +- .../views/component_site_views/view.html.php | 6 +- admin/views/component_updates/view.html.php | 6 +- .../components_admin_views/view.html.php | 6 +- admin/views/components_config/view.html.php | 6 +- .../view.html.php | 6 +- .../view.html.php | 6 +- .../views/components_dashboard/view.html.php | 6 +- .../components_files_folders/view.html.php | 6 +- admin/views/components_modules/view.html.php | 6 +- .../components_mysql_tweaks/view.html.php | 6 +- .../components_placeholders/view.html.php | 6 +- admin/views/components_plugins/view.html.php | 6 +- .../views/components_site_views/view.html.php | 6 +- admin/views/components_updates/view.html.php | 6 +- admin/views/custom_admin_view/view.html.php | 6 +- admin/views/custom_admin_views/view.html.php | 6 +- admin/views/custom_code/view.html.php | 6 +- admin/views/custom_codes/view.html.php | 6 +- admin/views/dynamic_get/view.html.php | 6 +- admin/views/dynamic_gets/view.html.php | 6 +- admin/views/field/view.html.php | 6 +- admin/views/fields/view.html.php | 6 +- admin/views/fieldtype/view.html.php | 10 +- admin/views/fieldtypes/view.html.php | 6 +- admin/views/get_snippets/view.html.php | 13 +- admin/views/help_document/view.html.php | 6 +- admin/views/help_documents/view.html.php | 6 +- admin/views/import/view.html.php | 6 +- .../import_joomla_components/view.html.php | 6 +- .../view.html.php | 6 +- admin/views/joomla_component/view.html.php | 6 +- admin/views/joomla_components/view.html.php | 6 +- admin/views/joomla_module/view.html.php | 6 +- .../view.html.php | 6 +- .../views/joomla_module_updates/view.html.php | 6 +- admin/views/joomla_modules/view.html.php | 6 +- .../view.html.php | 6 +- .../joomla_modules_updates/view.html.php | 6 +- admin/views/joomla_plugin/view.html.php | 6 +- .../view.html.php | 6 +- admin/views/joomla_plugin_group/view.html.php | 6 +- .../views/joomla_plugin_groups/view.html.php | 6 +- .../views/joomla_plugin_updates/view.html.php | 6 +- admin/views/joomla_plugins/view.html.php | 6 +- .../view.html.php | 6 +- .../joomla_plugins_updates/view.html.php | 6 +- admin/views/language/view.html.php | 6 +- .../views/language_translation/view.html.php | 6 +- .../views/language_translations/view.html.php | 6 +- admin/views/languages/view.html.php | 6 +- admin/views/layout/view.html.php | 6 +- admin/views/layouts/view.html.php | 6 +- admin/views/libraries/view.html.php | 6 +- admin/views/libraries_config/view.html.php | 6 +- .../view.html.php | 6 +- admin/views/library/view.html.php | 6 +- admin/views/library_config/view.html.php | 6 +- .../library_files_folders_urls/view.html.php | 6 +- admin/views/placeholder/view.html.php | 6 +- admin/views/placeholders/view.html.php | 6 +- admin/views/server/view.html.php | 10 +- admin/views/servers/view.html.php | 6 +- admin/views/site_view/view.html.php | 6 +- admin/views/site_views/view.html.php | 6 +- admin/views/snippet/view.html.php | 6 +- admin/views/snippet_type/view.html.php | 6 +- admin/views/snippet_types/view.html.php | 6 +- admin/views/snippets/view.html.php | 6 +- admin/views/template/view.html.php | 6 +- admin/views/templates/view.html.php | 6 +- admin/views/validation_rule/view.html.php | 6 +- admin/views/validation_rules/view.html.php | 6 +- componentbuilder.xml | 2 +- site/controller.php | 5 +- site/controllers/api.php | 5 +- site/controllers/help.php | 5 +- site/models/api.php | 5 +- site/views/api/view.html.php | 10 +- 398 files changed, 1461 insertions(+), 911 deletions(-) rename admin/compiler/joomla_3/{JControllerAdmin.php => AdminController.php} (93%) rename admin/compiler/joomla_3/{DASHJControllerAdmin.php => AdminControllerDashboard.php} (85%) rename admin/compiler/joomla_3/{JControllerAdmin_custom_admin.php => AdminController_custom_admin.php} (82%) rename admin/compiler/joomla_3/{JModelAdmin.php => AdminModel.php} (99%) rename admin/compiler/joomla_3/{JModelAdmin_site.php => AdminModel_site.php} (99%) rename admin/compiler/joomla_3/{JControllerLegacy.php => BaseController.php} (97%) rename admin/compiler/joomla_3/{JControllerLegacyAjax.php => BaseControllerAjax.php} (93%) rename admin/compiler/joomla_3/{JControllerLegacyAjaxSite.php => BaseControllerAjaxSite.php} (93%) rename admin/compiler/joomla_3/{JControllerLegacyHelp.php => BaseControllerHelp.php} (95%) rename admin/compiler/joomla_3/{JControllerLegacyHelp_site.php => BaseControllerHelp_site.php} (95%) rename admin/compiler/joomla_3/{JControllerLegacySITE.php => BaseControllerSITE.php} (96%) rename admin/compiler/joomla_3/{JControllerLegacy_custom_admin.php => BaseController_custom_admin.php} (88%) rename admin/compiler/joomla_3/{JControllerLegacy_import.php => BaseController_import.php} (91%) rename admin/compiler/joomla_3/{JControllerLegacy_import_custom.php => BaseController_import_custom.php} (90%) rename admin/compiler/joomla_3/{JModelLegacy_import.php => BaseDatabaseModel_import.php} (98%) rename admin/compiler/joomla_3/{JModelLegacy_import_custom.php => BaseDatabaseModel_import_custom.php} (98%) rename admin/compiler/joomla_3/{JControllerForm.php => FormController.php} (98%) rename admin/compiler/joomla_3/{JControllerForm_custom_site.php => FormController_custom_site.php} (95%) rename admin/compiler/joomla_3/{JControllerForm_site.php => FormController_site.php} (98%) rename admin/compiler/joomla_3/{JViewLegacy_custom_admin.php => HtmlView_custom_admin.php} (96%) rename admin/compiler/joomla_3/{JViewLegacy_edit.php => HtmlView_edit.php} (97%) rename admin/compiler/joomla_3/{JViewLegacy_edit_site.php => HtmlView_edit_site.php} (98%) rename admin/compiler/joomla_3/{JViewLegacy_import.php => HtmlView_import.php} (95%) rename admin/compiler/joomla_3/{JViewLegacy_import_custom.php => HtmlView_import_custom.php} (91%) rename admin/compiler/joomla_3/{JViewLegacy_list.php => HtmlView_list.php} (98%) rename admin/compiler/joomla_3/{JViewLegacy_list_custom_admin.php => HtmlView_list_custom_admin.php} (96%) rename admin/compiler/joomla_3/{JViewLegacy_list_site.php => HtmlView_list_site.php} (95%) rename admin/compiler/joomla_3/{JViewLegacy_site.php => HtmlView_site.php} (95%) rename admin/compiler/joomla_3/{JModelItem_custom_admin.php => ItemModel_custom_admin.php} (96%) rename admin/compiler/joomla_3/{JModelItem_site.php => ItemModel_site.php} (96%) rename admin/compiler/joomla_3/{JModelList.php => ListModel.php} (96%) rename admin/compiler/joomla_3/{JModelListAjax.php => ListModelAjax.php} (90%) rename admin/compiler/joomla_3/{JModelListAjaxSite.php => ListModelAjaxSite.php} (90%) rename admin/compiler/joomla_3/{DASHJModelList.php => ListModelDASH.php} (98%) rename admin/compiler/joomla_3/{JModelList_custom_admin.php => ListModel_custom_admin.php} (95%) rename admin/compiler/joomla_3/{JModelList_site.php => ListModel_site.php} (95%) rename admin/compiler/joomla_3/{JTable.php => Table.php} (99%) diff --git a/README.md b/README.md index 3678ff75a..aa695ca1a 100644 --- a/README.md +++ b/README.md @@ -143,11 +143,11 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 19th May, 2022 ++ *Last Build*: 25th May, 2022 + *Version*: 2.12.17 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **286780** ++ *Line count*: **287273** + *Field count*: **1581** + *File count*: **1853** + *Folder count*: **261** diff --git a/admin/README.txt b/admin/README.txt index 3678ff75a..aa695ca1a 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -143,11 +143,11 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 19th May, 2022 ++ *Last Build*: 25th May, 2022 + *Version*: 2.12.17 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **286780** ++ *Line count*: **287273** + *Field count*: **1581** + *File count*: **1853** + *Folder count*: **261** diff --git a/admin/compiler/joomla_3/JControllerAdmin.php b/admin/compiler/joomla_3/AdminController.php similarity index 93% rename from admin/compiler/joomla_3/JControllerAdmin.php rename to admin/compiler/joomla_3/AdminController.php index e7f3a1543..34a6d3228 100644 --- a/admin/compiler/joomla_3/JControllerAdmin.php +++ b/admin/compiler/joomla_3/AdminController.php @@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access'); ###ADMIN_VIEWS_CONTROLLER_HEADER### /** - * ###Views### Controller + * ###Views### Admin Controller */ -class ###Component###Controller###Views### extends JControllerAdmin +class ###Component###Controller###Views### extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/compiler/joomla_3/DASHJControllerAdmin.php b/admin/compiler/joomla_3/AdminControllerDashboard.php similarity index 85% rename from admin/compiler/joomla_3/DASHJControllerAdmin.php rename to admin/compiler/joomla_3/AdminControllerDashboard.php index 7a6f029f3..8f53ecd75 100644 --- a/admin/compiler/joomla_3/DASHJControllerAdmin.php +++ b/admin/compiler/joomla_3/AdminControllerDashboard.php @@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access'); ###DASH_CONTROLLER_HEADER### /** - * ###Component### Controller + * ###Component### Admin Controller */ -class ###Component###Controller###Component### extends JControllerAdmin +class ###Component###Controller###Component### extends AdminController { } diff --git a/admin/compiler/joomla_3/JControllerAdmin_custom_admin.php b/admin/compiler/joomla_3/AdminController_custom_admin.php similarity index 82% rename from admin/compiler/joomla_3/JControllerAdmin_custom_admin.php rename to admin/compiler/joomla_3/AdminController_custom_admin.php index d4ff71ecf..8c32dc3cb 100644 --- a/admin/compiler/joomla_3/JControllerAdmin_custom_admin.php +++ b/admin/compiler/joomla_3/AdminController_custom_admin.php @@ -20,11 +20,18 @@ defined('_JEXEC') or die('Restricted access'); ###CUSTOM_ADMIN_VIEWS_CONTROLLER_HEADER### /** - * ###SViews### Controller + * ###SViews### Admin Controller */ -class ###Component###Controller###SViews### extends JControllerAdmin +class ###Component###Controller###SViews### extends AdminController { + /** + * The prefix to use with controller messages. + * + * @var string + * @since 1.6 + */ protected $text_prefix = 'COM_###COMPONENT###_###SVIEWS###'; + /** * Proxy for getModel. * @since 2.5 @@ -36,7 +43,7 @@ class ###Component###Controller###SViews### extends JControllerAdmin return $model; } - public function dashboard() + public function dashboard() { $this->setRedirect(JRoute::_('index.php?option=com_###component###', false)); return; diff --git a/admin/compiler/joomla_3/JModelAdmin.php b/admin/compiler/joomla_3/AdminModel.php similarity index 99% rename from admin/compiler/joomla_3/JModelAdmin.php rename to admin/compiler/joomla_3/AdminModel.php index eccb3d614..4c2c92c56 100644 --- a/admin/compiler/joomla_3/JModelAdmin.php +++ b/admin/compiler/joomla_3/AdminModel.php @@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access'); ###ADMIN_VIEW_MODEL_HEADER### /** - * ###Component### ###View### Model + * ###Component### ###View### Admin Model */ -class ###Component###Model###View### extends JModelAdmin +class ###Component###Model###View### extends AdminModel { /** * The tab layout fields array. diff --git a/admin/compiler/joomla_3/JModelAdmin_site.php b/admin/compiler/joomla_3/AdminModel_site.php similarity index 99% rename from admin/compiler/joomla_3/JModelAdmin_site.php rename to admin/compiler/joomla_3/AdminModel_site.php index 9c47bab9d..b805c970f 100644 --- a/admin/compiler/joomla_3/JModelAdmin_site.php +++ b/admin/compiler/joomla_3/AdminModel_site.php @@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access'); ###SITE_ADMIN_VIEW_MODEL_HEADER### /** - * ###Component### ###View### Model + * ###Component### ###View### Admin Model */ -class ###Component###Model###View### extends JModelAdmin +class ###Component###Model###View### extends AdminModel { /** * The tab layout fields array. diff --git a/admin/compiler/joomla_3/JControllerLegacy.php b/admin/compiler/joomla_3/BaseController.php similarity index 97% rename from admin/compiler/joomla_3/JControllerLegacy.php rename to admin/compiler/joomla_3/BaseController.php index a92ee289f..b7dd77c85 100644 --- a/admin/compiler/joomla_3/JControllerLegacy.php +++ b/admin/compiler/joomla_3/BaseController.php @@ -17,12 +17,13 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** * General Controller of ###Component### component */ -class ###Component###Controller extends JControllerLegacy +class ###Component###Controller extends BaseController { /** * Constructor. diff --git a/admin/compiler/joomla_3/JControllerLegacyAjax.php b/admin/compiler/joomla_3/BaseControllerAjax.php similarity index 93% rename from admin/compiler/joomla_3/JControllerLegacyAjax.php rename to admin/compiler/joomla_3/BaseControllerAjax.php index 8e36cf1a9..fb3b4ac1c 100644 --- a/admin/compiler/joomla_3/JControllerLegacyAjax.php +++ b/admin/compiler/joomla_3/BaseControllerAjax.php @@ -17,12 +17,13 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * ###Component### Ajax Controller + * ###Component### Ajax Base Controller */ -class ###Component###ControllerAjax extends JControllerLegacy +class ###Component###ControllerAjax extends BaseController { public function __construct($config) { diff --git a/admin/compiler/joomla_3/JControllerLegacyAjaxSite.php b/admin/compiler/joomla_3/BaseControllerAjaxSite.php similarity index 93% rename from admin/compiler/joomla_3/JControllerLegacyAjaxSite.php rename to admin/compiler/joomla_3/BaseControllerAjaxSite.php index 0ddcc119e..b32768f64 100644 --- a/admin/compiler/joomla_3/JControllerLegacyAjaxSite.php +++ b/admin/compiler/joomla_3/BaseControllerAjaxSite.php @@ -17,12 +17,13 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * ###Component### Ajax Controller + * ###Component### Ajax Base Controller */ -class ###Component###ControllerAjax extends JControllerLegacy +class ###Component###ControllerAjax extends BaseController { public function __construct($config) { diff --git a/admin/compiler/joomla_3/JControllerLegacyHelp.php b/admin/compiler/joomla_3/BaseControllerHelp.php similarity index 95% rename from admin/compiler/joomla_3/JControllerLegacyHelp.php rename to admin/compiler/joomla_3/BaseControllerHelp.php index 006f31866..86f92aa41 100644 --- a/admin/compiler/joomla_3/JControllerLegacyHelp.php +++ b/admin/compiler/joomla_3/BaseControllerHelp.php @@ -17,12 +17,13 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * ###Component### Help Controller + * ###Component### Help Base Controller */ -class ###Component###ControllerHelp extends JControllerLegacy +class ###Component###ControllerHelp extends BaseController { public function __construct($config) { diff --git a/admin/compiler/joomla_3/JControllerLegacyHelp_site.php b/admin/compiler/joomla_3/BaseControllerHelp_site.php similarity index 95% rename from admin/compiler/joomla_3/JControllerLegacyHelp_site.php rename to admin/compiler/joomla_3/BaseControllerHelp_site.php index 8730e01d8..2df722c4b 100644 --- a/admin/compiler/joomla_3/JControllerLegacyHelp_site.php +++ b/admin/compiler/joomla_3/BaseControllerHelp_site.php @@ -17,12 +17,13 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * ###Component### Help Controller + * ###Component### Help Base Controller */ -class ###Component###ControllerHelp extends JControllerLegacy +class ###Component###ControllerHelp extends BaseController { public function __construct($config) { diff --git a/admin/compiler/joomla_3/JControllerLegacySITE.php b/admin/compiler/joomla_3/BaseControllerSITE.php similarity index 96% rename from admin/compiler/joomla_3/JControllerLegacySITE.php rename to admin/compiler/joomla_3/BaseControllerSITE.php index 6e5451c9d..af2bde03e 100644 --- a/admin/compiler/joomla_3/JControllerLegacySITE.php +++ b/admin/compiler/joomla_3/BaseControllerSITE.php @@ -17,12 +17,13 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * ###Component### Component Controller + * ###Component### Component Base Controller */ -class ###Component###Controller extends JControllerLegacy +class ###Component###Controller extends BaseController { /** * Method to display a view. diff --git a/admin/compiler/joomla_3/JControllerLegacy_custom_admin.php b/admin/compiler/joomla_3/BaseController_custom_admin.php similarity index 88% rename from admin/compiler/joomla_3/JControllerLegacy_custom_admin.php rename to admin/compiler/joomla_3/BaseController_custom_admin.php index 44919fa96..8ed50653a 100644 --- a/admin/compiler/joomla_3/JControllerLegacy_custom_admin.php +++ b/admin/compiler/joomla_3/BaseController_custom_admin.php @@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access'); ###CUSTOM_ADMIN_VIEW_CONTROLLER_HEADER### /** - * ###Component### ###SView### Controller + * ###Component### ###SView### Base Controller */ -class ###Component###Controller###SView### extends JControllerLegacy +class ###Component###Controller###SView### extends BaseController { public function __construct($config) { diff --git a/admin/compiler/joomla_3/JControllerLegacy_import.php b/admin/compiler/joomla_3/BaseController_import.php similarity index 91% rename from admin/compiler/joomla_3/JControllerLegacy_import.php rename to admin/compiler/joomla_3/BaseController_import.php index cde56feaa..9a13dbd18 100644 --- a/admin/compiler/joomla_3/JControllerLegacy_import.php +++ b/admin/compiler/joomla_3/BaseController_import.php @@ -17,12 +17,13 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * ###Component### Import Controller + * ###Component### Import Base Controller */ -class ###Component###ControllerImport extends JControllerLegacy +class ###Component###ControllerImport extends BaseController { /** * Import an spreadsheet. diff --git a/admin/compiler/joomla_3/JControllerLegacy_import_custom.php b/admin/compiler/joomla_3/BaseController_import_custom.php similarity index 90% rename from admin/compiler/joomla_3/JControllerLegacy_import_custom.php rename to admin/compiler/joomla_3/BaseController_import_custom.php index eeac24851..a4474ba5e 100644 --- a/admin/compiler/joomla_3/JControllerLegacy_import_custom.php +++ b/admin/compiler/joomla_3/BaseController_import_custom.php @@ -17,12 +17,13 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * ###Component### ###View### Controller + * ###Component### ###View### Base Controller */ -class ###Component###Controller###View### extends JControllerLegacy +class ###Component###Controller###View### extends BaseController { /** * Import an spreadsheet. diff --git a/admin/compiler/joomla_3/JModelLegacy_import.php b/admin/compiler/joomla_3/BaseDatabaseModel_import.php similarity index 98% rename from admin/compiler/joomla_3/JModelLegacy_import.php rename to admin/compiler/joomla_3/BaseDatabaseModel_import.php index 5dd8344f1..7d7b21a68 100644 --- a/admin/compiler/joomla_3/JModelLegacy_import.php +++ b/admin/compiler/joomla_3/BaseDatabaseModel_import.php @@ -17,15 +17,16 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\BaseDatabaseModel; use Joomla\CMS\Filesystem\File; use Joomla\CMS\Filesystem\Folder; use Joomla\Utilities\ArrayHelper; use PhpOffice\PhpSpreadsheet\IOFactory; /** - * ###Component### Import Model + * ###Component### Import Base Database Model */ -class ###Component###ModelImport extends JModelLegacy +class ###Component###ModelImport extends BaseDatabaseModel { // set uploading values protected $use_streams = false; diff --git a/admin/compiler/joomla_3/JModelLegacy_import_custom.php b/admin/compiler/joomla_3/BaseDatabaseModel_import_custom.php similarity index 98% rename from admin/compiler/joomla_3/JModelLegacy_import_custom.php rename to admin/compiler/joomla_3/BaseDatabaseModel_import_custom.php index 713738d48..43d0c526f 100644 --- a/admin/compiler/joomla_3/JModelLegacy_import_custom.php +++ b/admin/compiler/joomla_3/BaseDatabaseModel_import_custom.php @@ -17,15 +17,16 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\BaseDatabaseModel; use Joomla\CMS\Filesystem\File; use Joomla\CMS\Filesystem\Folder; use Joomla\Utilities\ArrayHelper; use PhpOffice\PhpSpreadsheet\IOFactory; /** - * ###Component### ###View### Model + * ###Component### ###View### Base Database Model */ -class ###Component###Model###View### extends JModelLegacy +class ###Component###Model###View### extends BaseDatabaseModel { // set uploading values protected $use_streams = false; diff --git a/admin/compiler/joomla_3/JControllerForm.php b/admin/compiler/joomla_3/FormController.php similarity index 98% rename from admin/compiler/joomla_3/JControllerForm.php rename to admin/compiler/joomla_3/FormController.php index 3c33c1f7d..feb4ec217 100644 --- a/admin/compiler/joomla_3/JControllerForm.php +++ b/admin/compiler/joomla_3/FormController.php @@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access'); ###ADMIN_VIEW_CONTROLLER_HEADER### /** - * ###View### Controller + * ###View### Form Controller */ -class ###Component###Controller###View### extends JControllerForm +class ###Component###Controller###View### extends FormController { /** * Current or most recently performed task. diff --git a/admin/compiler/joomla_3/JControllerForm_custom_site.php b/admin/compiler/joomla_3/FormController_custom_site.php similarity index 95% rename from admin/compiler/joomla_3/JControllerForm_custom_site.php rename to admin/compiler/joomla_3/FormController_custom_site.php index 03b173e24..8d6d30cd5 100644 --- a/admin/compiler/joomla_3/JControllerForm_custom_site.php +++ b/admin/compiler/joomla_3/FormController_custom_site.php @@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access'); ###SITE_VIEW_CONTROLLER_HEADER### /** - * ###Component### ###SView### Controller + * ###Component### ###SView### Form Controller */ -class ###Component###Controller###SView### extends JControllerForm +class ###Component###Controller###SView### extends FormController { /** * Current or most recently performed task. diff --git a/admin/compiler/joomla_3/JControllerForm_site.php b/admin/compiler/joomla_3/FormController_site.php similarity index 98% rename from admin/compiler/joomla_3/JControllerForm_site.php rename to admin/compiler/joomla_3/FormController_site.php index 2953b74c3..530f3ac90 100644 --- a/admin/compiler/joomla_3/JControllerForm_site.php +++ b/admin/compiler/joomla_3/FormController_site.php @@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access'); ###SITE_ADMIN_VIEW_CONTROLLER_HEADER### /** - * ###View### Controller + * ###View### Form Controller */ -class ###Component###Controller###View### extends JControllerForm +class ###Component###Controller###View### extends FormController { /** * Current or most recently performed task. diff --git a/admin/compiler/joomla_3/JViewLegacy_custom_admin.php b/admin/compiler/joomla_3/HtmlView_custom_admin.php similarity index 96% rename from admin/compiler/joomla_3/JViewLegacy_custom_admin.php rename to admin/compiler/joomla_3/HtmlView_custom_admin.php index 8f3201187..ca7f5df16 100644 --- a/admin/compiler/joomla_3/JViewLegacy_custom_admin.php +++ b/admin/compiler/joomla_3/HtmlView_custom_admin.php @@ -16,11 +16,13 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); ###LICENSE_LOCKED_DEFINED######CUSTOM_ADMIN_GET_MODULE_JIMPORT### + ###CUSTOM_ADMIN_VIEW_HTML_HEADER### + /** - * ###Component### View class for the ###SView### + * ###Component### Html View class for the ###SView### */ -class ###Component###View###SView### extends JViewLegacy +class ###Component###View###SView### extends HtmlView { // Overwriting JView display method function display($tpl = null) diff --git a/admin/compiler/joomla_3/JViewLegacy_edit.php b/admin/compiler/joomla_3/HtmlView_edit.php similarity index 97% rename from admin/compiler/joomla_3/JViewLegacy_edit.php rename to admin/compiler/joomla_3/HtmlView_edit.php index dc2c3fe4e..309e298b9 100644 --- a/admin/compiler/joomla_3/JViewLegacy_edit.php +++ b/admin/compiler/joomla_3/HtmlView_edit.php @@ -16,11 +16,13 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED### + ###ADMIN_VIEW_HTML_HEADER### + /** - * ###View### View class + * ###View### Html View class */ -class ###Component###View###View### extends JViewLegacy +class ###Component###View###View### extends HtmlView { /** * display method of View diff --git a/admin/compiler/joomla_3/JViewLegacy_edit_site.php b/admin/compiler/joomla_3/HtmlView_edit_site.php similarity index 98% rename from admin/compiler/joomla_3/JViewLegacy_edit_site.php rename to admin/compiler/joomla_3/HtmlView_edit_site.php index 73753da8b..b2fd1f338 100644 --- a/admin/compiler/joomla_3/JViewLegacy_edit_site.php +++ b/admin/compiler/joomla_3/HtmlView_edit_site.php @@ -16,11 +16,13 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED### + ###SITE_ADMIN_VIEW_HTML_HEADER### + /** - * ###View### View class + * ###View### Html View class */ -class ###Component###View###View### extends JViewLegacy +class ###Component###View###View### extends HtmlView { /** * display method of View diff --git a/admin/compiler/joomla_3/JViewLegacy_import.php b/admin/compiler/joomla_3/HtmlView_import.php similarity index 95% rename from admin/compiler/joomla_3/JViewLegacy_import.php rename to admin/compiler/joomla_3/HtmlView_import.php index 3371eace3..c19e19f8d 100644 --- a/admin/compiler/joomla_3/JViewLegacy_import.php +++ b/admin/compiler/joomla_3/HtmlView_import.php @@ -17,10 +17,12 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED### +use Joomla\CMS\MVC\View\HtmlView; + /** - * ###Component### Import View + * ###Component### Import Html View */ -class ###Component###ViewImport extends JViewLegacy +class ###Component###ViewImport extends HtmlView { protected $headerList; protected $hasPackage = false; diff --git a/admin/compiler/joomla_3/JViewLegacy_import_custom.php b/admin/compiler/joomla_3/HtmlView_import_custom.php similarity index 91% rename from admin/compiler/joomla_3/JViewLegacy_import_custom.php rename to admin/compiler/joomla_3/HtmlView_import_custom.php index f8b56738c..bee878fc1 100644 --- a/admin/compiler/joomla_3/JViewLegacy_import_custom.php +++ b/admin/compiler/joomla_3/HtmlView_import_custom.php @@ -17,10 +17,12 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED### +use Joomla\CMS\MVC\View\HtmlView; + /** - * ###Component### ###View### View + * ###Component### ###View### Html View */ -class ###Component###View###View### extends JViewLegacy +class ###Component###View###View### extends HtmlView {###IMPORT_DISPLAY_METHOD_CUSTOM### /** diff --git a/admin/compiler/joomla_3/JViewLegacy_list.php b/admin/compiler/joomla_3/HtmlView_list.php similarity index 98% rename from admin/compiler/joomla_3/JViewLegacy_list.php rename to admin/compiler/joomla_3/HtmlView_list.php index 2b457fe14..740a8c545 100644 --- a/admin/compiler/joomla_3/JViewLegacy_list.php +++ b/admin/compiler/joomla_3/HtmlView_list.php @@ -16,11 +16,13 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED### + ###ADMIN_VIEWS_HTML_HEADER### + /** - * ###Component### View class for the ###Views### + * ###Component### Html View class for the ###Views### */ -class ###Component###View###Views### extends JViewLegacy +class ###Component###View###Views### extends HtmlView { /** * ###Views### view display method diff --git a/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php b/admin/compiler/joomla_3/HtmlView_list_custom_admin.php similarity index 96% rename from admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php rename to admin/compiler/joomla_3/HtmlView_list_custom_admin.php index f56863a6c..766c63395 100644 --- a/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php +++ b/admin/compiler/joomla_3/HtmlView_list_custom_admin.php @@ -16,11 +16,13 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED######CUSTOM_ADMIN_GET_MODULE_JIMPORT### + ###CUSTOM_ADMIN_VIEWS_HTML_HEADER### + /** - * ###Component### View class for the ###SViews### + * ###Component### Html View class for the ###SViews### */ -class ###Component###View###SViews### extends JViewLegacy +class ###Component###View###SViews### extends HtmlView { // Overwriting JView display method function display($tpl = null) diff --git a/admin/compiler/joomla_3/JViewLegacy_list_site.php b/admin/compiler/joomla_3/HtmlView_list_site.php similarity index 95% rename from admin/compiler/joomla_3/JViewLegacy_list_site.php rename to admin/compiler/joomla_3/HtmlView_list_site.php index 7a2410c70..dea200543 100644 --- a/admin/compiler/joomla_3/JViewLegacy_list_site.php +++ b/admin/compiler/joomla_3/HtmlView_list_site.php @@ -16,11 +16,13 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED######SITE_GET_MODULE_JIMPORT### + ###SITE_VIEWS_HTML_HEADER### + /** - * ###Component### View class for the ###SViews### + * ###Component### Html View class for the ###SViews### */ -class ###Component###View###SViews### extends JViewLegacy +class ###Component###View###SViews### extends HtmlView { // Overwriting JView display method function display($tpl = null) diff --git a/admin/compiler/joomla_3/JViewLegacy_site.php b/admin/compiler/joomla_3/HtmlView_site.php similarity index 95% rename from admin/compiler/joomla_3/JViewLegacy_site.php rename to admin/compiler/joomla_3/HtmlView_site.php index 7a7b1e978..12e20f031 100644 --- a/admin/compiler/joomla_3/JViewLegacy_site.php +++ b/admin/compiler/joomla_3/HtmlView_site.php @@ -16,11 +16,13 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED######SITE_GET_MODULE_JIMPORT### + ###SITE_VIEW_HTML_HEADER### + /** - * ###Component### View class for the ###SView### + * ###Component### Html View class for the ###SView### */ -class ###Component###View###SView### extends JViewLegacy +class ###Component###View###SView### extends HtmlView { // Overwriting JView display method function display($tpl = null) diff --git a/admin/compiler/joomla_3/JModelItem_custom_admin.php b/admin/compiler/joomla_3/ItemModel_custom_admin.php similarity index 96% rename from admin/compiler/joomla_3/JModelItem_custom_admin.php rename to admin/compiler/joomla_3/ItemModel_custom_admin.php index 9c076fed6..56f08cab1 100644 --- a/admin/compiler/joomla_3/JModelItem_custom_admin.php +++ b/admin/compiler/joomla_3/ItemModel_custom_admin.php @@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access'); ###CUSTOM_ADMIN_VIEW_MODEL_HEADER### /** - * ###Component### ###SView### Model + * ###Component### ###SView### Item Model */ -class ###Component###Model###SView### extends JModelItem +class ###Component###Model###SView### extends ItemModel { /** * Model context string. diff --git a/admin/compiler/joomla_3/JModelItem_site.php b/admin/compiler/joomla_3/ItemModel_site.php similarity index 96% rename from admin/compiler/joomla_3/JModelItem_site.php rename to admin/compiler/joomla_3/ItemModel_site.php index 064e9ded5..621f2f1c7 100644 --- a/admin/compiler/joomla_3/JModelItem_site.php +++ b/admin/compiler/joomla_3/ItemModel_site.php @@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access'); ###SITE_VIEW_MODEL_HEADER### /** - * ###Component### ###SView### Model + * ###Component### ###SView### Item Model */ -class ###Component###Model###SView### extends JModelItem +class ###Component###Model###SView### extends ItemModel { /** * Model context string. diff --git a/admin/compiler/joomla_3/JModelList.php b/admin/compiler/joomla_3/ListModel.php similarity index 96% rename from admin/compiler/joomla_3/JModelList.php rename to admin/compiler/joomla_3/ListModel.php index 13adbf010..2d45037ab 100644 --- a/admin/compiler/joomla_3/JModelList.php +++ b/admin/compiler/joomla_3/ListModel.php @@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access'); ###ADMIN_VIEWS_MODEL_HEADER### /** - * ###Views### Model + * ###Views### List Model */ -class ###Component###Model###Views### extends JModelList +class ###Component###Model###Views### extends ListModel { public function __construct($config = array()) { diff --git a/admin/compiler/joomla_3/JModelListAjax.php b/admin/compiler/joomla_3/ListModelAjax.php similarity index 90% rename from admin/compiler/joomla_3/JModelListAjax.php rename to admin/compiler/joomla_3/ListModelAjax.php index 7505d2b21..cf9cb916f 100644 --- a/admin/compiler/joomla_3/JModelListAjax.php +++ b/admin/compiler/joomla_3/ListModelAjax.php @@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access'); ###AJAX_ADMIN_MODEL_HEADER### /** - * ###Component### Ajax Model + * ###Component### Ajax List Model */ -class ###Component###ModelAjax extends JModelList +class ###Component###ModelAjax extends ListModel { protected $app_params; diff --git a/admin/compiler/joomla_3/JModelListAjaxSite.php b/admin/compiler/joomla_3/ListModelAjaxSite.php similarity index 90% rename from admin/compiler/joomla_3/JModelListAjaxSite.php rename to admin/compiler/joomla_3/ListModelAjaxSite.php index f4771a6f1..2aacc4948 100644 --- a/admin/compiler/joomla_3/JModelListAjaxSite.php +++ b/admin/compiler/joomla_3/ListModelAjaxSite.php @@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access'); ###AJAX_SITE_MODEL_HEADER### /** - * ###Component### Ajax Model + * ###Component### Ajax List Model */ -class ###Component###ModelAjax extends JModelList +class ###Component###ModelAjax extends ListModel { protected $app_params; diff --git a/admin/compiler/joomla_3/DASHJModelList.php b/admin/compiler/joomla_3/ListModelDASH.php similarity index 98% rename from admin/compiler/joomla_3/DASHJModelList.php rename to admin/compiler/joomla_3/ListModelDASH.php index ec041c5c9..ad8357abb 100644 --- a/admin/compiler/joomla_3/DASHJModelList.php +++ b/admin/compiler/joomla_3/ListModelDASH.php @@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access'); ###DASH_MODEL_HEADER### /** - * ###Component### Model + * ###Component### List Model */ -class ###Component###Model###Component### extends JModelList +class ###Component###Model###Component### extends ListModel { public function getIcons() { diff --git a/admin/compiler/joomla_3/JModelList_custom_admin.php b/admin/compiler/joomla_3/ListModel_custom_admin.php similarity index 95% rename from admin/compiler/joomla_3/JModelList_custom_admin.php rename to admin/compiler/joomla_3/ListModel_custom_admin.php index a8d5b38dd..d49fcec4a 100644 --- a/admin/compiler/joomla_3/JModelList_custom_admin.php +++ b/admin/compiler/joomla_3/ListModel_custom_admin.php @@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access'); ###CUSTOM_ADMIN_VIEWS_MODEL_HEADER### /** - * ###Component### Model for ###SViews### + * ###Component### List Model for ###SViews### */ -class ###Component###Model###SViews### extends JModelList +class ###Component###Model###SViews### extends ListModel { /** * Model user data. diff --git a/admin/compiler/joomla_3/JModelList_site.php b/admin/compiler/joomla_3/ListModel_site.php similarity index 95% rename from admin/compiler/joomla_3/JModelList_site.php rename to admin/compiler/joomla_3/ListModel_site.php index b93fe6cfd..441031541 100644 --- a/admin/compiler/joomla_3/JModelList_site.php +++ b/admin/compiler/joomla_3/ListModel_site.php @@ -20,9 +20,9 @@ defined('_JEXEC') or die('Restricted access'); ###SITE_VIEWS_MODEL_HEADER### /** - * ###Component### Model for ###SViews### + * ###Component### List Model for ###SViews### */ -class ###Component###Model###SViews### extends JModelList +class ###Component###Model###SViews### extends ListModel { /** * Model user data. diff --git a/admin/compiler/joomla_3/JTable.php b/admin/compiler/joomla_3/Table.php similarity index 99% rename from admin/compiler/joomla_3/JTable.php rename to admin/compiler/joomla_3/Table.php index 55509dead..fd286af4b 100644 --- a/admin/compiler/joomla_3/JTable.php +++ b/admin/compiler/joomla_3/Table.php @@ -17,6 +17,7 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -24,7 +25,7 @@ use Joomla\Utilities\ArrayHelper; /** * ###Views### Table class */ -class ###Component###Table###View### extends JTable +class ###Component###Table###View### extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/compiler/joomla_3/settings.json b/admin/compiler/joomla_3/settings.json index edfe475a9..a49ebc81f 100644 --- a/admin/compiler/joomla_3/settings.json +++ b/admin/compiler/joomla_3/settings.json @@ -64,8 +64,8 @@ "rename": false, "type": "file" }, - "JControllerLegacy.php": { - "naam": "JControllerLegacy.php", + "BaseController.php": { + "naam": "BaseController.php", "path": "c0mp0n3nt/admin", "rename": "new", "newName": "controller.php", @@ -138,8 +138,8 @@ "newName": "route.php", "type": "file" }, - "JControllerLegacySITE.php": { - "naam": "JControllerLegacySITE.php", + "BaseControllerSITE.php": { + "naam": "BaseControllerSITE.php", "path": "c0mp0n3nt/site", "rename": "new", "newName": "controller.php", @@ -232,14 +232,14 @@ "rename": "Helper_", "type": "emailer" }, - "DASHJControllerAdmin.php": { + "AdminControllerDashboard.php": { "path": "c0mp0n3nt/admin/controllers", - "rename": "DASHJControllerAdmin", + "rename": "AdminControllerDashboard", "type": "dashboard" }, - "DASHJModelList.php": { + "ListModelDASH.php": { "path": "c0mp0n3nt/admin/models", - "rename": "DASHJModelList", + "rename": "ListModelDASH", "type": "dashboard" }, "DASHJViewLagacy.php": { @@ -289,19 +289,19 @@ "rename": false, "type": "single" }, - "JModelAdmin.php": { + "AdminModel.php": { "path": "c0mp0n3nt/admin/models", - "rename": "JModelAdmin", + "rename": "AdminModel", "type": "single" }, - "JControllerForm.php": { + "FormController.php": { "path": "c0mp0n3nt/admin/controllers", - "rename": "JControllerForm", + "rename": "FormController", "type": "single" }, - "JTable.php": { + "Table.php": { "path": "c0mp0n3nt/admin/tables", - "rename": "JTable", + "rename": "Table", "type": "single" }, "submitbutton.js": { @@ -309,7 +309,7 @@ "rename": false, "type": "single" }, - "JViewLegacy_edit.php": { + "HtmlView_edit.php": { "path": "c0mp0n3nt/admin/views/VIEW", "rename": "new", "newName": "view.html.php", @@ -320,14 +320,14 @@ "rename": "view", "type": "single" }, - "JControllerAdmin.php": { + "AdminController.php": { "path": "c0mp0n3nt/admin/controllers", - "rename": "JControllerAdmin", + "rename": "AdminController", "type": "list" }, - "JModelList.php": { + "ListModel.php": { "path": "c0mp0n3nt/admin/models", - "rename": "JModelList", + "rename": "ListModel", "type": "list" }, "views.css": { @@ -335,7 +335,7 @@ "rename": "views", "type": "list" }, - "JViewLegacy_list.php": { + "HtmlView_list.php": { "path": "c0mp0n3nt/admin/views/VIEW", "rename": "new", "newName": "view.html.php", @@ -446,31 +446,31 @@ "rename": "JFormFieldUser", "type": "fielduser" }, - "JControllerLegacyAjax.php": { + "BaseControllerAjax.php": { "path": "c0mp0n3nt/admin/controllers", "rename": "new", "newName": "ajax.json.php", "type": "ajax" }, - "JModelListAjax.php": { + "ListModelAjax.php": { "path": "c0mp0n3nt/admin/models", "rename": "new", "newName": "ajax.php", "type": "ajax" }, - "JControllerLegacy_import.php": { + "BaseController_import.php": { "path": "c0mp0n3nt/admin/controllers", "rename": "new", "newName": "import.php", "type": "import" }, - "JModelLegacy_import.php": { + "BaseDatabaseModel_import.php": { "path": "c0mp0n3nt/admin/models", "rename": "new", "newName": "import.php", "type": "import" }, - "JViewLegacy_import.php": { + "HtmlView_import.php": { "path": "c0mp0n3nt/admin/views/import", "rename": "new", "newName": "view.html.php", @@ -482,17 +482,17 @@ "newName": "default.php", "type": "import" }, - "JControllerLegacy_import_custom.php": { + "BaseController_import_custom.php": { "path": "c0mp0n3nt/admin/controllers", - "rename": "JControllerLegacy_import_custom", + "rename": "BaseController_import_custom", "type": "customimport" }, - "JModelLegacy_import_custom.php": { + "BaseDatabaseModel_import_custom.php": { "path": "c0mp0n3nt/admin/models", - "rename": "JModelLegacy_import_custom", + "rename": "BaseDatabaseModel_import_custom", "type": "customimport" }, - "JViewLegacy_import_custom.php": { + "HtmlView_import_custom.php": { "path": "c0mp0n3nt/admin/views/VIEW", "rename": "new", "newName": "view.html.php", @@ -504,7 +504,7 @@ "newName": "default.php", "type": "customimport" }, - "JControllerLegacyHelp.php": { + "BaseControllerHelp.php": { "path": "c0mp0n3nt/admin/controllers", "rename": "new", "newName": "help.php", @@ -527,15 +527,15 @@ } }, "site": { - "JViewLegacy_list_site.php": { + "HtmlView_list_site.php": { "path": "c0mp0n3nt/site/views/VIEW", "rename": "new", "newName": "view.html.php", "type": "list" }, - "JModelList_site.php": { + "ListModel_site.php": { "path": "c0mp0n3nt/site/models", - "rename": "JModelList_site", + "rename": "ListModel_site", "type": "list" }, "views_site.css": { @@ -549,7 +549,7 @@ "newName": "default.php", "type": "list" }, - "JViewLegacy_site.php": { + "HtmlView_site.php": { "path": "c0mp0n3nt/site/views/VIEW", "rename": "new", "newName": "view.html.php", @@ -560,9 +560,9 @@ "rename": "view_site", "type": "single" }, - "JModelItem_site.php": { + "ItemModel_site.php": { "path": "c0mp0n3nt/site/models", - "rename": "JModelItem_site", + "rename": "ItemModel_site", "type": "single" }, "default_site.php": { @@ -642,14 +642,14 @@ "newName": "edit.php", "type": "edit" }, - "JModelAdmin_site.php": { + "AdminModel_site.php": { "path": "c0mp0n3nt/site/models", - "rename": "JModelAdmin_site", + "rename": "AdminModel_site", "type": "edit" }, - "JControllerForm_site.php": { + "FormController_site.php": { "path": "c0mp0n3nt/site/controllers", - "rename": "JControllerForm_site", + "rename": "FormController_site", "type": "edit" }, "submitbutton.js": { @@ -657,7 +657,7 @@ "rename": false, "type": "edit" }, - "JViewLegacy_edit_site.php": { + "HtmlView_edit_site.php": { "path": "c0mp0n3nt/site/views/VIEW", "rename": "new", "newName": "view.html.php", @@ -668,27 +668,27 @@ "rename": "view_site_edit", "type": "edit" }, - "JControllerLegacyAjaxSite.php": { + "BaseControllerAjaxSite.php": { "path": "c0mp0n3nt/site/controllers", "rename": "new", "newName": "ajax.json.php", "type": "ajax" }, - "JModelListAjaxSite.php": { + "ListModelAjaxSite.php": { "path": "c0mp0n3nt/site/models", "rename": "new", "newName": "ajax.php", "type": "ajax" }, - "JControllerLegacyHelp_site.php": { + "BaseControllerHelp_site.php": { "path": "c0mp0n3nt/site/controllers", "rename": "new", "newName": "help.php", "type": "help" }, - "JControllerForm_custom_site.php": { + "FormController_custom_site.php": { "path": "c0mp0n3nt/site/controllers", - "rename": "JControllerForm_custom_site", + "rename": "FormController_custom_site", "type": "custom_form" }, "submitbutton_site.js": { @@ -709,15 +709,15 @@ } }, "custom_admin": { - "JViewLegacy_list_custom_admin.php": { + "HtmlView_list_custom_admin.php": { "path": "c0mp0n3nt/admin/views/VIEW", "rename": "new", "newName": "view.html.php", "type": "list" }, - "JModelList_custom_admin.php": { + "ListModel_custom_admin.php": { "path": "c0mp0n3nt/admin/models", - "rename": "JModelList_custom_admin", + "rename": "ListModel_custom_admin", "type": "list" }, "default_list_custom_admin.php": { @@ -726,9 +726,9 @@ "newName": "default.php", "type": "list" }, - "JControllerAdmin_custom_admin.php": { + "AdminController_custom_admin.php": { "path": "c0mp0n3nt/admin/controllers", - "rename": "JControllerAdmin_custom_admin", + "rename": "AdminController_custom_admin", "type": "list" }, "views_custom_admin.css": { @@ -741,15 +741,15 @@ "rename": "view_custom_admin", "type": "single" }, - "JViewLegacy_custom_admin.php": { + "HtmlView_custom_admin.php": { "path": "c0mp0n3nt/admin/views/VIEW", "rename": "new", "newName": "view.html.php", "type": "single" }, - "JModelItem_custom_admin.php": { + "ItemModel_custom_admin.php": { "path": "c0mp0n3nt/admin/models", - "rename": "JModelItem_custom_admin", + "rename": "ItemModel_custom_admin", "type": "single" }, "default_custom_admin.php": { @@ -758,9 +758,9 @@ "newName": "default.php", "type": "single" }, - "JControllerLegacy_custom_admin.php": { + "BaseController_custom_admin.php": { "path": "c0mp0n3nt/admin/controllers", - "rename": "JControllerLegacy_custom_admin", + "rename": "BaseController_custom_admin", "type": "single" }, "default_custom_admin_template.php": { diff --git a/admin/compiler/joomla_3/settings_componentbuilder.json b/admin/compiler/joomla_3/settings_componentbuilder.json index f62c27ad6..d543db459 100644 --- a/admin/compiler/joomla_3/settings_componentbuilder.json +++ b/admin/compiler/joomla_3/settings_componentbuilder.json @@ -64,8 +64,8 @@ "rename": false, "type": "file" }, - "JControllerLegacy.php": { - "naam": "JControllerLegacy.php", + "BaseController.php": { + "naam": "BaseController.php", "path": "c0mp0n3nt/admin", "rename": "new", "newName": "controller.php", @@ -138,8 +138,8 @@ "newName": "route.php", "type": "file" }, - "JControllerLegacySITE.php": { - "naam": "JControllerLegacySITE.php", + "BaseControllerSITE.php": { + "naam": "BaseControllerSITE.php", "path": "c0mp0n3nt/site", "rename": "new", "newName": "controller.php", @@ -232,14 +232,14 @@ "rename": "Helper_", "type": "emailer" }, - "DASHJControllerAdmin.php": { + "AdminControllerDashboard.php": { "path": "c0mp0n3nt/admin/controllers", - "rename": "DASHJControllerAdmin", + "rename": "AdminControllerDashboard", "type": "dashboard" }, - "DASHJModelList.php": { + "ListModelDASH.php": { "path": "c0mp0n3nt/admin/models", - "rename": "DASHJModelList", + "rename": "ListModelDASH", "type": "dashboard" }, "DASHJViewLagacy.php": { @@ -289,19 +289,19 @@ "rename": false, "type": "single" }, - "JModelAdmin.php": { + "AdminModel.php": { "path": "c0mp0n3nt/admin/models", - "rename": "JModelAdmin", + "rename": "AdminModel", "type": "single" }, - "JControllerForm.php": { + "FormController.php": { "path": "c0mp0n3nt/admin/controllers", - "rename": "JControllerForm", + "rename": "FormController", "type": "single" }, - "JTable.php": { + "Table.php": { "path": "c0mp0n3nt/admin/tables", - "rename": "JTable", + "rename": "Table", "type": "single" }, "submitbutton.js": { @@ -309,7 +309,7 @@ "rename": false, "type": "single" }, - "JViewLegacy_edit.php": { + "HtmlView_edit.php": { "path": "c0mp0n3nt/admin/views/VIEW", "rename": "new", "newName": "view.html.php", @@ -320,14 +320,14 @@ "rename": "view", "type": "single" }, - "JControllerAdmin.php": { + "AdminController.php": { "path": "c0mp0n3nt/admin/controllers", - "rename": "JControllerAdmin", + "rename": "AdminController", "type": "list" }, - "JModelList.php": { + "ListModel.php": { "path": "c0mp0n3nt/admin/models", - "rename": "JModelList", + "rename": "ListModel", "type": "list" }, "views.css": { @@ -335,7 +335,7 @@ "rename": "views", "type": "list" }, - "JViewLegacy_list.php": { + "HtmlView_list.php": { "path": "c0mp0n3nt/admin/views/VIEW", "rename": "new", "newName": "view.html.php", @@ -446,31 +446,31 @@ "rename": "JFormFieldUser", "type": "fielduser" }, - "JControllerLegacyAjax.php": { + "BaseControllerAjax.php": { "path": "c0mp0n3nt/admin/controllers", "rename": "new", "newName": "ajax.json.php", "type": "ajax" }, - "JModelListAjax.php": { + "ListModelAjax.php": { "path": "c0mp0n3nt/admin/models", "rename": "new", "newName": "ajax.php", "type": "ajax" }, - "JControllerLegacy_import.php": { + "BaseController_import.php": { "path": "c0mp0n3nt/admin/controllers", "rename": "new", "newName": "import.php", "type": "import" }, - "JModelLegacy_import.php": { + "BaseDatabaseModel_import.php": { "path": "c0mp0n3nt/admin/models", "rename": "new", "newName": "import.php", "type": "import" }, - "JViewLegacy_import.php": { + "HtmlView_import.php": { "path": "c0mp0n3nt/admin/views/import", "rename": "new", "newName": "view.html.php", @@ -482,17 +482,17 @@ "newName": "default.php", "type": "import" }, - "JControllerLegacy_import_custom.php": { + "BaseController_import_custom.php": { "path": "c0mp0n3nt/admin/controllers", - "rename": "JControllerLegacy_import_custom", + "rename": "BaseController_import_custom", "type": "customimport" }, - "JModelLegacy_import_custom.php": { + "BaseDatabaseModel_import_custom.php": { "path": "c0mp0n3nt/admin/models", - "rename": "JModelLegacy_import_custom", + "rename": "BaseDatabaseModel_import_custom", "type": "customimport" }, - "JViewLegacy_import_custom.php": { + "HtmlView_import_custom.php": { "path": "c0mp0n3nt/admin/views/VIEW", "rename": "new", "newName": "view.html.php", @@ -504,7 +504,7 @@ "newName": "default.php", "type": "customimport" }, - "JControllerLegacyHelp.php": { + "BaseControllerHelp.php": { "path": "c0mp0n3nt/admin/controllers", "rename": "new", "newName": "help.php", @@ -527,15 +527,15 @@ } }, "site": { - "JViewLegacy_list_site.php": { + "HtmlView_list_site.php": { "path": "c0mp0n3nt/site/views/VIEW", "rename": "new", "newName": "view.html.php", "type": "list" }, - "JModelList_site.php": { + "ListModel_site.php": { "path": "c0mp0n3nt/site/models", - "rename": "JModelList_site", + "rename": "ListModel_site", "type": "list" }, "views_site.css": { @@ -549,7 +549,7 @@ "newName": "default.php", "type": "list" }, - "JViewLegacy_site.php": { + "HtmlView_site.php": { "path": "c0mp0n3nt/site/views/VIEW", "rename": "new", "newName": "view.html.php", @@ -560,9 +560,9 @@ "rename": "view_site", "type": "single" }, - "JModelItem_site.php": { + "ItemModel_site.php": { "path": "c0mp0n3nt/site/models", - "rename": "JModelItem_site", + "rename": "ItemModel_site", "type": "single" }, "default_site.php": { @@ -642,14 +642,14 @@ "newName": "edit.php", "type": "edit" }, - "JModelAdmin_site.php": { + "AdminModel_site.php": { "path": "c0mp0n3nt/site/models", - "rename": "JModelAdmin_site", + "rename": "AdminModel_site", "type": "edit" }, - "JControllerForm_site.php": { + "FormController_site.php": { "path": "c0mp0n3nt/site/controllers", - "rename": "JControllerForm_site", + "rename": "FormController_site", "type": "edit" }, "submitbutton.js": { @@ -657,7 +657,7 @@ "rename": false, "type": "edit" }, - "JViewLegacy_edit_site.php": { + "HtmlView_edit_site.php": { "path": "c0mp0n3nt/site/views/VIEW", "rename": "new", "newName": "view.html.php", @@ -668,27 +668,27 @@ "rename": "view_site_edit", "type": "edit" }, - "JControllerLegacyAjaxSite.php": { + "BaseControllerAjaxSite.php": { "path": "c0mp0n3nt/site/controllers", "rename": "new", "newName": "ajax.json.php", "type": "ajax" }, - "JModelListAjaxSite.php": { + "ListModelAjaxSite.php": { "path": "c0mp0n3nt/site/models", "rename": "new", "newName": "ajax.php", "type": "ajax" }, - "JControllerLegacyHelp_site.php": { + "BaseControllerHelp_site.php": { "path": "c0mp0n3nt/site/controllers", "rename": "new", "newName": "help.php", "type": "help" }, - "JControllerForm_custom_site.php": { + "FormController_custom_site.php": { "path": "c0mp0n3nt/site/controllers", - "rename": "JControllerForm_custom_site", + "rename": "FormController_custom_site", "type": "custom_form" }, "submitbutton_site.js": { @@ -709,15 +709,15 @@ } }, "custom_admin": { - "JViewLegacy_list_custom_admin.php": { + "HtmlView_list_custom_admin.php": { "path": "c0mp0n3nt/admin/views/VIEW", "rename": "new", "newName": "view.html.php", "type": "list" }, - "JModelList_custom_admin.php": { + "ListModel_custom_admin.php": { "path": "c0mp0n3nt/admin/models", - "rename": "JModelList_custom_admin", + "rename": "ListModel_custom_admin", "type": "list" }, "default_list_custom_admin.php": { @@ -726,9 +726,9 @@ "newName": "default.php", "type": "list" }, - "JControllerAdmin_custom_admin.php": { + "AdminController_custom_admin.php": { "path": "c0mp0n3nt/admin/controllers", - "rename": "JControllerAdmin_custom_admin", + "rename": "AdminController_custom_admin", "type": "list" }, "views_custom_admin.css": { @@ -741,15 +741,15 @@ "rename": "view_custom_admin", "type": "single" }, - "JViewLegacy_custom_admin.php": { + "HtmlView_custom_admin.php": { "path": "c0mp0n3nt/admin/views/VIEW", "rename": "new", "newName": "view.html.php", "type": "single" }, - "JModelItem_custom_admin.php": { + "ItemModel_custom_admin.php": { "path": "c0mp0n3nt/admin/models", - "rename": "JModelItem_custom_admin", + "rename": "ItemModel_custom_admin", "type": "single" }, "default_custom_admin.php": { @@ -758,9 +758,9 @@ "newName": "default.php", "type": "single" }, - "JControllerLegacy_custom_admin.php": { + "BaseController_custom_admin.php": { "path": "c0mp0n3nt/admin/controllers", - "rename": "JControllerLegacy_custom_admin", + "rename": "BaseController_custom_admin", "type": "single" }, "default_custom_admin_template.php": { diff --git a/admin/controller.php b/admin/controller.php index a5ed699cc..8f0ae9839 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** * General Controller of Componentbuilder component */ -class ComponentbuilderController extends JControllerLegacy +class ComponentbuilderController extends BaseController { /** * Constructor. diff --git a/admin/controllers/admin_custom_tabs.php b/admin/controllers/admin_custom_tabs.php index e7c7e45d4..9e4f71fdb 100644 --- a/admin/controllers/admin_custom_tabs.php +++ b/admin/controllers/admin_custom_tabs.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Admin_custom_tabs Controller + * Admin_custom_tabs Form Controller */ -class ComponentbuilderControllerAdmin_custom_tabs extends JControllerForm +class ComponentbuilderControllerAdmin_custom_tabs extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/admin_fields.php b/admin/controllers/admin_fields.php index b3501203a..b86e6e799 100644 --- a/admin/controllers/admin_fields.php +++ b/admin/controllers/admin_fields.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Admin_fields Controller + * Admin_fields Form Controller */ -class ComponentbuilderControllerAdmin_fields extends JControllerForm +class ComponentbuilderControllerAdmin_fields extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/admin_fields_conditions.php b/admin/controllers/admin_fields_conditions.php index 5ce3d1208..ab1df21e1 100644 --- a/admin/controllers/admin_fields_conditions.php +++ b/admin/controllers/admin_fields_conditions.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Admin_fields_conditions Controller + * Admin_fields_conditions Form Controller */ -class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm +class ComponentbuilderControllerAdmin_fields_conditions extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/admin_fields_relations.php b/admin/controllers/admin_fields_relations.php index b5327b9bd..fb41946e1 100644 --- a/admin/controllers/admin_fields_relations.php +++ b/admin/controllers/admin_fields_relations.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Admin_fields_relations Controller + * Admin_fields_relations Form Controller */ -class ComponentbuilderControllerAdmin_fields_relations extends JControllerForm +class ComponentbuilderControllerAdmin_fields_relations extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index 355bd2ded..cdb2beaa7 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Admin_view Controller + * Admin_view Form Controller */ -class ComponentbuilderControllerAdmin_view extends JControllerForm +class ComponentbuilderControllerAdmin_view extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index f9207a3fd..e1cff06be 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Admin_views Controller + * Admin_views Admin Controller */ -class ComponentbuilderControllerAdmin_views extends JControllerAdmin +class ComponentbuilderControllerAdmin_views extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/admins_custom_tabs.php b/admin/controllers/admins_custom_tabs.php index 9a2f95cf8..cd8b07980 100644 --- a/admin/controllers/admins_custom_tabs.php +++ b/admin/controllers/admins_custom_tabs.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Admins_custom_tabs Controller + * Admins_custom_tabs Admin Controller */ -class ComponentbuilderControllerAdmins_custom_tabs extends JControllerAdmin +class ComponentbuilderControllerAdmins_custom_tabs extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/admins_fields.php b/admin/controllers/admins_fields.php index 073c158b6..5eae066ea 100644 --- a/admin/controllers/admins_fields.php +++ b/admin/controllers/admins_fields.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Admins_fields Controller + * Admins_fields Admin Controller */ -class ComponentbuilderControllerAdmins_fields extends JControllerAdmin +class ComponentbuilderControllerAdmins_fields extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/admins_fields_conditions.php b/admin/controllers/admins_fields_conditions.php index 934cc84a1..7cbf3f229 100644 --- a/admin/controllers/admins_fields_conditions.php +++ b/admin/controllers/admins_fields_conditions.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Admins_fields_conditions Controller + * Admins_fields_conditions Admin Controller */ -class ComponentbuilderControllerAdmins_fields_conditions extends JControllerAdmin +class ComponentbuilderControllerAdmins_fields_conditions extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/admins_fields_relations.php b/admin/controllers/admins_fields_relations.php index 050bb08b4..cecff618a 100644 --- a/admin/controllers/admins_fields_relations.php +++ b/admin/controllers/admins_fields_relations.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Admins_fields_relations Controller + * Admins_fields_relations Admin Controller */ -class ComponentbuilderControllerAdmins_fields_relations extends JControllerAdmin +class ComponentbuilderControllerAdmins_fields_relations extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index cfbd219c5..4dc4eb87e 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Ajax Controller + * Componentbuilder Ajax Base Controller */ -class ComponentbuilderControllerAjax extends JControllerLegacy +class ComponentbuilderControllerAjax extends BaseController { public function __construct($config) { diff --git a/admin/controllers/class_extendings.php b/admin/controllers/class_extendings.php index 0cc4cf952..bf2a12d49 100644 --- a/admin/controllers/class_extendings.php +++ b/admin/controllers/class_extendings.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Class_extendings Controller + * Class_extendings Admin Controller */ -class ComponentbuilderControllerClass_extendings extends JControllerAdmin +class ComponentbuilderControllerClass_extendings extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/class_extends.php b/admin/controllers/class_extends.php index 49c990a99..54112fc20 100644 --- a/admin/controllers/class_extends.php +++ b/admin/controllers/class_extends.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Class_extends Controller + * Class_extends Form Controller */ -class ComponentbuilderControllerClass_extends extends JControllerForm +class ComponentbuilderControllerClass_extends extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/class_method.php b/admin/controllers/class_method.php index 4d143d291..7205e5ce6 100644 --- a/admin/controllers/class_method.php +++ b/admin/controllers/class_method.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Class_method Controller + * Class_method Form Controller */ -class ComponentbuilderControllerClass_method extends JControllerForm +class ComponentbuilderControllerClass_method extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/class_methods.php b/admin/controllers/class_methods.php index 33d13c81d..be1a84882 100644 --- a/admin/controllers/class_methods.php +++ b/admin/controllers/class_methods.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Class_methods Controller + * Class_methods Admin Controller */ -class ComponentbuilderControllerClass_methods extends JControllerAdmin +class ComponentbuilderControllerClass_methods extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/class_properties.php b/admin/controllers/class_properties.php index ab007f24e..27e1c5e98 100644 --- a/admin/controllers/class_properties.php +++ b/admin/controllers/class_properties.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Class_properties Controller + * Class_properties Admin Controller */ -class ComponentbuilderControllerClass_properties extends JControllerAdmin +class ComponentbuilderControllerClass_properties extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/class_property.php b/admin/controllers/class_property.php index 3fc1676e9..4b4c68dcb 100644 --- a/admin/controllers/class_property.php +++ b/admin/controllers/class_property.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Class_property Controller + * Class_property Form Controller */ -class ComponentbuilderControllerClass_property extends JControllerForm +class ComponentbuilderControllerClass_property extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/compiler.php b/admin/controllers/compiler.php index 97595d494..0e0de3af1 100644 --- a/admin/controllers/compiler.php +++ b/admin/controllers/compiler.php @@ -13,14 +13,22 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Compiler Controller + * Compiler Admin Controller */ -class ComponentbuilderControllerCompiler extends JControllerAdmin +class ComponentbuilderControllerCompiler extends AdminController { + /** + * The prefix to use with controller messages. + * + * @var string + * @since 1.6 + */ protected $text_prefix = 'COM_COMPONENTBUILDER_COMPILER'; + /** * Proxy for getModel. * @since 2.5 @@ -32,7 +40,7 @@ class ComponentbuilderControllerCompiler extends JControllerAdmin return $model; } - public function dashboard() + public function dashboard() { $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder', false)); return; diff --git a/admin/controllers/component_admin_views.php b/admin/controllers/component_admin_views.php index e7fa80dd4..df6f7f696 100644 --- a/admin/controllers/component_admin_views.php +++ b/admin/controllers/component_admin_views.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Component_admin_views Controller + * Component_admin_views Form Controller */ -class ComponentbuilderControllerComponent_admin_views extends JControllerForm +class ComponentbuilderControllerComponent_admin_views extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/component_config.php b/admin/controllers/component_config.php index da894401e..3fc8873b9 100644 --- a/admin/controllers/component_config.php +++ b/admin/controllers/component_config.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Component_config Controller + * Component_config Form Controller */ -class ComponentbuilderControllerComponent_config extends JControllerForm +class ComponentbuilderControllerComponent_config extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/component_custom_admin_menus.php b/admin/controllers/component_custom_admin_menus.php index 1da4615cb..729b9de02 100644 --- a/admin/controllers/component_custom_admin_menus.php +++ b/admin/controllers/component_custom_admin_menus.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Component_custom_admin_menus Controller + * Component_custom_admin_menus Form Controller */ -class ComponentbuilderControllerComponent_custom_admin_menus extends JControllerForm +class ComponentbuilderControllerComponent_custom_admin_menus extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/component_custom_admin_views.php b/admin/controllers/component_custom_admin_views.php index 3c4fa15e5..340fbb473 100644 --- a/admin/controllers/component_custom_admin_views.php +++ b/admin/controllers/component_custom_admin_views.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Component_custom_admin_views Controller + * Component_custom_admin_views Form Controller */ -class ComponentbuilderControllerComponent_custom_admin_views extends JControllerForm +class ComponentbuilderControllerComponent_custom_admin_views extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/component_dashboard.php b/admin/controllers/component_dashboard.php index f153b036c..02f158d3c 100644 --- a/admin/controllers/component_dashboard.php +++ b/admin/controllers/component_dashboard.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Component_dashboard Controller + * Component_dashboard Form Controller */ -class ComponentbuilderControllerComponent_dashboard extends JControllerForm +class ComponentbuilderControllerComponent_dashboard extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/component_files_folders.php b/admin/controllers/component_files_folders.php index 3b404b266..b90c0fb37 100644 --- a/admin/controllers/component_files_folders.php +++ b/admin/controllers/component_files_folders.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Component_files_folders Controller + * Component_files_folders Form Controller */ -class ComponentbuilderControllerComponent_files_folders extends JControllerForm +class ComponentbuilderControllerComponent_files_folders extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/component_modules.php b/admin/controllers/component_modules.php index d36eddf08..335ba7354 100644 --- a/admin/controllers/component_modules.php +++ b/admin/controllers/component_modules.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Component_modules Controller + * Component_modules Form Controller */ -class ComponentbuilderControllerComponent_modules extends JControllerForm +class ComponentbuilderControllerComponent_modules extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/component_mysql_tweaks.php b/admin/controllers/component_mysql_tweaks.php index 90e6cba6a..f57729eb1 100644 --- a/admin/controllers/component_mysql_tweaks.php +++ b/admin/controllers/component_mysql_tweaks.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Component_mysql_tweaks Controller + * Component_mysql_tweaks Form Controller */ -class ComponentbuilderControllerComponent_mysql_tweaks extends JControllerForm +class ComponentbuilderControllerComponent_mysql_tweaks extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/component_placeholders.php b/admin/controllers/component_placeholders.php index 7f91f9f19..e1923d1e2 100644 --- a/admin/controllers/component_placeholders.php +++ b/admin/controllers/component_placeholders.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Component_placeholders Controller + * Component_placeholders Form Controller */ -class ComponentbuilderControllerComponent_placeholders extends JControllerForm +class ComponentbuilderControllerComponent_placeholders extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/component_plugins.php b/admin/controllers/component_plugins.php index a1a2175f4..17d7d92e6 100644 --- a/admin/controllers/component_plugins.php +++ b/admin/controllers/component_plugins.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Component_plugins Controller + * Component_plugins Form Controller */ -class ComponentbuilderControllerComponent_plugins extends JControllerForm +class ComponentbuilderControllerComponent_plugins extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/component_site_views.php b/admin/controllers/component_site_views.php index 9c4bd90f1..c147d112e 100644 --- a/admin/controllers/component_site_views.php +++ b/admin/controllers/component_site_views.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Component_site_views Controller + * Component_site_views Form Controller */ -class ComponentbuilderControllerComponent_site_views extends JControllerForm +class ComponentbuilderControllerComponent_site_views extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/component_updates.php b/admin/controllers/component_updates.php index 14b259495..014693ef1 100644 --- a/admin/controllers/component_updates.php +++ b/admin/controllers/component_updates.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Component_updates Controller + * Component_updates Form Controller */ -class ComponentbuilderControllerComponent_updates extends JControllerForm +class ComponentbuilderControllerComponent_updates extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 5ae313571..2f19114b2 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); - +use Joomla\CMS\MVC\Controller\AdminController; +use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Controller + * Componentbuilder Admin Controller */ -class ComponentbuilderControllerComponentbuilder extends JControllerAdmin +class ComponentbuilderControllerComponentbuilder extends AdminController { } diff --git a/admin/controllers/components_admin_views.php b/admin/controllers/components_admin_views.php index 76401bd74..d9a03e818 100644 --- a/admin/controllers/components_admin_views.php +++ b/admin/controllers/components_admin_views.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Components_admin_views Controller + * Components_admin_views Admin Controller */ -class ComponentbuilderControllerComponents_admin_views extends JControllerAdmin +class ComponentbuilderControllerComponents_admin_views extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/components_config.php b/admin/controllers/components_config.php index 9e2b6cf94..a499cddad 100644 --- a/admin/controllers/components_config.php +++ b/admin/controllers/components_config.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Components_config Controller + * Components_config Admin Controller */ -class ComponentbuilderControllerComponents_config extends JControllerAdmin +class ComponentbuilderControllerComponents_config extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/components_custom_admin_menus.php b/admin/controllers/components_custom_admin_menus.php index 3b858a7e2..a48bed4b6 100644 --- a/admin/controllers/components_custom_admin_menus.php +++ b/admin/controllers/components_custom_admin_menus.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Components_custom_admin_menus Controller + * Components_custom_admin_menus Admin Controller */ -class ComponentbuilderControllerComponents_custom_admin_menus extends JControllerAdmin +class ComponentbuilderControllerComponents_custom_admin_menus extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/components_custom_admin_views.php b/admin/controllers/components_custom_admin_views.php index 79d8c8f32..00e128c35 100644 --- a/admin/controllers/components_custom_admin_views.php +++ b/admin/controllers/components_custom_admin_views.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Components_custom_admin_views Controller + * Components_custom_admin_views Admin Controller */ -class ComponentbuilderControllerComponents_custom_admin_views extends JControllerAdmin +class ComponentbuilderControllerComponents_custom_admin_views extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/components_dashboard.php b/admin/controllers/components_dashboard.php index 34d01069f..5727bdd16 100644 --- a/admin/controllers/components_dashboard.php +++ b/admin/controllers/components_dashboard.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Components_dashboard Controller + * Components_dashboard Admin Controller */ -class ComponentbuilderControllerComponents_dashboard extends JControllerAdmin +class ComponentbuilderControllerComponents_dashboard extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/components_files_folders.php b/admin/controllers/components_files_folders.php index 2d192374c..6f16d65cf 100644 --- a/admin/controllers/components_files_folders.php +++ b/admin/controllers/components_files_folders.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Components_files_folders Controller + * Components_files_folders Admin Controller */ -class ComponentbuilderControllerComponents_files_folders extends JControllerAdmin +class ComponentbuilderControllerComponents_files_folders extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/components_modules.php b/admin/controllers/components_modules.php index f9c640c33..66402b03a 100644 --- a/admin/controllers/components_modules.php +++ b/admin/controllers/components_modules.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Components_modules Controller + * Components_modules Admin Controller */ -class ComponentbuilderControllerComponents_modules extends JControllerAdmin +class ComponentbuilderControllerComponents_modules extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/components_mysql_tweaks.php b/admin/controllers/components_mysql_tweaks.php index e13283528..24ca7d015 100644 --- a/admin/controllers/components_mysql_tweaks.php +++ b/admin/controllers/components_mysql_tweaks.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Components_mysql_tweaks Controller + * Components_mysql_tweaks Admin Controller */ -class ComponentbuilderControllerComponents_mysql_tweaks extends JControllerAdmin +class ComponentbuilderControllerComponents_mysql_tweaks extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/components_placeholders.php b/admin/controllers/components_placeholders.php index e9e16eabf..9003ee555 100644 --- a/admin/controllers/components_placeholders.php +++ b/admin/controllers/components_placeholders.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Components_placeholders Controller + * Components_placeholders Admin Controller */ -class ComponentbuilderControllerComponents_placeholders extends JControllerAdmin +class ComponentbuilderControllerComponents_placeholders extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/components_plugins.php b/admin/controllers/components_plugins.php index 5cf3db2ef..c13707185 100644 --- a/admin/controllers/components_plugins.php +++ b/admin/controllers/components_plugins.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Components_plugins Controller + * Components_plugins Admin Controller */ -class ComponentbuilderControllerComponents_plugins extends JControllerAdmin +class ComponentbuilderControllerComponents_plugins extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/components_site_views.php b/admin/controllers/components_site_views.php index 687343bf8..94092eeb6 100644 --- a/admin/controllers/components_site_views.php +++ b/admin/controllers/components_site_views.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Components_site_views Controller + * Components_site_views Admin Controller */ -class ComponentbuilderControllerComponents_site_views extends JControllerAdmin +class ComponentbuilderControllerComponents_site_views extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/components_updates.php b/admin/controllers/components_updates.php index db56e080b..e43da3020 100644 --- a/admin/controllers/components_updates.php +++ b/admin/controllers/components_updates.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Components_updates Controller + * Components_updates Admin Controller */ -class ComponentbuilderControllerComponents_updates extends JControllerAdmin +class ComponentbuilderControllerComponents_updates extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/custom_admin_view.php b/admin/controllers/custom_admin_view.php index b974cc02f..f033773bb 100644 --- a/admin/controllers/custom_admin_view.php +++ b/admin/controllers/custom_admin_view.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Custom_admin_view Controller + * Custom_admin_view Form Controller */ -class ComponentbuilderControllerCustom_admin_view extends JControllerForm +class ComponentbuilderControllerCustom_admin_view extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/custom_admin_views.php b/admin/controllers/custom_admin_views.php index 5d1276da4..cf423d953 100644 --- a/admin/controllers/custom_admin_views.php +++ b/admin/controllers/custom_admin_views.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Custom_admin_views Controller + * Custom_admin_views Admin Controller */ -class ComponentbuilderControllerCustom_admin_views extends JControllerAdmin +class ComponentbuilderControllerCustom_admin_views extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/custom_code.php b/admin/controllers/custom_code.php index dc90ff760..3a8102aef 100644 --- a/admin/controllers/custom_code.php +++ b/admin/controllers/custom_code.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Custom_code Controller + * Custom_code Form Controller */ -class ComponentbuilderControllerCustom_code extends JControllerForm +class ComponentbuilderControllerCustom_code extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/custom_codes.php b/admin/controllers/custom_codes.php index 22e4a3dd7..e62bdcce7 100644 --- a/admin/controllers/custom_codes.php +++ b/admin/controllers/custom_codes.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Custom_codes Controller + * Custom_codes Admin Controller */ -class ComponentbuilderControllerCustom_codes extends JControllerAdmin +class ComponentbuilderControllerCustom_codes extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/dynamic_get.php b/admin/controllers/dynamic_get.php index f36110d8b..a2aaf65bb 100644 --- a/admin/controllers/dynamic_get.php +++ b/admin/controllers/dynamic_get.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Dynamic_get Controller + * Dynamic_get Form Controller */ -class ComponentbuilderControllerDynamic_get extends JControllerForm +class ComponentbuilderControllerDynamic_get extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/dynamic_gets.php b/admin/controllers/dynamic_gets.php index 82df8ba3f..1ba549f8b 100644 --- a/admin/controllers/dynamic_gets.php +++ b/admin/controllers/dynamic_gets.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Dynamic_gets Controller + * Dynamic_gets Admin Controller */ -class ComponentbuilderControllerDynamic_gets extends JControllerAdmin +class ComponentbuilderControllerDynamic_gets extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/field.php b/admin/controllers/field.php index deb137338..6954d6aee 100644 --- a/admin/controllers/field.php +++ b/admin/controllers/field.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Field Controller + * Field Form Controller */ -class ComponentbuilderControllerField extends JControllerForm +class ComponentbuilderControllerField extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/fields.php b/admin/controllers/fields.php index 600eb282f..af17b9b11 100644 --- a/admin/controllers/fields.php +++ b/admin/controllers/fields.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Fields Controller + * Fields Admin Controller */ -class ComponentbuilderControllerFields extends JControllerAdmin +class ComponentbuilderControllerFields extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/fieldtype.php b/admin/controllers/fieldtype.php index cf41e0f89..1f0429aa9 100644 --- a/admin/controllers/fieldtype.php +++ b/admin/controllers/fieldtype.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Fieldtype Controller + * Fieldtype Form Controller */ -class ComponentbuilderControllerFieldtype extends JControllerForm +class ComponentbuilderControllerFieldtype extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/fieldtypes.php b/admin/controllers/fieldtypes.php index b50703e4d..4541ab691 100644 --- a/admin/controllers/fieldtypes.php +++ b/admin/controllers/fieldtypes.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Fieldtypes Controller + * Fieldtypes Admin Controller */ -class ComponentbuilderControllerFieldtypes extends JControllerAdmin +class ComponentbuilderControllerFieldtypes extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/get_snippets.php b/admin/controllers/get_snippets.php index 556892192..759482acd 100644 --- a/admin/controllers/get_snippets.php +++ b/admin/controllers/get_snippets.php @@ -13,14 +13,22 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Get_snippets Controller + * Get_snippets Admin Controller */ -class ComponentbuilderControllerGet_snippets extends JControllerAdmin +class ComponentbuilderControllerGet_snippets extends AdminController { + /** + * The prefix to use with controller messages. + * + * @var string + * @since 1.6 + */ protected $text_prefix = 'COM_COMPONENTBUILDER_GET_SNIPPETS'; + /** * Proxy for getModel. * @since 2.5 @@ -32,7 +40,7 @@ class ComponentbuilderControllerGet_snippets extends JControllerAdmin return $model; } - public function dashboard() + public function dashboard() { $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder', false)); return; diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 023e029b1..2d465316c 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Help Controller + * Componentbuilder Help Base Controller */ -class ComponentbuilderControllerHelp extends JControllerLegacy +class ComponentbuilderControllerHelp extends BaseController { public function __construct($config) { diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index 2da7e8c63..4152864f4 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Help_document Controller + * Help_document Form Controller */ -class ComponentbuilderControllerHelp_document extends JControllerForm +class ComponentbuilderControllerHelp_document extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index 57753a7c2..8a05c7c0a 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Help_documents Controller + * Help_documents Admin Controller */ -class ComponentbuilderControllerHelp_documents extends JControllerAdmin +class ComponentbuilderControllerHelp_documents extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 3de0fb664..44c32eb3f 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Import Controller + * Componentbuilder Import Base Controller */ -class ComponentbuilderControllerImport extends JControllerLegacy +class ComponentbuilderControllerImport extends BaseController { /** * Import an spreadsheet. diff --git a/admin/controllers/import_joomla_components.php b/admin/controllers/import_joomla_components.php index 39a7afb09..8061bc826 100644 --- a/admin/controllers/import_joomla_components.php +++ b/admin/controllers/import_joomla_components.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Import_joomla_components Controller + * Componentbuilder Import_joomla_components Base Controller */ -class ComponentbuilderControllerImport_joomla_components extends JControllerLegacy +class ComponentbuilderControllerImport_joomla_components extends BaseController { /** * Import an spreadsheet. diff --git a/admin/controllers/import_language_translations.php b/admin/controllers/import_language_translations.php index 9626bd41b..e2bb90606 100644 --- a/admin/controllers/import_language_translations.php +++ b/admin/controllers/import_language_translations.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Import_language_translations Controller + * Componentbuilder Import_language_translations Base Controller */ -class ComponentbuilderControllerImport_language_translations extends JControllerLegacy +class ComponentbuilderControllerImport_language_translations extends BaseController { /** * Import an spreadsheet. diff --git a/admin/controllers/joomla_component.php b/admin/controllers/joomla_component.php index 7d3ccefc2..e8379efcf 100644 --- a/admin/controllers/joomla_component.php +++ b/admin/controllers/joomla_component.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Joomla_component Controller + * Joomla_component Form Controller */ -class ComponentbuilderControllerJoomla_component extends JControllerForm +class ComponentbuilderControllerJoomla_component extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/joomla_components.php b/admin/controllers/joomla_components.php index 6dae5c981..22ae28cf8 100644 --- a/admin/controllers/joomla_components.php +++ b/admin/controllers/joomla_components.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Joomla_components Controller + * Joomla_components Admin Controller */ -class ComponentbuilderControllerJoomla_components extends JControllerAdmin +class ComponentbuilderControllerJoomla_components extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/joomla_module.php b/admin/controllers/joomla_module.php index 98d586fda..bbca733fc 100644 --- a/admin/controllers/joomla_module.php +++ b/admin/controllers/joomla_module.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Joomla_module Controller + * Joomla_module Form Controller */ -class ComponentbuilderControllerJoomla_module extends JControllerForm +class ComponentbuilderControllerJoomla_module extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/joomla_module_files_folders_urls.php b/admin/controllers/joomla_module_files_folders_urls.php index f3c57dd28..1b49ef8de 100644 --- a/admin/controllers/joomla_module_files_folders_urls.php +++ b/admin/controllers/joomla_module_files_folders_urls.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Joomla_module_files_folders_urls Controller + * Joomla_module_files_folders_urls Form Controller */ -class ComponentbuilderControllerJoomla_module_files_folders_urls extends JControllerForm +class ComponentbuilderControllerJoomla_module_files_folders_urls extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/joomla_module_updates.php b/admin/controllers/joomla_module_updates.php index 3f1bfdc4c..91ced4ce6 100644 --- a/admin/controllers/joomla_module_updates.php +++ b/admin/controllers/joomla_module_updates.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Joomla_module_updates Controller + * Joomla_module_updates Form Controller */ -class ComponentbuilderControllerJoomla_module_updates extends JControllerForm +class ComponentbuilderControllerJoomla_module_updates extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/joomla_modules.php b/admin/controllers/joomla_modules.php index 5be22e342..51bcb45a4 100644 --- a/admin/controllers/joomla_modules.php +++ b/admin/controllers/joomla_modules.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Joomla_modules Controller + * Joomla_modules Admin Controller */ -class ComponentbuilderControllerJoomla_modules extends JControllerAdmin +class ComponentbuilderControllerJoomla_modules extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/joomla_modules_files_folders_urls.php b/admin/controllers/joomla_modules_files_folders_urls.php index 610cdd982..9cbfbe52a 100644 --- a/admin/controllers/joomla_modules_files_folders_urls.php +++ b/admin/controllers/joomla_modules_files_folders_urls.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Joomla_modules_files_folders_urls Controller + * Joomla_modules_files_folders_urls Admin Controller */ -class ComponentbuilderControllerJoomla_modules_files_folders_urls extends JControllerAdmin +class ComponentbuilderControllerJoomla_modules_files_folders_urls extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/joomla_modules_updates.php b/admin/controllers/joomla_modules_updates.php index 5f81a254b..28a2bd2f8 100644 --- a/admin/controllers/joomla_modules_updates.php +++ b/admin/controllers/joomla_modules_updates.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Joomla_modules_updates Controller + * Joomla_modules_updates Admin Controller */ -class ComponentbuilderControllerJoomla_modules_updates extends JControllerAdmin +class ComponentbuilderControllerJoomla_modules_updates extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/joomla_plugin.php b/admin/controllers/joomla_plugin.php index adeddfe56..01ba00dfc 100644 --- a/admin/controllers/joomla_plugin.php +++ b/admin/controllers/joomla_plugin.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Joomla_plugin Controller + * Joomla_plugin Form Controller */ -class ComponentbuilderControllerJoomla_plugin extends JControllerForm +class ComponentbuilderControllerJoomla_plugin extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/joomla_plugin_files_folders_urls.php b/admin/controllers/joomla_plugin_files_folders_urls.php index 9683c436f..0f89c0b43 100644 --- a/admin/controllers/joomla_plugin_files_folders_urls.php +++ b/admin/controllers/joomla_plugin_files_folders_urls.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Joomla_plugin_files_folders_urls Controller + * Joomla_plugin_files_folders_urls Form Controller */ -class ComponentbuilderControllerJoomla_plugin_files_folders_urls extends JControllerForm +class ComponentbuilderControllerJoomla_plugin_files_folders_urls extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/joomla_plugin_group.php b/admin/controllers/joomla_plugin_group.php index 08f88efa2..0935f0185 100644 --- a/admin/controllers/joomla_plugin_group.php +++ b/admin/controllers/joomla_plugin_group.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Joomla_plugin_group Controller + * Joomla_plugin_group Form Controller */ -class ComponentbuilderControllerJoomla_plugin_group extends JControllerForm +class ComponentbuilderControllerJoomla_plugin_group extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/joomla_plugin_groups.php b/admin/controllers/joomla_plugin_groups.php index ec02bd780..8b8bbe286 100644 --- a/admin/controllers/joomla_plugin_groups.php +++ b/admin/controllers/joomla_plugin_groups.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Joomla_plugin_groups Controller + * Joomla_plugin_groups Admin Controller */ -class ComponentbuilderControllerJoomla_plugin_groups extends JControllerAdmin +class ComponentbuilderControllerJoomla_plugin_groups extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/joomla_plugin_updates.php b/admin/controllers/joomla_plugin_updates.php index 800606d20..087f71ca0 100644 --- a/admin/controllers/joomla_plugin_updates.php +++ b/admin/controllers/joomla_plugin_updates.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Joomla_plugin_updates Controller + * Joomla_plugin_updates Form Controller */ -class ComponentbuilderControllerJoomla_plugin_updates extends JControllerForm +class ComponentbuilderControllerJoomla_plugin_updates extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/joomla_plugins.php b/admin/controllers/joomla_plugins.php index 979e325fc..74dce6826 100644 --- a/admin/controllers/joomla_plugins.php +++ b/admin/controllers/joomla_plugins.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Joomla_plugins Controller + * Joomla_plugins Admin Controller */ -class ComponentbuilderControllerJoomla_plugins extends JControllerAdmin +class ComponentbuilderControllerJoomla_plugins extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/joomla_plugins_files_folders_urls.php b/admin/controllers/joomla_plugins_files_folders_urls.php index 17a9f3602..77f7f4ada 100644 --- a/admin/controllers/joomla_plugins_files_folders_urls.php +++ b/admin/controllers/joomla_plugins_files_folders_urls.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Joomla_plugins_files_folders_urls Controller + * Joomla_plugins_files_folders_urls Admin Controller */ -class ComponentbuilderControllerJoomla_plugins_files_folders_urls extends JControllerAdmin +class ComponentbuilderControllerJoomla_plugins_files_folders_urls extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/joomla_plugins_updates.php b/admin/controllers/joomla_plugins_updates.php index 0ce7b9380..2444963ff 100644 --- a/admin/controllers/joomla_plugins_updates.php +++ b/admin/controllers/joomla_plugins_updates.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Joomla_plugins_updates Controller + * Joomla_plugins_updates Admin Controller */ -class ComponentbuilderControllerJoomla_plugins_updates extends JControllerAdmin +class ComponentbuilderControllerJoomla_plugins_updates extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/language.php b/admin/controllers/language.php index 92f6d556a..b3b7c9a7c 100644 --- a/admin/controllers/language.php +++ b/admin/controllers/language.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Language Controller + * Language Form Controller */ -class ComponentbuilderControllerLanguage extends JControllerForm +class ComponentbuilderControllerLanguage extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/language_translation.php b/admin/controllers/language_translation.php index 2a4bf51b5..1a3294ae6 100644 --- a/admin/controllers/language_translation.php +++ b/admin/controllers/language_translation.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Language_translation Controller + * Language_translation Form Controller */ -class ComponentbuilderControllerLanguage_translation extends JControllerForm +class ComponentbuilderControllerLanguage_translation extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/language_translations.php b/admin/controllers/language_translations.php index 3050919f7..2ba5e1fed 100644 --- a/admin/controllers/language_translations.php +++ b/admin/controllers/language_translations.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Language_translations Controller + * Language_translations Admin Controller */ -class ComponentbuilderControllerLanguage_translations extends JControllerAdmin +class ComponentbuilderControllerLanguage_translations extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/languages.php b/admin/controllers/languages.php index a430aa790..b80dca20d 100644 --- a/admin/controllers/languages.php +++ b/admin/controllers/languages.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Languages Controller + * Languages Admin Controller */ -class ComponentbuilderControllerLanguages extends JControllerAdmin +class ComponentbuilderControllerLanguages extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/layout.php b/admin/controllers/layout.php index 84e1d558d..3fb8dffb1 100644 --- a/admin/controllers/layout.php +++ b/admin/controllers/layout.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Layout Controller + * Layout Form Controller */ -class ComponentbuilderControllerLayout extends JControllerForm +class ComponentbuilderControllerLayout extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/layouts.php b/admin/controllers/layouts.php index 853b8833d..aa7dc7880 100644 --- a/admin/controllers/layouts.php +++ b/admin/controllers/layouts.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Layouts Controller + * Layouts Admin Controller */ -class ComponentbuilderControllerLayouts extends JControllerAdmin +class ComponentbuilderControllerLayouts extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/libraries.php b/admin/controllers/libraries.php index 9f07a841b..a4bd14fea 100644 --- a/admin/controllers/libraries.php +++ b/admin/controllers/libraries.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Libraries Controller + * Libraries Admin Controller */ -class ComponentbuilderControllerLibraries extends JControllerAdmin +class ComponentbuilderControllerLibraries extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/libraries_config.php b/admin/controllers/libraries_config.php index ad4287575..1bb0a0767 100644 --- a/admin/controllers/libraries_config.php +++ b/admin/controllers/libraries_config.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Libraries_config Controller + * Libraries_config Admin Controller */ -class ComponentbuilderControllerLibraries_config extends JControllerAdmin +class ComponentbuilderControllerLibraries_config extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/libraries_files_folders_urls.php b/admin/controllers/libraries_files_folders_urls.php index aa65bf27d..6563cefa8 100644 --- a/admin/controllers/libraries_files_folders_urls.php +++ b/admin/controllers/libraries_files_folders_urls.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Libraries_files_folders_urls Controller + * Libraries_files_folders_urls Admin Controller */ -class ComponentbuilderControllerLibraries_files_folders_urls extends JControllerAdmin +class ComponentbuilderControllerLibraries_files_folders_urls extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/library.php b/admin/controllers/library.php index 50225bdf4..533f961ec 100644 --- a/admin/controllers/library.php +++ b/admin/controllers/library.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Library Controller + * Library Form Controller */ -class ComponentbuilderControllerLibrary extends JControllerForm +class ComponentbuilderControllerLibrary extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/library_config.php b/admin/controllers/library_config.php index 0addb49d2..8411ec656 100644 --- a/admin/controllers/library_config.php +++ b/admin/controllers/library_config.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Library_config Controller + * Library_config Form Controller */ -class ComponentbuilderControllerLibrary_config extends JControllerForm +class ComponentbuilderControllerLibrary_config extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/library_files_folders_urls.php b/admin/controllers/library_files_folders_urls.php index 9f0786e62..9d5aa72a6 100644 --- a/admin/controllers/library_files_folders_urls.php +++ b/admin/controllers/library_files_folders_urls.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Library_files_folders_urls Controller + * Library_files_folders_urls Form Controller */ -class ComponentbuilderControllerLibrary_files_folders_urls extends JControllerForm +class ComponentbuilderControllerLibrary_files_folders_urls extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/placeholder.php b/admin/controllers/placeholder.php index c052cb7e9..879439b3d 100644 --- a/admin/controllers/placeholder.php +++ b/admin/controllers/placeholder.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Placeholder Controller + * Placeholder Form Controller */ -class ComponentbuilderControllerPlaceholder extends JControllerForm +class ComponentbuilderControllerPlaceholder extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/placeholders.php b/admin/controllers/placeholders.php index 63fea4e6d..4b650b8fb 100644 --- a/admin/controllers/placeholders.php +++ b/admin/controllers/placeholders.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Placeholders Controller + * Placeholders Admin Controller */ -class ComponentbuilderControllerPlaceholders extends JControllerAdmin +class ComponentbuilderControllerPlaceholders extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/server.php b/admin/controllers/server.php index 4e53a5c1a..8c4c2e12c 100644 --- a/admin/controllers/server.php +++ b/admin/controllers/server.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Server Controller + * Server Form Controller */ -class ComponentbuilderControllerServer extends JControllerForm +class ComponentbuilderControllerServer extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/servers.php b/admin/controllers/servers.php index b71573303..ed345c6b9 100644 --- a/admin/controllers/servers.php +++ b/admin/controllers/servers.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Servers Controller + * Servers Admin Controller */ -class ComponentbuilderControllerServers extends JControllerAdmin +class ComponentbuilderControllerServers extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/site_view.php b/admin/controllers/site_view.php index 54ce2f595..037408103 100644 --- a/admin/controllers/site_view.php +++ b/admin/controllers/site_view.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Site_view Controller + * Site_view Form Controller */ -class ComponentbuilderControllerSite_view extends JControllerForm +class ComponentbuilderControllerSite_view extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/site_views.php b/admin/controllers/site_views.php index 27c398369..43fa83190 100644 --- a/admin/controllers/site_views.php +++ b/admin/controllers/site_views.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Site_views Controller + * Site_views Admin Controller */ -class ComponentbuilderControllerSite_views extends JControllerAdmin +class ComponentbuilderControllerSite_views extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/snippet.php b/admin/controllers/snippet.php index c9df37d79..72b0baadc 100644 --- a/admin/controllers/snippet.php +++ b/admin/controllers/snippet.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Snippet Controller + * Snippet Form Controller */ -class ComponentbuilderControllerSnippet extends JControllerForm +class ComponentbuilderControllerSnippet extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/snippet_type.php b/admin/controllers/snippet_type.php index 3d363f229..e56ed1428 100644 --- a/admin/controllers/snippet_type.php +++ b/admin/controllers/snippet_type.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Snippet_type Controller + * Snippet_type Form Controller */ -class ComponentbuilderControllerSnippet_type extends JControllerForm +class ComponentbuilderControllerSnippet_type extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/snippet_types.php b/admin/controllers/snippet_types.php index 347d0c21d..8bc357ebe 100644 --- a/admin/controllers/snippet_types.php +++ b/admin/controllers/snippet_types.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Snippet_types Controller + * Snippet_types Admin Controller */ -class ComponentbuilderControllerSnippet_types extends JControllerAdmin +class ComponentbuilderControllerSnippet_types extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/snippets.php b/admin/controllers/snippets.php index 9717bb619..7f8b868a2 100644 --- a/admin/controllers/snippets.php +++ b/admin/controllers/snippets.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Snippets Controller + * Snippets Admin Controller */ -class ComponentbuilderControllerSnippets extends JControllerAdmin +class ComponentbuilderControllerSnippets extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/template.php b/admin/controllers/template.php index 484bc55de..99226853f 100644 --- a/admin/controllers/template.php +++ b/admin/controllers/template.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Template Controller + * Template Form Controller */ -class ComponentbuilderControllerTemplate extends JControllerForm +class ComponentbuilderControllerTemplate extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/templates.php b/admin/controllers/templates.php index 0e50bbc2a..80d67a118 100644 --- a/admin/controllers/templates.php +++ b/admin/controllers/templates.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Templates Controller + * Templates Admin Controller */ -class ComponentbuilderControllerTemplates extends JControllerAdmin +class ComponentbuilderControllerTemplates extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/controllers/validation_rule.php b/admin/controllers/validation_rule.php index 24ea93263..b58bb060e 100644 --- a/admin/controllers/validation_rule.php +++ b/admin/controllers/validation_rule.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Validation_rule Controller + * Validation_rule Form Controller */ -class ComponentbuilderControllerValidation_rule extends JControllerForm +class ComponentbuilderControllerValidation_rule extends FormController { /** * Current or most recently performed task. diff --git a/admin/controllers/validation_rules.php b/admin/controllers/validation_rules.php index 600f228ed..948e12860 100644 --- a/admin/controllers/validation_rules.php +++ b/admin/controllers/validation_rules.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\AdminController; use Joomla\Utilities\ArrayHelper; /** - * Validation_rules Controller + * Validation_rules Admin Controller */ -class ComponentbuilderControllerValidation_rules extends JControllerAdmin +class ComponentbuilderControllerValidation_rules extends AdminController { /** * The prefix to use with controller messages. diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index 58387435b..10cb11d62 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -6217,7 +6217,7 @@ class Interpretation extends Fields $chart[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " load the google chart js."; $chart[] = $this->_t(2) - . "JHtml::_('script', 'com_" + . "JHtml::_('script', 'media/com_" . $this->componentCodeName . "/js/google.jsapi.js', ['version' => 'auto']);"; $chart[] = $this->_t(2) . "\$this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', ['version' => 'auto']);"; @@ -6626,7 +6626,7 @@ class Interpretation extends Fields . "if ((!\$HeaderCheck->css_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)"; $setter .= PHP_EOL . $tabV . $this->_t(2) . "{"; $setter .= PHP_EOL . $tabV . $this->_t(3) - . "JHtml::_('stylesheet', 'com_" + . "JHtml::_('stylesheet', 'media/com_" . $this->componentCodeName . "/uikit-v2/css/uikit'.\$style.\$size.'.css', ['version' => 'auto']);"; $setter .= PHP_EOL . $tabV . $this->_t(2) . "}"; @@ -6637,7 +6637,7 @@ class Interpretation extends Fields . "if ((!\$HeaderCheck->js_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)"; $setter .= PHP_EOL . $tabV . $this->_t(2) . "{"; $setter .= PHP_EOL . $tabV . $this->_t(3) - . "JHtml::_('script', 'com_" + . "JHtml::_('script', 'media/com_" . $this->componentCodeName . "/uikit-v2/js/uikit'.\$size.'.js', ['version' => 'auto']);"; $setter .= PHP_EOL . $tabV . $this->_t(2) . "}"; @@ -6733,7 +6733,7 @@ class Interpretation extends Fields __LINE__ ) . " load the css."; $setter .= PHP_EOL . $tabV . $this->_t(6) - . "JHtml::_('stylesheet', 'com_" + . "JHtml::_('stylesheet', 'media/com_" . $this->componentCodeName . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css', ['version' => 'auto']);"; $setter .= PHP_EOL . $tabV . $this->_t(5) . "}"; @@ -6749,7 +6749,7 @@ class Interpretation extends Fields __LINE__ ) . " load the js."; $setter .= PHP_EOL . $tabV . $this->_t(6) - . "JHtml::_('script', 'com_" + . "JHtml::_('script', 'media/com_" . $this->componentCodeName . "/uikit-v2/js/components/'.\$name.\$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']);"; $setter .= PHP_EOL . $tabV . $this->_t(5) . "}"; @@ -6795,7 +6795,7 @@ class Interpretation extends Fields __LINE__ ) . " load the css."; $setter .= PHP_EOL . $tabV . $this->_t(6) - . "JHtml::_('stylesheet', 'com_" + . "JHtml::_('stylesheet', 'media/com_" . $this->componentCodeName . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css', ['version' => 'auto']);"; $setter .= PHP_EOL . $tabV . $this->_t(5) . "}"; @@ -6811,15 +6811,9 @@ class Interpretation extends Fields __LINE__ ) . " load the js."; $setter .= PHP_EOL . $tabV . $this->_t(6) - . "JHtml::_('script', JURI::root(true) .'/media/com_" + . "JHtml::_('script', 'media/com_" . $this->componentCodeName - . "/uikit-v2/js/components/'.\$name.\$size.'.js', (" - . $this->fileContentStatic[$this->hhh . 'Component' - . $this->hhh] - . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (" - . $this->fileContentStatic[$this->hhh . 'Component' - . $this->hhh] - . "Helper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);"; + . "/uikit-v2/js/components/'.\$name.\$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']);"; $setter .= PHP_EOL . $tabV . $this->_t(5) . "}"; $setter .= PHP_EOL . $tabV . $this->_t(4) . "}"; $setter .= PHP_EOL . $tabV . $this->_t(3) . "}"; @@ -6846,7 +6840,7 @@ class Interpretation extends Fields . "if ((!\$HeaderCheck->css_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)"; $setter .= PHP_EOL . $tabV . $this->_t(2) . "{"; $setter .= PHP_EOL . $tabV . $this->_t(3) - . "JHtml::_('stylesheet', 'com_" + . "JHtml::_('stylesheet', 'media/com_" . $this->componentCodeName . "/uikit-v3/css/uikit'.\$size.'.css', ['version' => 'auto']);"; $setter .= PHP_EOL . $tabV . $this->_t(2) . "}"; @@ -6857,11 +6851,11 @@ class Interpretation extends Fields . "if ((!\$HeaderCheck->js_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)"; $setter .= PHP_EOL . $tabV . $this->_t(2) . "{"; $setter .= PHP_EOL . $tabV . $this->_t(3) - . "JHtml::_('script', 'com_" + . "JHtml::_('script', 'media/com_" . $this->componentCodeName . "/uikit-v3/js/uikit'.\$size.'.js', ['version' => 'auto']);"; $setter .= PHP_EOL . $tabV . $this->_t(3) - . "JHtml::_('script', 'com_" + . "JHtml::_('script', 'media/com_" . $this->componentCodeName . "/uikit-v3/js/uikit-icons'.\$size.'.js', ['version' => 'auto']);"; $setter .= PHP_EOL . $tabV . $this->_t(2) . "}"; @@ -14110,7 +14104,7 @@ class Interpretation extends Fields __LINE__ ) . " Add the CSS for Footable."; $foo .= PHP_EOL . $this->_t(2) - . "JHtml::_('stylesheet', 'com_" + . "JHtml::_('stylesheet', 'media/com_" . $this->componentCodeName . "/footable-v2/css/footable.core.min.css', ['version' => 'auto']);"; $foo .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine( @@ -14120,7 +14114,7 @@ class Interpretation extends Fields . "if (!isset(\$this->fooTableStyle) || 0 == \$this->fooTableStyle)"; $foo .= PHP_EOL . $this->_t(2) . "{"; $foo .= PHP_EOL . $this->_t(3) - . "JHtml::_('stylesheet', 'com_" + . "JHtml::_('stylesheet', 'media/com_" . $this->componentCodeName . "/footable-v2/css/footable.metro.min.css', ['version' => 'auto']);"; $foo .= PHP_EOL . $this->_t(2) . "}"; @@ -14130,7 +14124,7 @@ class Interpretation extends Fields . "elseif (isset(\$this->fooTableStyle) && 1 == \$this->fooTableStyle)"; $foo .= PHP_EOL . $this->_t(2) . "{"; $foo .= PHP_EOL . $this->_t(3) - . "JHtml::_('stylesheet', 'com_" + . "JHtml::_('stylesheet', 'media/com_" . $this->componentCodeName . "/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']);"; $foo .= PHP_EOL . $this->_t(2) . "}"; @@ -14138,18 +14132,18 @@ class Interpretation extends Fields __LINE__ ) . " Add the JavaScript for Footable"; $foo .= PHP_EOL . $this->_t(2) - . "JHtml::_('script', 'com_" + . "JHtml::_('script', 'media/com_" . $this->componentCodeName . "/footable-v2/js/footable.js', ['version' => 'auto']);"; $foo .= PHP_EOL . $this->_t(2) - . "JHtml::_('script', 'com_" + . "JHtml::_('script', 'media/com_" . $this->componentCodeName . "/footable-v2/js/footable.sort.js', ['version' => 'auto']);"; $foo .= PHP_EOL . $this->_t(2) - . "JHtml::_('script', 'com_" + . "JHtml::_('script', 'media/com_" . $this->componentCodeName . "/footable-v2/js/footable.filter.js', ['version' => 'auto']);"; $foo .= PHP_EOL . $this->_t(2) - . "JHtml::_('script', 'com_" + . "JHtml::_('script', 'media/com_" . $this->componentCodeName . "/footable-v2/js/footable.paginate.js', ['version' => 'auto']);"; if ($init) @@ -14175,13 +14169,13 @@ class Interpretation extends Fields $foo .= PHP_EOL . $this->_t(2) . "\$this->document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');"; $foo .= PHP_EOL . $this->_t(2) - . "JHtml::_('stylesheet', 'com_" + . "JHtml::_('stylesheet', 'media/com_" . $this->componentCodeName . "/footable-v3/css/footable.standalone.min.css', ['version' => 'auto']);"; $foo .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Add the JavaScript for Footable (adding all functions)"; $foo .= PHP_EOL . $this->_t(2) - . "JHtml::_('script', 'com_" + . "JHtml::_('script', 'media/com_" . $this->componentCodeName . "/footable-v3/js/footable.min.js', ['version' => 'auto']);"; if ($init) @@ -22552,8 +22546,20 @@ class Interpretation extends Fields case 'site.layout'; case 'dashboard.view'; case 'dashboard.view.html'; - case 'dashboard.model'; - case 'dashboard.controller'; + break; + case 'site.view.model': + case 'custom.admin.view.model': + $headers[] = 'use Joomla\CMS\MVC\Model\ItemModel;'; + $headers[] = 'use Joomla\Utilities\ArrayHelper;'; + break; + case 'admin.views.model': + case 'custom.admin.views.model': + case 'site.views.model': + case 'ajax.admin.model': + case 'ajax.site.model': + case 'dashboard.model': + $headers[] = 'use Joomla\CMS\MVC\Model\ListModel;'; + $headers[] = 'use Joomla\Utilities\ArrayHelper;'; break; case 'admin.helper': case 'site.helper': @@ -22568,6 +22574,7 @@ class Interpretation extends Fields break; case 'admin.view.model': case 'site.admin.view.model': + $headers[] = 'use Joomla\CMS\MVC\Model\AdminModel;'; $headers[] = 'use Joomla\Registry\Registry;'; $headers[] = 'use Joomla\String\StringHelper;'; $headers[] = 'use Joomla\Utilities\ArrayHelper;'; @@ -22596,8 +22603,7 @@ class Interpretation extends Fields case 'site.views.html': case 'custom.admin.view.html': case 'custom.admin.views.html': - // add a space - $headers = array(''); + $headers[] = 'use Joomla\CMS\MVC\View\HtmlView;'; // load the file class if uikit is being loaded if ((2 == $this->uikit || 1 == $this->uikit) && isset($this->uikitComp[$codeName]) @@ -22606,9 +22612,24 @@ class Interpretation extends Fields )) { $headers[] = 'use Joomla\CMS\Filesystem\File;'; - $headers[] = ''; } break; + case 'admin.view.controller': + case 'site.admin.view.controller': + case 'site.view.controller': + $headers[] = 'use Joomla\CMS\MVC\Controller\FormController;'; + $headers[] = 'use Joomla\Utilities\ArrayHelper;'; + break; + case 'custom.admin.view.controller': + $headers[] = 'use Joomla\CMS\MVC\Controller\BaseController;'; + $headers[] = 'use Joomla\Utilities\ArrayHelper;'; + break; + case 'admin.views.controller': + case 'custom.admin.views.controller': + case 'dashboard.controller': + $headers[] = 'use Joomla\CMS\MVC\Controller\AdminController;'; + $headers[] = 'use Joomla\Utilities\ArrayHelper;'; + break; default: $headers[] = 'use Joomla\Utilities\ArrayHelper;'; break; diff --git a/admin/models/admin_custom_tabs.php b/admin/models/admin_custom_tabs.php index fd33609d8..ba736ebfe 100644 --- a/admin/models/admin_custom_tabs.php +++ b/admin/models/admin_custom_tabs.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Admin_custom_tabs Model + * Componentbuilder Admin_custom_tabs Admin Model */ -class ComponentbuilderModelAdmin_custom_tabs extends JModelAdmin +class ComponentbuilderModelAdmin_custom_tabs extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/admin_fields.php b/admin/models/admin_fields.php index cc03ae725..cd8f0b684 100644 --- a/admin/models/admin_fields.php +++ b/admin/models/admin_fields.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Admin_fields Model + * Componentbuilder Admin_fields Admin Model */ -class ComponentbuilderModelAdmin_fields extends JModelAdmin +class ComponentbuilderModelAdmin_fields extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/admin_fields_conditions.php b/admin/models/admin_fields_conditions.php index 00c007197..db05c9b40 100644 --- a/admin/models/admin_fields_conditions.php +++ b/admin/models/admin_fields_conditions.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Admin_fields_conditions Model + * Componentbuilder Admin_fields_conditions Admin Model */ -class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin +class ComponentbuilderModelAdmin_fields_conditions extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/admin_fields_relations.php b/admin/models/admin_fields_relations.php index 44d9f3a82..fad10ea6e 100644 --- a/admin/models/admin_fields_relations.php +++ b/admin/models/admin_fields_relations.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Admin_fields_relations Model + * Componentbuilder Admin_fields_relations Admin Model */ -class ComponentbuilderModelAdmin_fields_relations extends JModelAdmin +class ComponentbuilderModelAdmin_fields_relations extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 759e3742b..2773da10f 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Admin_view Model + * Componentbuilder Admin_view Admin Model */ -class ComponentbuilderModelAdmin_view extends JModelAdmin +class ComponentbuilderModelAdmin_view extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index 94314a6df..a44dd189b 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Admin_views Model + * Admin_views List Model */ -class ComponentbuilderModelAdmin_views extends JModelList +class ComponentbuilderModelAdmin_views extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/admins_custom_tabs.php b/admin/models/admins_custom_tabs.php index 2cd0de01a..e66e2ec02 100644 --- a/admin/models/admins_custom_tabs.php +++ b/admin/models/admins_custom_tabs.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Admins_custom_tabs Model + * Admins_custom_tabs List Model */ -class ComponentbuilderModelAdmins_custom_tabs extends JModelList +class ComponentbuilderModelAdmins_custom_tabs extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/admins_fields.php b/admin/models/admins_fields.php index 4630c9cd8..f53af0c69 100644 --- a/admin/models/admins_fields.php +++ b/admin/models/admins_fields.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Admins_fields Model + * Admins_fields List Model */ -class ComponentbuilderModelAdmins_fields extends JModelList +class ComponentbuilderModelAdmins_fields extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/admins_fields_conditions.php b/admin/models/admins_fields_conditions.php index f588062a1..620b2031a 100644 --- a/admin/models/admins_fields_conditions.php +++ b/admin/models/admins_fields_conditions.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Admins_fields_conditions Model + * Admins_fields_conditions List Model */ -class ComponentbuilderModelAdmins_fields_conditions extends JModelList +class ComponentbuilderModelAdmins_fields_conditions extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/admins_fields_relations.php b/admin/models/admins_fields_relations.php index 16491c625..d01ba707b 100644 --- a/admin/models/admins_fields_relations.php +++ b/admin/models/admins_fields_relations.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Admins_fields_relations Model + * Admins_fields_relations List Model */ -class ComponentbuilderModelAdmins_fields_relations extends JModelList +class ComponentbuilderModelAdmins_fields_relations extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/ajax.php b/admin/models/ajax.php index f5f00d6c2..e229a4c57 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Ajax Model + * Componentbuilder Ajax List Model */ -class ComponentbuilderModelAjax extends JModelList +class ComponentbuilderModelAjax extends ListModel { protected $app_params; @@ -1086,11 +1087,11 @@ class ComponentbuilderModelAjax extends JModelList array('table' => 'component_plugins', 'tables' => 'components_plugins', 'fields' => array('addjoomla_plugins' => 'plugin', 'joomla_component' => 'NAME'), 'linked' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT', 'linked_name' => 'system_name') ), 'power' => array( - array('table' => 'admin_view', 'tables' => 'admin_views', 'fields' => array('params' => 'admin_view_headers:power_', 'system_name' => 'NAME'), 'linked' => 'COM_COMPONENTBUILDER_ADMIN_VIEW'), - array('table' => 'site_view', 'tables' => 'site_views', 'fields' => array('params' => 'site_view_headers:power_', 'system_name' => 'NAME'), 'linked' => 'COM_COMPONENTBUILDER_SITE_VIEW'), - array('table' => 'custom_admin_view', 'tables' => 'custom_admin_views', 'fields' => array('params' => 'custom_admin_view_headers:power_', 'system_name' => 'NAME'), 'linked' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW'), - array('table' => 'joomla_component', 'tables' => 'joomla_components', 'fields' => array('params' => 'joomla_component_headers:power_', 'system_name' => 'NAME'), 'linked' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT'), - array('table' => 'component_dashboard', 'tables' => 'components_dashboard', 'fields' => array('params' => 'component_dashboard_headers:power_', 'joomla_component' => 'NAME'), 'linked' => 'COM_COMPONENTBUILDER_COMPONENT_DASHBOARD', 'linked_name' => 'system_name'), + array('table' => 'admin_view', 'tables' => 'admin_views', 'fields' => array('params' => 'admin_view_headers:power_:power', 'system_name' => 'NAME'), 'linked' => 'COM_COMPONENTBUILDER_ADMIN_VIEW'), + array('table' => 'site_view', 'tables' => 'site_views', 'fields' => array('params' => 'site_view_headers:power_:power', 'system_name' => 'NAME'), 'linked' => 'COM_COMPONENTBUILDER_SITE_VIEW'), + array('table' => 'custom_admin_view', 'tables' => 'custom_admin_views', 'fields' => array('params' => 'custom_admin_view_headers:power_:power', 'system_name' => 'NAME'), 'linked' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW'), + array('table' => 'joomla_component', 'tables' => 'joomla_components', 'fields' => array('params' => 'joomla_component_headers:power_:power', 'system_name' => 'NAME'), 'linked' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT'), + array('table' => 'component_dashboard', 'tables' => 'components_dashboard', 'fields' => array('params' => 'component_dashboard_headers:power_:power', 'joomla_component' => 'NAME'), 'linked' => 'COM_COMPONENTBUILDER_COMPONENT_DASHBOARD', 'linked_name' => 'system_name'), array('table' => 'power', 'tables' => 'powers', 'fields' => array('extends' => 'GUID', 'implements' => 'ARRAY', 'use_selection' => 'use', 'load_selection' => 'load', 'system_name' => 'NAME'), 'linked' => 'COM_COMPONENTBUILDER_POWER') ) ); @@ -1277,9 +1278,9 @@ class ComponentbuilderModelAjax extends JModelList { if (!$found && $field_name === $_target[0]) { - foreach ($row as $key => $_ids) + foreach ($row as $_key => $_ids) { - if (!$found && strpos($key, $_target[1]) !== false && (in_array($id, $_ids) || $this->linkedGuid($guid, $_ids))) + if (!$found && strpos($_key, $_target[1]) !== false && (in_array($id, $_ids) || $this->linkedGuid($guid, $_ids))) { $found = true; } @@ -1287,6 +1288,29 @@ class ComponentbuilderModelAjax extends JModelList } } } + // check that we have an array and get the size + if (($_size = ComponentbuilderHelper::checkArray($_target)) == 3) + { + foreach ($item->{$key} as $field_name => $row) + { + if (!$found && $field_name === $_target[0]) + { + foreach ($row as $_key => $_items) + { + if (!$found && strpos($_key, $_target[1]) !== false && is_array($_items) && count($_items) > 0) + { + foreach ($_items as $_item) + { + if (!$found && isset($_item[$_target[2]]) && ($id == $_item[$_target[2]] || $this->linkedGuid($guid, $_item[$_target[2]]))) + { + $found = true; + } + } + } + } + } + } + } } else { diff --git a/admin/models/class_extendings.php b/admin/models/class_extendings.php index 4beb12da9..027749ad1 100644 --- a/admin/models/class_extendings.php +++ b/admin/models/class_extendings.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Class_extendings Model + * Class_extendings List Model */ -class ComponentbuilderModelClass_extendings extends JModelList +class ComponentbuilderModelClass_extendings extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/class_extends.php b/admin/models/class_extends.php index 7e30a7531..6959503be 100644 --- a/admin/models/class_extends.php +++ b/admin/models/class_extends.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Class_extends Model + * Componentbuilder Class_extends Admin Model */ -class ComponentbuilderModelClass_extends extends JModelAdmin +class ComponentbuilderModelClass_extends extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/class_method.php b/admin/models/class_method.php index 613909c68..98d3052de 100644 --- a/admin/models/class_method.php +++ b/admin/models/class_method.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Class_method Model + * Componentbuilder Class_method Admin Model */ -class ComponentbuilderModelClass_method extends JModelAdmin +class ComponentbuilderModelClass_method extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/class_methods.php b/admin/models/class_methods.php index 6b3e5e79f..752f6b0bb 100644 --- a/admin/models/class_methods.php +++ b/admin/models/class_methods.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Class_methods Model + * Class_methods List Model */ -class ComponentbuilderModelClass_methods extends JModelList +class ComponentbuilderModelClass_methods extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/class_properties.php b/admin/models/class_properties.php index 5b1288dd8..3ad5eb153 100644 --- a/admin/models/class_properties.php +++ b/admin/models/class_properties.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Class_properties Model + * Class_properties List Model */ -class ComponentbuilderModelClass_properties extends JModelList +class ComponentbuilderModelClass_properties extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/class_property.php b/admin/models/class_property.php index 3eb9cd7e9..0eee0cfe4 100644 --- a/admin/models/class_property.php +++ b/admin/models/class_property.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Class_property Model + * Componentbuilder Class_property Admin Model */ -class ComponentbuilderModelClass_property extends JModelAdmin +class ComponentbuilderModelClass_property extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/compiler.php b/admin/models/compiler.php index a7b995f4e..c23de20ea 100644 --- a/admin/models/compiler.php +++ b/admin/models/compiler.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Model for Compiler + * Componentbuilder List Model for Compiler */ -class ComponentbuilderModelCompiler extends JModelList +class ComponentbuilderModelCompiler extends ListModel { /** * Model user data. diff --git a/admin/models/component_admin_views.php b/admin/models/component_admin_views.php index a319c39b7..a3889116d 100644 --- a/admin/models/component_admin_views.php +++ b/admin/models/component_admin_views.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Component_admin_views Model + * Componentbuilder Component_admin_views Admin Model */ -class ComponentbuilderModelComponent_admin_views extends JModelAdmin +class ComponentbuilderModelComponent_admin_views extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/component_config.php b/admin/models/component_config.php index 1ace94763..9a9b5ba23 100644 --- a/admin/models/component_config.php +++ b/admin/models/component_config.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Component_config Model + * Componentbuilder Component_config Admin Model */ -class ComponentbuilderModelComponent_config extends JModelAdmin +class ComponentbuilderModelComponent_config extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/component_custom_admin_menus.php b/admin/models/component_custom_admin_menus.php index f8b46ac95..c50d81095 100644 --- a/admin/models/component_custom_admin_menus.php +++ b/admin/models/component_custom_admin_menus.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Component_custom_admin_menus Model + * Componentbuilder Component_custom_admin_menus Admin Model */ -class ComponentbuilderModelComponent_custom_admin_menus extends JModelAdmin +class ComponentbuilderModelComponent_custom_admin_menus extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/component_custom_admin_views.php b/admin/models/component_custom_admin_views.php index 94c0d7eb0..eec6d399a 100644 --- a/admin/models/component_custom_admin_views.php +++ b/admin/models/component_custom_admin_views.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Component_custom_admin_views Model + * Componentbuilder Component_custom_admin_views Admin Model */ -class ComponentbuilderModelComponent_custom_admin_views extends JModelAdmin +class ComponentbuilderModelComponent_custom_admin_views extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/component_dashboard.php b/admin/models/component_dashboard.php index 4ca14076a..9d6b5fc6e 100644 --- a/admin/models/component_dashboard.php +++ b/admin/models/component_dashboard.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Component_dashboard Model + * Componentbuilder Component_dashboard Admin Model */ -class ComponentbuilderModelComponent_dashboard extends JModelAdmin +class ComponentbuilderModelComponent_dashboard extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/component_files_folders.php b/admin/models/component_files_folders.php index 85a385443..4c7e853a2 100644 --- a/admin/models/component_files_folders.php +++ b/admin/models/component_files_folders.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Component_files_folders Model + * Componentbuilder Component_files_folders Admin Model */ -class ComponentbuilderModelComponent_files_folders extends JModelAdmin +class ComponentbuilderModelComponent_files_folders extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/component_modules.php b/admin/models/component_modules.php index b5d099cbc..79c8a137f 100644 --- a/admin/models/component_modules.php +++ b/admin/models/component_modules.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Component_modules Model + * Componentbuilder Component_modules Admin Model */ -class ComponentbuilderModelComponent_modules extends JModelAdmin +class ComponentbuilderModelComponent_modules extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/component_mysql_tweaks.php b/admin/models/component_mysql_tweaks.php index f314cfe6c..49b26f8bf 100644 --- a/admin/models/component_mysql_tweaks.php +++ b/admin/models/component_mysql_tweaks.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Component_mysql_tweaks Model + * Componentbuilder Component_mysql_tweaks Admin Model */ -class ComponentbuilderModelComponent_mysql_tweaks extends JModelAdmin +class ComponentbuilderModelComponent_mysql_tweaks extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/component_placeholders.php b/admin/models/component_placeholders.php index d373a4914..9e4de87d1 100644 --- a/admin/models/component_placeholders.php +++ b/admin/models/component_placeholders.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Component_placeholders Model + * Componentbuilder Component_placeholders Admin Model */ -class ComponentbuilderModelComponent_placeholders extends JModelAdmin +class ComponentbuilderModelComponent_placeholders extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/component_plugins.php b/admin/models/component_plugins.php index 47815e893..7fb13028a 100644 --- a/admin/models/component_plugins.php +++ b/admin/models/component_plugins.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Component_plugins Model + * Componentbuilder Component_plugins Admin Model */ -class ComponentbuilderModelComponent_plugins extends JModelAdmin +class ComponentbuilderModelComponent_plugins extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/component_site_views.php b/admin/models/component_site_views.php index 452dc5b1b..1b0a12522 100644 --- a/admin/models/component_site_views.php +++ b/admin/models/component_site_views.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Component_site_views Model + * Componentbuilder Component_site_views Admin Model */ -class ComponentbuilderModelComponent_site_views extends JModelAdmin +class ComponentbuilderModelComponent_site_views extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/component_updates.php b/admin/models/component_updates.php index 993b78bb8..2c041aaa5 100644 --- a/admin/models/component_updates.php +++ b/admin/models/component_updates.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Component_updates Model + * Componentbuilder Component_updates Admin Model */ -class ComponentbuilderModelComponent_updates extends JModelAdmin +class ComponentbuilderModelComponent_updates extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index 066f62c12..cb2bbd14e 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); - +use Joomla\CMS\MVC\Model\ListModel; +use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Model + * Componentbuilder List Model */ -class ComponentbuilderModelComponentbuilder extends JModelList +class ComponentbuilderModelComponentbuilder extends ListModel { public function getIcons() { diff --git a/admin/models/components_admin_views.php b/admin/models/components_admin_views.php index 75ec3e4bf..1e109053e 100644 --- a/admin/models/components_admin_views.php +++ b/admin/models/components_admin_views.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Components_admin_views Model + * Components_admin_views List Model */ -class ComponentbuilderModelComponents_admin_views extends JModelList +class ComponentbuilderModelComponents_admin_views extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/components_config.php b/admin/models/components_config.php index e100e49c2..4f2f3cf25 100644 --- a/admin/models/components_config.php +++ b/admin/models/components_config.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Components_config Model + * Components_config List Model */ -class ComponentbuilderModelComponents_config extends JModelList +class ComponentbuilderModelComponents_config extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/components_custom_admin_menus.php b/admin/models/components_custom_admin_menus.php index a05d26f6b..b045f7c58 100644 --- a/admin/models/components_custom_admin_menus.php +++ b/admin/models/components_custom_admin_menus.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Components_custom_admin_menus Model + * Components_custom_admin_menus List Model */ -class ComponentbuilderModelComponents_custom_admin_menus extends JModelList +class ComponentbuilderModelComponents_custom_admin_menus extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/components_custom_admin_views.php b/admin/models/components_custom_admin_views.php index 38f60715a..26bdac6e4 100644 --- a/admin/models/components_custom_admin_views.php +++ b/admin/models/components_custom_admin_views.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Components_custom_admin_views Model + * Components_custom_admin_views List Model */ -class ComponentbuilderModelComponents_custom_admin_views extends JModelList +class ComponentbuilderModelComponents_custom_admin_views extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/components_dashboard.php b/admin/models/components_dashboard.php index 473551471..069fc553f 100644 --- a/admin/models/components_dashboard.php +++ b/admin/models/components_dashboard.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Components_dashboard Model + * Components_dashboard List Model */ -class ComponentbuilderModelComponents_dashboard extends JModelList +class ComponentbuilderModelComponents_dashboard extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/components_files_folders.php b/admin/models/components_files_folders.php index bd53f0406..e4121d06a 100644 --- a/admin/models/components_files_folders.php +++ b/admin/models/components_files_folders.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Components_files_folders Model + * Components_files_folders List Model */ -class ComponentbuilderModelComponents_files_folders extends JModelList +class ComponentbuilderModelComponents_files_folders extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/components_modules.php b/admin/models/components_modules.php index e035eb096..7f6fedb42 100644 --- a/admin/models/components_modules.php +++ b/admin/models/components_modules.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Components_modules Model + * Components_modules List Model */ -class ComponentbuilderModelComponents_modules extends JModelList +class ComponentbuilderModelComponents_modules extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/components_mysql_tweaks.php b/admin/models/components_mysql_tweaks.php index 655fa1622..eccd5b8e8 100644 --- a/admin/models/components_mysql_tweaks.php +++ b/admin/models/components_mysql_tweaks.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Components_mysql_tweaks Model + * Components_mysql_tweaks List Model */ -class ComponentbuilderModelComponents_mysql_tweaks extends JModelList +class ComponentbuilderModelComponents_mysql_tweaks extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/components_placeholders.php b/admin/models/components_placeholders.php index 98fdabbf6..ecb6fbe04 100644 --- a/admin/models/components_placeholders.php +++ b/admin/models/components_placeholders.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Components_placeholders Model + * Components_placeholders List Model */ -class ComponentbuilderModelComponents_placeholders extends JModelList +class ComponentbuilderModelComponents_placeholders extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/components_plugins.php b/admin/models/components_plugins.php index 3bfafdba9..ba24db424 100644 --- a/admin/models/components_plugins.php +++ b/admin/models/components_plugins.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Components_plugins Model + * Components_plugins List Model */ -class ComponentbuilderModelComponents_plugins extends JModelList +class ComponentbuilderModelComponents_plugins extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/components_site_views.php b/admin/models/components_site_views.php index 27426721d..cba265a7e 100644 --- a/admin/models/components_site_views.php +++ b/admin/models/components_site_views.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Components_site_views Model + * Components_site_views List Model */ -class ComponentbuilderModelComponents_site_views extends JModelList +class ComponentbuilderModelComponents_site_views extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/components_updates.php b/admin/models/components_updates.php index caa6a7680..507bb8b74 100644 --- a/admin/models/components_updates.php +++ b/admin/models/components_updates.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Components_updates Model + * Components_updates List Model */ -class ComponentbuilderModelComponents_updates extends JModelList +class ComponentbuilderModelComponents_updates extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index e59caa4ac..73d2ef7f3 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Custom_admin_view Model + * Componentbuilder Custom_admin_view Admin Model */ -class ComponentbuilderModelCustom_admin_view extends JModelAdmin +class ComponentbuilderModelCustom_admin_view extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/custom_admin_views.php b/admin/models/custom_admin_views.php index b0b77d966..4fc59812c 100644 --- a/admin/models/custom_admin_views.php +++ b/admin/models/custom_admin_views.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Custom_admin_views Model + * Custom_admin_views List Model */ -class ComponentbuilderModelCustom_admin_views extends JModelList +class ComponentbuilderModelCustom_admin_views extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/custom_code.php b/admin/models/custom_code.php index 8a951cc39..7d12f38a3 100644 --- a/admin/models/custom_code.php +++ b/admin/models/custom_code.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Custom_code Model + * Componentbuilder Custom_code Admin Model */ -class ComponentbuilderModelCustom_code extends JModelAdmin +class ComponentbuilderModelCustom_code extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/custom_codes.php b/admin/models/custom_codes.php index fbd8a0d5e..d54bdb400 100644 --- a/admin/models/custom_codes.php +++ b/admin/models/custom_codes.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Custom_codes Model + * Custom_codes List Model */ -class ComponentbuilderModelCustom_codes extends JModelList +class ComponentbuilderModelCustom_codes extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php index 23b28df87..2244701ce 100644 --- a/admin/models/dynamic_get.php +++ b/admin/models/dynamic_get.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Dynamic_get Model + * Componentbuilder Dynamic_get Admin Model */ -class ComponentbuilderModelDynamic_get extends JModelAdmin +class ComponentbuilderModelDynamic_get extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/dynamic_gets.php b/admin/models/dynamic_gets.php index a04f7cb53..591cfa0a3 100644 --- a/admin/models/dynamic_gets.php +++ b/admin/models/dynamic_gets.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Dynamic_gets Model + * Dynamic_gets List Model */ -class ComponentbuilderModelDynamic_gets extends JModelList +class ComponentbuilderModelDynamic_gets extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/field.php b/admin/models/field.php index 76506875d..e684f5d6c 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Field Model + * Componentbuilder Field Admin Model */ -class ComponentbuilderModelField extends JModelAdmin +class ComponentbuilderModelField extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/fields.php b/admin/models/fields.php index dc32a6bbc..ab14fd447 100644 --- a/admin/models/fields.php +++ b/admin/models/fields.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Fields Model + * Fields List Model */ -class ComponentbuilderModelFields extends JModelList +class ComponentbuilderModelFields extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index d2a96116e..868ed1084 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Fieldtype Model + * Componentbuilder Fieldtype Admin Model */ -class ComponentbuilderModelFieldtype extends JModelAdmin +class ComponentbuilderModelFieldtype extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/fieldtypes.php b/admin/models/fieldtypes.php index e6129fb03..83de4411a 100644 --- a/admin/models/fieldtypes.php +++ b/admin/models/fieldtypes.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Fieldtypes Model + * Fieldtypes List Model */ -class ComponentbuilderModelFieldtypes extends JModelList +class ComponentbuilderModelFieldtypes extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/get_snippets.php b/admin/models/get_snippets.php index 6a13f1b94..56b95a38f 100644 --- a/admin/models/get_snippets.php +++ b/admin/models/get_snippets.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Model for Get_snippets + * Componentbuilder List Model for Get_snippets */ -class ComponentbuilderModelGet_snippets extends JModelList +class ComponentbuilderModelGet_snippets extends ListModel { /** * Model user data. diff --git a/admin/models/help_document.php b/admin/models/help_document.php index 1c791135f..58394c4f3 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Help_document Model + * Componentbuilder Help_document Admin Model */ -class ComponentbuilderModelHelp_document extends JModelAdmin +class ComponentbuilderModelHelp_document extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index 0300518c1..847962d65 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Help_documents Model + * Help_documents List Model */ -class ComponentbuilderModelHelp_documents extends JModelList +class ComponentbuilderModelHelp_documents extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/import.php b/admin/models/import.php index 2197c3219..c8da02a25 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -13,15 +13,16 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\BaseDatabaseModel; use Joomla\CMS\Filesystem\File; use Joomla\CMS\Filesystem\Folder; use Joomla\Utilities\ArrayHelper; use PhpOffice\PhpSpreadsheet\IOFactory; /** - * Componentbuilder Import Model + * Componentbuilder Import Base Database Model */ -class ComponentbuilderModelImport extends JModelLegacy +class ComponentbuilderModelImport extends BaseDatabaseModel { // set uploading values protected $use_streams = false; diff --git a/admin/models/import_joomla_components.php b/admin/models/import_joomla_components.php index b50f6da07..fc1f58c98 100644 --- a/admin/models/import_joomla_components.php +++ b/admin/models/import_joomla_components.php @@ -13,15 +13,16 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\BaseDatabaseModel; use Joomla\CMS\Filesystem\File; use Joomla\CMS\Filesystem\Folder; use Joomla\Utilities\ArrayHelper; use PhpOffice\PhpSpreadsheet\IOFactory; /** - * Componentbuilder Import_joomla_components Model + * Componentbuilder Import_joomla_components Base Database Model */ -class ComponentbuilderModelImport_joomla_components extends JModelLegacy +class ComponentbuilderModelImport_joomla_components extends BaseDatabaseModel { // set uploading values protected $use_streams = false; diff --git a/admin/models/import_language_translations.php b/admin/models/import_language_translations.php index ca87fb153..c27a814a3 100644 --- a/admin/models/import_language_translations.php +++ b/admin/models/import_language_translations.php @@ -13,15 +13,16 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\BaseDatabaseModel; use Joomla\CMS\Filesystem\File; use Joomla\CMS\Filesystem\Folder; use Joomla\Utilities\ArrayHelper; use PhpOffice\PhpSpreadsheet\IOFactory; /** - * Componentbuilder Import_language_translations Model + * Componentbuilder Import_language_translations Base Database Model */ -class ComponentbuilderModelImport_language_translations extends JModelLegacy +class ComponentbuilderModelImport_language_translations extends BaseDatabaseModel { // set uploading values protected $use_streams = false; diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php index 19501b536..90ec675c1 100644 --- a/admin/models/joomla_component.php +++ b/admin/models/joomla_component.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Joomla_component Model + * Componentbuilder Joomla_component Admin Model */ -class ComponentbuilderModelJoomla_component extends JModelAdmin +class ComponentbuilderModelJoomla_component extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php index 8052ddb6b..d1fc27fad 100644 --- a/admin/models/joomla_components.php +++ b/admin/models/joomla_components.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Joomla_components Model + * Joomla_components List Model */ -class ComponentbuilderModelJoomla_components extends JModelList +class ComponentbuilderModelJoomla_components extends ListModel { public function __construct($config = array()) { @@ -662,7 +663,10 @@ class ComponentbuilderModelJoomla_components extends JModelList { foreach ($val as $v) { - $bucket[$v] = $v; + if (ComponentbuilderHelper::checkArray($v) && isset($v['power'])) + { + $bucket[$v['power']] = $v['power']; + } } } } diff --git a/admin/models/joomla_module.php b/admin/models/joomla_module.php index e41ba633d..c57a7ad83 100644 --- a/admin/models/joomla_module.php +++ b/admin/models/joomla_module.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Joomla_module Model + * Componentbuilder Joomla_module Admin Model */ -class ComponentbuilderModelJoomla_module extends JModelAdmin +class ComponentbuilderModelJoomla_module extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/joomla_module_files_folders_urls.php b/admin/models/joomla_module_files_folders_urls.php index 58bb8d904..c3581d096 100644 --- a/admin/models/joomla_module_files_folders_urls.php +++ b/admin/models/joomla_module_files_folders_urls.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Joomla_module_files_folders_urls Model + * Componentbuilder Joomla_module_files_folders_urls Admin Model */ -class ComponentbuilderModelJoomla_module_files_folders_urls extends JModelAdmin +class ComponentbuilderModelJoomla_module_files_folders_urls extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/joomla_module_updates.php b/admin/models/joomla_module_updates.php index ea04f6a62..bf6170036 100644 --- a/admin/models/joomla_module_updates.php +++ b/admin/models/joomla_module_updates.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Joomla_module_updates Model + * Componentbuilder Joomla_module_updates Admin Model */ -class ComponentbuilderModelJoomla_module_updates extends JModelAdmin +class ComponentbuilderModelJoomla_module_updates extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/joomla_modules.php b/admin/models/joomla_modules.php index 73a407fc9..e8e44fa43 100644 --- a/admin/models/joomla_modules.php +++ b/admin/models/joomla_modules.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Joomla_modules Model + * Joomla_modules List Model */ -class ComponentbuilderModelJoomla_modules extends JModelList +class ComponentbuilderModelJoomla_modules extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/joomla_modules_files_folders_urls.php b/admin/models/joomla_modules_files_folders_urls.php index 6f883c835..a70457cfc 100644 --- a/admin/models/joomla_modules_files_folders_urls.php +++ b/admin/models/joomla_modules_files_folders_urls.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Joomla_modules_files_folders_urls Model + * Joomla_modules_files_folders_urls List Model */ -class ComponentbuilderModelJoomla_modules_files_folders_urls extends JModelList +class ComponentbuilderModelJoomla_modules_files_folders_urls extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/joomla_modules_updates.php b/admin/models/joomla_modules_updates.php index ece517811..67688fd53 100644 --- a/admin/models/joomla_modules_updates.php +++ b/admin/models/joomla_modules_updates.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Joomla_modules_updates Model + * Joomla_modules_updates List Model */ -class ComponentbuilderModelJoomla_modules_updates extends JModelList +class ComponentbuilderModelJoomla_modules_updates extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/joomla_plugin.php b/admin/models/joomla_plugin.php index a0b2cb26d..c0bb829dd 100644 --- a/admin/models/joomla_plugin.php +++ b/admin/models/joomla_plugin.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Joomla_plugin Model + * Componentbuilder Joomla_plugin Admin Model */ -class ComponentbuilderModelJoomla_plugin extends JModelAdmin +class ComponentbuilderModelJoomla_plugin extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/joomla_plugin_files_folders_urls.php b/admin/models/joomla_plugin_files_folders_urls.php index 40179f688..9074dc174 100644 --- a/admin/models/joomla_plugin_files_folders_urls.php +++ b/admin/models/joomla_plugin_files_folders_urls.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Joomla_plugin_files_folders_urls Model + * Componentbuilder Joomla_plugin_files_folders_urls Admin Model */ -class ComponentbuilderModelJoomla_plugin_files_folders_urls extends JModelAdmin +class ComponentbuilderModelJoomla_plugin_files_folders_urls extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/joomla_plugin_group.php b/admin/models/joomla_plugin_group.php index b1956843e..69147f291 100644 --- a/admin/models/joomla_plugin_group.php +++ b/admin/models/joomla_plugin_group.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Joomla_plugin_group Model + * Componentbuilder Joomla_plugin_group Admin Model */ -class ComponentbuilderModelJoomla_plugin_group extends JModelAdmin +class ComponentbuilderModelJoomla_plugin_group extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/joomla_plugin_groups.php b/admin/models/joomla_plugin_groups.php index db1b680d2..4f5b3c5a1 100644 --- a/admin/models/joomla_plugin_groups.php +++ b/admin/models/joomla_plugin_groups.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Joomla_plugin_groups Model + * Joomla_plugin_groups List Model */ -class ComponentbuilderModelJoomla_plugin_groups extends JModelList +class ComponentbuilderModelJoomla_plugin_groups extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/joomla_plugin_updates.php b/admin/models/joomla_plugin_updates.php index 0aeeb8bbb..0697155a6 100644 --- a/admin/models/joomla_plugin_updates.php +++ b/admin/models/joomla_plugin_updates.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Joomla_plugin_updates Model + * Componentbuilder Joomla_plugin_updates Admin Model */ -class ComponentbuilderModelJoomla_plugin_updates extends JModelAdmin +class ComponentbuilderModelJoomla_plugin_updates extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/joomla_plugins.php b/admin/models/joomla_plugins.php index 7260d50cc..68a335c9f 100644 --- a/admin/models/joomla_plugins.php +++ b/admin/models/joomla_plugins.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Joomla_plugins Model + * Joomla_plugins List Model */ -class ComponentbuilderModelJoomla_plugins extends JModelList +class ComponentbuilderModelJoomla_plugins extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/joomla_plugins_files_folders_urls.php b/admin/models/joomla_plugins_files_folders_urls.php index 141d3e495..e39671df6 100644 --- a/admin/models/joomla_plugins_files_folders_urls.php +++ b/admin/models/joomla_plugins_files_folders_urls.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Joomla_plugins_files_folders_urls Model + * Joomla_plugins_files_folders_urls List Model */ -class ComponentbuilderModelJoomla_plugins_files_folders_urls extends JModelList +class ComponentbuilderModelJoomla_plugins_files_folders_urls extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/joomla_plugins_updates.php b/admin/models/joomla_plugins_updates.php index 404c898af..35c535505 100644 --- a/admin/models/joomla_plugins_updates.php +++ b/admin/models/joomla_plugins_updates.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Joomla_plugins_updates Model + * Joomla_plugins_updates List Model */ -class ComponentbuilderModelJoomla_plugins_updates extends JModelList +class ComponentbuilderModelJoomla_plugins_updates extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/language.php b/admin/models/language.php index d30893acc..09709419a 100644 --- a/admin/models/language.php +++ b/admin/models/language.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Language Model + * Componentbuilder Language Admin Model */ -class ComponentbuilderModelLanguage extends JModelAdmin +class ComponentbuilderModelLanguage extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/language_translation.php b/admin/models/language_translation.php index 639d5d377..05df3a332 100644 --- a/admin/models/language_translation.php +++ b/admin/models/language_translation.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Language_translation Model + * Componentbuilder Language_translation Admin Model */ -class ComponentbuilderModelLanguage_translation extends JModelAdmin +class ComponentbuilderModelLanguage_translation extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/language_translations.php b/admin/models/language_translations.php index 2cf9fa98e..affab026a 100644 --- a/admin/models/language_translations.php +++ b/admin/models/language_translations.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Language_translations Model + * Language_translations List Model */ -class ComponentbuilderModelLanguage_translations extends JModelList +class ComponentbuilderModelLanguage_translations extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/languages.php b/admin/models/languages.php index 2c2040c90..f8385bd59 100644 --- a/admin/models/languages.php +++ b/admin/models/languages.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Languages Model + * Languages List Model */ -class ComponentbuilderModelLanguages extends JModelList +class ComponentbuilderModelLanguages extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/layout.php b/admin/models/layout.php index 868e67483..17a3549fb 100644 --- a/admin/models/layout.php +++ b/admin/models/layout.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Layout Model + * Componentbuilder Layout Admin Model */ -class ComponentbuilderModelLayout extends JModelAdmin +class ComponentbuilderModelLayout extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/layouts.php b/admin/models/layouts.php index f40249259..059a9c981 100644 --- a/admin/models/layouts.php +++ b/admin/models/layouts.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Layouts Model + * Layouts List Model */ -class ComponentbuilderModelLayouts extends JModelList +class ComponentbuilderModelLayouts extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/libraries.php b/admin/models/libraries.php index c338037a9..6bd48b230 100644 --- a/admin/models/libraries.php +++ b/admin/models/libraries.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Libraries Model + * Libraries List Model */ -class ComponentbuilderModelLibraries extends JModelList +class ComponentbuilderModelLibraries extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/libraries_config.php b/admin/models/libraries_config.php index 39142cb2d..9ee5eb8df 100644 --- a/admin/models/libraries_config.php +++ b/admin/models/libraries_config.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Libraries_config Model + * Libraries_config List Model */ -class ComponentbuilderModelLibraries_config extends JModelList +class ComponentbuilderModelLibraries_config extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/libraries_files_folders_urls.php b/admin/models/libraries_files_folders_urls.php index 6564426d2..f4d2914a5 100644 --- a/admin/models/libraries_files_folders_urls.php +++ b/admin/models/libraries_files_folders_urls.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Libraries_files_folders_urls Model + * Libraries_files_folders_urls List Model */ -class ComponentbuilderModelLibraries_files_folders_urls extends JModelList +class ComponentbuilderModelLibraries_files_folders_urls extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/library.php b/admin/models/library.php index 215fca074..375a82e5d 100644 --- a/admin/models/library.php +++ b/admin/models/library.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Library Model + * Componentbuilder Library Admin Model */ -class ComponentbuilderModelLibrary extends JModelAdmin +class ComponentbuilderModelLibrary extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/library_config.php b/admin/models/library_config.php index 8fe76e56c..cb958fb73 100644 --- a/admin/models/library_config.php +++ b/admin/models/library_config.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Library_config Model + * Componentbuilder Library_config Admin Model */ -class ComponentbuilderModelLibrary_config extends JModelAdmin +class ComponentbuilderModelLibrary_config extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/library_files_folders_urls.php b/admin/models/library_files_folders_urls.php index 612f7c0e2..a8e386701 100644 --- a/admin/models/library_files_folders_urls.php +++ b/admin/models/library_files_folders_urls.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Library_files_folders_urls Model + * Componentbuilder Library_files_folders_urls Admin Model */ -class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin +class ComponentbuilderModelLibrary_files_folders_urls extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/placeholder.php b/admin/models/placeholder.php index 87db82f83..ef7765b1a 100644 --- a/admin/models/placeholder.php +++ b/admin/models/placeholder.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Placeholder Model + * Componentbuilder Placeholder Admin Model */ -class ComponentbuilderModelPlaceholder extends JModelAdmin +class ComponentbuilderModelPlaceholder extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/placeholders.php b/admin/models/placeholders.php index 63c5119e2..5048a885f 100644 --- a/admin/models/placeholders.php +++ b/admin/models/placeholders.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Placeholders Model + * Placeholders List Model */ -class ComponentbuilderModelPlaceholders extends JModelList +class ComponentbuilderModelPlaceholders extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/server.php b/admin/models/server.php index 8e8c99055..93dbe9aae 100644 --- a/admin/models/server.php +++ b/admin/models/server.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Server Model + * Componentbuilder Server Admin Model */ -class ComponentbuilderModelServer extends JModelAdmin +class ComponentbuilderModelServer extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/servers.php b/admin/models/servers.php index e6cad44db..c35f26f48 100644 --- a/admin/models/servers.php +++ b/admin/models/servers.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Servers Model + * Servers List Model */ -class ComponentbuilderModelServers extends JModelList +class ComponentbuilderModelServers extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/site_view.php b/admin/models/site_view.php index 3d1bcc792..9c961e96c 100644 --- a/admin/models/site_view.php +++ b/admin/models/site_view.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Site_view Model + * Componentbuilder Site_view Admin Model */ -class ComponentbuilderModelSite_view extends JModelAdmin +class ComponentbuilderModelSite_view extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/site_views.php b/admin/models/site_views.php index ce75c8edd..645a52cdc 100644 --- a/admin/models/site_views.php +++ b/admin/models/site_views.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Site_views Model + * Site_views List Model */ -class ComponentbuilderModelSite_views extends JModelList +class ComponentbuilderModelSite_views extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/snippet.php b/admin/models/snippet.php index 235adbc5b..f3250af31 100644 --- a/admin/models/snippet.php +++ b/admin/models/snippet.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Snippet Model + * Componentbuilder Snippet Admin Model */ -class ComponentbuilderModelSnippet extends JModelAdmin +class ComponentbuilderModelSnippet extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/snippet_type.php b/admin/models/snippet_type.php index 1e4c3379e..3e86294b1 100644 --- a/admin/models/snippet_type.php +++ b/admin/models/snippet_type.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Snippet_type Model + * Componentbuilder Snippet_type Admin Model */ -class ComponentbuilderModelSnippet_type extends JModelAdmin +class ComponentbuilderModelSnippet_type extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/snippet_types.php b/admin/models/snippet_types.php index 08b26f9c7..6d6b477fc 100644 --- a/admin/models/snippet_types.php +++ b/admin/models/snippet_types.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Snippet_types Model + * Snippet_types List Model */ -class ComponentbuilderModelSnippet_types extends JModelList +class ComponentbuilderModelSnippet_types extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/snippets.php b/admin/models/snippets.php index 9a8f86e45..c3857fca1 100644 --- a/admin/models/snippets.php +++ b/admin/models/snippets.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Snippets Model + * Snippets List Model */ -class ComponentbuilderModelSnippets extends JModelList +class ComponentbuilderModelSnippets extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/template.php b/admin/models/template.php index eeca5de69..e6871c3ff 100644 --- a/admin/models/template.php +++ b/admin/models/template.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Template Model + * Componentbuilder Template Admin Model */ -class ComponentbuilderModelTemplate extends JModelAdmin +class ComponentbuilderModelTemplate extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/templates.php b/admin/models/templates.php index 684ab27ab..7b33fb25c 100644 --- a/admin/models/templates.php +++ b/admin/models/templates.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Templates Model + * Templates List Model */ -class ComponentbuilderModelTemplates extends JModelList +class ComponentbuilderModelTemplates extends ListModel { public function __construct($config = array()) { diff --git a/admin/models/validation_rule.php b/admin/models/validation_rule.php index e37ec4a46..b6f10fd09 100644 --- a/admin/models/validation_rule.php +++ b/admin/models/validation_rule.php @@ -13,14 +13,15 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\AdminModel; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Validation_rule Model + * Componentbuilder Validation_rule Admin Model */ -class ComponentbuilderModelValidation_rule extends JModelAdmin +class ComponentbuilderModelValidation_rule extends AdminModel { /** * The tab layout fields array. diff --git a/admin/models/validation_rules.php b/admin/models/validation_rules.php index ead2271b9..61f74ce91 100644 --- a/admin/models/validation_rules.php +++ b/admin/models/validation_rules.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ListModel; use Joomla\Utilities\ArrayHelper; /** - * Validation_rules Model + * Validation_rules List Model */ -class ComponentbuilderModelValidation_rules extends JModelList +class ComponentbuilderModelValidation_rules extends ListModel { public function __construct($config = array()) { diff --git a/admin/tables/admin_custom_tabs.php b/admin/tables/admin_custom_tabs.php index 32c1f5c90..2cfac9012 100644 --- a/admin/tables/admin_custom_tabs.php +++ b/admin/tables/admin_custom_tabs.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Admins_custom_tabs Table class */ -class ComponentbuilderTableAdmin_custom_tabs extends JTable +class ComponentbuilderTableAdmin_custom_tabs extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/admin_fields.php b/admin/tables/admin_fields.php index db5403a2f..9ba6a98c4 100644 --- a/admin/tables/admin_fields.php +++ b/admin/tables/admin_fields.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Admins_fields Table class */ -class ComponentbuilderTableAdmin_fields extends JTable +class ComponentbuilderTableAdmin_fields extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/admin_fields_conditions.php b/admin/tables/admin_fields_conditions.php index 83c19c847..4e89f0928 100644 --- a/admin/tables/admin_fields_conditions.php +++ b/admin/tables/admin_fields_conditions.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Admins_fields_conditions Table class */ -class ComponentbuilderTableAdmin_fields_conditions extends JTable +class ComponentbuilderTableAdmin_fields_conditions extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/admin_fields_relations.php b/admin/tables/admin_fields_relations.php index ff7f3195d..4a3766b21 100644 --- a/admin/tables/admin_fields_relations.php +++ b/admin/tables/admin_fields_relations.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Admins_fields_relations Table class */ -class ComponentbuilderTableAdmin_fields_relations extends JTable +class ComponentbuilderTableAdmin_fields_relations extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php index a217886d8..6f3d5fb10 100644 --- a/admin/tables/admin_view.php +++ b/admin/tables/admin_view.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Admin_views Table class */ -class ComponentbuilderTableAdmin_view extends JTable +class ComponentbuilderTableAdmin_view extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/class_extends.php b/admin/tables/class_extends.php index 3388a70a9..319ab3974 100644 --- a/admin/tables/class_extends.php +++ b/admin/tables/class_extends.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Class_extendings Table class */ -class ComponentbuilderTableClass_extends extends JTable +class ComponentbuilderTableClass_extends extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/class_method.php b/admin/tables/class_method.php index f81fec1ba..ad8b51746 100644 --- a/admin/tables/class_method.php +++ b/admin/tables/class_method.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Class_methods Table class */ -class ComponentbuilderTableClass_method extends JTable +class ComponentbuilderTableClass_method extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/class_property.php b/admin/tables/class_property.php index 814f26500..4470ee3ad 100644 --- a/admin/tables/class_property.php +++ b/admin/tables/class_property.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Class_properties Table class */ -class ComponentbuilderTableClass_property extends JTable +class ComponentbuilderTableClass_property extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/component_admin_views.php b/admin/tables/component_admin_views.php index 5ea1bafd9..930642488 100644 --- a/admin/tables/component_admin_views.php +++ b/admin/tables/component_admin_views.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Components_admin_views Table class */ -class ComponentbuilderTableComponent_admin_views extends JTable +class ComponentbuilderTableComponent_admin_views extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/component_config.php b/admin/tables/component_config.php index 4e6ef71f9..b0b5dcc96 100644 --- a/admin/tables/component_config.php +++ b/admin/tables/component_config.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Components_config Table class */ -class ComponentbuilderTableComponent_config extends JTable +class ComponentbuilderTableComponent_config extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/component_custom_admin_menus.php b/admin/tables/component_custom_admin_menus.php index decd59301..890b5fdab 100644 --- a/admin/tables/component_custom_admin_menus.php +++ b/admin/tables/component_custom_admin_menus.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Components_custom_admin_menus Table class */ -class ComponentbuilderTableComponent_custom_admin_menus extends JTable +class ComponentbuilderTableComponent_custom_admin_menus extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/component_custom_admin_views.php b/admin/tables/component_custom_admin_views.php index e9cff11e3..9dec5a5eb 100644 --- a/admin/tables/component_custom_admin_views.php +++ b/admin/tables/component_custom_admin_views.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Components_custom_admin_views Table class */ -class ComponentbuilderTableComponent_custom_admin_views extends JTable +class ComponentbuilderTableComponent_custom_admin_views extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/component_dashboard.php b/admin/tables/component_dashboard.php index f73203fe9..25c3f3426 100644 --- a/admin/tables/component_dashboard.php +++ b/admin/tables/component_dashboard.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Components_dashboard Table class */ -class ComponentbuilderTableComponent_dashboard extends JTable +class ComponentbuilderTableComponent_dashboard extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/component_files_folders.php b/admin/tables/component_files_folders.php index 81a74969b..6083f0112 100644 --- a/admin/tables/component_files_folders.php +++ b/admin/tables/component_files_folders.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Components_files_folders Table class */ -class ComponentbuilderTableComponent_files_folders extends JTable +class ComponentbuilderTableComponent_files_folders extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/component_modules.php b/admin/tables/component_modules.php index c06c98c28..9a4e8a990 100644 --- a/admin/tables/component_modules.php +++ b/admin/tables/component_modules.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Components_modules Table class */ -class ComponentbuilderTableComponent_modules extends JTable +class ComponentbuilderTableComponent_modules extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/component_mysql_tweaks.php b/admin/tables/component_mysql_tweaks.php index 1590ca49b..d007f91f1 100644 --- a/admin/tables/component_mysql_tweaks.php +++ b/admin/tables/component_mysql_tweaks.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Components_mysql_tweaks Table class */ -class ComponentbuilderTableComponent_mysql_tweaks extends JTable +class ComponentbuilderTableComponent_mysql_tweaks extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/component_placeholders.php b/admin/tables/component_placeholders.php index c6b8980b0..7093dbe7e 100644 --- a/admin/tables/component_placeholders.php +++ b/admin/tables/component_placeholders.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Components_placeholders Table class */ -class ComponentbuilderTableComponent_placeholders extends JTable +class ComponentbuilderTableComponent_placeholders extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/component_plugins.php b/admin/tables/component_plugins.php index 4fe378b93..389ca710f 100644 --- a/admin/tables/component_plugins.php +++ b/admin/tables/component_plugins.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Components_plugins Table class */ -class ComponentbuilderTableComponent_plugins extends JTable +class ComponentbuilderTableComponent_plugins extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/component_site_views.php b/admin/tables/component_site_views.php index b1f19166e..c6d665d54 100644 --- a/admin/tables/component_site_views.php +++ b/admin/tables/component_site_views.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Components_site_views Table class */ -class ComponentbuilderTableComponent_site_views extends JTable +class ComponentbuilderTableComponent_site_views extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/component_updates.php b/admin/tables/component_updates.php index e4325a566..8ad6dac9f 100644 --- a/admin/tables/component_updates.php +++ b/admin/tables/component_updates.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Components_updates Table class */ -class ComponentbuilderTableComponent_updates extends JTable +class ComponentbuilderTableComponent_updates extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/custom_admin_view.php b/admin/tables/custom_admin_view.php index 762a194cd..5ac4a1ded 100644 --- a/admin/tables/custom_admin_view.php +++ b/admin/tables/custom_admin_view.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Custom_admin_views Table class */ -class ComponentbuilderTableCustom_admin_view extends JTable +class ComponentbuilderTableCustom_admin_view extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/custom_code.php b/admin/tables/custom_code.php index bb5cda76c..275b06781 100644 --- a/admin/tables/custom_code.php +++ b/admin/tables/custom_code.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Custom_codes Table class */ -class ComponentbuilderTableCustom_code extends JTable +class ComponentbuilderTableCustom_code extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/dynamic_get.php b/admin/tables/dynamic_get.php index 810575047..543cfba49 100644 --- a/admin/tables/dynamic_get.php +++ b/admin/tables/dynamic_get.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Dynamic_gets Table class */ -class ComponentbuilderTableDynamic_get extends JTable +class ComponentbuilderTableDynamic_get extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/field.php b/admin/tables/field.php index 362006f85..ba93f537b 100644 --- a/admin/tables/field.php +++ b/admin/tables/field.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Fields Table class */ -class ComponentbuilderTableField extends JTable +class ComponentbuilderTableField extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/fieldtype.php b/admin/tables/fieldtype.php index 397586344..266d91a4e 100644 --- a/admin/tables/fieldtype.php +++ b/admin/tables/fieldtype.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Fieldtypes Table class */ -class ComponentbuilderTableFieldtype extends JTable +class ComponentbuilderTableFieldtype extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index d3d1d7dea..c51c3cfec 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Help_documents Table class */ -class ComponentbuilderTableHelp_document extends JTable +class ComponentbuilderTableHelp_document extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/joomla_component.php b/admin/tables/joomla_component.php index 1a53684ea..ed1c9544f 100644 --- a/admin/tables/joomla_component.php +++ b/admin/tables/joomla_component.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Joomla_components Table class */ -class ComponentbuilderTableJoomla_component extends JTable +class ComponentbuilderTableJoomla_component extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/joomla_module.php b/admin/tables/joomla_module.php index 1a2afeff0..bcd5794d4 100644 --- a/admin/tables/joomla_module.php +++ b/admin/tables/joomla_module.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Joomla_modules Table class */ -class ComponentbuilderTableJoomla_module extends JTable +class ComponentbuilderTableJoomla_module extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/joomla_module_files_folders_urls.php b/admin/tables/joomla_module_files_folders_urls.php index 17eb3465e..aa16b3f71 100644 --- a/admin/tables/joomla_module_files_folders_urls.php +++ b/admin/tables/joomla_module_files_folders_urls.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Joomla_modules_files_folders_urls Table class */ -class ComponentbuilderTableJoomla_module_files_folders_urls extends JTable +class ComponentbuilderTableJoomla_module_files_folders_urls extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/joomla_module_updates.php b/admin/tables/joomla_module_updates.php index f82d4dc8a..5c7dc274c 100644 --- a/admin/tables/joomla_module_updates.php +++ b/admin/tables/joomla_module_updates.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Joomla_modules_updates Table class */ -class ComponentbuilderTableJoomla_module_updates extends JTable +class ComponentbuilderTableJoomla_module_updates extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/joomla_plugin.php b/admin/tables/joomla_plugin.php index 8a3dfbd37..6f580c39d 100644 --- a/admin/tables/joomla_plugin.php +++ b/admin/tables/joomla_plugin.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Joomla_plugins Table class */ -class ComponentbuilderTableJoomla_plugin extends JTable +class ComponentbuilderTableJoomla_plugin extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/joomla_plugin_files_folders_urls.php b/admin/tables/joomla_plugin_files_folders_urls.php index 1c79f1456..054ffaeee 100644 --- a/admin/tables/joomla_plugin_files_folders_urls.php +++ b/admin/tables/joomla_plugin_files_folders_urls.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Joomla_plugins_files_folders_urls Table class */ -class ComponentbuilderTableJoomla_plugin_files_folders_urls extends JTable +class ComponentbuilderTableJoomla_plugin_files_folders_urls extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/joomla_plugin_group.php b/admin/tables/joomla_plugin_group.php index 07567514d..30e3f6c3a 100644 --- a/admin/tables/joomla_plugin_group.php +++ b/admin/tables/joomla_plugin_group.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Joomla_plugin_groups Table class */ -class ComponentbuilderTableJoomla_plugin_group extends JTable +class ComponentbuilderTableJoomla_plugin_group extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/joomla_plugin_updates.php b/admin/tables/joomla_plugin_updates.php index cfc0e550e..03c33a1b4 100644 --- a/admin/tables/joomla_plugin_updates.php +++ b/admin/tables/joomla_plugin_updates.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Joomla_plugins_updates Table class */ -class ComponentbuilderTableJoomla_plugin_updates extends JTable +class ComponentbuilderTableJoomla_plugin_updates extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/language.php b/admin/tables/language.php index a16bdcc86..5e2e91124 100644 --- a/admin/tables/language.php +++ b/admin/tables/language.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Languages Table class */ -class ComponentbuilderTableLanguage extends JTable +class ComponentbuilderTableLanguage extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/language_translation.php b/admin/tables/language_translation.php index 21e13f209..79f799c11 100644 --- a/admin/tables/language_translation.php +++ b/admin/tables/language_translation.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Language_translations Table class */ -class ComponentbuilderTableLanguage_translation extends JTable +class ComponentbuilderTableLanguage_translation extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/layout.php b/admin/tables/layout.php index 5d5e31084..a26925c1c 100644 --- a/admin/tables/layout.php +++ b/admin/tables/layout.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Layouts Table class */ -class ComponentbuilderTableLayout extends JTable +class ComponentbuilderTableLayout extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/library.php b/admin/tables/library.php index 79db549bb..32eb6ab16 100644 --- a/admin/tables/library.php +++ b/admin/tables/library.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Libraries Table class */ -class ComponentbuilderTableLibrary extends JTable +class ComponentbuilderTableLibrary extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/library_config.php b/admin/tables/library_config.php index db4bf5033..d352e6628 100644 --- a/admin/tables/library_config.php +++ b/admin/tables/library_config.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Libraries_config Table class */ -class ComponentbuilderTableLibrary_config extends JTable +class ComponentbuilderTableLibrary_config extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/library_files_folders_urls.php b/admin/tables/library_files_folders_urls.php index 5c813da67..6237c4ba4 100644 --- a/admin/tables/library_files_folders_urls.php +++ b/admin/tables/library_files_folders_urls.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Libraries_files_folders_urls Table class */ -class ComponentbuilderTableLibrary_files_folders_urls extends JTable +class ComponentbuilderTableLibrary_files_folders_urls extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/placeholder.php b/admin/tables/placeholder.php index 7a801ae1e..a0400aaa6 100644 --- a/admin/tables/placeholder.php +++ b/admin/tables/placeholder.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Placeholders Table class */ -class ComponentbuilderTablePlaceholder extends JTable +class ComponentbuilderTablePlaceholder extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/server.php b/admin/tables/server.php index 9dab61035..39e50e291 100644 --- a/admin/tables/server.php +++ b/admin/tables/server.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Servers Table class */ -class ComponentbuilderTableServer extends JTable +class ComponentbuilderTableServer extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/site_view.php b/admin/tables/site_view.php index 98f14477d..936d480c8 100644 --- a/admin/tables/site_view.php +++ b/admin/tables/site_view.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Site_views Table class */ -class ComponentbuilderTableSite_view extends JTable +class ComponentbuilderTableSite_view extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/snippet.php b/admin/tables/snippet.php index 466ba5234..e5f28c556 100644 --- a/admin/tables/snippet.php +++ b/admin/tables/snippet.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Snippets Table class */ -class ComponentbuilderTableSnippet extends JTable +class ComponentbuilderTableSnippet extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/snippet_type.php b/admin/tables/snippet_type.php index 4972c0619..93a73499e 100644 --- a/admin/tables/snippet_type.php +++ b/admin/tables/snippet_type.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Snippet_types Table class */ -class ComponentbuilderTableSnippet_type extends JTable +class ComponentbuilderTableSnippet_type extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/template.php b/admin/tables/template.php index 695640735..0ca459949 100644 --- a/admin/tables/template.php +++ b/admin/tables/template.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Templates Table class */ -class ComponentbuilderTableTemplate extends JTable +class ComponentbuilderTableTemplate extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/tables/validation_rule.php b/admin/tables/validation_rule.php index bb360384d..07f92b841 100644 --- a/admin/tables/validation_rule.php +++ b/admin/tables/validation_rule.php @@ -13,6 +13,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\Table\Table; use Joomla\Registry\Registry; use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; @@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper; /** * Validation_rules Table class */ -class ComponentbuilderTableValidation_rule extends JTable +class ComponentbuilderTableValidation_rule extends Table { /** * Ensure the params and metadata in json encoded in the bind method diff --git a/admin/views/admin_custom_tabs/view.html.php b/admin/views/admin_custom_tabs/view.html.php index 7a8cbc4db..2958e6316 100644 --- a/admin/views/admin_custom_tabs/view.html.php +++ b/admin/views/admin_custom_tabs/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Admin_custom_tabs View class + * Admin_custom_tabs Html View class */ -class ComponentbuilderViewAdmin_custom_tabs extends JViewLegacy +class ComponentbuilderViewAdmin_custom_tabs extends HtmlView { /** * display method of View diff --git a/admin/views/admin_fields/view.html.php b/admin/views/admin_fields/view.html.php index aa2f62426..a75797dff 100644 --- a/admin/views/admin_fields/view.html.php +++ b/admin/views/admin_fields/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Admin_fields View class + * Admin_fields Html View class */ -class ComponentbuilderViewAdmin_fields extends JViewLegacy +class ComponentbuilderViewAdmin_fields extends HtmlView { /** * display method of View diff --git a/admin/views/admin_fields_conditions/view.html.php b/admin/views/admin_fields_conditions/view.html.php index d23c4f0aa..69bf15077 100644 --- a/admin/views/admin_fields_conditions/view.html.php +++ b/admin/views/admin_fields_conditions/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Admin_fields_conditions View class + * Admin_fields_conditions Html View class */ -class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy +class ComponentbuilderViewAdmin_fields_conditions extends HtmlView { /** * display method of View diff --git a/admin/views/admin_fields_relations/view.html.php b/admin/views/admin_fields_relations/view.html.php index a5663f78f..39e91f4b3 100644 --- a/admin/views/admin_fields_relations/view.html.php +++ b/admin/views/admin_fields_relations/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Admin_fields_relations View class + * Admin_fields_relations Html View class */ -class ComponentbuilderViewAdmin_fields_relations extends JViewLegacy +class ComponentbuilderViewAdmin_fields_relations extends HtmlView { /** * display method of View diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index d673c6735..72dd38a06 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Admin_view View class + * Admin_view Html View class */ -class ComponentbuilderViewAdmin_view extends JViewLegacy +class ComponentbuilderViewAdmin_view extends HtmlView { /** * display method of View diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index 9fff10040..4f28a0116 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Admin_views + * Componentbuilder Html View class for the Admin_views */ -class ComponentbuilderViewAdmin_views extends JViewLegacy +class ComponentbuilderViewAdmin_views extends HtmlView { /** * Admin_views view display method diff --git a/admin/views/admins_custom_tabs/view.html.php b/admin/views/admins_custom_tabs/view.html.php index 72148c519..9b6f7db70 100644 --- a/admin/views/admins_custom_tabs/view.html.php +++ b/admin/views/admins_custom_tabs/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Admins_custom_tabs + * Componentbuilder Html View class for the Admins_custom_tabs */ -class ComponentbuilderViewAdmins_custom_tabs extends JViewLegacy +class ComponentbuilderViewAdmins_custom_tabs extends HtmlView { /** * Admins_custom_tabs view display method diff --git a/admin/views/admins_fields/view.html.php b/admin/views/admins_fields/view.html.php index c2b73967c..884fc5cfe 100644 --- a/admin/views/admins_fields/view.html.php +++ b/admin/views/admins_fields/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Admins_fields + * Componentbuilder Html View class for the Admins_fields */ -class ComponentbuilderViewAdmins_fields extends JViewLegacy +class ComponentbuilderViewAdmins_fields extends HtmlView { /** * Admins_fields view display method diff --git a/admin/views/admins_fields_conditions/view.html.php b/admin/views/admins_fields_conditions/view.html.php index fe4de943a..68bb5910f 100644 --- a/admin/views/admins_fields_conditions/view.html.php +++ b/admin/views/admins_fields_conditions/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Admins_fields_conditions + * Componentbuilder Html View class for the Admins_fields_conditions */ -class ComponentbuilderViewAdmins_fields_conditions extends JViewLegacy +class ComponentbuilderViewAdmins_fields_conditions extends HtmlView { /** * Admins_fields_conditions view display method diff --git a/admin/views/admins_fields_relations/view.html.php b/admin/views/admins_fields_relations/view.html.php index 8a175ff8b..815fa288f 100644 --- a/admin/views/admins_fields_relations/view.html.php +++ b/admin/views/admins_fields_relations/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Admins_fields_relations + * Componentbuilder Html View class for the Admins_fields_relations */ -class ComponentbuilderViewAdmins_fields_relations extends JViewLegacy +class ComponentbuilderViewAdmins_fields_relations extends HtmlView { /** * Admins_fields_relations view display method diff --git a/admin/views/class_extendings/view.html.php b/admin/views/class_extendings/view.html.php index 427b9fd60..b0ac53741 100644 --- a/admin/views/class_extendings/view.html.php +++ b/admin/views/class_extendings/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Class_extendings + * Componentbuilder Html View class for the Class_extendings */ -class ComponentbuilderViewClass_extendings extends JViewLegacy +class ComponentbuilderViewClass_extendings extends HtmlView { /** * Class_extendings view display method diff --git a/admin/views/class_extends/view.html.php b/admin/views/class_extends/view.html.php index aa432667b..ad47a7b12 100644 --- a/admin/views/class_extends/view.html.php +++ b/admin/views/class_extends/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Class_extends View class + * Class_extends Html View class */ -class ComponentbuilderViewClass_extends extends JViewLegacy +class ComponentbuilderViewClass_extends extends HtmlView { /** * display method of View diff --git a/admin/views/class_method/view.html.php b/admin/views/class_method/view.html.php index 20873dbbc..5810d2f0c 100644 --- a/admin/views/class_method/view.html.php +++ b/admin/views/class_method/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Class_method View class + * Class_method Html View class */ -class ComponentbuilderViewClass_method extends JViewLegacy +class ComponentbuilderViewClass_method extends HtmlView { /** * display method of View diff --git a/admin/views/class_methods/view.html.php b/admin/views/class_methods/view.html.php index dc003c06c..d762f54e6 100644 --- a/admin/views/class_methods/view.html.php +++ b/admin/views/class_methods/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Class_methods + * Componentbuilder Html View class for the Class_methods */ -class ComponentbuilderViewClass_methods extends JViewLegacy +class ComponentbuilderViewClass_methods extends HtmlView { /** * Class_methods view display method diff --git a/admin/views/class_properties/view.html.php b/admin/views/class_properties/view.html.php index 1a24ea13d..70d01829a 100644 --- a/admin/views/class_properties/view.html.php +++ b/admin/views/class_properties/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Class_properties + * Componentbuilder Html View class for the Class_properties */ -class ComponentbuilderViewClass_properties extends JViewLegacy +class ComponentbuilderViewClass_properties extends HtmlView { /** * Class_properties view display method diff --git a/admin/views/class_property/view.html.php b/admin/views/class_property/view.html.php index 9248f770a..109f77549 100644 --- a/admin/views/class_property/view.html.php +++ b/admin/views/class_property/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Class_property View class + * Class_property Html View class */ -class ComponentbuilderViewClass_property extends JViewLegacy +class ComponentbuilderViewClass_property extends HtmlView { /** * display method of View diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php index 9da3b235a..fb04fe0c2 100644 --- a/admin/views/compiler/view.html.php +++ b/admin/views/compiler/view.html.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; use Joomla\CMS\Filesystem\File; /** - * Componentbuilder View class for the Compiler + * Componentbuilder Html View class for the Compiler */ -class ComponentbuilderViewCompiler extends JViewLegacy +class ComponentbuilderViewCompiler extends HtmlView { // Overwriting JView display method function display($tpl = null) @@ -235,12 +236,12 @@ class ComponentbuilderViewCompiler extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - JHtml::_('stylesheet', 'com_componentbuilder/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); + JHtml::_('stylesheet', 'media/com_componentbuilder/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - JHtml::_('script', 'com_componentbuilder/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_componentbuilder/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); } // Load the script to find all uikit components needed. @@ -280,13 +281,13 @@ class ComponentbuilderViewCompiler extends JViewLegacy if (File::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css')) { // load the css. - JHtml::_('stylesheet', 'com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']); + JHtml::_('stylesheet', 'media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']); } // check if the JavaScript file exists. if (File::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js')) { // load the js. - JHtml::_('script', 'com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']); + JHtml::_('script', 'media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']); } } } diff --git a/admin/views/component_admin_views/view.html.php b/admin/views/component_admin_views/view.html.php index b1bc6a80c..c3b0dc195 100644 --- a/admin/views/component_admin_views/view.html.php +++ b/admin/views/component_admin_views/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Component_admin_views View class + * Component_admin_views Html View class */ -class ComponentbuilderViewComponent_admin_views extends JViewLegacy +class ComponentbuilderViewComponent_admin_views extends HtmlView { /** * display method of View diff --git a/admin/views/component_config/view.html.php b/admin/views/component_config/view.html.php index 956a7eaa1..0bab21874 100644 --- a/admin/views/component_config/view.html.php +++ b/admin/views/component_config/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Component_config View class + * Component_config Html View class */ -class ComponentbuilderViewComponent_config extends JViewLegacy +class ComponentbuilderViewComponent_config extends HtmlView { /** * display method of View diff --git a/admin/views/component_custom_admin_menus/view.html.php b/admin/views/component_custom_admin_menus/view.html.php index 45ecc11cb..604bbf67a 100644 --- a/admin/views/component_custom_admin_menus/view.html.php +++ b/admin/views/component_custom_admin_menus/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Component_custom_admin_menus View class + * Component_custom_admin_menus Html View class */ -class ComponentbuilderViewComponent_custom_admin_menus extends JViewLegacy +class ComponentbuilderViewComponent_custom_admin_menus extends HtmlView { /** * display method of View diff --git a/admin/views/component_custom_admin_views/view.html.php b/admin/views/component_custom_admin_views/view.html.php index a22b00644..cd7130faf 100644 --- a/admin/views/component_custom_admin_views/view.html.php +++ b/admin/views/component_custom_admin_views/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Component_custom_admin_views View class + * Component_custom_admin_views Html View class */ -class ComponentbuilderViewComponent_custom_admin_views extends JViewLegacy +class ComponentbuilderViewComponent_custom_admin_views extends HtmlView { /** * display method of View diff --git a/admin/views/component_dashboard/view.html.php b/admin/views/component_dashboard/view.html.php index c6b9a5618..7e2914c1f 100644 --- a/admin/views/component_dashboard/view.html.php +++ b/admin/views/component_dashboard/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Component_dashboard View class + * Component_dashboard Html View class */ -class ComponentbuilderViewComponent_dashboard extends JViewLegacy +class ComponentbuilderViewComponent_dashboard extends HtmlView { /** * display method of View diff --git a/admin/views/component_files_folders/view.html.php b/admin/views/component_files_folders/view.html.php index ffe48dad0..ccecbc553 100644 --- a/admin/views/component_files_folders/view.html.php +++ b/admin/views/component_files_folders/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Component_files_folders View class + * Component_files_folders Html View class */ -class ComponentbuilderViewComponent_files_folders extends JViewLegacy +class ComponentbuilderViewComponent_files_folders extends HtmlView { /** * display method of View diff --git a/admin/views/component_modules/view.html.php b/admin/views/component_modules/view.html.php index 414bee80f..f0bf1cb9e 100644 --- a/admin/views/component_modules/view.html.php +++ b/admin/views/component_modules/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Component_modules View class + * Component_modules Html View class */ -class ComponentbuilderViewComponent_modules extends JViewLegacy +class ComponentbuilderViewComponent_modules extends HtmlView { /** * display method of View diff --git a/admin/views/component_mysql_tweaks/view.html.php b/admin/views/component_mysql_tweaks/view.html.php index 3a7f557bb..7d364402e 100644 --- a/admin/views/component_mysql_tweaks/view.html.php +++ b/admin/views/component_mysql_tweaks/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Component_mysql_tweaks View class + * Component_mysql_tweaks Html View class */ -class ComponentbuilderViewComponent_mysql_tweaks extends JViewLegacy +class ComponentbuilderViewComponent_mysql_tweaks extends HtmlView { /** * display method of View diff --git a/admin/views/component_placeholders/view.html.php b/admin/views/component_placeholders/view.html.php index cdbfa52f6..f5fa78fda 100644 --- a/admin/views/component_placeholders/view.html.php +++ b/admin/views/component_placeholders/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Component_placeholders View class + * Component_placeholders Html View class */ -class ComponentbuilderViewComponent_placeholders extends JViewLegacy +class ComponentbuilderViewComponent_placeholders extends HtmlView { /** * display method of View diff --git a/admin/views/component_plugins/view.html.php b/admin/views/component_plugins/view.html.php index 801d3852a..374643be4 100644 --- a/admin/views/component_plugins/view.html.php +++ b/admin/views/component_plugins/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Component_plugins View class + * Component_plugins Html View class */ -class ComponentbuilderViewComponent_plugins extends JViewLegacy +class ComponentbuilderViewComponent_plugins extends HtmlView { /** * display method of View diff --git a/admin/views/component_site_views/view.html.php b/admin/views/component_site_views/view.html.php index 5e68385dd..2e356c06e 100644 --- a/admin/views/component_site_views/view.html.php +++ b/admin/views/component_site_views/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Component_site_views View class + * Component_site_views Html View class */ -class ComponentbuilderViewComponent_site_views extends JViewLegacy +class ComponentbuilderViewComponent_site_views extends HtmlView { /** * display method of View diff --git a/admin/views/component_updates/view.html.php b/admin/views/component_updates/view.html.php index b2d4e7020..c78a78cf1 100644 --- a/admin/views/component_updates/view.html.php +++ b/admin/views/component_updates/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Component_updates View class + * Component_updates Html View class */ -class ComponentbuilderViewComponent_updates extends JViewLegacy +class ComponentbuilderViewComponent_updates extends HtmlView { /** * display method of View diff --git a/admin/views/components_admin_views/view.html.php b/admin/views/components_admin_views/view.html.php index f5d8ab210..994b9a0ae 100644 --- a/admin/views/components_admin_views/view.html.php +++ b/admin/views/components_admin_views/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Components_admin_views + * Componentbuilder Html View class for the Components_admin_views */ -class ComponentbuilderViewComponents_admin_views extends JViewLegacy +class ComponentbuilderViewComponents_admin_views extends HtmlView { /** * Components_admin_views view display method diff --git a/admin/views/components_config/view.html.php b/admin/views/components_config/view.html.php index 5be830841..71ae25ee7 100644 --- a/admin/views/components_config/view.html.php +++ b/admin/views/components_config/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Components_config + * Componentbuilder Html View class for the Components_config */ -class ComponentbuilderViewComponents_config extends JViewLegacy +class ComponentbuilderViewComponents_config extends HtmlView { /** * Components_config view display method diff --git a/admin/views/components_custom_admin_menus/view.html.php b/admin/views/components_custom_admin_menus/view.html.php index 3eced497b..1912a4abc 100644 --- a/admin/views/components_custom_admin_menus/view.html.php +++ b/admin/views/components_custom_admin_menus/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Components_custom_admin_menus + * Componentbuilder Html View class for the Components_custom_admin_menus */ -class ComponentbuilderViewComponents_custom_admin_menus extends JViewLegacy +class ComponentbuilderViewComponents_custom_admin_menus extends HtmlView { /** * Components_custom_admin_menus view display method diff --git a/admin/views/components_custom_admin_views/view.html.php b/admin/views/components_custom_admin_views/view.html.php index 035146151..b517ca4ed 100644 --- a/admin/views/components_custom_admin_views/view.html.php +++ b/admin/views/components_custom_admin_views/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Components_custom_admin_views + * Componentbuilder Html View class for the Components_custom_admin_views */ -class ComponentbuilderViewComponents_custom_admin_views extends JViewLegacy +class ComponentbuilderViewComponents_custom_admin_views extends HtmlView { /** * Components_custom_admin_views view display method diff --git a/admin/views/components_dashboard/view.html.php b/admin/views/components_dashboard/view.html.php index 4b2e649a1..58ba99cbd 100644 --- a/admin/views/components_dashboard/view.html.php +++ b/admin/views/components_dashboard/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Components_dashboard + * Componentbuilder Html View class for the Components_dashboard */ -class ComponentbuilderViewComponents_dashboard extends JViewLegacy +class ComponentbuilderViewComponents_dashboard extends HtmlView { /** * Components_dashboard view display method diff --git a/admin/views/components_files_folders/view.html.php b/admin/views/components_files_folders/view.html.php index b9c7207f6..31113b052 100644 --- a/admin/views/components_files_folders/view.html.php +++ b/admin/views/components_files_folders/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Components_files_folders + * Componentbuilder Html View class for the Components_files_folders */ -class ComponentbuilderViewComponents_files_folders extends JViewLegacy +class ComponentbuilderViewComponents_files_folders extends HtmlView { /** * Components_files_folders view display method diff --git a/admin/views/components_modules/view.html.php b/admin/views/components_modules/view.html.php index 995deedb2..5e4732250 100644 --- a/admin/views/components_modules/view.html.php +++ b/admin/views/components_modules/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Components_modules + * Componentbuilder Html View class for the Components_modules */ -class ComponentbuilderViewComponents_modules extends JViewLegacy +class ComponentbuilderViewComponents_modules extends HtmlView { /** * Components_modules view display method diff --git a/admin/views/components_mysql_tweaks/view.html.php b/admin/views/components_mysql_tweaks/view.html.php index 70c6a83bf..41464dc71 100644 --- a/admin/views/components_mysql_tweaks/view.html.php +++ b/admin/views/components_mysql_tweaks/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Components_mysql_tweaks + * Componentbuilder Html View class for the Components_mysql_tweaks */ -class ComponentbuilderViewComponents_mysql_tweaks extends JViewLegacy +class ComponentbuilderViewComponents_mysql_tweaks extends HtmlView { /** * Components_mysql_tweaks view display method diff --git a/admin/views/components_placeholders/view.html.php b/admin/views/components_placeholders/view.html.php index 0124abac5..cd39a54a0 100644 --- a/admin/views/components_placeholders/view.html.php +++ b/admin/views/components_placeholders/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Components_placeholders + * Componentbuilder Html View class for the Components_placeholders */ -class ComponentbuilderViewComponents_placeholders extends JViewLegacy +class ComponentbuilderViewComponents_placeholders extends HtmlView { /** * Components_placeholders view display method diff --git a/admin/views/components_plugins/view.html.php b/admin/views/components_plugins/view.html.php index 5a2a02fb8..ba9fa9420 100644 --- a/admin/views/components_plugins/view.html.php +++ b/admin/views/components_plugins/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Components_plugins + * Componentbuilder Html View class for the Components_plugins */ -class ComponentbuilderViewComponents_plugins extends JViewLegacy +class ComponentbuilderViewComponents_plugins extends HtmlView { /** * Components_plugins view display method diff --git a/admin/views/components_site_views/view.html.php b/admin/views/components_site_views/view.html.php index c34214081..9a7d19e98 100644 --- a/admin/views/components_site_views/view.html.php +++ b/admin/views/components_site_views/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Components_site_views + * Componentbuilder Html View class for the Components_site_views */ -class ComponentbuilderViewComponents_site_views extends JViewLegacy +class ComponentbuilderViewComponents_site_views extends HtmlView { /** * Components_site_views view display method diff --git a/admin/views/components_updates/view.html.php b/admin/views/components_updates/view.html.php index 6221a98ce..1340c9b02 100644 --- a/admin/views/components_updates/view.html.php +++ b/admin/views/components_updates/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Components_updates + * Componentbuilder Html View class for the Components_updates */ -class ComponentbuilderViewComponents_updates extends JViewLegacy +class ComponentbuilderViewComponents_updates extends HtmlView { /** * Components_updates view display method diff --git a/admin/views/custom_admin_view/view.html.php b/admin/views/custom_admin_view/view.html.php index 909b43c8d..f7a80af0d 100644 --- a/admin/views/custom_admin_view/view.html.php +++ b/admin/views/custom_admin_view/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Custom_admin_view View class + * Custom_admin_view Html View class */ -class ComponentbuilderViewCustom_admin_view extends JViewLegacy +class ComponentbuilderViewCustom_admin_view extends HtmlView { /** * display method of View diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php index 269d6f029..cafa3eac3 100644 --- a/admin/views/custom_admin_views/view.html.php +++ b/admin/views/custom_admin_views/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Custom_admin_views + * Componentbuilder Html View class for the Custom_admin_views */ -class ComponentbuilderViewCustom_admin_views extends JViewLegacy +class ComponentbuilderViewCustom_admin_views extends HtmlView { /** * Custom_admin_views view display method diff --git a/admin/views/custom_code/view.html.php b/admin/views/custom_code/view.html.php index 86622d143..180ef2c78 100644 --- a/admin/views/custom_code/view.html.php +++ b/admin/views/custom_code/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Custom_code View class + * Custom_code Html View class */ -class ComponentbuilderViewCustom_code extends JViewLegacy +class ComponentbuilderViewCustom_code extends HtmlView { /** * display method of View diff --git a/admin/views/custom_codes/view.html.php b/admin/views/custom_codes/view.html.php index 8a8cc386b..af050c130 100644 --- a/admin/views/custom_codes/view.html.php +++ b/admin/views/custom_codes/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Custom_codes + * Componentbuilder Html View class for the Custom_codes */ -class ComponentbuilderViewCustom_codes extends JViewLegacy +class ComponentbuilderViewCustom_codes extends HtmlView { /** * Custom_codes view display method diff --git a/admin/views/dynamic_get/view.html.php b/admin/views/dynamic_get/view.html.php index 1aa339f9f..0a19893f1 100644 --- a/admin/views/dynamic_get/view.html.php +++ b/admin/views/dynamic_get/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Dynamic_get View class + * Dynamic_get Html View class */ -class ComponentbuilderViewDynamic_get extends JViewLegacy +class ComponentbuilderViewDynamic_get extends HtmlView { /** * display method of View diff --git a/admin/views/dynamic_gets/view.html.php b/admin/views/dynamic_gets/view.html.php index 30cbd2c66..0cd4f59e2 100644 --- a/admin/views/dynamic_gets/view.html.php +++ b/admin/views/dynamic_gets/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Dynamic_gets + * Componentbuilder Html View class for the Dynamic_gets */ -class ComponentbuilderViewDynamic_gets extends JViewLegacy +class ComponentbuilderViewDynamic_gets extends HtmlView { /** * Dynamic_gets view display method diff --git a/admin/views/field/view.html.php b/admin/views/field/view.html.php index 1499d2e07..df2cb158e 100644 --- a/admin/views/field/view.html.php +++ b/admin/views/field/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Field View class + * Field Html View class */ -class ComponentbuilderViewField extends JViewLegacy +class ComponentbuilderViewField extends HtmlView { /** * display method of View diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php index 59d86d9a6..cd1cf9eb2 100644 --- a/admin/views/fields/view.html.php +++ b/admin/views/fields/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Fields + * Componentbuilder Html View class for the Fields */ -class ComponentbuilderViewFields extends JViewLegacy +class ComponentbuilderViewFields extends HtmlView { /** * Fields view display method diff --git a/admin/views/fieldtype/view.html.php b/admin/views/fieldtype/view.html.php index aa211d8d5..c3947955e 100644 --- a/admin/views/fieldtype/view.html.php +++ b/admin/views/fieldtype/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Fieldtype View class + * Fieldtype Html View class */ -class ComponentbuilderViewFieldtype extends JViewLegacy +class ComponentbuilderViewFieldtype extends HtmlView { /** * display method of View @@ -197,9 +199,9 @@ class ComponentbuilderViewFieldtype extends JViewLegacy // Add the CSS for Footable $this->document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css'); - JHtml::_('stylesheet', 'com_componentbuilder/footable-v3/css/footable.standalone.min.css', ['version' => 'auto']); + JHtml::_('stylesheet', 'media/com_componentbuilder/footable-v3/css/footable.standalone.min.css', ['version' => 'auto']); // Add the JavaScript for Footable (adding all functions) - JHtml::_('script', 'com_componentbuilder/footable-v3/js/footable.min.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_componentbuilder/footable-v3/js/footable.min.js', ['version' => 'auto']); $footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable();});});"; $this->document->addScriptDeclaration($footable); diff --git a/admin/views/fieldtypes/view.html.php b/admin/views/fieldtypes/view.html.php index 364fbb89b..50653d765 100644 --- a/admin/views/fieldtypes/view.html.php +++ b/admin/views/fieldtypes/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Fieldtypes + * Componentbuilder Html View class for the Fieldtypes */ -class ComponentbuilderViewFieldtypes extends JViewLegacy +class ComponentbuilderViewFieldtypes extends HtmlView { /** * Fieldtypes view display method diff --git a/admin/views/get_snippets/view.html.php b/admin/views/get_snippets/view.html.php index ea36c1bc8..eb7f5b970 100644 --- a/admin/views/get_snippets/view.html.php +++ b/admin/views/get_snippets/view.html.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; use Joomla\CMS\Filesystem\File; /** - * Componentbuilder View class for the Get_snippets + * Componentbuilder Html View class for the Get_snippets */ -class ComponentbuilderViewGet_snippets extends JViewLegacy +class ComponentbuilderViewGet_snippets extends HtmlView { // Overwriting JView display method function display($tpl = null) @@ -79,12 +80,12 @@ class ComponentbuilderViewGet_snippets extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - JHtml::_('stylesheet', 'com_componentbuilder/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); + JHtml::_('stylesheet', 'media/com_componentbuilder/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - JHtml::_('script', 'com_componentbuilder/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_componentbuilder/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); } // Load the script to find all uikit components needed. @@ -110,13 +111,13 @@ class ComponentbuilderViewGet_snippets extends JViewLegacy if (File::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css')) { // load the css. - JHtml::_('stylesheet', 'com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']); + JHtml::_('stylesheet', 'media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']); } // check if the JavaScript file exists. if (File::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js')) { // load the js. - JHtml::_('script', 'com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']); + JHtml::_('script', 'media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']); } } } diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php index 70747b5ae..9b71e8c4b 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Help_document View class + * Help_document Html View class */ -class ComponentbuilderViewHelp_document extends JViewLegacy +class ComponentbuilderViewHelp_document extends HtmlView { /** * display method of View diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index 94e4aa451..9b9ea9f66 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Help_documents + * Componentbuilder Html View class for the Help_documents */ -class ComponentbuilderViewHelp_documents extends JViewLegacy +class ComponentbuilderViewHelp_documents extends HtmlView { /** * Help_documents view display method diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index 1be5fdd2a..21c34481a 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder Import View + * Componentbuilder Import Html View */ -class ComponentbuilderViewImport extends JViewLegacy +class ComponentbuilderViewImport extends HtmlView { protected $headerList; protected $hasPackage = false; diff --git a/admin/views/import_joomla_components/view.html.php b/admin/views/import_joomla_components/view.html.php index 7df5f96e1..40cd236ab 100644 --- a/admin/views/import_joomla_components/view.html.php +++ b/admin/views/import_joomla_components/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder Import_joomla_components View + * Componentbuilder Import_joomla_components Html View */ -class ComponentbuilderViewImport_joomla_components extends JViewLegacy +class ComponentbuilderViewImport_joomla_components extends HtmlView { protected $headerList; protected $hasPackage = false; diff --git a/admin/views/import_language_translations/view.html.php b/admin/views/import_language_translations/view.html.php index 8fa95880c..cf86a9b1f 100644 --- a/admin/views/import_language_translations/view.html.php +++ b/admin/views/import_language_translations/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder Import_language_translations View + * Componentbuilder Import_language_translations Html View */ -class ComponentbuilderViewImport_language_translations extends JViewLegacy +class ComponentbuilderViewImport_language_translations extends HtmlView { protected $headerList; protected $hasPackage = false; diff --git a/admin/views/joomla_component/view.html.php b/admin/views/joomla_component/view.html.php index 74141674c..533cd1ab0 100644 --- a/admin/views/joomla_component/view.html.php +++ b/admin/views/joomla_component/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Joomla_component View class + * Joomla_component Html View class */ -class ComponentbuilderViewJoomla_component extends JViewLegacy +class ComponentbuilderViewJoomla_component extends HtmlView { /** * display method of View diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php index 66a02279e..601274ede 100644 --- a/admin/views/joomla_components/view.html.php +++ b/admin/views/joomla_components/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Joomla_components + * Componentbuilder Html View class for the Joomla_components */ -class ComponentbuilderViewJoomla_components extends JViewLegacy +class ComponentbuilderViewJoomla_components extends HtmlView { /** * Joomla_components view display method diff --git a/admin/views/joomla_module/view.html.php b/admin/views/joomla_module/view.html.php index 240d90634..c75e04474 100644 --- a/admin/views/joomla_module/view.html.php +++ b/admin/views/joomla_module/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Joomla_module View class + * Joomla_module Html View class */ -class ComponentbuilderViewJoomla_module extends JViewLegacy +class ComponentbuilderViewJoomla_module extends HtmlView { /** * display method of View diff --git a/admin/views/joomla_module_files_folders_urls/view.html.php b/admin/views/joomla_module_files_folders_urls/view.html.php index e9be94ebf..5d149eb66 100644 --- a/admin/views/joomla_module_files_folders_urls/view.html.php +++ b/admin/views/joomla_module_files_folders_urls/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Joomla_module_files_folders_urls View class + * Joomla_module_files_folders_urls Html View class */ -class ComponentbuilderViewJoomla_module_files_folders_urls extends JViewLegacy +class ComponentbuilderViewJoomla_module_files_folders_urls extends HtmlView { /** * display method of View diff --git a/admin/views/joomla_module_updates/view.html.php b/admin/views/joomla_module_updates/view.html.php index d4ec249c7..63e37f264 100644 --- a/admin/views/joomla_module_updates/view.html.php +++ b/admin/views/joomla_module_updates/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Joomla_module_updates View class + * Joomla_module_updates Html View class */ -class ComponentbuilderViewJoomla_module_updates extends JViewLegacy +class ComponentbuilderViewJoomla_module_updates extends HtmlView { /** * display method of View diff --git a/admin/views/joomla_modules/view.html.php b/admin/views/joomla_modules/view.html.php index fe9db733c..6ffe8b97c 100644 --- a/admin/views/joomla_modules/view.html.php +++ b/admin/views/joomla_modules/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Joomla_modules + * Componentbuilder Html View class for the Joomla_modules */ -class ComponentbuilderViewJoomla_modules extends JViewLegacy +class ComponentbuilderViewJoomla_modules extends HtmlView { /** * Joomla_modules view display method diff --git a/admin/views/joomla_modules_files_folders_urls/view.html.php b/admin/views/joomla_modules_files_folders_urls/view.html.php index 50af7e3b1..a92b9e92b 100644 --- a/admin/views/joomla_modules_files_folders_urls/view.html.php +++ b/admin/views/joomla_modules_files_folders_urls/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Joomla_modules_files_folders_urls + * Componentbuilder Html View class for the Joomla_modules_files_folders_urls */ -class ComponentbuilderViewJoomla_modules_files_folders_urls extends JViewLegacy +class ComponentbuilderViewJoomla_modules_files_folders_urls extends HtmlView { /** * Joomla_modules_files_folders_urls view display method diff --git a/admin/views/joomla_modules_updates/view.html.php b/admin/views/joomla_modules_updates/view.html.php index 585e582af..f5994aa7e 100644 --- a/admin/views/joomla_modules_updates/view.html.php +++ b/admin/views/joomla_modules_updates/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Joomla_modules_updates + * Componentbuilder Html View class for the Joomla_modules_updates */ -class ComponentbuilderViewJoomla_modules_updates extends JViewLegacy +class ComponentbuilderViewJoomla_modules_updates extends HtmlView { /** * Joomla_modules_updates view display method diff --git a/admin/views/joomla_plugin/view.html.php b/admin/views/joomla_plugin/view.html.php index 773da7ca3..1ca91e8e8 100644 --- a/admin/views/joomla_plugin/view.html.php +++ b/admin/views/joomla_plugin/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Joomla_plugin View class + * Joomla_plugin Html View class */ -class ComponentbuilderViewJoomla_plugin extends JViewLegacy +class ComponentbuilderViewJoomla_plugin extends HtmlView { /** * display method of View diff --git a/admin/views/joomla_plugin_files_folders_urls/view.html.php b/admin/views/joomla_plugin_files_folders_urls/view.html.php index 3209b6e6d..269ac812b 100644 --- a/admin/views/joomla_plugin_files_folders_urls/view.html.php +++ b/admin/views/joomla_plugin_files_folders_urls/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Joomla_plugin_files_folders_urls View class + * Joomla_plugin_files_folders_urls Html View class */ -class ComponentbuilderViewJoomla_plugin_files_folders_urls extends JViewLegacy +class ComponentbuilderViewJoomla_plugin_files_folders_urls extends HtmlView { /** * display method of View diff --git a/admin/views/joomla_plugin_group/view.html.php b/admin/views/joomla_plugin_group/view.html.php index b4ad2b452..e6a57ce7e 100644 --- a/admin/views/joomla_plugin_group/view.html.php +++ b/admin/views/joomla_plugin_group/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Joomla_plugin_group View class + * Joomla_plugin_group Html View class */ -class ComponentbuilderViewJoomla_plugin_group extends JViewLegacy +class ComponentbuilderViewJoomla_plugin_group extends HtmlView { /** * display method of View diff --git a/admin/views/joomla_plugin_groups/view.html.php b/admin/views/joomla_plugin_groups/view.html.php index 4c7d73810..e4c7e1976 100644 --- a/admin/views/joomla_plugin_groups/view.html.php +++ b/admin/views/joomla_plugin_groups/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Joomla_plugin_groups + * Componentbuilder Html View class for the Joomla_plugin_groups */ -class ComponentbuilderViewJoomla_plugin_groups extends JViewLegacy +class ComponentbuilderViewJoomla_plugin_groups extends HtmlView { /** * Joomla_plugin_groups view display method diff --git a/admin/views/joomla_plugin_updates/view.html.php b/admin/views/joomla_plugin_updates/view.html.php index 2b6082e26..480db1a0b 100644 --- a/admin/views/joomla_plugin_updates/view.html.php +++ b/admin/views/joomla_plugin_updates/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Joomla_plugin_updates View class + * Joomla_plugin_updates Html View class */ -class ComponentbuilderViewJoomla_plugin_updates extends JViewLegacy +class ComponentbuilderViewJoomla_plugin_updates extends HtmlView { /** * display method of View diff --git a/admin/views/joomla_plugins/view.html.php b/admin/views/joomla_plugins/view.html.php index 9bd98efe2..3a7607d87 100644 --- a/admin/views/joomla_plugins/view.html.php +++ b/admin/views/joomla_plugins/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Joomla_plugins + * Componentbuilder Html View class for the Joomla_plugins */ -class ComponentbuilderViewJoomla_plugins extends JViewLegacy +class ComponentbuilderViewJoomla_plugins extends HtmlView { /** * Joomla_plugins view display method diff --git a/admin/views/joomla_plugins_files_folders_urls/view.html.php b/admin/views/joomla_plugins_files_folders_urls/view.html.php index cb7d8df4e..f3c719345 100644 --- a/admin/views/joomla_plugins_files_folders_urls/view.html.php +++ b/admin/views/joomla_plugins_files_folders_urls/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Joomla_plugins_files_folders_urls + * Componentbuilder Html View class for the Joomla_plugins_files_folders_urls */ -class ComponentbuilderViewJoomla_plugins_files_folders_urls extends JViewLegacy +class ComponentbuilderViewJoomla_plugins_files_folders_urls extends HtmlView { /** * Joomla_plugins_files_folders_urls view display method diff --git a/admin/views/joomla_plugins_updates/view.html.php b/admin/views/joomla_plugins_updates/view.html.php index ddfe60e81..dab1d7094 100644 --- a/admin/views/joomla_plugins_updates/view.html.php +++ b/admin/views/joomla_plugins_updates/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Joomla_plugins_updates + * Componentbuilder Html View class for the Joomla_plugins_updates */ -class ComponentbuilderViewJoomla_plugins_updates extends JViewLegacy +class ComponentbuilderViewJoomla_plugins_updates extends HtmlView { /** * Joomla_plugins_updates view display method diff --git a/admin/views/language/view.html.php b/admin/views/language/view.html.php index f4f85f4e1..6fa0d9728 100644 --- a/admin/views/language/view.html.php +++ b/admin/views/language/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Language View class + * Language Html View class */ -class ComponentbuilderViewLanguage extends JViewLegacy +class ComponentbuilderViewLanguage extends HtmlView { /** * display method of View diff --git a/admin/views/language_translation/view.html.php b/admin/views/language_translation/view.html.php index 7e22642a3..1f5d27b68 100644 --- a/admin/views/language_translation/view.html.php +++ b/admin/views/language_translation/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Language_translation View class + * Language_translation Html View class */ -class ComponentbuilderViewLanguage_translation extends JViewLegacy +class ComponentbuilderViewLanguage_translation extends HtmlView { /** * display method of View diff --git a/admin/views/language_translations/view.html.php b/admin/views/language_translations/view.html.php index 100146b15..5395cf2ac 100644 --- a/admin/views/language_translations/view.html.php +++ b/admin/views/language_translations/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Language_translations + * Componentbuilder Html View class for the Language_translations */ -class ComponentbuilderViewLanguage_translations extends JViewLegacy +class ComponentbuilderViewLanguage_translations extends HtmlView { /** * Language_translations view display method diff --git a/admin/views/languages/view.html.php b/admin/views/languages/view.html.php index 84fe993e7..1878730e4 100644 --- a/admin/views/languages/view.html.php +++ b/admin/views/languages/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Languages + * Componentbuilder Html View class for the Languages */ -class ComponentbuilderViewLanguages extends JViewLegacy +class ComponentbuilderViewLanguages extends HtmlView { /** * Languages view display method diff --git a/admin/views/layout/view.html.php b/admin/views/layout/view.html.php index 7c730c0e9..5ecdec521 100644 --- a/admin/views/layout/view.html.php +++ b/admin/views/layout/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Layout View class + * Layout Html View class */ -class ComponentbuilderViewLayout extends JViewLegacy +class ComponentbuilderViewLayout extends HtmlView { /** * display method of View diff --git a/admin/views/layouts/view.html.php b/admin/views/layouts/view.html.php index f334157da..11629442e 100644 --- a/admin/views/layouts/view.html.php +++ b/admin/views/layouts/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Layouts + * Componentbuilder Html View class for the Layouts */ -class ComponentbuilderViewLayouts extends JViewLegacy +class ComponentbuilderViewLayouts extends HtmlView { /** * Layouts view display method diff --git a/admin/views/libraries/view.html.php b/admin/views/libraries/view.html.php index 19fbe74d8..2d153004e 100644 --- a/admin/views/libraries/view.html.php +++ b/admin/views/libraries/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Libraries + * Componentbuilder Html View class for the Libraries */ -class ComponentbuilderViewLibraries extends JViewLegacy +class ComponentbuilderViewLibraries extends HtmlView { /** * Libraries view display method diff --git a/admin/views/libraries_config/view.html.php b/admin/views/libraries_config/view.html.php index 4404f192b..8626da738 100644 --- a/admin/views/libraries_config/view.html.php +++ b/admin/views/libraries_config/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Libraries_config + * Componentbuilder Html View class for the Libraries_config */ -class ComponentbuilderViewLibraries_config extends JViewLegacy +class ComponentbuilderViewLibraries_config extends HtmlView { /** * Libraries_config view display method diff --git a/admin/views/libraries_files_folders_urls/view.html.php b/admin/views/libraries_files_folders_urls/view.html.php index 414e83dd5..b482225da 100644 --- a/admin/views/libraries_files_folders_urls/view.html.php +++ b/admin/views/libraries_files_folders_urls/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Libraries_files_folders_urls + * Componentbuilder Html View class for the Libraries_files_folders_urls */ -class ComponentbuilderViewLibraries_files_folders_urls extends JViewLegacy +class ComponentbuilderViewLibraries_files_folders_urls extends HtmlView { /** * Libraries_files_folders_urls view display method diff --git a/admin/views/library/view.html.php b/admin/views/library/view.html.php index 8f112390d..5fe360eab 100644 --- a/admin/views/library/view.html.php +++ b/admin/views/library/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Library View class + * Library Html View class */ -class ComponentbuilderViewLibrary extends JViewLegacy +class ComponentbuilderViewLibrary extends HtmlView { /** * display method of View diff --git a/admin/views/library_config/view.html.php b/admin/views/library_config/view.html.php index 23e7ed569..d4eb6ea39 100644 --- a/admin/views/library_config/view.html.php +++ b/admin/views/library_config/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Library_config View class + * Library_config Html View class */ -class ComponentbuilderViewLibrary_config extends JViewLegacy +class ComponentbuilderViewLibrary_config extends HtmlView { /** * display method of View diff --git a/admin/views/library_files_folders_urls/view.html.php b/admin/views/library_files_folders_urls/view.html.php index 92e372ae6..b20793dd2 100644 --- a/admin/views/library_files_folders_urls/view.html.php +++ b/admin/views/library_files_folders_urls/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Library_files_folders_urls View class + * Library_files_folders_urls Html View class */ -class ComponentbuilderViewLibrary_files_folders_urls extends JViewLegacy +class ComponentbuilderViewLibrary_files_folders_urls extends HtmlView { /** * display method of View diff --git a/admin/views/placeholder/view.html.php b/admin/views/placeholder/view.html.php index 02d723b54..0c4ea16a9 100644 --- a/admin/views/placeholder/view.html.php +++ b/admin/views/placeholder/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Placeholder View class + * Placeholder Html View class */ -class ComponentbuilderViewPlaceholder extends JViewLegacy +class ComponentbuilderViewPlaceholder extends HtmlView { /** * display method of View diff --git a/admin/views/placeholders/view.html.php b/admin/views/placeholders/view.html.php index 2248343b1..75b6ed3a4 100644 --- a/admin/views/placeholders/view.html.php +++ b/admin/views/placeholders/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Placeholders + * Componentbuilder Html View class for the Placeholders */ -class ComponentbuilderViewPlaceholders extends JViewLegacy +class ComponentbuilderViewPlaceholders extends HtmlView { /** * Placeholders view display method diff --git a/admin/views/server/view.html.php b/admin/views/server/view.html.php index 82a0d1472..8e5bb1f88 100644 --- a/admin/views/server/view.html.php +++ b/admin/views/server/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Server View class + * Server Html View class */ -class ComponentbuilderViewServer extends JViewLegacy +class ComponentbuilderViewServer extends HtmlView { /** * display method of View @@ -195,9 +197,9 @@ class ComponentbuilderViewServer extends JViewLegacy // Add the CSS for Footable $this->document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css'); - JHtml::_('stylesheet', 'com_componentbuilder/footable-v3/css/footable.standalone.min.css', ['version' => 'auto']); + JHtml::_('stylesheet', 'media/com_componentbuilder/footable-v3/css/footable.standalone.min.css', ['version' => 'auto']); // Add the JavaScript for Footable (adding all functions) - JHtml::_('script', 'com_componentbuilder/footable-v3/js/footable.min.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_componentbuilder/footable-v3/js/footable.min.js', ['version' => 'auto']); $footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable();});});"; $this->document->addScriptDeclaration($footable); diff --git a/admin/views/servers/view.html.php b/admin/views/servers/view.html.php index edcabb67d..b73fb9bae 100644 --- a/admin/views/servers/view.html.php +++ b/admin/views/servers/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Servers + * Componentbuilder Html View class for the Servers */ -class ComponentbuilderViewServers extends JViewLegacy +class ComponentbuilderViewServers extends HtmlView { /** * Servers view display method diff --git a/admin/views/site_view/view.html.php b/admin/views/site_view/view.html.php index 95d028d3c..2d9628619 100644 --- a/admin/views/site_view/view.html.php +++ b/admin/views/site_view/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Site_view View class + * Site_view Html View class */ -class ComponentbuilderViewSite_view extends JViewLegacy +class ComponentbuilderViewSite_view extends HtmlView { /** * display method of View diff --git a/admin/views/site_views/view.html.php b/admin/views/site_views/view.html.php index 4ee3f95b9..3b14299b0 100644 --- a/admin/views/site_views/view.html.php +++ b/admin/views/site_views/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Site_views + * Componentbuilder Html View class for the Site_views */ -class ComponentbuilderViewSite_views extends JViewLegacy +class ComponentbuilderViewSite_views extends HtmlView { /** * Site_views view display method diff --git a/admin/views/snippet/view.html.php b/admin/views/snippet/view.html.php index 420f84c63..94db2b4f2 100644 --- a/admin/views/snippet/view.html.php +++ b/admin/views/snippet/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Snippet View class + * Snippet Html View class */ -class ComponentbuilderViewSnippet extends JViewLegacy +class ComponentbuilderViewSnippet extends HtmlView { /** * display method of View diff --git a/admin/views/snippet_type/view.html.php b/admin/views/snippet_type/view.html.php index bfb531347..4a6192b41 100644 --- a/admin/views/snippet_type/view.html.php +++ b/admin/views/snippet_type/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Snippet_type View class + * Snippet_type Html View class */ -class ComponentbuilderViewSnippet_type extends JViewLegacy +class ComponentbuilderViewSnippet_type extends HtmlView { /** * display method of View diff --git a/admin/views/snippet_types/view.html.php b/admin/views/snippet_types/view.html.php index 0af44fd8f..96b5397f1 100644 --- a/admin/views/snippet_types/view.html.php +++ b/admin/views/snippet_types/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Snippet_types + * Componentbuilder Html View class for the Snippet_types */ -class ComponentbuilderViewSnippet_types extends JViewLegacy +class ComponentbuilderViewSnippet_types extends HtmlView { /** * Snippet_types view display method diff --git a/admin/views/snippets/view.html.php b/admin/views/snippets/view.html.php index d6ce5bd0f..3600ffbd1 100644 --- a/admin/views/snippets/view.html.php +++ b/admin/views/snippets/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Snippets + * Componentbuilder Html View class for the Snippets */ -class ComponentbuilderViewSnippets extends JViewLegacy +class ComponentbuilderViewSnippets extends HtmlView { /** * Snippets view display method diff --git a/admin/views/template/view.html.php b/admin/views/template/view.html.php index 1628c6670..adf352d25 100644 --- a/admin/views/template/view.html.php +++ b/admin/views/template/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Template View class + * Template Html View class */ -class ComponentbuilderViewTemplate extends JViewLegacy +class ComponentbuilderViewTemplate extends HtmlView { /** * display method of View diff --git a/admin/views/templates/view.html.php b/admin/views/templates/view.html.php index 9e4a9ac87..6e1c3e1ba 100644 --- a/admin/views/templates/view.html.php +++ b/admin/views/templates/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Templates + * Componentbuilder Html View class for the Templates */ -class ComponentbuilderViewTemplates extends JViewLegacy +class ComponentbuilderViewTemplates extends HtmlView { /** * Templates view display method diff --git a/admin/views/validation_rule/view.html.php b/admin/views/validation_rule/view.html.php index 9f8f8ed82..36ad6eb73 100644 --- a/admin/views/validation_rule/view.html.php +++ b/admin/views/validation_rule/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Validation_rule View class + * Validation_rule Html View class */ -class ComponentbuilderViewValidation_rule extends JViewLegacy +class ComponentbuilderViewValidation_rule extends HtmlView { /** * display method of View diff --git a/admin/views/validation_rules/view.html.php b/admin/views/validation_rules/view.html.php index a0101e371..8b7b6951b 100644 --- a/admin/views/validation_rules/view.html.php +++ b/admin/views/validation_rules/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Validation_rules + * Componentbuilder Html View class for the Validation_rules */ -class ComponentbuilderViewValidation_rules extends JViewLegacy +class ComponentbuilderViewValidation_rules extends HtmlView { /** * Validation_rules view display method diff --git a/componentbuilder.xml b/componentbuilder.xml index 306de3b62..6611ceb53 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 19th May, 2022 + 25th May, 2022 Llewellyn van der Merwe llewellyn@joomlacomponentbuilder.com http://www.joomlacomponentbuilder.com diff --git a/site/controller.php b/site/controller.php index a2f2bfe89..2f67af7a9 100644 --- a/site/controller.php +++ b/site/controller.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Component Controller + * Componentbuilder Component Base Controller */ -class ComponentbuilderController extends JControllerLegacy +class ComponentbuilderController extends BaseController { /** * Method to display a view. diff --git a/site/controllers/api.php b/site/controllers/api.php index 58314a56c..0833d8f82 100644 --- a/site/controllers/api.php +++ b/site/controllers/api.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\FormController; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Api Controller + * Componentbuilder Api Form Controller */ -class ComponentbuilderControllerApi extends JControllerForm +class ComponentbuilderControllerApi extends FormController { /** * Current or most recently performed task. diff --git a/site/controllers/help.php b/site/controllers/help.php index fb5fa9dfc..b709ed8e8 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Controller\BaseController; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Help Controller + * Componentbuilder Help Base Controller */ -class ComponentbuilderControllerHelp extends JControllerLegacy +class ComponentbuilderControllerHelp extends BaseController { public function __construct($config) { diff --git a/site/models/api.php b/site/models/api.php index 4756a269c..a1c08d58a 100644 --- a/site/models/api.php +++ b/site/models/api.php @@ -13,12 +13,13 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\Model\ItemModel; use Joomla\Utilities\ArrayHelper; /** - * Componentbuilder Api Model + * Componentbuilder Api Item Model */ -class ComponentbuilderModelApi extends JModelItem +class ComponentbuilderModelApi extends ItemModel { /** * Model context string. diff --git a/site/views/api/view.html.php b/site/views/api/view.html.php index 7c27dd8a3..3817aae1a 100644 --- a/site/views/api/view.html.php +++ b/site/views/api/view.html.php @@ -13,10 +13,12 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\CMS\MVC\View\HtmlView; + /** - * Componentbuilder View class for the Api + * Componentbuilder Html View class for the Api */ -class ComponentbuilderViewApi extends JViewLegacy +class ComponentbuilderViewApi extends HtmlView { // Overwriting JView display method function display($tpl = null) @@ -70,12 +72,12 @@ class ComponentbuilderViewApi extends JViewLegacy // The uikit css. if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - JHtml::_('stylesheet', 'com_componentbuilder/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); + JHtml::_('stylesheet', 'media/com_componentbuilder/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']); } // The uikit js. if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) { - JHtml::_('script', 'com_componentbuilder/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); + JHtml::_('script', 'media/com_componentbuilder/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']); } // add the document default css file $this->document->addStyleSheet(JURI::root(true) .'/components/com_componentbuilder/assets/css/api.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');