From bb73fe044e187564732b7e20c3a6a673010e8609 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Mon, 25 May 2020 18:17:00 +0200 Subject: [PATCH] Fixed missing ArrayHelper class on export. Updated the table class to also use StringHelper instead of JString. --- README.md | 2 +- admin/README.txt | 2 +- admin/compiler/joomla_3/JControllerAdmin.php | 2 ++ .../joomla_3/JControllerAdmin_custom_admin.php | 2 ++ admin/compiler/joomla_3/JControllerForm.php | 2 ++ .../compiler/joomla_3/JControllerForm_custom_site.php | 2 ++ admin/compiler/joomla_3/JControllerForm_site.php | 2 ++ admin/compiler/joomla_3/JControllerLegacy.php | 2 ++ admin/compiler/joomla_3/JControllerLegacyAjax.php | 2 ++ admin/compiler/joomla_3/JControllerLegacyAjaxSite.php | 2 ++ admin/compiler/joomla_3/JControllerLegacyHelp.php | 2 ++ admin/compiler/joomla_3/JControllerLegacyHelp_site.php | 2 ++ admin/compiler/joomla_3/JControllerLegacySITE.php | 2 ++ .../joomla_3/JControllerLegacy_custom_admin.php | 2 ++ admin/compiler/joomla_3/JControllerLegacy_import.php | 2 ++ .../joomla_3/JControllerLegacy_import_custom.php | 2 ++ admin/compiler/joomla_3/JModelItem_custom_admin.php | 2 ++ admin/compiler/joomla_3/JModelItem_site.php | 2 ++ admin/compiler/joomla_3/JModelLegacy_import.php | 1 + admin/compiler/joomla_3/JModelLegacy_import_custom.php | 1 + admin/compiler/joomla_3/JTable.php | 10 ++++++---- admin/controller.php | 2 ++ admin/controllers/admin_custom_tabs.php | 2 ++ admin/controllers/admin_fields.php | 2 ++ admin/controllers/admin_fields_conditions.php | 2 ++ admin/controllers/admin_fields_relations.php | 2 ++ admin/controllers/admin_view.php | 2 ++ admin/controllers/admin_views.php | 2 ++ admin/controllers/admins_custom_tabs.php | 2 ++ admin/controllers/admins_fields.php | 2 ++ admin/controllers/admins_fields_conditions.php | 2 ++ admin/controllers/admins_fields_relations.php | 2 ++ admin/controllers/ajax.json.php | 2 ++ admin/controllers/class_extendings.php | 2 ++ admin/controllers/class_extends.php | 2 ++ admin/controllers/class_method.php | 2 ++ admin/controllers/class_methods.php | 2 ++ admin/controllers/class_properties.php | 2 ++ admin/controllers/class_property.php | 2 ++ admin/controllers/compiler.php | 2 ++ admin/controllers/component_admin_views.php | 2 ++ admin/controllers/component_config.php | 2 ++ admin/controllers/component_custom_admin_menus.php | 2 ++ admin/controllers/component_custom_admin_views.php | 2 ++ admin/controllers/component_dashboard.php | 2 ++ admin/controllers/component_files_folders.php | 2 ++ admin/controllers/component_modules.php | 2 ++ admin/controllers/component_mysql_tweaks.php | 2 ++ admin/controllers/component_placeholders.php | 2 ++ admin/controllers/component_plugins.php | 2 ++ admin/controllers/component_site_views.php | 2 ++ admin/controllers/component_updates.php | 2 ++ admin/controllers/components_admin_views.php | 2 ++ admin/controllers/components_config.php | 2 ++ admin/controllers/components_custom_admin_menus.php | 2 ++ admin/controllers/components_custom_admin_views.php | 2 ++ admin/controllers/components_dashboard.php | 2 ++ admin/controllers/components_files_folders.php | 2 ++ admin/controllers/components_modules.php | 2 ++ admin/controllers/components_mysql_tweaks.php | 2 ++ admin/controllers/components_placeholders.php | 2 ++ admin/controllers/components_plugins.php | 2 ++ admin/controllers/components_site_views.php | 2 ++ admin/controllers/components_updates.php | 2 ++ admin/controllers/custom_admin_view.php | 2 ++ admin/controllers/custom_admin_views.php | 2 ++ admin/controllers/custom_code.php | 2 ++ admin/controllers/custom_codes.php | 2 ++ admin/controllers/dynamic_get.php | 2 ++ admin/controllers/dynamic_gets.php | 2 ++ admin/controllers/field.php | 2 ++ admin/controllers/fields.php | 2 ++ admin/controllers/fieldtype.php | 2 ++ admin/controllers/fieldtypes.php | 2 ++ admin/controllers/get_snippets.php | 2 ++ admin/controllers/help.php | 2 ++ admin/controllers/help_document.php | 2 ++ admin/controllers/help_documents.php | 2 ++ admin/controllers/import.php | 2 ++ admin/controllers/import_joomla_components.php | 2 ++ admin/controllers/import_language_translations.php | 2 ++ admin/controllers/joomla_component.php | 2 ++ admin/controllers/joomla_components.php | 2 ++ admin/controllers/joomla_module.php | 2 ++ admin/controllers/joomla_module_files_folders_urls.php | 2 ++ admin/controllers/joomla_module_updates.php | 2 ++ admin/controllers/joomla_modules.php | 2 ++ .../controllers/joomla_modules_files_folders_urls.php | 2 ++ admin/controllers/joomla_modules_updates.php | 2 ++ admin/controllers/joomla_plugin.php | 2 ++ admin/controllers/joomla_plugin_files_folders_urls.php | 2 ++ admin/controllers/joomla_plugin_group.php | 2 ++ admin/controllers/joomla_plugin_groups.php | 2 ++ admin/controllers/joomla_plugin_updates.php | 2 ++ admin/controllers/joomla_plugins.php | 2 ++ .../controllers/joomla_plugins_files_folders_urls.php | 2 ++ admin/controllers/joomla_plugins_updates.php | 2 ++ admin/controllers/language.php | 2 ++ admin/controllers/language_translation.php | 2 ++ admin/controllers/language_translations.php | 2 ++ admin/controllers/languages.php | 2 ++ admin/controllers/layout.php | 2 ++ admin/controllers/layouts.php | 2 ++ admin/controllers/libraries.php | 2 ++ admin/controllers/libraries_config.php | 2 ++ admin/controllers/libraries_files_folders_urls.php | 2 ++ admin/controllers/library.php | 2 ++ admin/controllers/library_config.php | 2 ++ admin/controllers/library_files_folders_urls.php | 2 ++ admin/controllers/placeholder.php | 2 ++ admin/controllers/placeholders.php | 2 ++ admin/controllers/server.php | 2 ++ admin/controllers/servers.php | 2 ++ admin/controllers/site_view.php | 2 ++ admin/controllers/site_views.php | 2 ++ admin/controllers/snippet.php | 2 ++ admin/controllers/snippet_type.php | 2 ++ admin/controllers/snippet_types.php | 2 ++ admin/controllers/snippets.php | 2 ++ admin/controllers/template.php | 2 ++ admin/controllers/templates.php | 2 ++ admin/controllers/validation_rule.php | 2 ++ admin/controllers/validation_rules.php | 2 ++ admin/models/import.php | 1 + admin/models/import_joomla_components.php | 1 + admin/models/import_language_translations.php | 1 + admin/tables/admin_custom_tabs.php | 10 ++++++---- admin/tables/admin_fields.php | 10 ++++++---- admin/tables/admin_fields_conditions.php | 10 ++++++---- admin/tables/admin_fields_relations.php | 10 ++++++---- admin/tables/admin_view.php | 10 ++++++---- admin/tables/class_extends.php | 10 ++++++---- admin/tables/class_method.php | 10 ++++++---- admin/tables/class_property.php | 10 ++++++---- admin/tables/component_admin_views.php | 10 ++++++---- admin/tables/component_config.php | 10 ++++++---- admin/tables/component_custom_admin_menus.php | 10 ++++++---- admin/tables/component_custom_admin_views.php | 10 ++++++---- admin/tables/component_dashboard.php | 10 ++++++---- admin/tables/component_files_folders.php | 10 ++++++---- admin/tables/component_modules.php | 10 ++++++---- admin/tables/component_mysql_tweaks.php | 10 ++++++---- admin/tables/component_placeholders.php | 10 ++++++---- admin/tables/component_plugins.php | 10 ++++++---- admin/tables/component_site_views.php | 10 ++++++---- admin/tables/component_updates.php | 10 ++++++---- admin/tables/custom_admin_view.php | 10 ++++++---- admin/tables/custom_code.php | 10 ++++++---- admin/tables/dynamic_get.php | 10 ++++++---- admin/tables/field.php | 10 ++++++---- admin/tables/fieldtype.php | 10 ++++++---- admin/tables/help_document.php | 10 ++++++---- admin/tables/joomla_component.php | 10 ++++++---- admin/tables/joomla_module.php | 10 ++++++---- admin/tables/joomla_module_files_folders_urls.php | 10 ++++++---- admin/tables/joomla_module_updates.php | 10 ++++++---- admin/tables/joomla_plugin.php | 10 ++++++---- admin/tables/joomla_plugin_files_folders_urls.php | 10 ++++++---- admin/tables/joomla_plugin_group.php | 10 ++++++---- admin/tables/joomla_plugin_updates.php | 10 ++++++---- admin/tables/language.php | 10 ++++++---- admin/tables/language_translation.php | 10 ++++++---- admin/tables/layout.php | 10 ++++++---- admin/tables/library.php | 10 ++++++---- admin/tables/library_config.php | 10 ++++++---- admin/tables/library_files_folders_urls.php | 10 ++++++---- admin/tables/placeholder.php | 10 ++++++---- admin/tables/server.php | 10 ++++++---- admin/tables/site_view.php | 10 ++++++---- admin/tables/snippet.php | 10 ++++++---- admin/tables/snippet_type.php | 10 ++++++---- admin/tables/template.php | 10 ++++++---- admin/tables/validation_rule.php | 10 ++++++---- site/controller.php | 2 ++ site/controllers/api.php | 2 ++ site/controllers/help.php | 2 ++ site/models/api.php | 2 ++ 177 files changed, 539 insertions(+), 194 deletions(-) diff --git a/README.md b/README.md index 6be109f46..5e1984dc2 100644 --- a/README.md +++ b/README.md @@ -148,7 +148,7 @@ TODO + *Version*: 2.11.1 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **281857** ++ *Line count*: **282168** + *Field count*: **1522** + *File count*: **1783** + *Folder count*: **295** diff --git a/admin/README.txt b/admin/README.txt index 6be109f46..5e1984dc2 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -148,7 +148,7 @@ TODO + *Version*: 2.11.1 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **281857** ++ *Line count*: **282168** + *Field count*: **1522** + *File count*: **1783** + *Folder count*: **295** diff --git a/admin/compiler/joomla_3/JControllerAdmin.php b/admin/compiler/joomla_3/JControllerAdmin.php index ffe5ef9bf..868d6561b 100644 --- a/admin/compiler/joomla_3/JControllerAdmin.php +++ b/admin/compiler/joomla_3/JControllerAdmin.php @@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * ###Views### Controller */ diff --git a/admin/compiler/joomla_3/JControllerAdmin_custom_admin.php b/admin/compiler/joomla_3/JControllerAdmin_custom_admin.php index deaaf3466..ab6775c93 100644 --- a/admin/compiler/joomla_3/JControllerAdmin_custom_admin.php +++ b/admin/compiler/joomla_3/JControllerAdmin_custom_admin.php @@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * ###SViews### Controller */ diff --git a/admin/compiler/joomla_3/JControllerForm.php b/admin/compiler/joomla_3/JControllerForm.php index 3f5e8f1c6..1dca102af 100644 --- a/admin/compiler/joomla_3/JControllerForm.php +++ b/admin/compiler/joomla_3/JControllerForm.php @@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * ###View### Controller */ diff --git a/admin/compiler/joomla_3/JControllerForm_custom_site.php b/admin/compiler/joomla_3/JControllerForm_custom_site.php index 104fb8545..ef0d3102a 100644 --- a/admin/compiler/joomla_3/JControllerForm_custom_site.php +++ b/admin/compiler/joomla_3/JControllerForm_custom_site.php @@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * ###Component### ###SView### Controller */ diff --git a/admin/compiler/joomla_3/JControllerForm_site.php b/admin/compiler/joomla_3/JControllerForm_site.php index 5ccd4c362..87686d985 100644 --- a/admin/compiler/joomla_3/JControllerForm_site.php +++ b/admin/compiler/joomla_3/JControllerForm_site.php @@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * ###View### Controller */ diff --git a/admin/compiler/joomla_3/JControllerLegacy.php b/admin/compiler/joomla_3/JControllerLegacy.php index dfa13ba59..fdc066dc4 100644 --- a/admin/compiler/joomla_3/JControllerLegacy.php +++ b/admin/compiler/joomla_3/JControllerLegacy.php @@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * General Controller of ###Component### component */ diff --git a/admin/compiler/joomla_3/JControllerLegacyAjax.php b/admin/compiler/joomla_3/JControllerLegacyAjax.php index ba88f128e..32568aea1 100644 --- a/admin/compiler/joomla_3/JControllerLegacyAjax.php +++ b/admin/compiler/joomla_3/JControllerLegacyAjax.php @@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * ###Component### Ajax Controller */ diff --git a/admin/compiler/joomla_3/JControllerLegacyAjaxSite.php b/admin/compiler/joomla_3/JControllerLegacyAjaxSite.php index fb10fd0fe..d3e1863cf 100644 --- a/admin/compiler/joomla_3/JControllerLegacyAjaxSite.php +++ b/admin/compiler/joomla_3/JControllerLegacyAjaxSite.php @@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * ###Component### Ajax Controller */ diff --git a/admin/compiler/joomla_3/JControllerLegacyHelp.php b/admin/compiler/joomla_3/JControllerLegacyHelp.php index d39a00a66..0e13f806c 100644 --- a/admin/compiler/joomla_3/JControllerLegacyHelp.php +++ b/admin/compiler/joomla_3/JControllerLegacyHelp.php @@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * ###Component### Help Controller */ diff --git a/admin/compiler/joomla_3/JControllerLegacyHelp_site.php b/admin/compiler/joomla_3/JControllerLegacyHelp_site.php index 199b7b2ce..a2fafb964 100644 --- a/admin/compiler/joomla_3/JControllerLegacyHelp_site.php +++ b/admin/compiler/joomla_3/JControllerLegacyHelp_site.php @@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * ###Component### Help Controller */ diff --git a/admin/compiler/joomla_3/JControllerLegacySITE.php b/admin/compiler/joomla_3/JControllerLegacySITE.php index b088c6f8f..bf4a61e5f 100644 --- a/admin/compiler/joomla_3/JControllerLegacySITE.php +++ b/admin/compiler/joomla_3/JControllerLegacySITE.php @@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * ###Component### Component Controller */ diff --git a/admin/compiler/joomla_3/JControllerLegacy_custom_admin.php b/admin/compiler/joomla_3/JControllerLegacy_custom_admin.php index 965b53296..b148b5c56 100644 --- a/admin/compiler/joomla_3/JControllerLegacy_custom_admin.php +++ b/admin/compiler/joomla_3/JControllerLegacy_custom_admin.php @@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * ###Component### ###SView### Controller */ diff --git a/admin/compiler/joomla_3/JControllerLegacy_import.php b/admin/compiler/joomla_3/JControllerLegacy_import.php index a72c30003..494de1507 100644 --- a/admin/compiler/joomla_3/JControllerLegacy_import.php +++ b/admin/compiler/joomla_3/JControllerLegacy_import.php @@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * ###Component### Import Controller */ diff --git a/admin/compiler/joomla_3/JControllerLegacy_import_custom.php b/admin/compiler/joomla_3/JControllerLegacy_import_custom.php index d31738dc9..23174381c 100644 --- a/admin/compiler/joomla_3/JControllerLegacy_import_custom.php +++ b/admin/compiler/joomla_3/JControllerLegacy_import_custom.php @@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * ###Component### ###View### Controller */ diff --git a/admin/compiler/joomla_3/JModelItem_custom_admin.php b/admin/compiler/joomla_3/JModelItem_custom_admin.php index 8630851b9..0ba6a9c0a 100644 --- a/admin/compiler/joomla_3/JModelItem_custom_admin.php +++ b/admin/compiler/joomla_3/JModelItem_custom_admin.php @@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * ###Component### ###SView### Model */ diff --git a/admin/compiler/joomla_3/JModelItem_site.php b/admin/compiler/joomla_3/JModelItem_site.php index 4cf35dd3a..85e514bac 100644 --- a/admin/compiler/joomla_3/JModelItem_site.php +++ b/admin/compiler/joomla_3/JModelItem_site.php @@ -17,6 +17,8 @@ defined('_JEXEC') or die('Restricted access'); // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * ###Component### ###SView### Model */ diff --git a/admin/compiler/joomla_3/JModelLegacy_import.php b/admin/compiler/joomla_3/JModelLegacy_import.php index 8b898ae89..8d56bc069 100644 --- a/admin/compiler/joomla_3/JModelLegacy_import.php +++ b/admin/compiler/joomla_3/JModelLegacy_import.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\Utilities\ArrayHelper; use PhpOffice\PhpSpreadsheet\IOFactory; /** diff --git a/admin/compiler/joomla_3/JModelLegacy_import_custom.php b/admin/compiler/joomla_3/JModelLegacy_import_custom.php index 6852c5840..eabd9c587 100644 --- a/admin/compiler/joomla_3/JModelLegacy_import_custom.php +++ b/admin/compiler/joomla_3/JModelLegacy_import_custom.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\Utilities\ArrayHelper; use PhpOffice\PhpSpreadsheet\IOFactory; /** diff --git a/admin/compiler/joomla_3/JTable.php b/admin/compiler/joomla_3/JTable.php index 73304bb31..b83d59975 100644 --- a/admin/compiler/joomla_3/JTable.php +++ b/admin/compiler/joomla_3/JTable.php @@ -18,6 +18,8 @@ defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * ###Views### Table class @@ -142,7 +144,7 @@ class ###Component###Table###View### extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -157,7 +159,7 @@ class ###Component###Table###View### extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -181,7 +183,7 @@ class ###Component###Table###View### extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -220,7 +222,7 @@ class ###Component###Table###View### extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/controller.php b/admin/controller.php index a5a670453..dcf9c0f8d 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * General Controller of Componentbuilder component */ diff --git a/admin/controllers/admin_custom_tabs.php b/admin/controllers/admin_custom_tabs.php index 8184df968..899fe2110 100644 --- a/admin/controllers/admin_custom_tabs.php +++ b/admin/controllers/admin_custom_tabs.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Admin_custom_tabs Controller */ diff --git a/admin/controllers/admin_fields.php b/admin/controllers/admin_fields.php index 517ac544d..511be1dbc 100644 --- a/admin/controllers/admin_fields.php +++ b/admin/controllers/admin_fields.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Admin_fields Controller */ diff --git a/admin/controllers/admin_fields_conditions.php b/admin/controllers/admin_fields_conditions.php index cb909cb29..e8024e432 100644 --- a/admin/controllers/admin_fields_conditions.php +++ b/admin/controllers/admin_fields_conditions.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Admin_fields_conditions Controller */ diff --git a/admin/controllers/admin_fields_relations.php b/admin/controllers/admin_fields_relations.php index bf8853499..a121865a3 100644 --- a/admin/controllers/admin_fields_relations.php +++ b/admin/controllers/admin_fields_relations.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Admin_fields_relations Controller */ diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index 0a6198eee..e14856eb1 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Admin_view Controller */ diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index 28e1a3772..bb3825f81 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Admin_views Controller */ diff --git a/admin/controllers/admins_custom_tabs.php b/admin/controllers/admins_custom_tabs.php index 01abf5bec..cbccdf08a 100644 --- a/admin/controllers/admins_custom_tabs.php +++ b/admin/controllers/admins_custom_tabs.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Admins_custom_tabs Controller */ diff --git a/admin/controllers/admins_fields.php b/admin/controllers/admins_fields.php index 4b671f5b5..6d0d4c159 100644 --- a/admin/controllers/admins_fields.php +++ b/admin/controllers/admins_fields.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Admins_fields Controller */ diff --git a/admin/controllers/admins_fields_conditions.php b/admin/controllers/admins_fields_conditions.php index 8276bd86a..505c387db 100644 --- a/admin/controllers/admins_fields_conditions.php +++ b/admin/controllers/admins_fields_conditions.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Admins_fields_conditions Controller */ diff --git a/admin/controllers/admins_fields_relations.php b/admin/controllers/admins_fields_relations.php index 8b9c50981..c00e77130 100644 --- a/admin/controllers/admins_fields_relations.php +++ b/admin/controllers/admins_fields_relations.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Admins_fields_relations Controller */ diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 86aa14c01..427912071 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Componentbuilder Ajax Controller */ diff --git a/admin/controllers/class_extendings.php b/admin/controllers/class_extendings.php index 1ad68352c..749e0e750 100644 --- a/admin/controllers/class_extendings.php +++ b/admin/controllers/class_extendings.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Class_extendings Controller */ diff --git a/admin/controllers/class_extends.php b/admin/controllers/class_extends.php index f39348d60..716f641a3 100644 --- a/admin/controllers/class_extends.php +++ b/admin/controllers/class_extends.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Class_extends Controller */ diff --git a/admin/controllers/class_method.php b/admin/controllers/class_method.php index e1e5704f7..ffd7a8b00 100644 --- a/admin/controllers/class_method.php +++ b/admin/controllers/class_method.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Class_method Controller */ diff --git a/admin/controllers/class_methods.php b/admin/controllers/class_methods.php index 9b03042d5..709f69dd7 100644 --- a/admin/controllers/class_methods.php +++ b/admin/controllers/class_methods.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Class_methods Controller */ diff --git a/admin/controllers/class_properties.php b/admin/controllers/class_properties.php index bf2f89cfb..f55e8a472 100644 --- a/admin/controllers/class_properties.php +++ b/admin/controllers/class_properties.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Class_properties Controller */ diff --git a/admin/controllers/class_property.php b/admin/controllers/class_property.php index 40d8261b0..f39e643ff 100644 --- a/admin/controllers/class_property.php +++ b/admin/controllers/class_property.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Class_property Controller */ diff --git a/admin/controllers/compiler.php b/admin/controllers/compiler.php index 057fc8241..e5deb1dae 100644 --- a/admin/controllers/compiler.php +++ b/admin/controllers/compiler.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Compiler Controller */ diff --git a/admin/controllers/component_admin_views.php b/admin/controllers/component_admin_views.php index e0abeaa3e..5ee2efdcd 100644 --- a/admin/controllers/component_admin_views.php +++ b/admin/controllers/component_admin_views.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Component_admin_views Controller */ diff --git a/admin/controllers/component_config.php b/admin/controllers/component_config.php index ae12a8cb3..d0c47e709 100644 --- a/admin/controllers/component_config.php +++ b/admin/controllers/component_config.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Component_config Controller */ diff --git a/admin/controllers/component_custom_admin_menus.php b/admin/controllers/component_custom_admin_menus.php index d9f3918f7..4ca9d1552 100644 --- a/admin/controllers/component_custom_admin_menus.php +++ b/admin/controllers/component_custom_admin_menus.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Component_custom_admin_menus Controller */ diff --git a/admin/controllers/component_custom_admin_views.php b/admin/controllers/component_custom_admin_views.php index e54f4f568..33fd06279 100644 --- a/admin/controllers/component_custom_admin_views.php +++ b/admin/controllers/component_custom_admin_views.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Component_custom_admin_views Controller */ diff --git a/admin/controllers/component_dashboard.php b/admin/controllers/component_dashboard.php index 11b16527b..6ae4842ba 100644 --- a/admin/controllers/component_dashboard.php +++ b/admin/controllers/component_dashboard.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Component_dashboard Controller */ diff --git a/admin/controllers/component_files_folders.php b/admin/controllers/component_files_folders.php index b8cdd12e3..2cb99e99a 100644 --- a/admin/controllers/component_files_folders.php +++ b/admin/controllers/component_files_folders.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Component_files_folders Controller */ diff --git a/admin/controllers/component_modules.php b/admin/controllers/component_modules.php index 03598a5d3..93a7d01d9 100644 --- a/admin/controllers/component_modules.php +++ b/admin/controllers/component_modules.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Component_modules Controller */ diff --git a/admin/controllers/component_mysql_tweaks.php b/admin/controllers/component_mysql_tweaks.php index 6cc061c29..298a57b01 100644 --- a/admin/controllers/component_mysql_tweaks.php +++ b/admin/controllers/component_mysql_tweaks.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Component_mysql_tweaks Controller */ diff --git a/admin/controllers/component_placeholders.php b/admin/controllers/component_placeholders.php index 86385f8a3..97dcf1416 100644 --- a/admin/controllers/component_placeholders.php +++ b/admin/controllers/component_placeholders.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Component_placeholders Controller */ diff --git a/admin/controllers/component_plugins.php b/admin/controllers/component_plugins.php index bfc869bde..630bd82b4 100644 --- a/admin/controllers/component_plugins.php +++ b/admin/controllers/component_plugins.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Component_plugins Controller */ diff --git a/admin/controllers/component_site_views.php b/admin/controllers/component_site_views.php index fbdb6d70d..1a138f27c 100644 --- a/admin/controllers/component_site_views.php +++ b/admin/controllers/component_site_views.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Component_site_views Controller */ diff --git a/admin/controllers/component_updates.php b/admin/controllers/component_updates.php index c184ef4af..42f4af69d 100644 --- a/admin/controllers/component_updates.php +++ b/admin/controllers/component_updates.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Component_updates Controller */ diff --git a/admin/controllers/components_admin_views.php b/admin/controllers/components_admin_views.php index 7b613e375..25e11b2c3 100644 --- a/admin/controllers/components_admin_views.php +++ b/admin/controllers/components_admin_views.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Components_admin_views Controller */ diff --git a/admin/controllers/components_config.php b/admin/controllers/components_config.php index 305e00651..3f962db6c 100644 --- a/admin/controllers/components_config.php +++ b/admin/controllers/components_config.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Components_config Controller */ diff --git a/admin/controllers/components_custom_admin_menus.php b/admin/controllers/components_custom_admin_menus.php index 47f8faaba..1d7ee6dfd 100644 --- a/admin/controllers/components_custom_admin_menus.php +++ b/admin/controllers/components_custom_admin_menus.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Components_custom_admin_menus Controller */ diff --git a/admin/controllers/components_custom_admin_views.php b/admin/controllers/components_custom_admin_views.php index 851eb27b5..9d560d190 100644 --- a/admin/controllers/components_custom_admin_views.php +++ b/admin/controllers/components_custom_admin_views.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Components_custom_admin_views Controller */ diff --git a/admin/controllers/components_dashboard.php b/admin/controllers/components_dashboard.php index 85cf61aef..7a40f3d47 100644 --- a/admin/controllers/components_dashboard.php +++ b/admin/controllers/components_dashboard.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Components_dashboard Controller */ diff --git a/admin/controllers/components_files_folders.php b/admin/controllers/components_files_folders.php index 4dec04da1..346a0ddb2 100644 --- a/admin/controllers/components_files_folders.php +++ b/admin/controllers/components_files_folders.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Components_files_folders Controller */ diff --git a/admin/controllers/components_modules.php b/admin/controllers/components_modules.php index 47019c1bf..c824bf675 100644 --- a/admin/controllers/components_modules.php +++ b/admin/controllers/components_modules.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Components_modules Controller */ diff --git a/admin/controllers/components_mysql_tweaks.php b/admin/controllers/components_mysql_tweaks.php index 4f700bd71..30c38032e 100644 --- a/admin/controllers/components_mysql_tweaks.php +++ b/admin/controllers/components_mysql_tweaks.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Components_mysql_tweaks Controller */ diff --git a/admin/controllers/components_placeholders.php b/admin/controllers/components_placeholders.php index 1d0555c23..f8ef4b633 100644 --- a/admin/controllers/components_placeholders.php +++ b/admin/controllers/components_placeholders.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Components_placeholders Controller */ diff --git a/admin/controllers/components_plugins.php b/admin/controllers/components_plugins.php index a7cb5fe8d..8bef571e6 100644 --- a/admin/controllers/components_plugins.php +++ b/admin/controllers/components_plugins.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Components_plugins Controller */ diff --git a/admin/controllers/components_site_views.php b/admin/controllers/components_site_views.php index e65c16b5a..7e0b151be 100644 --- a/admin/controllers/components_site_views.php +++ b/admin/controllers/components_site_views.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Components_site_views Controller */ diff --git a/admin/controllers/components_updates.php b/admin/controllers/components_updates.php index 1b39c4783..e0e47353d 100644 --- a/admin/controllers/components_updates.php +++ b/admin/controllers/components_updates.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Components_updates Controller */ diff --git a/admin/controllers/custom_admin_view.php b/admin/controllers/custom_admin_view.php index 9aa00eb8b..86e866408 100644 --- a/admin/controllers/custom_admin_view.php +++ b/admin/controllers/custom_admin_view.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Custom_admin_view Controller */ diff --git a/admin/controllers/custom_admin_views.php b/admin/controllers/custom_admin_views.php index a8bfbf399..aa3a2def6 100644 --- a/admin/controllers/custom_admin_views.php +++ b/admin/controllers/custom_admin_views.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Custom_admin_views Controller */ diff --git a/admin/controllers/custom_code.php b/admin/controllers/custom_code.php index 0beb700fe..8c4678a5d 100644 --- a/admin/controllers/custom_code.php +++ b/admin/controllers/custom_code.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Custom_code Controller */ diff --git a/admin/controllers/custom_codes.php b/admin/controllers/custom_codes.php index 6da166f40..8fd2baf75 100644 --- a/admin/controllers/custom_codes.php +++ b/admin/controllers/custom_codes.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Custom_codes Controller */ diff --git a/admin/controllers/dynamic_get.php b/admin/controllers/dynamic_get.php index 1ddb46f48..affacc4d5 100644 --- a/admin/controllers/dynamic_get.php +++ b/admin/controllers/dynamic_get.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Dynamic_get Controller */ diff --git a/admin/controllers/dynamic_gets.php b/admin/controllers/dynamic_gets.php index 717b291a4..8f2779626 100644 --- a/admin/controllers/dynamic_gets.php +++ b/admin/controllers/dynamic_gets.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Dynamic_gets Controller */ diff --git a/admin/controllers/field.php b/admin/controllers/field.php index 753dec14e..e9a3de898 100644 --- a/admin/controllers/field.php +++ b/admin/controllers/field.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Field Controller */ diff --git a/admin/controllers/fields.php b/admin/controllers/fields.php index 629856ae6..333d6c2a3 100644 --- a/admin/controllers/fields.php +++ b/admin/controllers/fields.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Fields Controller */ diff --git a/admin/controllers/fieldtype.php b/admin/controllers/fieldtype.php index cb770f3b7..0f372a454 100644 --- a/admin/controllers/fieldtype.php +++ b/admin/controllers/fieldtype.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Fieldtype Controller */ diff --git a/admin/controllers/fieldtypes.php b/admin/controllers/fieldtypes.php index b9ce8c65e..b3f11562c 100644 --- a/admin/controllers/fieldtypes.php +++ b/admin/controllers/fieldtypes.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Fieldtypes Controller */ diff --git a/admin/controllers/get_snippets.php b/admin/controllers/get_snippets.php index 07b1a3193..6a8bd6fa1 100644 --- a/admin/controllers/get_snippets.php +++ b/admin/controllers/get_snippets.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Get_snippets Controller */ diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 73ad3c1d2..075ac8478 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Componentbuilder Help Controller */ diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index 882f003e3..7c8dac620 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Help_document Controller */ diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index 9d76a261d..1fd855f42 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Help_documents Controller */ diff --git a/admin/controllers/import.php b/admin/controllers/import.php index f7aa1cd91..1a4478621 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Componentbuilder Import Controller */ diff --git a/admin/controllers/import_joomla_components.php b/admin/controllers/import_joomla_components.php index 8a396d50d..83ab37693 100644 --- a/admin/controllers/import_joomla_components.php +++ b/admin/controllers/import_joomla_components.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Componentbuilder Import_joomla_components Controller */ diff --git a/admin/controllers/import_language_translations.php b/admin/controllers/import_language_translations.php index 3edf8d358..7cc0646a7 100644 --- a/admin/controllers/import_language_translations.php +++ b/admin/controllers/import_language_translations.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Componentbuilder Import_language_translations Controller */ diff --git a/admin/controllers/joomla_component.php b/admin/controllers/joomla_component.php index 1bceb12af..e6c961d4f 100644 --- a/admin/controllers/joomla_component.php +++ b/admin/controllers/joomla_component.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Joomla_component Controller */ diff --git a/admin/controllers/joomla_components.php b/admin/controllers/joomla_components.php index 97b865a52..6dae9b775 100644 --- a/admin/controllers/joomla_components.php +++ b/admin/controllers/joomla_components.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Joomla_components Controller */ diff --git a/admin/controllers/joomla_module.php b/admin/controllers/joomla_module.php index 1d97a6cf4..a77945ace 100644 --- a/admin/controllers/joomla_module.php +++ b/admin/controllers/joomla_module.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Joomla_module Controller */ diff --git a/admin/controllers/joomla_module_files_folders_urls.php b/admin/controllers/joomla_module_files_folders_urls.php index 617dd333a..5368584f2 100644 --- a/admin/controllers/joomla_module_files_folders_urls.php +++ b/admin/controllers/joomla_module_files_folders_urls.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Joomla_module_files_folders_urls Controller */ diff --git a/admin/controllers/joomla_module_updates.php b/admin/controllers/joomla_module_updates.php index 72bea6531..6dbb8290a 100644 --- a/admin/controllers/joomla_module_updates.php +++ b/admin/controllers/joomla_module_updates.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Joomla_module_updates Controller */ diff --git a/admin/controllers/joomla_modules.php b/admin/controllers/joomla_modules.php index 79f5acece..87c1942e7 100644 --- a/admin/controllers/joomla_modules.php +++ b/admin/controllers/joomla_modules.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Joomla_modules Controller */ diff --git a/admin/controllers/joomla_modules_files_folders_urls.php b/admin/controllers/joomla_modules_files_folders_urls.php index 240cf3004..47dc7e08b 100644 --- a/admin/controllers/joomla_modules_files_folders_urls.php +++ b/admin/controllers/joomla_modules_files_folders_urls.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Joomla_modules_files_folders_urls Controller */ diff --git a/admin/controllers/joomla_modules_updates.php b/admin/controllers/joomla_modules_updates.php index cec07b3f5..a831042a9 100644 --- a/admin/controllers/joomla_modules_updates.php +++ b/admin/controllers/joomla_modules_updates.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Joomla_modules_updates Controller */ diff --git a/admin/controllers/joomla_plugin.php b/admin/controllers/joomla_plugin.php index bb9cb77f4..8900cea02 100644 --- a/admin/controllers/joomla_plugin.php +++ b/admin/controllers/joomla_plugin.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Joomla_plugin Controller */ diff --git a/admin/controllers/joomla_plugin_files_folders_urls.php b/admin/controllers/joomla_plugin_files_folders_urls.php index 3511c1646..cf66e82f3 100644 --- a/admin/controllers/joomla_plugin_files_folders_urls.php +++ b/admin/controllers/joomla_plugin_files_folders_urls.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Joomla_plugin_files_folders_urls Controller */ diff --git a/admin/controllers/joomla_plugin_group.php b/admin/controllers/joomla_plugin_group.php index c9970a45a..c26681770 100644 --- a/admin/controllers/joomla_plugin_group.php +++ b/admin/controllers/joomla_plugin_group.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Joomla_plugin_group Controller */ diff --git a/admin/controllers/joomla_plugin_groups.php b/admin/controllers/joomla_plugin_groups.php index 4f9587e79..d9b99d1d5 100644 --- a/admin/controllers/joomla_plugin_groups.php +++ b/admin/controllers/joomla_plugin_groups.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Joomla_plugin_groups Controller */ diff --git a/admin/controllers/joomla_plugin_updates.php b/admin/controllers/joomla_plugin_updates.php index 83319afa7..e8a7c7b66 100644 --- a/admin/controllers/joomla_plugin_updates.php +++ b/admin/controllers/joomla_plugin_updates.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Joomla_plugin_updates Controller */ diff --git a/admin/controllers/joomla_plugins.php b/admin/controllers/joomla_plugins.php index 57c7297ac..351eb12ed 100644 --- a/admin/controllers/joomla_plugins.php +++ b/admin/controllers/joomla_plugins.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Joomla_plugins Controller */ diff --git a/admin/controllers/joomla_plugins_files_folders_urls.php b/admin/controllers/joomla_plugins_files_folders_urls.php index 70ca7ed0d..9841c2cfa 100644 --- a/admin/controllers/joomla_plugins_files_folders_urls.php +++ b/admin/controllers/joomla_plugins_files_folders_urls.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Joomla_plugins_files_folders_urls Controller */ diff --git a/admin/controllers/joomla_plugins_updates.php b/admin/controllers/joomla_plugins_updates.php index 1a0f902d5..3cc1b77c2 100644 --- a/admin/controllers/joomla_plugins_updates.php +++ b/admin/controllers/joomla_plugins_updates.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Joomla_plugins_updates Controller */ diff --git a/admin/controllers/language.php b/admin/controllers/language.php index 161b1e748..9eded7e7e 100644 --- a/admin/controllers/language.php +++ b/admin/controllers/language.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Language Controller */ diff --git a/admin/controllers/language_translation.php b/admin/controllers/language_translation.php index 956814d01..b732c1abb 100644 --- a/admin/controllers/language_translation.php +++ b/admin/controllers/language_translation.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Language_translation Controller */ diff --git a/admin/controllers/language_translations.php b/admin/controllers/language_translations.php index 85693f011..63f63c677 100644 --- a/admin/controllers/language_translations.php +++ b/admin/controllers/language_translations.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Language_translations Controller */ diff --git a/admin/controllers/languages.php b/admin/controllers/languages.php index 97f5e2130..4a5f9527c 100644 --- a/admin/controllers/languages.php +++ b/admin/controllers/languages.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Languages Controller */ diff --git a/admin/controllers/layout.php b/admin/controllers/layout.php index a778bc66d..1617b785b 100644 --- a/admin/controllers/layout.php +++ b/admin/controllers/layout.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Layout Controller */ diff --git a/admin/controllers/layouts.php b/admin/controllers/layouts.php index 3ed1b3554..5c46d7201 100644 --- a/admin/controllers/layouts.php +++ b/admin/controllers/layouts.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Layouts Controller */ diff --git a/admin/controllers/libraries.php b/admin/controllers/libraries.php index dc44a58fe..8ccb21caf 100644 --- a/admin/controllers/libraries.php +++ b/admin/controllers/libraries.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Libraries Controller */ diff --git a/admin/controllers/libraries_config.php b/admin/controllers/libraries_config.php index ede180819..d6e4985a9 100644 --- a/admin/controllers/libraries_config.php +++ b/admin/controllers/libraries_config.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Libraries_config Controller */ diff --git a/admin/controllers/libraries_files_folders_urls.php b/admin/controllers/libraries_files_folders_urls.php index bbfc67eea..34d8a7dcd 100644 --- a/admin/controllers/libraries_files_folders_urls.php +++ b/admin/controllers/libraries_files_folders_urls.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Libraries_files_folders_urls Controller */ diff --git a/admin/controllers/library.php b/admin/controllers/library.php index cc1196ce0..7c42dd1fb 100644 --- a/admin/controllers/library.php +++ b/admin/controllers/library.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Library Controller */ diff --git a/admin/controllers/library_config.php b/admin/controllers/library_config.php index 6116273b7..f404159e7 100644 --- a/admin/controllers/library_config.php +++ b/admin/controllers/library_config.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Library_config Controller */ diff --git a/admin/controllers/library_files_folders_urls.php b/admin/controllers/library_files_folders_urls.php index c95952e0f..73bf8b9a7 100644 --- a/admin/controllers/library_files_folders_urls.php +++ b/admin/controllers/library_files_folders_urls.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Library_files_folders_urls Controller */ diff --git a/admin/controllers/placeholder.php b/admin/controllers/placeholder.php index 372d06648..bf8a691e0 100644 --- a/admin/controllers/placeholder.php +++ b/admin/controllers/placeholder.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Placeholder Controller */ diff --git a/admin/controllers/placeholders.php b/admin/controllers/placeholders.php index 0649336ac..7e1cedf00 100644 --- a/admin/controllers/placeholders.php +++ b/admin/controllers/placeholders.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Placeholders Controller */ diff --git a/admin/controllers/server.php b/admin/controllers/server.php index 506c36e48..e36cd8324 100644 --- a/admin/controllers/server.php +++ b/admin/controllers/server.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Server Controller */ diff --git a/admin/controllers/servers.php b/admin/controllers/servers.php index d1948dfb5..c2dce20e0 100644 --- a/admin/controllers/servers.php +++ b/admin/controllers/servers.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Servers Controller */ diff --git a/admin/controllers/site_view.php b/admin/controllers/site_view.php index 9e06feb92..9a91ca8c2 100644 --- a/admin/controllers/site_view.php +++ b/admin/controllers/site_view.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Site_view Controller */ diff --git a/admin/controllers/site_views.php b/admin/controllers/site_views.php index f8c6d8e6f..e85fe2e21 100644 --- a/admin/controllers/site_views.php +++ b/admin/controllers/site_views.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Site_views Controller */ diff --git a/admin/controllers/snippet.php b/admin/controllers/snippet.php index af973f0c6..f6c3d87ba 100644 --- a/admin/controllers/snippet.php +++ b/admin/controllers/snippet.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Snippet Controller */ diff --git a/admin/controllers/snippet_type.php b/admin/controllers/snippet_type.php index 2ea618d1b..ec355f2d8 100644 --- a/admin/controllers/snippet_type.php +++ b/admin/controllers/snippet_type.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Snippet_type Controller */ diff --git a/admin/controllers/snippet_types.php b/admin/controllers/snippet_types.php index a8d54c97d..e6ed8596e 100644 --- a/admin/controllers/snippet_types.php +++ b/admin/controllers/snippet_types.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Snippet_types Controller */ diff --git a/admin/controllers/snippets.php b/admin/controllers/snippets.php index 0c0c97617..649f3270a 100644 --- a/admin/controllers/snippets.php +++ b/admin/controllers/snippets.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Snippets Controller */ diff --git a/admin/controllers/template.php b/admin/controllers/template.php index f37d24538..b4806cef4 100644 --- a/admin/controllers/template.php +++ b/admin/controllers/template.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Template Controller */ diff --git a/admin/controllers/templates.php b/admin/controllers/templates.php index 9ec42868f..5557a929f 100644 --- a/admin/controllers/templates.php +++ b/admin/controllers/templates.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Templates Controller */ diff --git a/admin/controllers/validation_rule.php b/admin/controllers/validation_rule.php index dd2051f24..73d31e491 100644 --- a/admin/controllers/validation_rule.php +++ b/admin/controllers/validation_rule.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Validation_rule Controller */ diff --git a/admin/controllers/validation_rules.php b/admin/controllers/validation_rules.php index ee7195018..f99585aaf 100644 --- a/admin/controllers/validation_rules.php +++ b/admin/controllers/validation_rules.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Validation_rules Controller */ diff --git a/admin/models/import.php b/admin/models/import.php index 227a86b3d..71b78bc15 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -12,6 +12,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; use PhpOffice\PhpSpreadsheet\IOFactory; /** diff --git a/admin/models/import_joomla_components.php b/admin/models/import_joomla_components.php index 7c3f23225..fc47f45e8 100644 --- a/admin/models/import_joomla_components.php +++ b/admin/models/import_joomla_components.php @@ -12,6 +12,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; use PhpOffice\PhpSpreadsheet\IOFactory; /** diff --git a/admin/models/import_language_translations.php b/admin/models/import_language_translations.php index 8dd8d834e..9d2745852 100644 --- a/admin/models/import_language_translations.php +++ b/admin/models/import_language_translations.php @@ -12,6 +12,7 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; use PhpOffice\PhpSpreadsheet\IOFactory; /** diff --git a/admin/tables/admin_custom_tabs.php b/admin/tables/admin_custom_tabs.php index 66f6e70e6..7bec1d269 100644 --- a/admin/tables/admin_custom_tabs.php +++ b/admin/tables/admin_custom_tabs.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Admins_custom_tabs Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableAdmin_custom_tabs extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableAdmin_custom_tabs extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableAdmin_custom_tabs extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableAdmin_custom_tabs extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/admin_fields.php b/admin/tables/admin_fields.php index b5ba51653..9d4fd12ab 100644 --- a/admin/tables/admin_fields.php +++ b/admin/tables/admin_fields.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Admins_fields Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableAdmin_fields extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableAdmin_fields extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableAdmin_fields extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableAdmin_fields extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/admin_fields_conditions.php b/admin/tables/admin_fields_conditions.php index 9f265b3e0..742329210 100644 --- a/admin/tables/admin_fields_conditions.php +++ b/admin/tables/admin_fields_conditions.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Admins_fields_conditions Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableAdmin_fields_conditions extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableAdmin_fields_conditions extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableAdmin_fields_conditions extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableAdmin_fields_conditions extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/admin_fields_relations.php b/admin/tables/admin_fields_relations.php index 57c5d5925..226db2fd9 100644 --- a/admin/tables/admin_fields_relations.php +++ b/admin/tables/admin_fields_relations.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Admins_fields_relations Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableAdmin_fields_relations extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableAdmin_fields_relations extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableAdmin_fields_relations extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableAdmin_fields_relations extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php index 2b723778a..3c3969ecf 100644 --- a/admin/tables/admin_view.php +++ b/admin/tables/admin_view.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Admin_views Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableAdmin_view extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableAdmin_view extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableAdmin_view extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableAdmin_view extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/class_extends.php b/admin/tables/class_extends.php index 23edae3ba..c367feeb5 100644 --- a/admin/tables/class_extends.php +++ b/admin/tables/class_extends.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Class_extendings Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableClass_extends extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableClass_extends extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableClass_extends extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableClass_extends extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/class_method.php b/admin/tables/class_method.php index 203c9a913..94c7ec59e 100644 --- a/admin/tables/class_method.php +++ b/admin/tables/class_method.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Class_methods Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableClass_method extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableClass_method extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableClass_method extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableClass_method extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/class_property.php b/admin/tables/class_property.php index 928d71858..7fdf3bbf8 100644 --- a/admin/tables/class_property.php +++ b/admin/tables/class_property.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Class_properties Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableClass_property extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableClass_property extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableClass_property extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableClass_property extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/component_admin_views.php b/admin/tables/component_admin_views.php index 3aa4de21b..ed2e997f4 100644 --- a/admin/tables/component_admin_views.php +++ b/admin/tables/component_admin_views.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Components_admin_views Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableComponent_admin_views extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableComponent_admin_views extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableComponent_admin_views extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableComponent_admin_views extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/component_config.php b/admin/tables/component_config.php index 296c677d5..0218bbe94 100644 --- a/admin/tables/component_config.php +++ b/admin/tables/component_config.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Components_config Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableComponent_config extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableComponent_config extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableComponent_config extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableComponent_config extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/component_custom_admin_menus.php b/admin/tables/component_custom_admin_menus.php index 3ac8d1775..2aa9bebfc 100644 --- a/admin/tables/component_custom_admin_menus.php +++ b/admin/tables/component_custom_admin_menus.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Components_custom_admin_menus Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableComponent_custom_admin_menus extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableComponent_custom_admin_menus extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableComponent_custom_admin_menus extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableComponent_custom_admin_menus extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/component_custom_admin_views.php b/admin/tables/component_custom_admin_views.php index a8a3740e0..b78547915 100644 --- a/admin/tables/component_custom_admin_views.php +++ b/admin/tables/component_custom_admin_views.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Components_custom_admin_views Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableComponent_custom_admin_views extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableComponent_custom_admin_views extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableComponent_custom_admin_views extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableComponent_custom_admin_views extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/component_dashboard.php b/admin/tables/component_dashboard.php index 018e187e7..9774a518f 100644 --- a/admin/tables/component_dashboard.php +++ b/admin/tables/component_dashboard.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Components_dashboard Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableComponent_dashboard extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableComponent_dashboard extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableComponent_dashboard extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableComponent_dashboard extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/component_files_folders.php b/admin/tables/component_files_folders.php index 1fd0f6f7f..fa925deea 100644 --- a/admin/tables/component_files_folders.php +++ b/admin/tables/component_files_folders.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Components_files_folders Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableComponent_files_folders extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableComponent_files_folders extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableComponent_files_folders extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableComponent_files_folders extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/component_modules.php b/admin/tables/component_modules.php index 7143c26bc..6006fd89b 100644 --- a/admin/tables/component_modules.php +++ b/admin/tables/component_modules.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Components_modules Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableComponent_modules extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableComponent_modules extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableComponent_modules extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableComponent_modules extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/component_mysql_tweaks.php b/admin/tables/component_mysql_tweaks.php index c98d9ce72..b9785dff1 100644 --- a/admin/tables/component_mysql_tweaks.php +++ b/admin/tables/component_mysql_tweaks.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Components_mysql_tweaks Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableComponent_mysql_tweaks extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableComponent_mysql_tweaks extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableComponent_mysql_tweaks extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableComponent_mysql_tweaks extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/component_placeholders.php b/admin/tables/component_placeholders.php index e691afb4c..4b51d1751 100644 --- a/admin/tables/component_placeholders.php +++ b/admin/tables/component_placeholders.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Components_placeholders Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableComponent_placeholders extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableComponent_placeholders extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableComponent_placeholders extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableComponent_placeholders extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/component_plugins.php b/admin/tables/component_plugins.php index 935030e17..4574d99d5 100644 --- a/admin/tables/component_plugins.php +++ b/admin/tables/component_plugins.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Components_plugins Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableComponent_plugins extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableComponent_plugins extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableComponent_plugins extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableComponent_plugins extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/component_site_views.php b/admin/tables/component_site_views.php index 3bbbc9023..2353d03f5 100644 --- a/admin/tables/component_site_views.php +++ b/admin/tables/component_site_views.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Components_site_views Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableComponent_site_views extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableComponent_site_views extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableComponent_site_views extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableComponent_site_views extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/component_updates.php b/admin/tables/component_updates.php index e43594d0a..7029b321e 100644 --- a/admin/tables/component_updates.php +++ b/admin/tables/component_updates.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Components_updates Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableComponent_updates extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableComponent_updates extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableComponent_updates extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableComponent_updates extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/custom_admin_view.php b/admin/tables/custom_admin_view.php index 0735aa7c2..1c5e0335c 100644 --- a/admin/tables/custom_admin_view.php +++ b/admin/tables/custom_admin_view.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Custom_admin_views Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableCustom_admin_view extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableCustom_admin_view extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableCustom_admin_view extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableCustom_admin_view extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/custom_code.php b/admin/tables/custom_code.php index 806adbb3c..20e54da29 100644 --- a/admin/tables/custom_code.php +++ b/admin/tables/custom_code.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Custom_codes Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableCustom_code extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableCustom_code extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableCustom_code extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableCustom_code extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/dynamic_get.php b/admin/tables/dynamic_get.php index 541fbfada..1c9ca76ab 100644 --- a/admin/tables/dynamic_get.php +++ b/admin/tables/dynamic_get.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Dynamic_gets Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableDynamic_get extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableDynamic_get extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableDynamic_get extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableDynamic_get extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/field.php b/admin/tables/field.php index 0f8d94b18..6be8c8cfb 100644 --- a/admin/tables/field.php +++ b/admin/tables/field.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Fields Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableField extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableField extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableField extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableField extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/fieldtype.php b/admin/tables/fieldtype.php index dea9198ad..46a382102 100644 --- a/admin/tables/fieldtype.php +++ b/admin/tables/fieldtype.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Fieldtypes Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableFieldtype extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableFieldtype extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableFieldtype extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableFieldtype extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index c00f627dd..ed5204cf2 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Help_documents Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableHelp_document extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableHelp_document extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableHelp_document extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableHelp_document extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/joomla_component.php b/admin/tables/joomla_component.php index ed6a48c26..6036e5929 100644 --- a/admin/tables/joomla_component.php +++ b/admin/tables/joomla_component.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Joomla_components Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableJoomla_component extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableJoomla_component extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableJoomla_component extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableJoomla_component extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/joomla_module.php b/admin/tables/joomla_module.php index 7ccfe9936..ce9614033 100644 --- a/admin/tables/joomla_module.php +++ b/admin/tables/joomla_module.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Joomla_modules Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableJoomla_module extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableJoomla_module extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableJoomla_module extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableJoomla_module extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/joomla_module_files_folders_urls.php b/admin/tables/joomla_module_files_folders_urls.php index 5eac01363..f0c7d70c5 100644 --- a/admin/tables/joomla_module_files_folders_urls.php +++ b/admin/tables/joomla_module_files_folders_urls.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Joomla_modules_files_folders_urls Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableJoomla_module_files_folders_urls extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableJoomla_module_files_folders_urls extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableJoomla_module_files_folders_urls extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableJoomla_module_files_folders_urls extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/joomla_module_updates.php b/admin/tables/joomla_module_updates.php index ce5dfbd34..572246a81 100644 --- a/admin/tables/joomla_module_updates.php +++ b/admin/tables/joomla_module_updates.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Joomla_modules_updates Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableJoomla_module_updates extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableJoomla_module_updates extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableJoomla_module_updates extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableJoomla_module_updates extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/joomla_plugin.php b/admin/tables/joomla_plugin.php index e19f65aa6..e746a252e 100644 --- a/admin/tables/joomla_plugin.php +++ b/admin/tables/joomla_plugin.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Joomla_plugins Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableJoomla_plugin extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableJoomla_plugin extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableJoomla_plugin extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableJoomla_plugin extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/joomla_plugin_files_folders_urls.php b/admin/tables/joomla_plugin_files_folders_urls.php index 4d481917b..a47cb7c57 100644 --- a/admin/tables/joomla_plugin_files_folders_urls.php +++ b/admin/tables/joomla_plugin_files_folders_urls.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Joomla_plugins_files_folders_urls Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableJoomla_plugin_files_folders_urls extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableJoomla_plugin_files_folders_urls extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableJoomla_plugin_files_folders_urls extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableJoomla_plugin_files_folders_urls extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/joomla_plugin_group.php b/admin/tables/joomla_plugin_group.php index e491b3dc8..15131683f 100644 --- a/admin/tables/joomla_plugin_group.php +++ b/admin/tables/joomla_plugin_group.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Joomla_plugin_groups Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableJoomla_plugin_group extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableJoomla_plugin_group extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableJoomla_plugin_group extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableJoomla_plugin_group extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/joomla_plugin_updates.php b/admin/tables/joomla_plugin_updates.php index a571cb4bb..7c592983d 100644 --- a/admin/tables/joomla_plugin_updates.php +++ b/admin/tables/joomla_plugin_updates.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Joomla_plugins_updates Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableJoomla_plugin_updates extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableJoomla_plugin_updates extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableJoomla_plugin_updates extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableJoomla_plugin_updates extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/language.php b/admin/tables/language.php index 89b068fe4..9ecc6a921 100644 --- a/admin/tables/language.php +++ b/admin/tables/language.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Languages Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableLanguage extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableLanguage extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableLanguage extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableLanguage extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/language_translation.php b/admin/tables/language_translation.php index 82456640f..59577758d 100644 --- a/admin/tables/language_translation.php +++ b/admin/tables/language_translation.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Language_translations Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableLanguage_translation extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableLanguage_translation extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableLanguage_translation extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableLanguage_translation extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/layout.php b/admin/tables/layout.php index 4d592279d..eaf50740a 100644 --- a/admin/tables/layout.php +++ b/admin/tables/layout.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Layouts Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableLayout extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableLayout extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableLayout extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableLayout extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/library.php b/admin/tables/library.php index 935a96642..a6750e29f 100644 --- a/admin/tables/library.php +++ b/admin/tables/library.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Libraries Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableLibrary extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableLibrary extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableLibrary extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableLibrary extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/library_config.php b/admin/tables/library_config.php index 735179e47..456f1eae3 100644 --- a/admin/tables/library_config.php +++ b/admin/tables/library_config.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Libraries_config Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableLibrary_config extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableLibrary_config extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableLibrary_config extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableLibrary_config extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/library_files_folders_urls.php b/admin/tables/library_files_folders_urls.php index 9dc3029fe..a00eaf60f 100644 --- a/admin/tables/library_files_folders_urls.php +++ b/admin/tables/library_files_folders_urls.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Libraries_files_folders_urls Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableLibrary_files_folders_urls extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableLibrary_files_folders_urls extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableLibrary_files_folders_urls extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableLibrary_files_folders_urls extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/placeholder.php b/admin/tables/placeholder.php index 8f1f57640..7dff815ef 100644 --- a/admin/tables/placeholder.php +++ b/admin/tables/placeholder.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Placeholders Table class @@ -140,7 +142,7 @@ class ComponentbuilderTablePlaceholder extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTablePlaceholder extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTablePlaceholder extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTablePlaceholder extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/server.php b/admin/tables/server.php index 189010a71..feec5c730 100644 --- a/admin/tables/server.php +++ b/admin/tables/server.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Servers Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableServer extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableServer extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableServer extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableServer extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/site_view.php b/admin/tables/site_view.php index 01c68ee51..72668d596 100644 --- a/admin/tables/site_view.php +++ b/admin/tables/site_view.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Site_views Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableSite_view extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableSite_view extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableSite_view extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableSite_view extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/snippet.php b/admin/tables/snippet.php index df69ecf58..c8ebc31e6 100644 --- a/admin/tables/snippet.php +++ b/admin/tables/snippet.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Snippets Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableSnippet extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableSnippet extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableSnippet extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableSnippet extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/snippet_type.php b/admin/tables/snippet_type.php index 7c01edcbe..f4a40d385 100644 --- a/admin/tables/snippet_type.php +++ b/admin/tables/snippet_type.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Snippet_types Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableSnippet_type extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableSnippet_type extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableSnippet_type extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableSnippet_type extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/template.php b/admin/tables/template.php index 2d6b402b9..18997eb59 100644 --- a/admin/tables/template.php +++ b/admin/tables/template.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Templates Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableTemplate extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableTemplate extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableTemplate extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableTemplate extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/admin/tables/validation_rule.php b/admin/tables/validation_rule.php index 5be38dc0e..2448e6064 100644 --- a/admin/tables/validation_rule.php +++ b/admin/tables/validation_rule.php @@ -13,6 +13,8 @@ defined('_JEXEC') or die('Restricted access'); use Joomla\Registry\Registry; +use Joomla\String\StringHelper; +use Joomla\Utilities\ArrayHelper; /** * Validation_rules Table class @@ -140,7 +142,7 @@ class ComponentbuilderTableValidation_rule extends JTable while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->alias = JString::increment($this->alias, 'dash'); + $this->alias = StringHelper::increment($this->alias, 'dash'); } } @@ -155,7 +157,7 @@ class ComponentbuilderTableValidation_rule extends JTable $bad_characters = array("\n", "\r", "\"", "<", ">"); // Remove bad characters. - $after_clean = JString::str_ireplace($bad_characters, "", $this->metakey); + $after_clean = StringHelper::str_ireplace($bad_characters, "", $this->metakey); // Create array using commas as delimiter. $keys = explode(',', $after_clean); @@ -179,7 +181,7 @@ class ComponentbuilderTableValidation_rule extends JTable { // Only process if not empty $bad_characters = array("\"", "<", ">"); - $this->metadesc = JString::str_ireplace($bad_characters, "", $this->metadesc); + $this->metadesc = StringHelper::str_ireplace($bad_characters, "", $this->metadesc); } // If we don't have any access rules set at this point just use an empty JAccessRules class @@ -218,7 +220,7 @@ class ComponentbuilderTableValidation_rule extends JTable $db->execute(); if ($db->loadRowList()) { - // asset alread set so use saved rules + // asset already set so use saved rules $assetId = (int) $db->loadResult(); return JAccess::getAssetRules($assetId); // (TODO) instead of keeping inherited Allowed it becomes Allowed. } diff --git a/site/controller.php b/site/controller.php index f4a89dda3..701ccb563 100644 --- a/site/controller.php +++ b/site/controller.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Componentbuilder Component Controller */ diff --git a/site/controllers/api.php b/site/controllers/api.php index 39acb5834..df5a7a0ce 100644 --- a/site/controllers/api.php +++ b/site/controllers/api.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Componentbuilder Api Controller */ diff --git a/site/controllers/help.php b/site/controllers/help.php index caf702d0c..5b25c24fe 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Componentbuilder Help Controller */ diff --git a/site/models/api.php b/site/models/api.php index 4c28f54b9..7e9ee8d41 100644 --- a/site/models/api.php +++ b/site/models/api.php @@ -12,6 +12,8 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +use Joomla\Utilities\ArrayHelper; + /** * Componentbuilder Api Model */