diff --git a/administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php b/administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php index 6e20d3a76dac..503a31f55c6b 100644 --- a/administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php +++ b/administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php @@ -120,6 +120,11 @@ public function display($tpl = null) // Load all actionlog plugins language files ActionlogsHelper::loadActionLogPluginsLanguage(); + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + parent::display($tpl); } diff --git a/administrator/components/com_actionlogs/tmpl/actionlogs/default.php b/administrator/components/com_actionlogs/tmpl/actionlogs/default.php index e0f9d0bf806b..3d98c88be375 100644 --- a/administrator/components/com_actionlogs/tmpl/actionlogs/default.php +++ b/administrator/components/com_actionlogs/tmpl/actionlogs/default.php @@ -118,9 +118,8 @@ pagination->getListFooter(); ?> - - - + + filterForm->renderControlFields(); ?>
diff --git a/administrator/components/com_associations/src/View/Association/HtmlView.php b/administrator/components/com_associations/src/View/Association/HtmlView.php index d0e662e404d8..faec09ff9005 100644 --- a/administrator/components/com_associations/src/View/Association/HtmlView.php +++ b/administrator/components/com_associations/src/View/Association/HtmlView.php @@ -322,6 +322,11 @@ public function display($tpl = null): void $this->addToolbar(); + // Add form control fields + $this->form + ->addControlField('task', '') + ->addControlField('target-id', '', ['id' => 'target-id']); + parent::display($tpl); } diff --git a/administrator/components/com_associations/src/View/Associations/HtmlView.php b/administrator/components/com_associations/src/View/Associations/HtmlView.php index 591a852c9a35..97b640dd4a54 100644 --- a/administrator/components/com_associations/src/View/Associations/HtmlView.php +++ b/administrator/components/com_associations/src/View/Associations/HtmlView.php @@ -134,6 +134,10 @@ public function display($tpl = null) $this->filterForm = $model->getFilterForm(); $this->activeFilters = $model->getActiveFilters(); + // Add form control fields + $this->filterForm + ->addControlField('task', ''); + if (!Associations::isEnabled()) { $link = Route::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . AssociationsHelper::getLanguagefilterPluginId()); Factory::getApplication()->enqueueMessage(Text::sprintf('COM_ASSOCIATIONS_ERROR_NO_ASSOC', $link), 'warning'); @@ -211,6 +215,11 @@ public function display($tpl = null) if ($forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD')) { $this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter'); } + + // Add extra form control fields for modal + $this->filterForm + ->addControlField('forcedItemType', Factory::getApplication()->getInput()->get('forcedItemType', '', 'string')) + ->addControlField('forcedLanguage', $forcedLanguage); } } diff --git a/administrator/components/com_associations/tmpl/association/edit.php b/administrator/components/com_associations/tmpl/association/edit.php index efbe432ed63d..9cfe74506696 100644 --- a/administrator/components/com_associations/tmpl/association/edit.php +++ b/administrator/components/com_associations/tmpl/association/edit.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; use Joomla\Component\Associations\Administrator\View\Association\HtmlView; @@ -83,7 +82,5 @@ - - - + form->renderControlFields(); ?>
diff --git a/administrator/components/com_associations/tmpl/associations/default.php b/administrator/components/com_associations/tmpl/associations/default.php index 3c6bcc2f202c..290d9c5da123 100644 --- a/administrator/components/com_associations/tmpl/associations/default.php +++ b/administrator/components/com_associations/tmpl/associations/default.php @@ -164,8 +164,8 @@ pagination->getListFooter(); ?> - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_associations/tmpl/associations/modal.php b/administrator/components/com_associations/tmpl/associations/modal.php index 5a4b2214e451..f945152d581e 100644 --- a/administrator/components/com_associations/tmpl/associations/modal.php +++ b/administrator/components/com_associations/tmpl/associations/modal.php @@ -164,9 +164,6 @@ - - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_banners/src/View/Banner/HtmlView.php b/administrator/components/com_banners/src/View/Banner/HtmlView.php index 7e2785000a55..d92a9f998b63 100644 --- a/administrator/components/com_banners/src/View/Banner/HtmlView.php +++ b/administrator/components/com_banners/src/View/Banner/HtmlView.php @@ -82,6 +82,10 @@ public function display($tpl = null): void $this->addToolbar(); + // Add form control fields + $this->form + ->addControlField('task', ''); + parent::display($tpl); } diff --git a/administrator/components/com_banners/src/View/Banners/HtmlView.php b/administrator/components/com_banners/src/View/Banners/HtmlView.php index dced0e0e68bc..372ec2d4bbd3 100644 --- a/administrator/components/com_banners/src/View/Banners/HtmlView.php +++ b/administrator/components/com_banners/src/View/Banners/HtmlView.php @@ -127,6 +127,11 @@ public function display($tpl = null): void $this->filterForm->removeField('language', 'filter'); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + parent::display($tpl); } diff --git a/administrator/components/com_banners/src/View/Client/HtmlView.php b/administrator/components/com_banners/src/View/Client/HtmlView.php index 0772f29620c4..fd365a3a50fa 100644 --- a/administrator/components/com_banners/src/View/Client/HtmlView.php +++ b/administrator/components/com_banners/src/View/Client/HtmlView.php @@ -91,6 +91,10 @@ public function display($tpl = null): void $this->addToolbar(); + // Add form control fields + $this->form + ->addControlField('task', ''); + parent::display($tpl); } diff --git a/administrator/components/com_banners/src/View/Clients/HtmlView.php b/administrator/components/com_banners/src/View/Clients/HtmlView.php index adc913a2edd5..432760d4c641 100644 --- a/administrator/components/com_banners/src/View/Clients/HtmlView.php +++ b/administrator/components/com_banners/src/View/Clients/HtmlView.php @@ -110,6 +110,11 @@ public function display($tpl = null): void $this->addToolbar(); + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + parent::display($tpl); } diff --git a/administrator/components/com_banners/src/View/Tracks/HtmlView.php b/administrator/components/com_banners/src/View/Tracks/HtmlView.php index 65044eed4151..b1f361f7edc1 100644 --- a/administrator/components/com_banners/src/View/Tracks/HtmlView.php +++ b/administrator/components/com_banners/src/View/Tracks/HtmlView.php @@ -110,6 +110,11 @@ public function display($tpl = null): void $this->addToolbar(); + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + parent::display($tpl); } diff --git a/administrator/components/com_banners/tmpl/banner/edit.php b/administrator/components/com_banners/tmpl/banner/edit.php index 9ee378083f9c..19faad9abe12 100644 --- a/administrator/components/com_banners/tmpl/banner/edit.php +++ b/administrator/components/com_banners/tmpl/banner/edit.php @@ -86,6 +86,5 @@ - - + form->renderControlFields(); ?> diff --git a/administrator/components/com_banners/tmpl/banners/default.php b/administrator/components/com_banners/tmpl/banners/default.php index 7b24a58ff792..eec10be10058 100644 --- a/administrator/components/com_banners/tmpl/banners/default.php +++ b/administrator/components/com_banners/tmpl/banners/default.php @@ -186,9 +186,7 @@ - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_banners/tmpl/banners/emptystate.php b/administrator/components/com_banners/tmpl/banners/emptystate.php index 24425a9e9ce4..5af96b0ad569 100644 --- a/administrator/components/com_banners/tmpl/banners/emptystate.php +++ b/administrator/components/com_banners/tmpl/banners/emptystate.php @@ -19,6 +19,8 @@ 'formURL' => 'index.php?option=com_banners&view=banners', 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Banners', 'icon' => 'icon-bookmark banners', + + 'controlFields' => $this->filterForm->renderControlFields(), ]; $user = $this->getCurrentUser(); diff --git a/administrator/components/com_banners/tmpl/client/edit.php b/administrator/components/com_banners/tmpl/client/edit.php index f7eec3482db9..bc69e03f3ff2 100644 --- a/administrator/components/com_banners/tmpl/client/edit.php +++ b/administrator/components/com_banners/tmpl/client/edit.php @@ -65,6 +65,5 @@ - - + form->renderControlFields(); ?> diff --git a/administrator/components/com_banners/tmpl/clients/default.php b/administrator/components/com_banners/tmpl/clients/default.php index 36e8899c727a..5502d061aed3 100644 --- a/administrator/components/com_banners/tmpl/clients/default.php +++ b/administrator/components/com_banners/tmpl/clients/default.php @@ -189,9 +189,7 @@ - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_banners/tmpl/clients/emptystate.php b/administrator/components/com_banners/tmpl/clients/emptystate.php index d97f2d15ffd2..6d897f271d3e 100644 --- a/administrator/components/com_banners/tmpl/clients/emptystate.php +++ b/administrator/components/com_banners/tmpl/clients/emptystate.php @@ -19,6 +19,8 @@ 'formURL' => 'index.php?option=com_banners&view=clients', 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Banners:_Clients', 'icon' => 'icon-bookmark banners', + + 'controlFields' => $this->filterForm->renderControlFields(), ]; if (count($this->getCurrentUser()->getAuthorisedCategories('com_banners', 'core.create')) > 0) { diff --git a/administrator/components/com_banners/tmpl/tracks/default.php b/administrator/components/com_banners/tmpl/tracks/default.php index 12c8c26b79dc..83e8ad4ae2cd 100644 --- a/administrator/components/com_banners/tmpl/tracks/default.php +++ b/administrator/components/com_banners/tmpl/tracks/default.php @@ -92,9 +92,8 @@ pagination->getListFooter(); ?> - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_banners/tmpl/tracks/emptystate.php b/administrator/components/com_banners/tmpl/tracks/emptystate.php index 13913c3e7c7e..336dd80ad4e6 100644 --- a/administrator/components/com_banners/tmpl/tracks/emptystate.php +++ b/administrator/components/com_banners/tmpl/tracks/emptystate.php @@ -16,6 +16,8 @@ 'textPrefix' => 'COM_BANNERS_TRACKS', 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Banners:_Tracks', 'icon' => 'icon-bookmark banners', + + 'controlFields' => $this->filterForm->renderControlFields(), ]; echo LayoutHelper::render('joomla.content.emptystate', $displayData); diff --git a/administrator/components/com_cache/src/View/Cache/HtmlView.php b/administrator/components/com_cache/src/View/Cache/HtmlView.php index 6d7a4b6a72fc..753ace6e0ba9 100644 --- a/administrator/components/com_cache/src/View/Cache/HtmlView.php +++ b/administrator/components/com_cache/src/View/Cache/HtmlView.php @@ -110,6 +110,11 @@ public function display($tpl = null): void $this->addToolbar(); + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + parent::display($tpl); } diff --git a/administrator/components/com_cache/tmpl/cache/default.php b/administrator/components/com_cache/tmpl/cache/default.php index 77ae9c583689..e107886cc604 100644 --- a/administrator/components/com_cache/tmpl/cache/default.php +++ b/administrator/components/com_cache/tmpl/cache/default.php @@ -92,9 +92,8 @@ pagination->getListFooter(); ?> - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_cache/tmpl/cache/emptystate.php b/administrator/components/com_cache/tmpl/cache/emptystate.php index 386e358d5323..71692ae92fa0 100644 --- a/administrator/components/com_cache/tmpl/cache/emptystate.php +++ b/administrator/components/com_cache/tmpl/cache/emptystate.php @@ -16,6 +16,8 @@ 'textPrefix' => 'COM_CACHE', 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Cache', 'icon' => 'icon-bolt clear', + + 'controlFields' => $this->filterForm->renderControlFields(), ]; echo LayoutHelper::render('joomla.content.emptystate', $displayData); diff --git a/administrator/components/com_categories/tmpl/categories/emptystate.php b/administrator/components/com_categories/tmpl/categories/emptystate.php index 96049dd3532a..7ddf8b16f99e 100644 --- a/administrator/components/com_categories/tmpl/categories/emptystate.php +++ b/administrator/components/com_categories/tmpl/categories/emptystate.php @@ -42,6 +42,8 @@ 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Category', 'title' => $title, 'icon' => 'icon-folder categories content-categories', + + 'controlFields' => $this->filterForm->renderControlFields(), ]; if ($this->getCurrentUser()->authorise('core.create', $extension)) { diff --git a/administrator/components/com_checkin/src/View/Checkin/HtmlView.php b/administrator/components/com_checkin/src/View/Checkin/HtmlView.php index 28fd48ea1db0..fc67120de5b8 100644 --- a/administrator/components/com_checkin/src/View/Checkin/HtmlView.php +++ b/administrator/components/com_checkin/src/View/Checkin/HtmlView.php @@ -113,6 +113,11 @@ public function display($tpl = null) $this->addToolbar(); + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + parent::display($tpl); } diff --git a/administrator/components/com_checkin/tmpl/checkin/default.php b/administrator/components/com_checkin/tmpl/checkin/default.php index 4067943b5933..2951960cec7b 100644 --- a/administrator/components/com_checkin/tmpl/checkin/default.php +++ b/administrator/components/com_checkin/tmpl/checkin/default.php @@ -72,9 +72,8 @@ pagination->getListFooter(); ?> - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_checkin/tmpl/checkin/emptystate.php b/administrator/components/com_checkin/tmpl/checkin/emptystate.php index 5f8dfdada745..6ecb1cc0a071 100644 --- a/administrator/components/com_checkin/tmpl/checkin/emptystate.php +++ b/administrator/components/com_checkin/tmpl/checkin/emptystate.php @@ -18,6 +18,8 @@ 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Maintenance:_Global_Check-in', 'icon' => 'icon-check-square', 'title' => Text::_('COM_CHECKIN_GLOBAL_CHECK_IN'), + + 'controlFields' => $this->filterForm->renderControlFields(), ]; echo LayoutHelper::render('joomla.content.emptystate', $displayData); diff --git a/administrator/components/com_config/src/View/Application/HtmlView.php b/administrator/components/com_config/src/View/Application/HtmlView.php index 6ec11ecb289a..cebecc38b18a 100644 --- a/administrator/components/com_config/src/View/Application/HtmlView.php +++ b/administrator/components/com_config/src/View/Application/HtmlView.php @@ -125,6 +125,10 @@ public function display($tpl = null) $this->addToolbar(); + // Add form control fields + $this->form + ->addControlField('task', ''); + parent::display($tpl); } diff --git a/administrator/components/com_config/src/View/Component/HtmlView.php b/administrator/components/com_config/src/View/Component/HtmlView.php index 486824d9f564..90c5ffa34351 100644 --- a/administrator/components/com_config/src/View/Component/HtmlView.php +++ b/administrator/components/com_config/src/View/Component/HtmlView.php @@ -125,6 +125,13 @@ public function display($tpl = null) $this->addToolbar(); + // Add form control fields + $this->form + ->addControlField('task', '') + ->addControlField('id', $this->component->id) + ->addControlField('component', $this->component->option) + ->addControlField('return', $this->return); + parent::display($tpl); } diff --git a/administrator/components/com_config/tmpl/application/default.php b/administrator/components/com_config/tmpl/application/default.php index 9ae86ea05fb6..a7f0de88f559 100644 --- a/administrator/components/com_config/tmpl/application/default.php +++ b/administrator/components/com_config/tmpl/application/default.php @@ -77,8 +77,7 @@ - - + form->renderControlFields(); ?> diff --git a/administrator/components/com_config/tmpl/component/default.php b/administrator/components/com_config/tmpl/component/default.php index 0ffc394ad285..fb439f77db7a 100644 --- a/administrator/components/com_config/tmpl/component/default.php +++ b/administrator/components/com_config/tmpl/component/default.php @@ -135,10 +135,6 @@ - - - - - + form->renderControlFields(); ?> diff --git a/administrator/components/com_contact/src/View/Contact/HtmlView.php b/administrator/components/com_contact/src/View/Contact/HtmlView.php index 5e64cf65aca6..ff0c64325efe 100644 --- a/administrator/components/com_contact/src/View/Contact/HtmlView.php +++ b/administrator/components/com_contact/src/View/Contact/HtmlView.php @@ -91,7 +91,9 @@ public function display($tpl = null) } // If we are forcing a language in modal (used for associations). - if ($this->getLayout() === 'modal' && $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'cmd')) { + $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'cmd'); + + if ($this->getLayout() === 'modal' && $forcedLanguage) { // Set the language field to the forcedLanguage and disable changing it. $this->form->setValue('language', null, $forcedLanguage); $this->form->setFieldAttribute('language', 'readonly', 'true'); @@ -109,6 +111,11 @@ public function display($tpl = null) $this->addModalToolbar(); } + // Add form control fields + $this->form + ->addControlField('task', '') + ->addControlField('forcedLanguage', $forcedLanguage); + parent::display($tpl); } diff --git a/administrator/components/com_contact/src/View/Contacts/HtmlView.php b/administrator/components/com_contact/src/View/Contacts/HtmlView.php index 02dea42e0211..7462847444b3 100644 --- a/administrator/components/com_contact/src/View/Contacts/HtmlView.php +++ b/administrator/components/com_contact/src/View/Contacts/HtmlView.php @@ -102,6 +102,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + // We don't need toolbar in the modal window. if ($this->getLayout() !== 'modal') { $this->addToolbar(); @@ -114,7 +119,9 @@ public function display($tpl = null) } else { // In article associations modal we need to remove language filter if forcing a language. // We also need to change the category filter to show show categories with All or the forced language. - if ($forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD')) { + $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD'); + + if ($forcedLanguage) { // If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field. $languageXml = new \SimpleXMLElement(''); $this->filterForm->setField($languageXml, 'filter', true); @@ -125,6 +132,9 @@ public function display($tpl = null) // One last changes needed is to change the category filter to just show categories with All language or with the forced language. $this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter'); } + + $this->filterForm + ->addControlField('forcedLanguage', $forcedLanguage); } parent::display($tpl); diff --git a/administrator/components/com_contact/tmpl/contact/edit.php b/administrator/components/com_contact/tmpl/contact/edit.php index dddda905f730..c45ef221aaaf 100644 --- a/administrator/components/com_contact/tmpl/contact/edit.php +++ b/administrator/components/com_contact/tmpl/contact/edit.php @@ -130,7 +130,6 @@ - - - + + form->renderControlFields(); ?> diff --git a/administrator/components/com_contact/tmpl/contacts/default.php b/administrator/components/com_contact/tmpl/contacts/default.php index 83049cc92f6b..2322b6ecd504 100644 --- a/administrator/components/com_contact/tmpl/contacts/default.php +++ b/administrator/components/com_contact/tmpl/contacts/default.php @@ -195,9 +195,8 @@ - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_contact/tmpl/contacts/emptystate.php b/administrator/components/com_contact/tmpl/contacts/emptystate.php index c42bdffdf487..2c0df25d1af6 100644 --- a/administrator/components/com_contact/tmpl/contacts/emptystate.php +++ b/administrator/components/com_contact/tmpl/contacts/emptystate.php @@ -19,6 +19,8 @@ 'formURL' => 'index.php?option=com_contact', 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Contacts', 'icon' => 'icon-address-book contact', + + 'controlFields' => $this->filterForm->renderControlFields(), ]; $user = $this->getCurrentUser(); diff --git a/administrator/components/com_contact/tmpl/contacts/modal.php b/administrator/components/com_contact/tmpl/contacts/modal.php index ed2579532dc8..8b44a1751b00 100644 --- a/administrator/components/com_contact/tmpl/contacts/modal.php +++ b/administrator/components/com_contact/tmpl/contacts/modal.php @@ -161,9 +161,7 @@ - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_content/tmpl/articles/emptystate.php b/administrator/components/com_content/tmpl/articles/emptystate.php index 90cf4415edad..03e2c62c2a75 100644 --- a/administrator/components/com_content/tmpl/articles/emptystate.php +++ b/administrator/components/com_content/tmpl/articles/emptystate.php @@ -19,6 +19,8 @@ 'formURL' => 'index.php?option=com_content&view=articles', 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Adding_a_new_article', 'icon' => 'icon-copy article', + + 'controlFields' => $this->filterForm->renderControlFields(), ]; $user = $this->getCurrentUser(); diff --git a/administrator/components/com_fields/src/View/Field/HtmlView.php b/administrator/components/com_fields/src/View/Field/HtmlView.php index 788807326a21..adfc857f0123 100644 --- a/administrator/components/com_fields/src/View/Field/HtmlView.php +++ b/administrator/components/com_fields/src/View/Field/HtmlView.php @@ -83,6 +83,10 @@ public function display($tpl = null) $this->addToolbar(); + // Add form control fields + $this->form + ->addControlField('task', ''); + parent::display($tpl); } diff --git a/administrator/components/com_fields/src/View/Fields/HtmlView.php b/administrator/components/com_fields/src/View/Fields/HtmlView.php index 35c6e2608139..3769ddd1b6db 100644 --- a/administrator/components/com_fields/src/View/Fields/HtmlView.php +++ b/administrator/components/com_fields/src/View/Fields/HtmlView.php @@ -114,6 +114,11 @@ public function display($tpl = null) } } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + parent::display($tpl); } diff --git a/administrator/components/com_fields/src/View/Group/HtmlView.php b/administrator/components/com_fields/src/View/Group/HtmlView.php index b6ebc8d9bd77..8e8452ef32fd 100644 --- a/administrator/components/com_fields/src/View/Group/HtmlView.php +++ b/administrator/components/com_fields/src/View/Group/HtmlView.php @@ -96,6 +96,10 @@ public function display($tpl = null) $this->addToolbar(); + // Add form control fields + $this->form + ->addControlField('task', ''); + parent::display($tpl); } diff --git a/administrator/components/com_fields/src/View/Groups/HtmlView.php b/administrator/components/com_fields/src/View/Groups/HtmlView.php index be2bf889e205..eee678dadf70 100644 --- a/administrator/components/com_fields/src/View/Groups/HtmlView.php +++ b/administrator/components/com_fields/src/View/Groups/HtmlView.php @@ -111,6 +111,11 @@ public function display($tpl = null) $this->filterForm->removeField('language', 'filter'); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + parent::display($tpl); } diff --git a/administrator/components/com_fields/tmpl/field/edit.php b/administrator/components/com_fields/tmpl/field/edit.php index ff044f1040ec..a6e0eaa7585c 100644 --- a/administrator/components/com_fields/tmpl/field/edit.php +++ b/administrator/components/com_fields/tmpl/field/edit.php @@ -95,7 +95,7 @@ form->getInput('context'); ?> - - + + form->renderControlFields(); ?> diff --git a/administrator/components/com_fields/tmpl/fields/default.php b/administrator/components/com_fields/tmpl/fields/default.php index 0c237e1ddde3..21955fd2e507 100644 --- a/administrator/components/com_fields/tmpl/fields/default.php +++ b/administrator/components/com_fields/tmpl/fields/default.php @@ -210,9 +210,8 @@ - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_fields/tmpl/fields/modal.php b/administrator/components/com_fields/tmpl/fields/modal.php index 717d6f07b9fd..7a4e9794febc 100644 --- a/administrator/components/com_fields/tmpl/fields/modal.php +++ b/administrator/components/com_fields/tmpl/fields/modal.php @@ -135,9 +135,6 @@ - - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_fields/tmpl/group/edit.php b/administrator/components/com_fields/tmpl/group/edit.php index a527ca814d36..9190bf7d937a 100644 --- a/administrator/components/com_fields/tmpl/group/edit.php +++ b/administrator/components/com_fields/tmpl/group/edit.php @@ -78,7 +78,7 @@ form->getInput('context'); ?> - - + + form->renderControlFields(); ?> diff --git a/administrator/components/com_fields/tmpl/groups/default.php b/administrator/components/com_fields/tmpl/groups/default.php index d72ad1d5cb4c..6ead0edaf260 100644 --- a/administrator/components/com_fields/tmpl/groups/default.php +++ b/administrator/components/com_fields/tmpl/groups/default.php @@ -178,9 +178,8 @@ - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_finder/src/View/Filter/HtmlView.php b/administrator/components/com_finder/src/View/Filter/HtmlView.php index dc0cbebf1650..22881548a78c 100644 --- a/administrator/components/com_finder/src/View/Filter/HtmlView.php +++ b/administrator/components/com_finder/src/View/Filter/HtmlView.php @@ -110,6 +110,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->form + ->addControlField('task', '') + ->addControlField('return', Factory::getApplication()->getInput()->get('return', '', 'BASE64')); + // Configure the toolbar. $this->addToolbar(); diff --git a/administrator/components/com_finder/src/View/Filters/HtmlView.php b/administrator/components/com_finder/src/View/Filters/HtmlView.php index 2bf2d1d8315c..48aeb2319730 100644 --- a/administrator/components/com_finder/src/View/Filters/HtmlView.php +++ b/administrator/components/com_finder/src/View/Filters/HtmlView.php @@ -121,6 +121,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + // Configure the toolbar. $this->addToolbar(); diff --git a/administrator/components/com_finder/src/View/Index/HtmlView.php b/administrator/components/com_finder/src/View/Index/HtmlView.php index 48bdfe06d97a..50d66193c5aa 100644 --- a/administrator/components/com_finder/src/View/Index/HtmlView.php +++ b/administrator/components/com_finder/src/View/Index/HtmlView.php @@ -171,6 +171,11 @@ public function display($tpl = null) $this->finderPlugins = false; } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + // Configure the toolbar. $this->addToolbar(); diff --git a/administrator/components/com_finder/src/View/Maps/HtmlView.php b/administrator/components/com_finder/src/View/Maps/HtmlView.php index 901b2c880907..dfd7ebfd076d 100644 --- a/administrator/components/com_finder/src/View/Maps/HtmlView.php +++ b/administrator/components/com_finder/src/View/Maps/HtmlView.php @@ -125,6 +125,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', 'display') + ->addControlField('boxchecked', '0'); + // Prepare the view. $this->addToolbar(); diff --git a/administrator/components/com_finder/src/View/Searches/HtmlView.php b/administrator/components/com_finder/src/View/Searches/HtmlView.php index 5abd14815b03..120b56b81ccd 100644 --- a/administrator/components/com_finder/src/View/Searches/HtmlView.php +++ b/administrator/components/com_finder/src/View/Searches/HtmlView.php @@ -137,6 +137,11 @@ public function display($tpl = null) } } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + // Prepare the view. $this->addToolbar(); diff --git a/administrator/components/com_finder/tmpl/filter/edit.php b/administrator/components/com_finder/tmpl/filter/edit.php index 8d0f660cffe4..10c4e69139e6 100644 --- a/administrator/components/com_finder/tmpl/filter/edit.php +++ b/administrator/components/com_finder/tmpl/filter/edit.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; -use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\LayoutHelper; @@ -87,8 +86,6 @@ - - - + form->renderControlFields(); ?> diff --git a/administrator/components/com_finder/tmpl/filters/default.php b/administrator/components/com_finder/tmpl/filters/default.php index a75c842ed8ec..88e5acbbc7bd 100644 --- a/administrator/components/com_finder/tmpl/filters/default.php +++ b/administrator/components/com_finder/tmpl/filters/default.php @@ -124,9 +124,8 @@ pagination->getListFooter(); ?> - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_finder/tmpl/filters/emptystate.php b/administrator/components/com_finder/tmpl/filters/emptystate.php index 416a26b97268..31767871bfb9 100644 --- a/administrator/components/com_finder/tmpl/filters/emptystate.php +++ b/administrator/components/com_finder/tmpl/filters/emptystate.php @@ -23,6 +23,8 @@ 'btnadd' => Text::_('COM_FINDER_FILTERS_EMPTYSTATE_BUTTON_ADD'), 'content' => Text::_('COM_FINDER_FILTERS_EMPTYSTATE_CONTENT'), 'title' => Text::_('COM_FINDER_FILTERS_TOOLBAR_TITLE'), + + 'controlFields' => $this->filterForm->renderControlFields(), ]; if ($this->getCurrentUser()->authorise('core.create', 'com_finder')) { diff --git a/administrator/components/com_finder/tmpl/index/default.php b/administrator/components/com_finder/tmpl/index/default.php index da5fe365c863..10065d9d8ed3 100644 --- a/administrator/components/com_finder/tmpl/index/default.php +++ b/administrator/components/com_finder/tmpl/index/default.php @@ -169,9 +169,7 @@ pagination->getListFooter(); ?> - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_finder/tmpl/index/emptystate.php b/administrator/components/com_finder/tmpl/index/emptystate.php index 10a2395144ea..3f48e714c364 100644 --- a/administrator/components/com_finder/tmpl/index/emptystate.php +++ b/administrator/components/com_finder/tmpl/index/emptystate.php @@ -26,6 +26,8 @@ 'content' => Text::_('COM_FINDER_INDEX_NO_DATA') . '
' . Text::_('COM_FINDER_INDEX_TIP'), 'title' => Text::_('COM_FINDER_HEADING_INDEXER'), 'createURL' => "javascript:document.getElementsByClassName('button-index')[0].click();", + + 'controlFields' => $this->filterForm->renderControlFields(), ]; echo LayoutHelper::render('joomla.content.emptystate', $displayData); diff --git a/administrator/components/com_finder/tmpl/maps/default.php b/administrator/components/com_finder/tmpl/maps/default.php index 2b9ca870ffec..1e14cc6b7265 100644 --- a/administrator/components/com_finder/tmpl/maps/default.php +++ b/administrator/components/com_finder/tmpl/maps/default.php @@ -168,9 +168,7 @@ - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_finder/tmpl/maps/emptystate.php b/administrator/components/com_finder/tmpl/maps/emptystate.php index 00bb16722d86..a7337a0766db 100644 --- a/administrator/components/com_finder/tmpl/maps/emptystate.php +++ b/administrator/components/com_finder/tmpl/maps/emptystate.php @@ -18,7 +18,9 @@ 'formURL' => 'index.php?option=com_finder&view=maps', 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Smart_Search:_Content_Maps', 'icon' => 'icon-search-plus finder', - 'title' => Text::_('COM_FINDER_MAPS_TOOLBAR_TITLE') + 'title' => Text::_('COM_FINDER_MAPS_TOOLBAR_TITLE'), + + 'controlFields' => $this->filterForm->renderControlFields(), ]; echo LayoutHelper::render('joomla.content.emptystate', $displayData); diff --git a/administrator/components/com_finder/tmpl/searches/default.php b/administrator/components/com_finder/tmpl/searches/default.php index e6cf3b29731e..d892b3163ecb 100644 --- a/administrator/components/com_finder/tmpl/searches/default.php +++ b/administrator/components/com_finder/tmpl/searches/default.php @@ -76,9 +76,8 @@ pagination->getListFooter(); ?> - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_finder/tmpl/searches/emptystate.php b/administrator/components/com_finder/tmpl/searches/emptystate.php index 31d49307f0a3..3534093a67c5 100644 --- a/administrator/components/com_finder/tmpl/searches/emptystate.php +++ b/administrator/components/com_finder/tmpl/searches/emptystate.php @@ -20,6 +20,8 @@ 'icon' => 'icon-search', 'title' => Text::_('COM_FINDER_MANAGER_SEARCHES'), 'content' => Text::_('COM_FINDER_EMPTYSTATE_SEARCHES_CONTENT'), + + 'controlFields' => $this->filterForm->renderControlFields(), ]; echo LayoutHelper::render('joomla.content.emptystate', $displayData); diff --git a/administrator/components/com_guidedtours/src/View/Step/HtmlView.php b/administrator/components/com_guidedtours/src/View/Step/HtmlView.php index 97e03713c143..1d596a34971a 100644 --- a/administrator/components/com_guidedtours/src/View/Step/HtmlView.php +++ b/administrator/components/com_guidedtours/src/View/Step/HtmlView.php @@ -81,6 +81,10 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->form + ->addControlField('task', ''); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php b/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php index 101f7df659d4..779ee9e3a39d 100644 --- a/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php +++ b/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php @@ -113,6 +113,11 @@ public function display($tpl = null) // Unset the tour_id field from activeFilters as we don't filter by tour here. unset($this->activeFilters['tour_id']); + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_guidedtours/src/View/Tour/HtmlView.php b/administrator/components/com_guidedtours/src/View/Tour/HtmlView.php index 064f7df2a367..0e12fe0bd201 100644 --- a/administrator/components/com_guidedtours/src/View/Tour/HtmlView.php +++ b/administrator/components/com_guidedtours/src/View/Tour/HtmlView.php @@ -80,6 +80,10 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->form + ->addControlField('task', ''); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php b/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php index 81aae1f4515e..2ccc7e3e6841 100644 --- a/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php +++ b/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php @@ -108,6 +108,11 @@ public function display($tpl = null) $this->filterForm->removeField('language', 'filter'); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + parent::display($tpl); } diff --git a/administrator/components/com_guidedtours/tmpl/step/edit.php b/administrator/components/com_guidedtours/tmpl/step/edit.php index 6f0fac755e90..a529e494035f 100644 --- a/administrator/components/com_guidedtours/tmpl/step/edit.php +++ b/administrator/components/com_guidedtours/tmpl/step/edit.php @@ -104,7 +104,7 @@ - form->getInput('tour_id'); ?> - + + form->renderControlFields(); ?> diff --git a/administrator/components/com_guidedtours/tmpl/steps/default.php b/administrator/components/com_guidedtours/tmpl/steps/default.php index 97a0217a49c8..fb6e1940d566 100644 --- a/administrator/components/com_guidedtours/tmpl/steps/default.php +++ b/administrator/components/com_guidedtours/tmpl/steps/default.php @@ -227,8 +227,6 @@ class="js-draggable" data-url="" data-direction=" ?> - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_guidedtours/tmpl/steps/emptystate.php b/administrator/components/com_guidedtours/tmpl/steps/emptystate.php index 68ae26353b72..4364dbdc5401 100644 --- a/administrator/components/com_guidedtours/tmpl/steps/emptystate.php +++ b/administrator/components/com_guidedtours/tmpl/steps/emptystate.php @@ -19,6 +19,8 @@ 'formURL' => 'index.php?option=com_guidedtours&view=steps', 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Guided_Tours:_Steps', 'icon' => 'icon-map-signs', + + 'controlFields' => $this->filterForm->renderControlFields(), ]; $user = $this->getCurrentUser(); diff --git a/administrator/components/com_guidedtours/tmpl/tour/edit.php b/administrator/components/com_guidedtours/tmpl/tour/edit.php index 5bef1f3549f8..7ed71c51be48 100644 --- a/administrator/components/com_guidedtours/tmpl/tour/edit.php +++ b/administrator/components/com_guidedtours/tmpl/tour/edit.php @@ -100,6 +100,5 @@ - - + form->renderControlFields(); ?> diff --git a/administrator/components/com_guidedtours/tmpl/tours/default.php b/administrator/components/com_guidedtours/tmpl/tours/default.php index 33ef8b8f550f..201495e91d9d 100644 --- a/administrator/components/com_guidedtours/tmpl/tours/default.php +++ b/administrator/components/com_guidedtours/tmpl/tours/default.php @@ -252,8 +252,6 @@ class="js-draggable" data-url="" data-direction=" ?> - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_guidedtours/tmpl/tours/emptystate.php b/administrator/components/com_guidedtours/tmpl/tours/emptystate.php index 6500a8626441..a899420c3ef5 100644 --- a/administrator/components/com_guidedtours/tmpl/tours/emptystate.php +++ b/administrator/components/com_guidedtours/tmpl/tours/emptystate.php @@ -19,6 +19,8 @@ 'formURL' => 'index.php?option=com_guidedtours&view=tours', 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Guided_Tours', 'icon' => 'icon-map-signs', + + 'controlFields' => $this->filterForm->renderControlFields(), ]; $user = $this->getCurrentUser(); diff --git a/administrator/components/com_installer/src/View/Database/HtmlView.php b/administrator/components/com_installer/src/View/Database/HtmlView.php index 931bf0062da6..cc738c40e862 100644 --- a/administrator/components/com_installer/src/View/Database/HtmlView.php +++ b/administrator/components/com_installer/src/View/Database/HtmlView.php @@ -105,6 +105,11 @@ public function display($tpl = null) : $app->enqueueMessage(Text::_('COM_INSTALLER_MSG_DATABASE_CORE_ERRORS'), 'warning'); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + parent::display($tpl); } diff --git a/administrator/components/com_installer/src/View/Discover/HtmlView.php b/administrator/components/com_installer/src/View/Discover/HtmlView.php index 15b49338c5a2..df8699f98faf 100644 --- a/administrator/components/com_installer/src/View/Discover/HtmlView.php +++ b/administrator/components/com_installer/src/View/Discover/HtmlView.php @@ -99,6 +99,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + parent::display($tpl); } diff --git a/administrator/components/com_installer/src/View/Languages/HtmlView.php b/administrator/components/com_installer/src/View/Languages/HtmlView.php index a0e6c4bf5025..e3f0634c8ae9 100644 --- a/administrator/components/com_installer/src/View/Languages/HtmlView.php +++ b/administrator/components/com_installer/src/View/Languages/HtmlView.php @@ -81,6 +81,15 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0') + ->addControlField('return', base64_encode('index.php?option=com_installer&view=languages')) + ->addControlField('install_url', '', ['id' => 'install_url']) + ->addControlField('installtype', 'url') + ->addControlField('package', 'language'); + parent::display($tpl); } diff --git a/administrator/components/com_installer/src/View/Manage/HtmlView.php b/administrator/components/com_installer/src/View/Manage/HtmlView.php index e4b596bb5397..1d6d56a5f106 100644 --- a/administrator/components/com_installer/src/View/Manage/HtmlView.php +++ b/administrator/components/com_installer/src/View/Manage/HtmlView.php @@ -88,6 +88,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + // Display the view. parent::display($tpl); } diff --git a/administrator/components/com_installer/src/View/Update/HtmlView.php b/administrator/components/com_installer/src/View/Update/HtmlView.php index 423786d0dc13..29a7f14c1c19 100644 --- a/administrator/components/com_installer/src/View/Update/HtmlView.php +++ b/administrator/components/com_installer/src/View/Update/HtmlView.php @@ -121,6 +121,11 @@ public function display($tpl = null) Factory::getApplication()->enqueueMessage($msg, CMSApplication::MSG_WARNING); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + parent::display($tpl); } diff --git a/administrator/components/com_installer/src/View/Updatesite/HtmlView.php b/administrator/components/com_installer/src/View/Updatesite/HtmlView.php index 8cf3c3552fca..e70f75c997f3 100644 --- a/administrator/components/com_installer/src/View/Updatesite/HtmlView.php +++ b/administrator/components/com_installer/src/View/Updatesite/HtmlView.php @@ -81,6 +81,10 @@ public function display($tpl = null): void throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->form + ->addControlField('task', ''); + parent::display($tpl); } diff --git a/administrator/components/com_installer/src/View/Updatesites/HtmlView.php b/administrator/components/com_installer/src/View/Updatesites/HtmlView.php index 2bfa9b0e3420..9c8402281ddb 100644 --- a/administrator/components/com_installer/src/View/Updatesites/HtmlView.php +++ b/administrator/components/com_installer/src/View/Updatesites/HtmlView.php @@ -86,6 +86,11 @@ public function display($tpl = null): void throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + // Display the view parent::display($tpl); } diff --git a/administrator/components/com_installer/tmpl/database/default.php b/administrator/components/com_installer/tmpl/database/default.php index dcbd008ce8c6..7567a1e071de 100644 --- a/administrator/components/com_installer/tmpl/database/default.php +++ b/administrator/components/com_installer/tmpl/database/default.php @@ -126,9 +126,8 @@ pagination->getListFooter(); ?> - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_installer/tmpl/discover/default.php b/administrator/components/com_installer/tmpl/discover/default.php index a42996408b1b..7ab3c8744675 100644 --- a/administrator/components/com_installer/tmpl/discover/default.php +++ b/administrator/components/com_installer/tmpl/discover/default.php @@ -121,9 +121,8 @@ pagination->getListFooter(); ?> - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_installer/tmpl/discover/emptystate.php b/administrator/components/com_installer/tmpl/discover/emptystate.php index b895352e42a9..f926998d141c 100644 --- a/administrator/components/com_installer/tmpl/discover/emptystate.php +++ b/administrator/components/com_installer/tmpl/discover/emptystate.php @@ -25,6 +25,8 @@ 'content' => Text::_('COM_INSTALLER_MSG_DISCOVER_DESCRIPTION'), 'title' => Text::_('COM_INSTALLER_EMPTYSTATE_DISCOVER_TITLE'), 'btnadd' => Text::_('COM_INSTALLER_EMPTYSTATE_DISCOVER_BUTTON_ADD'), + + 'controlFields' => $this->filterForm->renderControlFields(), ]; /** @var \Joomla\Component\Installer\Administrator\View\Discover\HtmlView $this */ diff --git a/administrator/components/com_installer/tmpl/languages/default.php b/administrator/components/com_installer/tmpl/languages/default.php index bc9575f3e1b6..6eebe95806eb 100644 --- a/administrator/components/com_installer/tmpl/languages/default.php +++ b/administrator/components/com_installer/tmpl/languages/default.php @@ -115,13 +115,8 @@ class="" pagination->getListFooter(); ?> - - - - - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_installer/tmpl/manage/default.php b/administrator/components/com_installer/tmpl/manage/default.php index 0c09f458e1d6..0a0f76bc438b 100644 --- a/administrator/components/com_installer/tmpl/manage/default.php +++ b/administrator/components/com_installer/tmpl/manage/default.php @@ -174,9 +174,8 @@ pagination->getListFooter(); ?> - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_installer/tmpl/update/default.php b/administrator/components/com_installer/tmpl/update/default.php index 9970fef2e6b2..ec9033776228 100644 --- a/administrator/components/com_installer/tmpl/update/default.php +++ b/administrator/components/com_installer/tmpl/update/default.php @@ -153,9 +153,8 @@ pagination->getListFooter(); ?> - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_installer/tmpl/update/emptystate.php b/administrator/components/com_installer/tmpl/update/emptystate.php index 6ba4a0d275fe..59b12f33b73e 100644 --- a/administrator/components/com_installer/tmpl/update/emptystate.php +++ b/administrator/components/com_installer/tmpl/update/emptystate.php @@ -20,6 +20,8 @@ 'formURL' => 'index.php?option=com_installer&view=update', 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Extensions:_Update', 'icon' => 'icon-puzzle-piece install', + + 'controlFields' => $this->filterForm->renderControlFields(), ]; $user = $this->getCurrentUser(); diff --git a/administrator/components/com_installer/tmpl/updatesite/edit.php b/administrator/components/com_installer/tmpl/updatesite/edit.php index dc95fcddcd8a..a0f33c209480 100644 --- a/administrator/components/com_installer/tmpl/updatesite/edit.php +++ b/administrator/components/com_installer/tmpl/updatesite/edit.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; @@ -24,6 +23,6 @@

item->name; ?>

form->renderFieldset('updateSite'); ?> - - + + form->renderControlFields(); ?>
diff --git a/administrator/components/com_installer/tmpl/updatesites/default.php b/administrator/components/com_installer/tmpl/updatesites/default.php index be5c1e9f2524..8c8bcd0d2e09 100644 --- a/administrator/components/com_installer/tmpl/updatesites/default.php +++ b/administrator/components/com_installer/tmpl/updatesites/default.php @@ -158,9 +158,8 @@ pagination->getListFooter(); ?> - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_languages/src/View/Installed/HtmlView.php b/administrator/components/com_languages/src/View/Installed/HtmlView.php index 2b36393c4994..dc8509b7e5f7 100644 --- a/administrator/components/com_languages/src/View/Installed/HtmlView.php +++ b/administrator/components/com_languages/src/View/Installed/HtmlView.php @@ -100,6 +100,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_languages/src/View/Language/HtmlView.php b/administrator/components/com_languages/src/View/Language/HtmlView.php index a9b0d445a9e8..6e7b3e0e629c 100644 --- a/administrator/components/com_languages/src/View/Language/HtmlView.php +++ b/administrator/components/com_languages/src/View/Language/HtmlView.php @@ -82,6 +82,10 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->form + ->addControlField('task', ''); + $this->addToolbar(); parent::display($tpl); } diff --git a/administrator/components/com_languages/src/View/Languages/HtmlView.php b/administrator/components/com_languages/src/View/Languages/HtmlView.php index b7598c374a3b..aaea90b2129d 100644 --- a/administrator/components/com_languages/src/View/Languages/HtmlView.php +++ b/administrator/components/com_languages/src/View/Languages/HtmlView.php @@ -92,6 +92,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_languages/src/View/Override/HtmlView.php b/administrator/components/com_languages/src/View/Override/HtmlView.php index 3daf15057ba6..e45054285a8a 100644 --- a/administrator/components/com_languages/src/View/Override/HtmlView.php +++ b/administrator/components/com_languages/src/View/Override/HtmlView.php @@ -101,6 +101,11 @@ public function display($tpl = null) Text::script('COM_LANGUAGES_VIEW_OVERRIDE_NO_RESULTS'); Text::script('COM_LANGUAGES_VIEW_OVERRIDE_REQUEST_ERROR'); + // Add form control fields + $this->form + ->addControlField('task', '') + ->addControlField('id', $this->item->key); + $this->addToolbar(); parent::display($tpl); } diff --git a/administrator/components/com_languages/src/View/Overrides/HtmlView.php b/administrator/components/com_languages/src/View/Overrides/HtmlView.php index 3fd8588e0f2c..2dab7b122100 100644 --- a/administrator/components/com_languages/src/View/Overrides/HtmlView.php +++ b/administrator/components/com_languages/src/View/Overrides/HtmlView.php @@ -99,6 +99,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors)); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); } diff --git a/administrator/components/com_languages/tmpl/installed/default.php b/administrator/components/com_languages/tmpl/installed/default.php index 02e4a8388634..582b5daa41c3 100644 --- a/administrator/components/com_languages/tmpl/installed/default.php +++ b/administrator/components/com_languages/tmpl/installed/default.php @@ -135,9 +135,8 @@ pagination->getListFooter(); ?> - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_languages/tmpl/language/edit.php b/administrator/components/com_languages/tmpl/language/edit.php index 3288093d4fb8..8ddd5db4914c 100644 --- a/administrator/components/com_languages/tmpl/language/edit.php +++ b/administrator/components/com_languages/tmpl/language/edit.php @@ -83,6 +83,5 @@ - - + form->renderControlFields(); ?> diff --git a/administrator/components/com_languages/tmpl/languages/default.php b/administrator/components/com_languages/tmpl/languages/default.php index b9930320a562..844dd1fe0814 100644 --- a/administrator/components/com_languages/tmpl/languages/default.php +++ b/administrator/components/com_languages/tmpl/languages/default.php @@ -165,9 +165,8 @@ pagination->getListFooter(); ?> - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_languages/tmpl/override/edit.php b/administrator/components/com_languages/tmpl/override/edit.php index 6df1ece2e977..c37c2602107c 100644 --- a/administrator/components/com_languages/tmpl/override/edit.php +++ b/administrator/components/com_languages/tmpl/override/edit.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; @@ -83,10 +82,7 @@ - - - - + form->renderControlFields(); ?> diff --git a/administrator/components/com_languages/tmpl/overrides/default.php b/administrator/components/com_languages/tmpl/overrides/default.php index 66b295bd8c4c..d61bb7913186 100644 --- a/administrator/components/com_languages/tmpl/overrides/default.php +++ b/administrator/components/com_languages/tmpl/overrides/default.php @@ -112,9 +112,7 @@ - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_mails/src/View/Template/HtmlView.php b/administrator/components/com_mails/src/View/Template/HtmlView.php index 89806873fe73..184955e385a6 100644 --- a/administrator/components/com_mails/src/View/Template/HtmlView.php +++ b/administrator/components/com_mails/src/View/Template/HtmlView.php @@ -116,6 +116,11 @@ public function display($tpl = null) } } + // Add form control fields + $this->form + ->addControlField('task', '') + ->addControlField('return', Factory::getApplication()->getInput()->get('return', '', 'BASE64')); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_mails/src/View/Templates/HtmlView.php b/administrator/components/com_mails/src/View/Templates/HtmlView.php index 8dd3e9db1df2..d34101d9173c 100644 --- a/administrator/components/com_mails/src/View/Templates/HtmlView.php +++ b/administrator/components/com_mails/src/View/Templates/HtmlView.php @@ -124,6 +124,11 @@ public function display($tpl = null) MailsHelper::loadTranslationFiles($extension, $currentLanguageTag); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_mails/tmpl/template/edit.php b/administrator/components/com_mails/tmpl/template/edit.php index 5cd1385fb84a..b39f2fc828af 100644 --- a/administrator/components/com_mails/tmpl/template/edit.php +++ b/administrator/components/com_mails/tmpl/template/edit.php @@ -116,7 +116,6 @@ form->renderField('template_id'); ?> form->renderField('language'); ?> - - - + + form->renderControlFields(); ?> diff --git a/administrator/components/com_mails/tmpl/templates/default.php b/administrator/components/com_mails/tmpl/templates/default.php index 86690895985b..b0d56a46f35a 100644 --- a/administrator/components/com_mails/tmpl/templates/default.php +++ b/administrator/components/com_mails/tmpl/templates/default.php @@ -113,9 +113,7 @@ pagination->getListFooter(); ?> - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_messages/src/View/Config/HtmlView.php b/administrator/components/com_messages/src/View/Config/HtmlView.php index a1920989761b..39cfa075eb69 100644 --- a/administrator/components/com_messages/src/View/Config/HtmlView.php +++ b/administrator/components/com_messages/src/View/Config/HtmlView.php @@ -75,6 +75,10 @@ public function display($tpl = null) // Bind the record to the form. $this->form->bind($this->item); + // Add form control fields + $this->form + ->addControlField('task', ''); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_messages/src/View/Message/HtmlView.php b/administrator/components/com_messages/src/View/Message/HtmlView.php index 9debde2ce09a..367d6f946820 100644 --- a/administrator/components/com_messages/src/View/Message/HtmlView.php +++ b/administrator/components/com_messages/src/View/Message/HtmlView.php @@ -80,6 +80,10 @@ public function display($tpl = null) throw new GenericDataException(Text::_('JERROR_ALERTNOAUTHOR'), 403); } + // Add form control fields + $this->form + ->addControlField('task', ''); + parent::display($tpl); $this->addToolbar(); } diff --git a/administrator/components/com_messages/src/View/Messages/HtmlView.php b/administrator/components/com_messages/src/View/Messages/HtmlView.php index a03cc1fad8e5..d35afd31fe9d 100644 --- a/administrator/components/com_messages/src/View/Messages/HtmlView.php +++ b/administrator/components/com_messages/src/View/Messages/HtmlView.php @@ -103,6 +103,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_messages/tmpl/config/default.php b/administrator/components/com_messages/tmpl/config/default.php index a36604571622..9cdf2f65105a 100644 --- a/administrator/components/com_messages/tmpl/config/default.php +++ b/administrator/components/com_messages/tmpl/config/default.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; @@ -36,6 +35,5 @@ - - + form->renderControlFields(); ?> diff --git a/administrator/components/com_messages/tmpl/message/edit.php b/administrator/components/com_messages/tmpl/message/edit.php index ac0fe33e81b5..35ef50855f07 100644 --- a/administrator/components/com_messages/tmpl/message/edit.php +++ b/administrator/components/com_messages/tmpl/message/edit.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; @@ -41,6 +40,6 @@ - - + + form->renderControlFields(); ?> diff --git a/administrator/components/com_messages/tmpl/messages/default.php b/administrator/components/com_messages/tmpl/messages/default.php index f79eb7488bdd..abf0723a9c2c 100644 --- a/administrator/components/com_messages/tmpl/messages/default.php +++ b/administrator/components/com_messages/tmpl/messages/default.php @@ -89,10 +89,7 @@ pagination->getListFooter(); ?> -
- - - -
+ + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_messages/tmpl/messages/emptystate.php b/administrator/components/com_messages/tmpl/messages/emptystate.php index 5b4eb77cbdf6..362c22b6aa95 100644 --- a/administrator/components/com_messages/tmpl/messages/emptystate.php +++ b/administrator/components/com_messages/tmpl/messages/emptystate.php @@ -19,6 +19,8 @@ 'formURL' => 'index.php?option=com_messages&view=messages', 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Private_Messages', 'icon' => 'icon-envelope inbox', + + 'controlFields' => $this->filterForm->renderControlFields(), ]; if ( diff --git a/administrator/components/com_modules/src/View/Module/HtmlView.php b/administrator/components/com_modules/src/View/Module/HtmlView.php index 8d9a0ec78e9c..197d6ffa1d66 100644 --- a/administrator/components/com_modules/src/View/Module/HtmlView.php +++ b/administrator/components/com_modules/src/View/Module/HtmlView.php @@ -105,6 +105,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->form + ->addControlField('task', '') + ->addControlField('return', Factory::getApplication()->getInput()->getBase64('return', '')); + if ($this->getLayout() !== 'modal') { $this->addToolbar(); } else { diff --git a/administrator/components/com_modules/src/View/Modules/HtmlView.php b/administrator/components/com_modules/src/View/Modules/HtmlView.php index f66002c26341..7d86dda63a8c 100644 --- a/administrator/components/com_modules/src/View/Modules/HtmlView.php +++ b/administrator/components/com_modules/src/View/Modules/HtmlView.php @@ -160,6 +160,11 @@ public function display($tpl = null) } } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + parent::display($tpl); } diff --git a/administrator/components/com_modules/tmpl/module/edit.php b/administrator/components/com_modules/tmpl/module/edit.php index 45a819a54cfa..f0f04801f40b 100644 --- a/administrator/components/com_modules/tmpl/module/edit.php +++ b/administrator/components/com_modules/tmpl/module/edit.php @@ -189,10 +189,9 @@ - - - form->getInput('module'); ?> form->getInput('client_id'); ?> + + form->renderControlFields(); ?> diff --git a/administrator/components/com_modules/tmpl/modules/default.php b/administrator/components/com_modules/tmpl/modules/default.php index 5928d7c24d6e..bf4c8b3906d6 100644 --- a/administrator/components/com_modules/tmpl/modules/default.php +++ b/administrator/components/com_modules/tmpl/modules/default.php @@ -207,8 +207,7 @@ ) : ?> - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_modules/tmpl/modules/emptystate.php b/administrator/components/com_modules/tmpl/modules/emptystate.php index 75450cad1207..c6d28d0a0ce5 100644 --- a/administrator/components/com_modules/tmpl/modules/emptystate.php +++ b/administrator/components/com_modules/tmpl/modules/emptystate.php @@ -22,6 +22,8 @@ 'icon' => 'icon-cube module', // Although it is (almost) impossible to get to this page with no created Administrator Modules, we add this for completeness. 'title' => Text::_('COM_MODULES_EMPTYSTATE_TITLE_' . ($this->clientId ? 'ADMINISTRATOR' : 'SITE')), + + 'controlFields' => $this->filterForm->renderControlFields(), ]; if ($this->getCurrentUser()->authorise('core.create', 'com_modules')) { diff --git a/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php b/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php index b972f0f1d21d..d92b4838268b 100644 --- a/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php +++ b/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php @@ -98,7 +98,9 @@ public function display($tpl = null) } // If we are forcing a language in modal (used for associations). - if ($this->getLayout() === 'modal' && $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'cmd')) { + $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'cmd'); + + if ($this->getLayout() === 'modal' && $forcedLanguage) { // Set the language field to the forcedLanguage and disable changing it. $this->form->setValue('language', null, $forcedLanguage); $this->form->setFieldAttribute('language', 'readonly', 'true'); @@ -110,6 +112,11 @@ public function display($tpl = null) $this->form->setFieldAttribute('tags', 'language', '*,' . $forcedLanguage); } + // Add form control fields + $this->form + ->addControlField('task', '') + ->addControlField('forcedLanguage', $forcedLanguage); + if ($this->getLayout() !== 'modal') { $this->addToolbar(); } else { diff --git a/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php b/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php index c7af4042e9b2..948e393e19fe 100644 --- a/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php +++ b/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php @@ -110,6 +110,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + // We don't need toolbar in the modal layout. if ($this->getLayout() !== 'modal') { $this->addToolbar(); @@ -122,7 +127,9 @@ public function display($tpl = null) } else { // In article associations modal we need to remove language filter if forcing a language. // We also need to change the category filter to show show categories with All or the forced language. - if ($forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD')) { + $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD'); + + if ($forcedLanguage) { // If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field. $languageXml = new \SimpleXMLElement(''); $this->filterForm->setField($languageXml, 'filter', true); @@ -133,6 +140,8 @@ public function display($tpl = null) // One last changes needed is to change the category filter to just show categories with All language or with the forced language. $this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter'); } + + $this->filterForm->addControlField('forcedLanguage', $forcedLanguage); } parent::display($tpl); diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php b/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php index 012242745664..9aa2867fc081 100644 --- a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php +++ b/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php @@ -116,7 +116,6 @@ - - - + + form->renderControlFields(); ?> diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php index 5b1cf424eb89..1d2a205d3406 100644 --- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php +++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php @@ -186,9 +186,8 @@ - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/emptystate.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/emptystate.php index d9df032a6337..f375c6c268fd 100644 --- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/emptystate.php +++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/emptystate.php @@ -19,6 +19,8 @@ 'formURL' => 'index.php?option=com_newsfeeds&view=newsfeeds', 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:News_Feeds', 'icon' => 'icon-rss newsfeeds', + + 'controlFields' => $this->filterForm->renderControlFields(), ]; $user = $this->getCurrentUser(); diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php index e048cc5bbf43..0f6ee1029dff 100644 --- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php +++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php @@ -139,10 +139,7 @@ - - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_plugins/src/View/Plugin/HtmlView.php b/administrator/components/com_plugins/src/View/Plugin/HtmlView.php index 03bf1f71102f..08ebafe29602 100644 --- a/administrator/components/com_plugins/src/View/Plugin/HtmlView.php +++ b/administrator/components/com_plugins/src/View/Plugin/HtmlView.php @@ -86,6 +86,10 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->form + ->addControlField('task', ''); + if ($this->getLayout() !== 'modal') { $this->addToolbar(); } else { diff --git a/administrator/components/com_plugins/src/View/Plugins/HtmlView.php b/administrator/components/com_plugins/src/View/Plugins/HtmlView.php index d22ece7d25b0..fb23651eed02 100644 --- a/administrator/components/com_plugins/src/View/Plugins/HtmlView.php +++ b/administrator/components/com_plugins/src/View/Plugins/HtmlView.php @@ -88,6 +88,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_plugins/tmpl/plugin/edit.php b/administrator/components/com_plugins/tmpl/plugin/edit.php index 1939185cd5f6..3660b9321376 100644 --- a/administrator/components/com_plugins/tmpl/plugin/edit.php +++ b/administrator/components/com_plugins/tmpl/plugin/edit.php @@ -134,6 +134,5 @@ - - + form->renderControlFields(); ?> diff --git a/administrator/components/com_plugins/tmpl/plugins/default.php b/administrator/components/com_plugins/tmpl/plugins/default.php index f56129c5dacd..d279a8e30af9 100644 --- a/administrator/components/com_plugins/tmpl/plugins/default.php +++ b/administrator/components/com_plugins/tmpl/plugins/default.php @@ -146,8 +146,6 @@ - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_privacy/src/View/Consents/HtmlView.php b/administrator/components/com_privacy/src/View/Consents/HtmlView.php index 3031f6ee0780..bfac7f736af9 100644 --- a/administrator/components/com_privacy/src/View/Consents/HtmlView.php +++ b/administrator/components/com_privacy/src/View/Consents/HtmlView.php @@ -110,6 +110,11 @@ public function display($tpl = null) throw new Genericdataexception(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_privacy/src/View/Request/HtmlView.php b/administrator/components/com_privacy/src/View/Request/HtmlView.php index 58cb2eea48c7..28c49fce7e02 100644 --- a/administrator/components/com_privacy/src/View/Request/HtmlView.php +++ b/administrator/components/com_privacy/src/View/Request/HtmlView.php @@ -97,6 +97,10 @@ public function display($tpl = null) // Variables only required for the edit layout if ($this->getLayout() === 'edit') { $this->form = $model->getForm(); + + // Add form control fields + $this->form + ->addControlField('task', ''); } // Check for errors. diff --git a/administrator/components/com_privacy/src/View/Requests/HtmlView.php b/administrator/components/com_privacy/src/View/Requests/HtmlView.php index e97ea63e4b09..5e456253467a 100644 --- a/administrator/components/com_privacy/src/View/Requests/HtmlView.php +++ b/administrator/components/com_privacy/src/View/Requests/HtmlView.php @@ -121,6 +121,11 @@ public function display($tpl = null) throw new Genericdataexception(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_privacy/tmpl/consents/default.php b/administrator/components/com_privacy/tmpl/consents/default.php index 73d9e7fd90c2..0f26a4228b6a 100644 --- a/administrator/components/com_privacy/tmpl/consents/default.php +++ b/administrator/components/com_privacy/tmpl/consents/default.php @@ -123,8 +123,6 @@ - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_privacy/tmpl/consents/emptystate.php b/administrator/components/com_privacy/tmpl/consents/emptystate.php index c9f60e961f39..370fbe14c5b9 100644 --- a/administrator/components/com_privacy/tmpl/consents/emptystate.php +++ b/administrator/components/com_privacy/tmpl/consents/emptystate.php @@ -17,6 +17,8 @@ 'formURL' => 'index.php?option=com_privacy&view=consents', 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Privacy:_Consents', 'icon' => 'icon-lock', + + 'controlFields' => $this->filterForm->renderControlFields(), ]; echo LayoutHelper::render('joomla.content.emptystate', $displayData); diff --git a/administrator/components/com_privacy/tmpl/request/edit.php b/administrator/components/com_privacy/tmpl/request/edit.php index c29e4134b394..15aa480caa16 100644 --- a/administrator/components/com_privacy/tmpl/request/edit.php +++ b/administrator/components/com_privacy/tmpl/request/edit.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; @@ -35,7 +34,6 @@ - - + form->renderControlFields(); ?> diff --git a/administrator/components/com_privacy/tmpl/requests/default.php b/administrator/components/com_privacy/tmpl/requests/default.php index 954c9ec399d1..960464ea11fe 100644 --- a/administrator/components/com_privacy/tmpl/requests/default.php +++ b/administrator/components/com_privacy/tmpl/requests/default.php @@ -123,8 +123,6 @@ - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_privacy/tmpl/requests/emptystate.php b/administrator/components/com_privacy/tmpl/requests/emptystate.php index 804dd09f628e..65216d3857b4 100644 --- a/administrator/components/com_privacy/tmpl/requests/emptystate.php +++ b/administrator/components/com_privacy/tmpl/requests/emptystate.php @@ -18,6 +18,8 @@ 'formURL' => 'index.php?option=com_privacy&view=requests', 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Privacy:_Information_Requests', 'icon' => 'icon-lock', + + 'controlFields' => $this->filterForm->renderControlFields(), ]; if (Factory::getApplication()->get('mailonline', 1)) { diff --git a/administrator/components/com_redirect/src/View/Link/HtmlView.php b/administrator/components/com_redirect/src/View/Link/HtmlView.php index b976c02115c3..4c516b42d78d 100644 --- a/administrator/components/com_redirect/src/View/Link/HtmlView.php +++ b/administrator/components/com_redirect/src/View/Link/HtmlView.php @@ -74,6 +74,10 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->form + ->addControlField('task', ''); + $this->addToolbar(); parent::display($tpl); } diff --git a/administrator/components/com_redirect/src/View/Links/HtmlView.php b/administrator/components/com_redirect/src/View/Links/HtmlView.php index 18ba6bd08b76..5a2b850820fc 100644 --- a/administrator/components/com_redirect/src/View/Links/HtmlView.php +++ b/administrator/components/com_redirect/src/View/Links/HtmlView.php @@ -143,6 +143,11 @@ public function display($tpl = null) $this->redirectPluginId = RedirectHelper::getRedirectPluginId(); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_redirect/tmpl/link/edit.php b/administrator/components/com_redirect/tmpl/link/edit.php index 6cc9b7d0cb9f..f746eb9cf423 100644 --- a/administrator/components/com_redirect/tmpl/link/edit.php +++ b/administrator/components/com_redirect/tmpl/link/edit.php @@ -43,7 +43,6 @@ - - + form->renderControlFields(); ?> diff --git a/administrator/components/com_redirect/tmpl/links/default.php b/administrator/components/com_redirect/tmpl/links/default.php index e3264a20df01..7c85bf575487 100644 --- a/administrator/components/com_redirect/tmpl/links/default.php +++ b/administrator/components/com_redirect/tmpl/links/default.php @@ -177,8 +177,6 @@ - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_redirect/tmpl/links/emptystate.php b/administrator/components/com_redirect/tmpl/links/emptystate.php index c5b709f63755..12fcaed2dd1d 100644 --- a/administrator/components/com_redirect/tmpl/links/emptystate.php +++ b/administrator/components/com_redirect/tmpl/links/emptystate.php @@ -25,6 +25,8 @@ 'formURL' => 'index.php?option=com_redirect&view=links', 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Redirects:_Links', 'icon' => 'icon-map-signs redirect', + + 'controlFields' => $this->filterForm->renderControlFields(), ]; $app = Factory::getApplication(); diff --git a/administrator/components/com_scheduler/src/View/Logs/HtmlView.php b/administrator/components/com_scheduler/src/View/Logs/HtmlView.php index b1a23b35d04c..6681c8dd4fc6 100644 --- a/administrator/components/com_scheduler/src/View/Logs/HtmlView.php +++ b/administrator/components/com_scheduler/src/View/Logs/HtmlView.php @@ -97,6 +97,11 @@ public function display($tpl = null): void throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); } diff --git a/administrator/components/com_scheduler/src/View/Task/HtmlView.php b/administrator/components/com_scheduler/src/View/Task/HtmlView.php index f7fbeff76443..efe4bf086d82 100644 --- a/administrator/components/com_scheduler/src/View/Task/HtmlView.php +++ b/administrator/components/com_scheduler/src/View/Task/HtmlView.php @@ -118,6 +118,10 @@ public function display($tpl = null): void $this->state = $model->getState(); $this->canDo = ContentHelper::getActions('com_scheduler', 'task', $this->item->id); + // Add form control fields + $this->form + ->addControlField('task', ''); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php b/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php index d58d60c9f955..5762e9cebc85 100644 --- a/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php +++ b/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php @@ -111,6 +111,11 @@ public function display($tpl = null): void throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_scheduler/tmpl/logs/default.php b/administrator/components/com_scheduler/tmpl/logs/default.php index d9436aeb49a2..b1a71c471e44 100644 --- a/administrator/components/com_scheduler/tmpl/logs/default.php +++ b/administrator/components/com_scheduler/tmpl/logs/default.php @@ -133,9 +133,8 @@ ?> pagination->getListFooter(); ?> - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_scheduler/tmpl/task/edit.php b/administrator/components/com_scheduler/tmpl/task/edit.php index 8240b1996cb4..36163e006ee5 100644 --- a/administrator/components/com_scheduler/tmpl/task/edit.php +++ b/administrator/components/com_scheduler/tmpl/task/edit.php @@ -198,7 +198,7 @@ class="form-validate"> form->getInput('context'); ?> - - + + form->renderControlFields(); ?> diff --git a/administrator/components/com_scheduler/tmpl/tasks/default.php b/administrator/components/com_scheduler/tmpl/tasks/default.php index 1cb5d49c3d45..e6b5fad9abc4 100644 --- a/administrator/components/com_scheduler/tmpl/tasks/default.php +++ b/administrator/components/com_scheduler/tmpl/tasks/default.php @@ -301,8 +301,6 @@ class="js-draggable" data-url="" data-direction=" - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_scheduler/tmpl/tasks/empty_state.php b/administrator/components/com_scheduler/tmpl/tasks/empty_state.php index 0665fd68284d..dd82ce3cdf77 100644 --- a/administrator/components/com_scheduler/tmpl/tasks/empty_state.php +++ b/administrator/components/com_scheduler/tmpl/tasks/empty_state.php @@ -15,10 +15,11 @@ /** @var \Joomla\Component\Scheduler\Administrator\View\Tasks\HtmlView $this */ $displayData = [ - 'textPrefix' => 'COM_SCHEDULER', - 'formURL' => 'index.php?option=com_scheduler&task=task.add', - 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/J4.x:Task_Scheduler', - 'icon' => 'icon-clock clock', + 'textPrefix' => 'COM_SCHEDULER', + 'formURL' => 'index.php?option=com_scheduler&task=task.add', + 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/J4.x:Task_Scheduler', + 'icon' => 'icon-clock clock', + 'controlFields' => $this->filterForm->renderControlFields(), ]; if ($this->getCurrentUser()->authorise('core.create', 'com_scheduler')) { diff --git a/administrator/components/com_tags/src/View/Tag/HtmlView.php b/administrator/components/com_tags/src/View/Tag/HtmlView.php index 1bceced1de02..2960f57bb7c1 100644 --- a/administrator/components/com_tags/src/View/Tag/HtmlView.php +++ b/administrator/components/com_tags/src/View/Tag/HtmlView.php @@ -98,6 +98,10 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->form + ->addControlField('task', ''); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_tags/src/View/Tags/HtmlView.php b/administrator/components/com_tags/src/View/Tags/HtmlView.php index 500c41a0bde1..f8cd65fb8d4d 100644 --- a/administrator/components/com_tags/src/View/Tags/HtmlView.php +++ b/administrator/components/com_tags/src/View/Tags/HtmlView.php @@ -118,6 +118,11 @@ public function display($tpl = null) $this->ordering[$item->parent_id][] = $item->id; } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + // We don't need toolbar in the modal window. if ($this->getLayout() !== 'modal') { $this->addToolbar(); diff --git a/administrator/components/com_tags/tmpl/tag/edit.php b/administrator/components/com_tags/tmpl/tag/edit.php index 9b23c6acec63..d269eeac902c 100644 --- a/administrator/components/com_tags/tmpl/tag/edit.php +++ b/administrator/components/com_tags/tmpl/tag/edit.php @@ -74,6 +74,6 @@ - - + + form->renderControlFields(); ?> diff --git a/administrator/components/com_tags/tmpl/tags/default.php b/administrator/components/com_tags/tmpl/tags/default.php index a3b20bea037f..0ccc7e4445ea 100644 --- a/administrator/components/com_tags/tmpl/tags/default.php +++ b/administrator/components/com_tags/tmpl/tags/default.php @@ -263,8 +263,6 @@ - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_tags/tmpl/tags/emptystate.php b/administrator/components/com_tags/tmpl/tags/emptystate.php index ab70fe7c796d..759e05f5f0b2 100644 --- a/administrator/components/com_tags/tmpl/tags/emptystate.php +++ b/administrator/components/com_tags/tmpl/tags/emptystate.php @@ -19,6 +19,8 @@ 'formURL' => 'index.php?option=com_tags&task=tag.add', 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/J4.x:How_To_Use_Content_Tags_in_Joomla', 'icon' => 'icon-tags tags', + + 'controlFields' => $this->filterForm->renderControlFields(), ]; if ($this->getCurrentUser()->authorise('core.create', 'com_tags')) { diff --git a/administrator/components/com_templates/src/View/Style/HtmlView.php b/administrator/components/com_templates/src/View/Style/HtmlView.php index cee8171d1cfa..fc407d012514 100644 --- a/administrator/components/com_templates/src/View/Style/HtmlView.php +++ b/administrator/components/com_templates/src/View/Style/HtmlView.php @@ -93,6 +93,10 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->form + ->addControlField('task', ''); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_templates/src/View/Styles/HtmlView.php b/administrator/components/com_templates/src/View/Styles/HtmlView.php index 8833a8a17441..4f6065b3635a 100644 --- a/administrator/components/com_templates/src/View/Styles/HtmlView.php +++ b/administrator/components/com_templates/src/View/Styles/HtmlView.php @@ -106,6 +106,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_templates/src/View/Templates/HtmlView.php b/administrator/components/com_templates/src/View/Templates/HtmlView.php index 9e11c3027773..01db6a9b3046 100644 --- a/administrator/components/com_templates/src/View/Templates/HtmlView.php +++ b/administrator/components/com_templates/src/View/Templates/HtmlView.php @@ -123,6 +123,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_templates/tmpl/style/edit.php b/administrator/components/com_templates/tmpl/style/edit.php index 56b4fb41d92f..d263626ccab9 100644 --- a/administrator/components/com_templates/tmpl/style/edit.php +++ b/administrator/components/com_templates/tmpl/style/edit.php @@ -143,7 +143,6 @@ class="form-validate"> - - + form->renderControlFields(); ?> diff --git a/administrator/components/com_templates/tmpl/styles/default.php b/administrator/components/com_templates/tmpl/styles/default.php index c708fdd97315..e8e07afc17fe 100644 --- a/administrator/components/com_templates/tmpl/styles/default.php +++ b/administrator/components/com_templates/tmpl/styles/default.php @@ -146,9 +146,7 @@ - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_templates/tmpl/templates/default.php b/administrator/components/com_templates/tmpl/templates/default.php index 0baf58bf55ff..aafcd5c299b7 100644 --- a/administrator/components/com_templates/tmpl/templates/default.php +++ b/administrator/components/com_templates/tmpl/templates/default.php @@ -137,9 +137,7 @@ - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_users/src/View/Debuggroup/HtmlView.php b/administrator/components/com_users/src/View/Debuggroup/HtmlView.php index 0ece79d109e9..392aa59a4463 100644 --- a/administrator/components/com_users/src/View/Debuggroup/HtmlView.php +++ b/administrator/components/com_users/src/View/Debuggroup/HtmlView.php @@ -112,6 +112,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_users/src/View/Debuguser/HtmlView.php b/administrator/components/com_users/src/View/Debuguser/HtmlView.php index 256a01974dce..999d2d0a458a 100644 --- a/administrator/components/com_users/src/View/Debuguser/HtmlView.php +++ b/administrator/components/com_users/src/View/Debuguser/HtmlView.php @@ -112,6 +112,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_users/src/View/Group/HtmlView.php b/administrator/components/com_users/src/View/Group/HtmlView.php index 6e7fed5737c3..b372e7dce8e1 100644 --- a/administrator/components/com_users/src/View/Group/HtmlView.php +++ b/administrator/components/com_users/src/View/Group/HtmlView.php @@ -83,6 +83,10 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->form + ->addControlField('task', ''); + $this->addToolbar(); parent::display($tpl); } diff --git a/administrator/components/com_users/src/View/Groups/HtmlView.php b/administrator/components/com_users/src/View/Groups/HtmlView.php index 5b7863db9212..a9325f2c6929 100644 --- a/administrator/components/com_users/src/View/Groups/HtmlView.php +++ b/administrator/components/com_users/src/View/Groups/HtmlView.php @@ -92,6 +92,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); } diff --git a/administrator/components/com_users/src/View/Level/HtmlView.php b/administrator/components/com_users/src/View/Level/HtmlView.php index 239b653d82c7..597111ad3c0e 100644 --- a/administrator/components/com_users/src/View/Level/HtmlView.php +++ b/administrator/components/com_users/src/View/Level/HtmlView.php @@ -74,6 +74,10 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->form + ->addControlField('task', ''); + $this->addToolbar(); parent::display($tpl); } diff --git a/administrator/components/com_users/src/View/Levels/HtmlView.php b/administrator/components/com_users/src/View/Levels/HtmlView.php index 66a5d273a2d2..a2c02a3fa6b5 100644 --- a/administrator/components/com_users/src/View/Levels/HtmlView.php +++ b/administrator/components/com_users/src/View/Levels/HtmlView.php @@ -92,6 +92,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); } diff --git a/administrator/components/com_users/src/View/Mail/HtmlView.php b/administrator/components/com_users/src/View/Mail/HtmlView.php index 501aacf8a788..764cf356b0d2 100644 --- a/administrator/components/com_users/src/View/Mail/HtmlView.php +++ b/administrator/components/com_users/src/View/Mail/HtmlView.php @@ -57,6 +57,10 @@ public function display($tpl = null) // Get data from the model $this->form = $model->getForm(); + // Add form control fields + $this->form + ->addControlField('task', ''); + $this->addToolbar(); parent::display($tpl); } diff --git a/administrator/components/com_users/src/View/Note/HtmlView.php b/administrator/components/com_users/src/View/Note/HtmlView.php index 6d6f5d4bf327..1b2054602723 100644 --- a/administrator/components/com_users/src/View/Note/HtmlView.php +++ b/administrator/components/com_users/src/View/Note/HtmlView.php @@ -81,6 +81,10 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->form + ->addControlField('task', ''); + parent::display($tpl); $this->addToolbar(); } diff --git a/administrator/components/com_users/src/View/Notes/HtmlView.php b/administrator/components/com_users/src/View/Notes/HtmlView.php index fdffc989bcf9..3ed37f2617a8 100644 --- a/administrator/components/com_users/src/View/Notes/HtmlView.php +++ b/administrator/components/com_users/src/View/Notes/HtmlView.php @@ -124,6 +124,11 @@ public function display($tpl = null) $item->cparams = new Registry($item->category_params); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); } diff --git a/administrator/components/com_users/src/View/User/HtmlView.php b/administrator/components/com_users/src/View/User/HtmlView.php index 3b221ba7af38..40da0e08b8cf 100644 --- a/administrator/components/com_users/src/View/User/HtmlView.php +++ b/administrator/components/com_users/src/View/User/HtmlView.php @@ -141,6 +141,11 @@ public function display($tpl = null) } } + // Add form control fields + $this->form + ->addControlField('task', '') + ->addControlField('return', Factory::getApplication()->getInput()->getBase64('return', '')); + parent::display($tpl); $this->addToolbar(); diff --git a/administrator/components/com_users/src/View/Users/HtmlView.php b/administrator/components/com_users/src/View/Users/HtmlView.php index d88ba9806791..330b2ac60eb7 100644 --- a/administrator/components/com_users/src/View/Users/HtmlView.php +++ b/administrator/components/com_users/src/View/Users/HtmlView.php @@ -102,6 +102,11 @@ public function display($tpl = null) throw new GenericDataException(implode("\n", $errors), 500); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); } diff --git a/administrator/components/com_users/tmpl/debuggroup/default.php b/administrator/components/com_users/tmpl/debuggroup/default.php index 105c04627585..7e8e3a4360e3 100644 --- a/administrator/components/com_users/tmpl/debuggroup/default.php +++ b/administrator/components/com_users/tmpl/debuggroup/default.php @@ -154,9 +154,7 @@ pagination->getListFooter(); ?> - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_users/tmpl/debuguser/default.php b/administrator/components/com_users/tmpl/debuguser/default.php index c7af6108f9fe..b9a831ca1014 100644 --- a/administrator/components/com_users/tmpl/debuguser/default.php +++ b/administrator/components/com_users/tmpl/debuguser/default.php @@ -157,9 +157,7 @@ pagination->getListFooter(); ?> - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_users/tmpl/group/edit.php b/administrator/components/com_users/tmpl/group/edit.php index 77af501d105e..4fb32df00674 100644 --- a/administrator/components/com_users/tmpl/group/edit.php +++ b/administrator/components/com_users/tmpl/group/edit.php @@ -37,6 +37,5 @@ - - + form->renderControlFields(); ?> diff --git a/administrator/components/com_users/tmpl/groups/default.php b/administrator/components/com_users/tmpl/groups/default.php index d01662367571..0384da71b69d 100644 --- a/administrator/components/com_users/tmpl/groups/default.php +++ b/administrator/components/com_users/tmpl/groups/default.php @@ -137,9 +137,7 @@ - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_users/tmpl/level/edit.php b/administrator/components/com_users/tmpl/level/edit.php index 4b3ef81307ec..1ad17237b9c2 100644 --- a/administrator/components/com_users/tmpl/level/edit.php +++ b/administrator/components/com_users/tmpl/level/edit.php @@ -32,6 +32,6 @@ - - - \ No newline at end of file + + form->renderControlFields(); ?> + diff --git a/administrator/components/com_users/tmpl/levels/default.php b/administrator/components/com_users/tmpl/levels/default.php index baf162c273f8..f59078ab215f 100644 --- a/administrator/components/com_users/tmpl/levels/default.php +++ b/administrator/components/com_users/tmpl/levels/default.php @@ -136,9 +136,8 @@ pagination->getListFooter(); ?> - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_users/tmpl/mail/default.php b/administrator/components/com_users/tmpl/mail/default.php index 212e57bc93e3..3e5bcb81e948 100644 --- a/administrator/components/com_users/tmpl/mail/default.php +++ b/administrator/components/com_users/tmpl/mail/default.php @@ -11,7 +11,6 @@ defined('_JEXEC') or die; use Joomla\CMS\Component\ComponentHelper; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; @@ -57,6 +56,6 @@ form->renderField('group'); ?> - - + + form->renderControlFields(); ?> diff --git a/administrator/components/com_users/tmpl/note/edit.php b/administrator/components/com_users/tmpl/note/edit.php index 9387a31e4992..2cd299cbbca1 100644 --- a/administrator/components/com_users/tmpl/note/edit.php +++ b/administrator/components/com_users/tmpl/note/edit.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; @@ -35,13 +34,13 @@ form->renderField('review_time'); ?> form->renderField('version_note'); ?> - - - + form->renderControlFields(); ?>
form->renderField('body'); ?>
+ + diff --git a/administrator/components/com_users/tmpl/notes/default.php b/administrator/components/com_users/tmpl/notes/default.php index d1665b2b956b..81b016c4df11 100644 --- a/administrator/components/com_users/tmpl/notes/default.php +++ b/administrator/components/com_users/tmpl/notes/default.php @@ -119,11 +119,7 @@ -
- - - -
+ filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_users/tmpl/notes/emptystate.php b/administrator/components/com_users/tmpl/notes/emptystate.php index 87792bafa261..9ca294602923 100644 --- a/administrator/components/com_users/tmpl/notes/emptystate.php +++ b/administrator/components/com_users/tmpl/notes/emptystate.php @@ -19,6 +19,8 @@ 'formURL' => 'index.php?option=com_users&view=notes', 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:User_Notes', 'icon' => 'icon-users user', + + 'controlFields' => $this->filterForm->renderControlFields(), ]; if ($this->getCurrentUser()->authorise('core.create', 'com_users')) { diff --git a/administrator/components/com_users/tmpl/user/edit.php b/administrator/components/com_users/tmpl/user/edit.php index 4714ed8e0327..8dc949474038 100644 --- a/administrator/components/com_users/tmpl/user/edit.php +++ b/administrator/components/com_users/tmpl/user/edit.php @@ -77,7 +77,5 @@ - - - + form->renderControlFields(); ?> diff --git a/administrator/components/com_users/tmpl/users/default.php b/administrator/components/com_users/tmpl/users/default.php index b02e1b66fe5e..3d2c8400f2d9 100644 --- a/administrator/components/com_users/tmpl/users/default.php +++ b/administrator/components/com_users/tmpl/users/default.php @@ -220,9 +220,7 @@ - - - + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_workflow/src/View/Stage/HtmlView.php b/administrator/components/com_workflow/src/View/Stage/HtmlView.php index bddb3b11b66c..0326746e44d6 100644 --- a/administrator/components/com_workflow/src/View/Stage/HtmlView.php +++ b/administrator/components/com_workflow/src/View/Stage/HtmlView.php @@ -105,6 +105,10 @@ public function display($tpl = null) $this->section = array_shift($parts); } + // Add form control fields + $this->form + ->addControlField('task', 'stage.edit'); + // Set the toolbar $this->addToolbar(); diff --git a/administrator/components/com_workflow/src/View/Stages/HtmlView.php b/administrator/components/com_workflow/src/View/Stages/HtmlView.php index 99d83726a810..b3ca38f5dfa0 100644 --- a/administrator/components/com_workflow/src/View/Stages/HtmlView.php +++ b/administrator/components/com_workflow/src/View/Stages/HtmlView.php @@ -155,6 +155,13 @@ public function display($tpl = null) $this->section = array_shift($parts); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0') + ->addControlField('workflow_id', $this->workflowID) + ->addControlField('extension', $this->extension); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_workflow/src/View/Transition/HtmlView.php b/administrator/components/com_workflow/src/View/Transition/HtmlView.php index fc6be898a61b..734b65a17d12 100644 --- a/administrator/components/com_workflow/src/View/Transition/HtmlView.php +++ b/administrator/components/com_workflow/src/View/Transition/HtmlView.php @@ -143,6 +143,10 @@ public function display($tpl = null) // Get the ID of workflow $this->workflowID = $this->input->getCmd("workflow_id"); + // Add form control fields + $this->form + ->addControlField('task', 'transition.edit'); + // Set the toolbar $this->addToolbar(); diff --git a/administrator/components/com_workflow/src/View/Transitions/HtmlView.php b/administrator/components/com_workflow/src/View/Transitions/HtmlView.php index 9335c19d9d3f..785f61c21d18 100644 --- a/administrator/components/com_workflow/src/View/Transitions/HtmlView.php +++ b/administrator/components/com_workflow/src/View/Transitions/HtmlView.php @@ -148,6 +148,13 @@ public function display($tpl = null) $this->section = array_shift($parts); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0') + ->addControlField('workflow_id', $this->workflowID) + ->addControlField('extension', $this->extension); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_workflow/src/View/Workflow/HtmlView.php b/administrator/components/com_workflow/src/View/Workflow/HtmlView.php index 2fda782e3b54..8e3e74a9c3f6 100644 --- a/administrator/components/com_workflow/src/View/Workflow/HtmlView.php +++ b/administrator/components/com_workflow/src/View/Workflow/HtmlView.php @@ -109,6 +109,10 @@ public function display($tpl = null) $this->section = array_shift($parts); } + // Add form control fields + $this->form + ->addControlField('task', 'workflow.edit'); + // Set the toolbar $this->addToolbar(); diff --git a/administrator/components/com_workflow/src/View/Workflows/HtmlView.php b/administrator/components/com_workflow/src/View/Workflows/HtmlView.php index c9bafa2336a6..a78ba9e670a3 100644 --- a/administrator/components/com_workflow/src/View/Workflows/HtmlView.php +++ b/administrator/components/com_workflow/src/View/Workflows/HtmlView.php @@ -128,6 +128,11 @@ public function display($tpl = null) $this->section = array_shift($parts); } + // Add form control fields + $this->filterForm + ->addControlField('task', '') + ->addControlField('boxchecked', '0'); + $this->addToolbar(); parent::display($tpl); diff --git a/administrator/components/com_workflow/tmpl/stage/edit.php b/administrator/components/com_workflow/tmpl/stage/edit.php index 37aaaf22b4da..83eae9b3757a 100644 --- a/administrator/components/com_workflow/tmpl/stage/edit.php +++ b/administrator/components/com_workflow/tmpl/stage/edit.php @@ -85,7 +85,7 @@ form->getInput('workflow_id'); ?> - - + + form->renderControlFields(); ?> diff --git a/administrator/components/com_workflow/tmpl/stages/default.php b/administrator/components/com_workflow/tmpl/stages/default.php index c9a053226c9b..22ba1d112bf3 100644 --- a/administrator/components/com_workflow/tmpl/stages/default.php +++ b/administrator/components/com_workflow/tmpl/stages/default.php @@ -149,11 +149,8 @@ pagination->getListFooter(); ?> - - - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_workflow/tmpl/transition/edit.php b/administrator/components/com_workflow/tmpl/transition/edit.php index 27e39dfb6339..10b3e7f6db66 100644 --- a/administrator/components/com_workflow/tmpl/transition/edit.php +++ b/administrator/components/com_workflow/tmpl/transition/edit.php @@ -68,6 +68,6 @@ form->getInput('workflow_id'); ?> - - + + form->renderControlFields(); ?> diff --git a/administrator/components/com_workflow/tmpl/transitions/default.php b/administrator/components/com_workflow/tmpl/transitions/default.php index 4f5967a2e040..c416ff7e2acf 100644 --- a/administrator/components/com_workflow/tmpl/transitions/default.php +++ b/administrator/components/com_workflow/tmpl/transitions/default.php @@ -156,11 +156,8 @@ pagination->getListFooter(); ?> - - - - - + + filterForm->renderControlFields(); ?> diff --git a/administrator/components/com_workflow/tmpl/workflow/edit.php b/administrator/components/com_workflow/tmpl/workflow/edit.php index 5ba15fef7dd4..8c0e2a8ae1d0 100644 --- a/administrator/components/com_workflow/tmpl/workflow/edit.php +++ b/administrator/components/com_workflow/tmpl/workflow/edit.php @@ -87,6 +87,6 @@ form->getInput('extension'); ?> - - + + form->renderControlFields(); ?> diff --git a/administrator/components/com_workflow/tmpl/workflows/default.php b/administrator/components/com_workflow/tmpl/workflows/default.php index 6409e3e6e1e5..1412a90d2c9f 100644 --- a/administrator/components/com_workflow/tmpl/workflows/default.php +++ b/administrator/components/com_workflow/tmpl/workflows/default.php @@ -184,9 +184,8 @@ pagination->getListFooter(); ?> - - - + + filterForm->renderControlFields(); ?> diff --git a/components/com_config/src/View/Config/HtmlView.php b/components/com_config/src/View/Config/HtmlView.php index adbb16beef0d..c7cd36a48323 100644 --- a/components/com_config/src/View/Config/HtmlView.php +++ b/components/com_config/src/View/Config/HtmlView.php @@ -99,6 +99,10 @@ public function display($tpl = null) $this->form = $form; $this->data = $serviceData; + // Add form control fields + $this->form + ->addControlField('task', ''); + $this->_prepareDocument(); parent::display($tpl); diff --git a/components/com_config/src/View/Modules/HtmlView.php b/components/com_config/src/View/Modules/HtmlView.php index 99e11deb2941..99e62fdeb206 100644 --- a/components/com_config/src/View/Modules/HtmlView.php +++ b/components/com_config/src/View/Modules/HtmlView.php @@ -80,6 +80,12 @@ public function display($tpl = null) if ($this->form) { $this->form->bind($moduleData); + + // Add form control fields + $this->form + ->addControlField('task', '') + ->addControlField('return', Factory::getApplication()->getInput()->get('return', null, 'base64')) + ->addControlField('id', $this->item['id']); } $this->_prepareDocument(); diff --git a/components/com_config/src/View/Templates/HtmlView.php b/components/com_config/src/View/Templates/HtmlView.php index ecaf86aed050..eb3bcf7974ca 100644 --- a/components/com_config/src/View/Templates/HtmlView.php +++ b/components/com_config/src/View/Templates/HtmlView.php @@ -117,6 +117,9 @@ public function display($tpl = null) if ($form) { $form->bind($data); + + // Add form control fields + $form->addControlField('task', ''); } $this->form = $form; diff --git a/components/com_config/tmpl/config/default.php b/components/com_config/tmpl/config/default.php index 9b2fe2e561db..f4c7fc3b4151 100644 --- a/components/com_config/tmpl/config/default.php +++ b/components/com_config/tmpl/config/default.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; @@ -47,8 +46,7 @@ loadTemplate('seo'); ?> loadTemplate('metadata'); ?> - - + form->renderControlFields(); ?>
- - - - + form->renderControlFields(); ?>
- - + form->renderControlFields(); ?>
- + + form->renderControlFields(); ?> diff --git a/components/com_privacy/tmpl/remind/default.php b/components/com_privacy/tmpl/remind/default.php index c430c929eadc..cf602a2c492d 100644 --- a/components/com_privacy/tmpl/remind/default.php +++ b/components/com_privacy/tmpl/remind/default.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; @@ -46,6 +45,6 @@ - + form->renderControlFields(); ?> diff --git a/components/com_privacy/tmpl/request/default.php b/components/com_privacy/tmpl/request/default.php index 6604e14b88bc..97a1b5294b16 100644 --- a/components/com_privacy/tmpl/request/default.php +++ b/components/com_privacy/tmpl/request/default.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; @@ -47,7 +46,7 @@ - + form->renderControlFields(); ?>
diff --git a/components/com_users/src/View/Login/HtmlView.php b/components/com_users/src/View/Login/HtmlView.php index 7fc7c5970904..9c4a41a0abbb 100644 --- a/components/com_users/src/View/Login/HtmlView.php +++ b/components/com_users/src/View/Login/HtmlView.php @@ -109,6 +109,12 @@ public function display($tpl = null) // Escape strings for HTML output $this->pageclass_sfx = htmlspecialchars($this->params->get('pageclass_sfx', ''), ENT_COMPAT, 'UTF-8'); + // Add form control fields + $return = $this->form->getValue('return', '', $this->params->get('login_redirect_url', $this->params->get('login_redirect_menuitem', ''))); + + $this->form + ->addControlField('return', $return); + $this->prepareDocument(); parent::display($tpl); diff --git a/components/com_users/tmpl/login/default_login.php b/components/com_users/tmpl/login/default_login.php index 2745abaafdeb..ce3da5372885 100644 --- a/components/com_users/tmpl/login/default_login.php +++ b/components/com_users/tmpl/login/default_login.php @@ -108,9 +108,7 @@ class="btn btn-secondary w-100 "
- form->getValue('return', '', $this->params->get('login_redirect_url', $this->params->get('login_redirect_menuitem', ''))); ?> - - + form->renderControlFields(); ?> - + + form->renderControlFields(); ?> diff --git a/components/com_users/tmpl/registration/default.php b/components/com_users/tmpl/registration/default.php index c531199b6ba3..c33b27063f5a 100644 --- a/components/com_users/tmpl/registration/default.php +++ b/components/com_users/tmpl/registration/default.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; @@ -57,6 +56,7 @@ - + + form->renderControlFields(); ?> diff --git a/components/com_users/tmpl/remind/default.php b/components/com_users/tmpl/remind/default.php index 7f0eafb1a398..913e380b67ab 100644 --- a/components/com_users/tmpl/remind/default.php +++ b/components/com_users/tmpl/remind/default.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; @@ -45,6 +44,7 @@ - + + form->renderControlFields(); ?> diff --git a/components/com_users/tmpl/reset/confirm.php b/components/com_users/tmpl/reset/confirm.php index b798d9e4dc77..38ad662ed4af 100644 --- a/components/com_users/tmpl/reset/confirm.php +++ b/components/com_users/tmpl/reset/confirm.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; @@ -45,6 +44,7 @@ - + + form->renderControlFields(); ?> diff --git a/components/com_users/tmpl/reset/default.php b/components/com_users/tmpl/reset/default.php index 3d294e6e622f..a92573392665 100644 --- a/components/com_users/tmpl/reset/default.php +++ b/components/com_users/tmpl/reset/default.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; @@ -45,6 +44,7 @@ - + + form->renderControlFields(); ?> diff --git a/layouts/joomla/content/emptystate.php b/layouts/joomla/content/emptystate.php index 2abe33d2ab64..dfe7a9f8bba6 100644 --- a/layouts/joomla/content/emptystate.php +++ b/layouts/joomla/content/emptystate.php @@ -29,6 +29,8 @@ $icon = $displayData['icon'] ?? 'icon-copy article'; $append = $displayData['formAppend'] ?? ''; $btnadd = $displayData['btnadd'] ?? Text::_($textPrefix . '_EMPTYSTATE_BUTTON_ADD'); + +$controlFields = $displayData['controlFields'] ?? ''; ?>
@@ -58,7 +60,11 @@ class="btn btn-outline-secondary btn-lg px-4"> - - - + + + + + + +
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index cb9058e71b84..943de366b7e3 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -96,6 +96,12 @@ parameters: count: 2 path: administrator/components/com_actionlogs/tmpl/actionlogs/default.php + - + message: '#^Access to property \$filterForm on an unknown class HtmlView\.$#' + identifier: class.notFound + count: 1 + path: administrator/components/com_actionlogs/tmpl/actionlogs/default.php + - message: '#^Access to property \$items on an unknown class HtmlView\.$#' identifier: class.notFound @@ -300,7 +306,7 @@ parameters: - message: '#^Access to property \$form on an unknown class HtmlView\.$#' identifier: class.notFound - count: 3 + count: 4 path: administrator/components/com_associations/tmpl/association/edit.php - @@ -2810,6 +2816,12 @@ parameters: count: 1 path: administrator/components/com_guidedtours/tmpl/step/edit.php + - + message: '#^Access to property \$filterForm on an unknown class HtmlView\.$#' + identifier: class.notFound + count: 1 + path: administrator/components/com_guidedtours/tmpl/steps/default.php + - message: '#^Access to property \$items on an unknown class HtmlView\.$#' identifier: class.notFound @@ -2852,6 +2864,12 @@ parameters: count: 1 path: administrator/components/com_guidedtours/tmpl/tour/edit.php + - + message: '#^Access to property \$filterForm on an unknown class HtmlView\.$#' + identifier: class.notFound + count: 1 + path: administrator/components/com_guidedtours/tmpl/tours/default.php + - message: '#^Access to property \$items on an unknown class HtmlView\.$#' identifier: class.notFound @@ -3459,17 +3477,6 @@ parameters: count: 2 path: administrator/components/com_languages/src/Controller/InstalledController.php - - - message: ''' - #^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\: - 3\.1\.4 will be removed in 7\.0 - Will be removed without replacement - Catch thrown Exceptions instead of getError$# - ''' - identifier: method.deprecated - count: 2 - path: administrator/components/com_languages/src/Controller/InstalledController.php - - message: ''' #^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Language\\Language\: @@ -3515,17 +3522,6 @@ parameters: count: 1 path: administrator/components/com_languages/src/Controller/OverrideController.php - - - message: ''' - #^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\: - 3\.1\.4 will be removed in 7\.0 - Will be removed without replacement - Catch thrown Exceptions instead of getError$# - ''' - identifier: method.deprecated - count: 1 - path: administrator/components/com_languages/src/Controller/OverridesController.php - - message: ''' #^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\: @@ -5675,7 +5671,7 @@ parameters: - message: '#^Access to property \$form on an unknown class HtmlView\.$#' identifier: class.notFound - count: 10 + count: 11 path: administrator/components/com_scheduler/tmpl/task/edit.php - @@ -5702,6 +5698,12 @@ parameters: count: 1 path: administrator/components/com_scheduler/tmpl/task/edit.php + - + message: '#^Access to property \$filterForm on an unknown class HtmlView\.$#' + identifier: class.notFound + count: 1 + path: administrator/components/com_scheduler/tmpl/tasks/default.php + - message: '#^Access to property \$hasDueTasks on an unknown class HtmlView\.$#' identifier: class.notFound