diff --git a/administrator/components/com_admin/models/profile.php b/administrator/components/com_admin/models/profile.php index e97d292bd73f0..779c279f616ad 100644 --- a/administrator/components/com_admin/models/profile.php +++ b/administrator/components/com_admin/models/profile.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once JPATH_ADMINISTRATOR . '/components/com_users/models/user.php'; +JLoader::register('UsersModelUser', JPATH_ADMINISTRATOR . '/components/com_users/models/user.php'); /** * User model. diff --git a/administrator/components/com_banners/controller.php b/administrator/components/com_banners/controller.php index 075ef264402de..c64d7edb3aa96 100644 --- a/administrator/components/com_banners/controller.php +++ b/administrator/components/com_banners/controller.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -JLoader::register('BannersHelper', JPATH_COMPONENT . '/helpers/banners.php'); +JLoader::register('BannersHelper', JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php'); /** * Banners master display controller. diff --git a/administrator/components/com_banners/models/forms/filter_banners.xml b/administrator/components/com_banners/models/forms/filter_banners.xml index 5ef151967fb41..76268022c7fec 100644 --- a/administrator/components/com_banners/models/forms/filter_banners.xml +++ b/administrator/components/com_banners/models/forms/filter_banners.xml @@ -1,6 +1,6 @@
- + - + addToolbar(); - require_once JPATH_COMPONENT . '/models/fields/bannerclient.php'; // Include the component HTML helpers. JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); @@ -92,7 +91,7 @@ public function display($tpl = null) */ protected function addToolbar() { - require_once JPATH_COMPONENT . '/helpers/banners.php'; + JLoader::register('BannersHelper', JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php'); $canDo = JHelperContent::getActions('com_banners', 'category', $this->state->get('filter.category_id')); $user = JFactory::getUser(); diff --git a/administrator/components/com_banners/views/client/view.html.php b/administrator/components/com_banners/views/client/view.html.php index 2d03c7b037198..8215e7f5c90ae 100644 --- a/administrator/components/com_banners/views/client/view.html.php +++ b/administrator/components/com_banners/views/client/view.html.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -JLoader::register('BannersHelper', JPATH_COMPONENT . '/helpers/banners.php'); +JLoader::register('BannersHelper', JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php'); /** * View to edit a client. diff --git a/administrator/components/com_banners/views/clients/view.html.php b/administrator/components/com_banners/views/clients/view.html.php index 29f4b8aa4b1ae..5bde6f4d9bd5f 100644 --- a/administrator/components/com_banners/views/clients/view.html.php +++ b/administrator/components/com_banners/views/clients/view.html.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -JLoader::register('BannersHelper', JPATH_COMPONENT . '/helpers/banners.php'); +JLoader::register('BannersHelper', JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php'); /** * View class for a list of clients. diff --git a/administrator/components/com_banners/views/tracks/view.html.php b/administrator/components/com_banners/views/tracks/view.html.php index 0135cafaa5c40..8aeaffce9f7a3 100644 --- a/administrator/components/com_banners/views/tracks/view.html.php +++ b/administrator/components/com_banners/views/tracks/view.html.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -JLoader::register('BannersHelper', JPATH_COMPONENT . '/helpers/banners.php'); +JLoader::register('BannersHelper', JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php'); /** * View class for a list of tracks. @@ -66,8 +66,6 @@ public function display($tpl = null) $this->addToolbar(); - require_once JPATH_COMPONENT . '/models/fields/bannerclient.php'; - $this->sidebar = JHtmlSidebar::render(); return parent::display($tpl); diff --git a/administrator/components/com_cache/controller.php b/administrator/components/com_cache/controller.php index 24854f3407332..b3f5e7c3a9fa3 100644 --- a/administrator/components/com_cache/controller.php +++ b/administrator/components/com_cache/controller.php @@ -28,7 +28,7 @@ class CacheController extends JControllerLegacy */ public function display($cachable = false, $urlparams = false) { - require_once JPATH_COMPONENT . '/helpers/cache.php'; + JLoader::register('CacheHelper', JPATH_ADMINISTRATOR . '/components/com_cache/helpers/cache.php'); // Get the document object. $document = JFactory::getDocument(); diff --git a/administrator/components/com_categories/controller.php b/administrator/components/com_categories/controller.php index ae7e2ce010b59..93468f2cd0293 100644 --- a/administrator/components/com_categories/controller.php +++ b/administrator/components/com_categories/controller.php @@ -89,7 +89,7 @@ public function display($cachable = false, $urlparams = array()) $view->document = $document; // Load the submenu. - require_once JPATH_COMPONENT . '/helpers/categories.php'; + JLoader::register('CategoriesHelper', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/categories.php'); CategoriesHelper::addSubmenu($model->getState('filter.extension')); $view->display(); diff --git a/administrator/components/com_categories/views/categories/tmpl/modal.php b/administrator/components/com_categories/views/categories/tmpl/modal.php index b10924e8ae63c..909bf838d8dd8 100644 --- a/administrator/components/com_categories/views/categories/tmpl/modal.php +++ b/administrator/components/com_categories/views/categories/tmpl/modal.php @@ -16,7 +16,7 @@ JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN')); } -require_once JPATH_ROOT . '/components/com_content/helpers/route.php'; +JLoader::register('ContentHelperRoute', JPATH_ROOT . '/components/com_content/helpers/route.php'); // Include the component HTML helpers. JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); diff --git a/administrator/components/com_categories/views/categories/view.html.php b/administrator/components/com_categories/views/categories/view.html.php index 98539bb2750ae..925cff302649b 100644 --- a/administrator/components/com_categories/views/categories/view.html.php +++ b/administrator/components/com_categories/views/categories/view.html.php @@ -163,7 +163,7 @@ protected function addToolbar() || $lang->load($component, JPATH_ADMINISTRATOR . '/components/' . $component, null, false, true); // Load the category helper. - require_once JPATH_COMPONENT . '/helpers/categories.php'; + JLoader::register('CategoriesHelper', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/categories.php'); // If a component categories title string is present, let's use it. if ($lang->hasKey($component_title_key = strtoupper($component . ($section ? "_$section" : '')) . '_CATEGORIES_TITLE')) diff --git a/administrator/components/com_categories/views/category/view.html.php b/administrator/components/com_categories/views/category/view.html.php index 37fe2c8fb2910..ff4d19ac821f5 100644 --- a/administrator/components/com_categories/views/category/view.html.php +++ b/administrator/components/com_categories/views/category/view.html.php @@ -129,7 +129,7 @@ protected function addToolbar() || $lang->load($component, JPATH_ADMINISTRATOR . '/components/' . $component, null, false, true); // Load the category helper. - require_once JPATH_COMPONENT . '/helpers/categories.php'; + JLoader::register('CategoriesHelper', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/categories.php'); // Get the results for each action. $canDo = $this->canDo; diff --git a/administrator/components/com_contact/controller.php b/administrator/components/com_contact/controller.php index 5d8ca9f15c08d..f95496c9033fb 100644 --- a/administrator/components/com_contact/controller.php +++ b/administrator/components/com_contact/controller.php @@ -36,7 +36,7 @@ class ContactController extends JControllerLegacy */ public function display($cachable = false, $urlparams = array()) { - require_once JPATH_COMPONENT . '/helpers/contact.php'; + JLoader::register('ContactHelper', JPATH_ADMINISTRATOR . '/components/com_contact/helpers/contact.php'); $view = $this->input->get('view', 'contacts'); $layout = $this->input->get('layout', 'default'); diff --git a/administrator/components/com_contact/views/contacts/tmpl/modal.php b/administrator/components/com_contact/views/contacts/tmpl/modal.php index 6279cb306c7b5..e9a81385e2d3d 100644 --- a/administrator/components/com_contact/views/contacts/tmpl/modal.php +++ b/administrator/components/com_contact/views/contacts/tmpl/modal.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once JPATH_ROOT . '/components/com_contact/helpers/route.php'; +JLoader::register('ContactHelperRoute', JPATH_ROOT . '/components/com_contact/helpers/route.php'); JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); diff --git a/administrator/components/com_content/controllers/featured.php b/administrator/components/com_content/controllers/featured.php index 089df321927db..ee27c3040fdfe 100644 --- a/administrator/components/com_content/controllers/featured.php +++ b/administrator/components/com_content/controllers/featured.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once __DIR__ . '/articles.php'; +JLoader::register('ContentControllerArticles', __DIR__ . '/articles.php'); /** * Featured content controller class. diff --git a/administrator/components/com_content/models/feature.php b/administrator/components/com_content/models/feature.php index f3730034575d5..7a12a1f876284 100644 --- a/administrator/components/com_content/models/feature.php +++ b/administrator/components/com_content/models/feature.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once __DIR__ . '/article.php'; +JLoader::register('ContentModelArticle', __DIR__ . '/article.php'); /** * Feature model. diff --git a/administrator/components/com_content/models/featured.php b/administrator/components/com_content/models/featured.php index 1292491004258..f5d2ef8faeb59 100644 --- a/administrator/components/com_content/models/featured.php +++ b/administrator/components/com_content/models/featured.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once __DIR__ . '/articles.php'; +JLoader::register('ContentModelArticles', __DIR__ . '/articles.php'); /** * About Page Model diff --git a/administrator/components/com_content/views/articles/tmpl/modal.php b/administrator/components/com_content/views/articles/tmpl/modal.php index 9365c667e98e6..e203021e641e0 100644 --- a/administrator/components/com_content/views/articles/tmpl/modal.php +++ b/administrator/components/com_content/views/articles/tmpl/modal.php @@ -16,7 +16,7 @@ JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN')); } -require_once JPATH_ROOT . '/components/com_content/helpers/route.php'; +JLoader::register('ContentHelperRoute', JPATH_ROOT . '/components/com_content/helpers/route.php'); // Include the component HTML helpers. JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); diff --git a/administrator/components/com_cpanel/views/cpanel/view.html.php b/administrator/components/com_cpanel/views/cpanel/view.html.php index 189ec63c6d47a..27d8b2399c58d 100644 --- a/administrator/components/com_cpanel/views/cpanel/view.html.php +++ b/administrator/components/com_cpanel/views/cpanel/view.html.php @@ -47,12 +47,6 @@ public function display($tpl = null) // Display the cpanel modules $this->modules = JModuleHelper::getModules('cpanel'); - // Load the RAD layer and count the number of post-installation messages - if (!defined('FOF_INCLUDED')) - { - require_once JPATH_LIBRARIES . '/fof/include.php'; - } - try { $messages_model = FOFModel::getTmpInstance('Messages', 'PostinstallModel')->eid(700); diff --git a/administrator/components/com_finder/controller.php b/administrator/components/com_finder/controller.php index 502775321d565..8ee462c77350d 100644 --- a/administrator/components/com_finder/controller.php +++ b/administrator/components/com_finder/controller.php @@ -28,13 +28,13 @@ class FinderController extends JControllerLegacy * @param boolean $cachable If true, the view output will be cached * @param array $urlparams An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}. * - * @return JController A JController object to support chaining. + * @return FinderController A JControllerLegacy object to support chaining. * * @since 2.5 */ public function display($cachable = false, $urlparams = array()) { - include_once JPATH_COMPONENT . '/helpers/finder.php'; + JLoader::register('FinderHelper', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/finder.php'); $view = $this->input->get('view', 'index', 'word'); $layout = $this->input->get('layout', 'index', 'word'); @@ -51,8 +51,6 @@ public function display($cachable = false, $urlparams = array()) return false; } - parent::display(); - - return $this; + return parent::display(); } } diff --git a/administrator/components/com_finder/controllers/indexer.json.php b/administrator/components/com_finder/controllers/indexer.json.php index 31e8215a632b5..df97d41ccb021 100644 --- a/administrator/components/com_finder/controllers/indexer.json.php +++ b/administrator/components/com_finder/controllers/indexer.json.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; // Register dependent classes. -JLoader::register('FinderIndexer', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/indexer/indexer.php'); +JLoader::register('FinderIndexer', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/indexer.php'); /** * Indexer controller class for Finder. diff --git a/administrator/components/com_finder/models/fields/directories.php b/administrator/components/com_finder/models/fields/directories.php index 2ccb80d9d952f..a65657b02d3f9 100644 --- a/administrator/components/com_finder/models/fields/directories.php +++ b/administrator/components/com_finder/models/fields/directories.php @@ -12,7 +12,7 @@ JFormHelper::loadFieldClass('list'); // Load the base adapter. -require_once JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php'; +JLoader::register('FinderIndexerAdapter', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php'); /** * Renders a list of directories. diff --git a/administrator/components/com_installer/controller.php b/administrator/components/com_installer/controller.php index 6d4e23659050d..e7484b522e8fd 100644 --- a/administrator/components/com_installer/controller.php +++ b/administrator/components/com_installer/controller.php @@ -28,7 +28,7 @@ class InstallerController extends JControllerLegacy */ public function display($cachable = false, $urlparams = false) { - require_once JPATH_ADMINISTRATOR . '/components/com_installer/helpers/installer.php'; + JLoader::register('InstallerHelper', JPATH_ADMINISTRATOR . '/components/com_installer/helpers/installer.php'); // Get the document object. $document = JFactory::getDocument(); diff --git a/administrator/components/com_installer/models/discover.php b/administrator/components/com_installer/models/discover.php index 2b02c55e4925b..f09d1572d8396 100644 --- a/administrator/components/com_installer/models/discover.php +++ b/administrator/components/com_installer/models/discover.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once __DIR__ . '/extension.php'; +JLoader::register('InstallerModel', __DIR__ . '/extension.php'); /** * Installer Discover Model diff --git a/administrator/components/com_installer/models/fields/extensionstatus.php b/administrator/components/com_installer/models/fields/extensionstatus.php index f9965d5eb5a5b..1a6ef20416835 100644 --- a/administrator/components/com_installer/models/fields/extensionstatus.php +++ b/administrator/components/com_installer/models/fields/extensionstatus.php @@ -11,7 +11,7 @@ JFormHelper::loadFieldClass('list'); -require_once __DIR__ . '/../../helpers/installer.php'; +JLoader::register('InstallerHelper', JPATH_ADMINISTRATOR . '/components/com_installer/helpers/installer.php'); /** * Status Field class for the Joomla Framework. diff --git a/administrator/components/com_installer/models/fields/folder.php b/administrator/components/com_installer/models/fields/folder.php index c73d8007c5493..08dbfd35fd24a 100644 --- a/administrator/components/com_installer/models/fields/folder.php +++ b/administrator/components/com_installer/models/fields/folder.php @@ -11,7 +11,7 @@ JFormHelper::loadFieldClass('list'); -require_once __DIR__ . '/../../helpers/installer.php'; +JLoader::register('InstallerHelper', JPATH_ADMINISTRATOR . '/components/com_installer/helpers/installer.php'); /** * Folder Field class for the Joomla Framework. diff --git a/administrator/components/com_installer/models/fields/location.php b/administrator/components/com_installer/models/fields/location.php index cf440c2a1cdea..a73177b668000 100644 --- a/administrator/components/com_installer/models/fields/location.php +++ b/administrator/components/com_installer/models/fields/location.php @@ -11,7 +11,7 @@ JFormHelper::loadFieldClass('list'); -require_once __DIR__ . '/../../helpers/installer.php'; +JLoader::register('InstallerHelper', JPATH_ADMINISTRATOR . '/components/com_installer/helpers/installer.php'); /** * Location Field class for the Joomla Framework. diff --git a/administrator/components/com_installer/models/fields/type.php b/administrator/components/com_installer/models/fields/type.php index bb2e72b2d65dc..e3f01db143824 100644 --- a/administrator/components/com_installer/models/fields/type.php +++ b/administrator/components/com_installer/models/fields/type.php @@ -11,7 +11,7 @@ JFormHelper::loadFieldClass('list'); -require_once __DIR__ . '/../../helpers/installer.php'; +JLoader::register('InstallerHelper', JPATH_ADMINISTRATOR . '/components/com_installer/helpers/installer.php'); /** * Type Field class for the Joomla Framework. diff --git a/administrator/components/com_installer/models/manage.php b/administrator/components/com_installer/models/manage.php index cdd9b0486bf5f..b4490328e0760 100644 --- a/administrator/components/com_installer/models/manage.php +++ b/administrator/components/com_installer/models/manage.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once __DIR__ . '/extension.php'; +JLoader::register('InstallerModel', __DIR__ . '/extension.php'); /** * Installer Manage Model diff --git a/administrator/components/com_installer/models/updatesites.php b/administrator/components/com_installer/models/updatesites.php index d806da9bcf8fe..8042d7067e958 100644 --- a/administrator/components/com_installer/models/updatesites.php +++ b/administrator/components/com_installer/models/updatesites.php @@ -9,14 +9,12 @@ defined('_JEXEC') or die; -require_once __DIR__ . '/extension.php'; +JLoader::register('InstallerModel', __DIR__ . '/extension.php'); /** * Installer Update Sites Model * - * @package Joomla.Administrator - * @subpackage com_installer - * @since 3.4 + * @since 3.4 */ class InstallerModelUpdatesites extends InstallerModel { diff --git a/administrator/components/com_installer/views/database/view.html.php b/administrator/components/com_installer/views/database/view.html.php index 690ceb89f0c84..37a4d2cf72bd5 100644 --- a/administrator/components/com_installer/views/database/view.html.php +++ b/administrator/components/com_installer/views/database/view.html.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -include_once __DIR__ . '/../default/view.php'; +JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php'); /** * Extension Manager Manage View diff --git a/administrator/components/com_installer/views/discover/view.html.php b/administrator/components/com_installer/views/discover/view.html.php index 4600284f17159..c7b312583a29f 100644 --- a/administrator/components/com_installer/views/discover/view.html.php +++ b/administrator/components/com_installer/views/discover/view.html.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -include_once __DIR__ . '/../default/view.php'; +JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php'); /** * Extension Manager Discover View diff --git a/administrator/components/com_installer/views/install/view.html.php b/administrator/components/com_installer/views/install/view.html.php index c61c838919232..1ede88a5fc87d 100644 --- a/administrator/components/com_installer/views/install/view.html.php +++ b/administrator/components/com_installer/views/install/view.html.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -include_once __DIR__ . '/../default/view.php'; +JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php'); /** * Extension Manager Install View diff --git a/administrator/components/com_installer/views/languages/view.html.php b/administrator/components/com_installer/views/languages/view.html.php index 0ffb1b9e836c8..59cb4b5113543 100644 --- a/administrator/components/com_installer/views/languages/view.html.php +++ b/administrator/components/com_installer/views/languages/view.html.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -include_once __DIR__ . '/../default/view.php'; +JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php'); /** * Language installer view diff --git a/administrator/components/com_installer/views/manage/view.html.php b/administrator/components/com_installer/views/manage/view.html.php index 95807df3a5a30..7bfa0b6bfd55e 100644 --- a/administrator/components/com_installer/views/manage/view.html.php +++ b/administrator/components/com_installer/views/manage/view.html.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -include_once __DIR__ . '/../default/view.php'; +JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php'); /** * Extension Manager Manage View diff --git a/administrator/components/com_installer/views/update/view.html.php b/administrator/components/com_installer/views/update/view.html.php index 325e3a5a91b8a..00559a1a7c76b 100644 --- a/administrator/components/com_installer/views/update/view.html.php +++ b/administrator/components/com_installer/views/update/view.html.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -include_once __DIR__ . '/../default/view.php'; +JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php'); /** * Extension Manager Update View diff --git a/administrator/components/com_installer/views/updatesites/view.html.php b/administrator/components/com_installer/views/updatesites/view.html.php index 66087e240c031..5b377d4d9af7d 100644 --- a/administrator/components/com_installer/views/updatesites/view.html.php +++ b/administrator/components/com_installer/views/updatesites/view.html.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -include_once __DIR__ . '/../default/view.php'; +JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php'); /** * Extension Manager Update Sites View diff --git a/administrator/components/com_installer/views/warnings/view.html.php b/administrator/components/com_installer/views/warnings/view.html.php index 5cee0fc778fa7..b8370dbb11845 100644 --- a/administrator/components/com_installer/views/warnings/view.html.php +++ b/administrator/components/com_installer/views/warnings/view.html.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -include_once __DIR__ . '/../default/view.php'; +JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php'); /** * Extension Manager Templates View diff --git a/administrator/components/com_joomlaupdate/controller.php b/administrator/components/com_joomlaupdate/controller.php index 1040f51a948f9..b9831e34d0bd6 100644 --- a/administrator/components/com_joomlaupdate/controller.php +++ b/administrator/components/com_joomlaupdate/controller.php @@ -47,10 +47,7 @@ public function display($cachable = false, $urlparams = false) $model = $this->getModel('default'); // Push the Installer Warnings model into the view, if we can load it - if (!class_exists('InstallerModelWarnings')) - { - @include_once JPATH_ADMINISTRATOR . '/components/com_installer/models/warnings.php'; - } + static::addModelPath(JPATH_ADMINISTRATOR . '/components/com_installer/models', 'InstallerModel'); $warningsModel = $this->getModel('warnings', 'InstallerModel'); diff --git a/administrator/components/com_joomlaupdate/views/upload/tmpl/captive.php b/administrator/components/com_joomlaupdate/views/upload/tmpl/captive.php index 0ae0824514e74..2c32d13755848 100644 --- a/administrator/components/com_joomlaupdate/views/upload/tmpl/captive.php +++ b/administrator/components/com_joomlaupdate/views/upload/tmpl/captive.php @@ -12,7 +12,7 @@ JHtml::_('behavior.keepalive'); JHtml::_('bootstrap.tooltip'); -require_once JPATH_ADMINISTRATOR . '/modules/mod_login/helper.php'; +JLoader::register('ModLoginHelper', JPATH_ADMINISTRATOR . '/modules/mod_login/helper.php'); $twofactormethods = ModLoginHelper::getTwoFactorMethods(); diff --git a/administrator/components/com_languages/controller.php b/administrator/components/com_languages/controller.php index 564ba304a1ee6..f22c151d76a8b 100644 --- a/administrator/components/com_languages/controller.php +++ b/administrator/components/com_languages/controller.php @@ -28,13 +28,13 @@ class LanguagesController extends JControllerLegacy * @param boolean $cachable If true, the view output will be cached. * @param array $urlparams An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}. * - * @return JController This object to support chaining. + * @return LanguagesController This object to support chaining. * * @since 1.5 */ public function display($cachable = false, $urlparams = false) { - require_once JPATH_COMPONENT . '/helpers/languages.php'; + JLoader::register('LanguagesHelper', JPATH_ADMINISTRATOR . '/components/com_languages/helpers/languages.php'); $view = $this->input->get('view', 'languages'); $layout = $this->input->get('layout', 'default'); @@ -51,8 +51,6 @@ public function display($cachable = false, $urlparams = false) return false; } - parent::display(); - - return $this; + return parent::display(); } } diff --git a/administrator/components/com_languages/controllers/override.php b/administrator/components/com_languages/controllers/override.php index 0c6c67f02c36e..950284e448c84 100644 --- a/administrator/components/com_languages/controllers/override.php +++ b/administrator/components/com_languages/controllers/override.php @@ -94,7 +94,7 @@ public function save($key = null, $urlVar = null) } // Require helper for filter functions called by JForm. - require_once JPATH_COMPONENT . '/helpers/languages.php'; + JLoader::register('LanguagesHelper', JPATH_ADMINISTRATOR . '/components/com_languages/helpers/languages.php'); // Test whether the data is valid. $validData = $model->validate($form, $data); diff --git a/administrator/components/com_languages/models/override.php b/administrator/components/com_languages/models/override.php index bf3f5825e8706..4801d05690569 100644 --- a/administrator/components/com_languages/models/override.php +++ b/administrator/components/com_languages/models/override.php @@ -89,7 +89,7 @@ protected function loadFormData() */ public function getItem($pk = null) { - require_once JPATH_COMPONENT . '/helpers/languages.php'; + JLoader::register('LanguagesHelper', JPATH_ADMINISTRATOR . '/components/com_languages/helpers/languages.php'); $input = JFactory::getApplication()->input; $pk = (!empty($pk)) ? $pk : $input->get('id'); @@ -122,10 +122,11 @@ public function getItem($pk = null) */ public function save($data, $opposite_client = false) { - $app = JFactory::getApplication(); - require_once JPATH_COMPONENT . '/helpers/languages.php'; + JLoader::register('LanguagesHelper', JPATH_ADMINISTRATOR . '/components/com_languages/helpers/languages.php'); jimport('joomla.filesystem.file'); + $app = JFactory::getApplication(); + $client = $app->getUserState('com_languages.overrides.filter.client', 0); $language = $app->getUserState('com_languages.overrides.filter.language', 'en-GB'); diff --git a/administrator/components/com_languages/models/overrides.php b/administrator/components/com_languages/models/overrides.php index bf762651686b7..78312a92e6125 100644 --- a/administrator/components/com_languages/models/overrides.php +++ b/administrator/components/com_languages/models/overrides.php @@ -247,7 +247,7 @@ public function delete($cids) } jimport('joomla.filesystem.file'); - require_once JPATH_COMPONENT . '/helpers/languages.php'; + JLoader::register('LanguagesHelper', JPATH_ADMINISTRATOR . '/components/com_languages/helpers/languages.php'); $filterclient = JFactory::getApplication()->getUserState('com_languages.overrides.filter.client'); $client = $filterclient == 0 ? 'SITE' : 'ADMINISTRATOR'; diff --git a/administrator/components/com_languages/models/strings.php b/administrator/components/com_languages/models/strings.php index fbe38bba778b5..42395b2344ce6 100644 --- a/administrator/components/com_languages/models/strings.php +++ b/administrator/components/com_languages/models/strings.php @@ -25,7 +25,7 @@ class LanguagesModelStrings extends JModelLegacy */ public function refresh() { - require_once JPATH_COMPONENT . '/helpers/languages.php'; + JLoader::register('LanguagesHelper', JPATH_ADMINISTRATOR . '/components/com_languages/helpers/languages.php'); $app = JFactory::getApplication(); diff --git a/administrator/components/com_languages/views/language/view.html.php b/administrator/components/com_languages/views/language/view.html.php index 6aa594d2a3884..07471d5876922 100644 --- a/administrator/components/com_languages/views/language/view.html.php +++ b/administrator/components/com_languages/views/language/view.html.php @@ -57,7 +57,7 @@ public function display($tpl = null) */ protected function addToolbar() { - require_once JPATH_COMPONENT . '/helpers/languages.php'; + JLoader::register('LanguagesHelper', JPATH_ADMINISTRATOR . '/components/com_languages/helpers/languages.php'); JFactory::getApplication()->input->set('hidemainmenu', 1); $isNew = empty($this->item->lang_id); diff --git a/administrator/components/com_languages/views/multilangstatus/view.html.php b/administrator/components/com_languages/views/multilangstatus/view.html.php index 7062e2131b144..1e33e60e97425 100644 --- a/administrator/components/com_languages/views/multilangstatus/view.html.php +++ b/administrator/components/com_languages/views/multilangstatus/view.html.php @@ -25,7 +25,7 @@ class LanguagesViewMultilangstatus extends JViewLegacy */ public function display($tpl = null) { - require_once JPATH_COMPONENT . '/helpers/multilangstatus.php'; + JLoader::register('MultilangstatusHelper', JPATH_ADMINISTRATOR . '/components/com_languages/helpers/multilangstatus.php'); $this->homes = MultilangstatusHelper::getHomes(); $this->language_filter = JLanguageMultilang::isEnabled(); diff --git a/administrator/components/com_media/media.php b/administrator/components/com_media/media.php index 10177130b20a8..2071beeb163ee 100644 --- a/administrator/components/com_media/media.php +++ b/administrator/components/com_media/media.php @@ -26,7 +26,7 @@ $params = JComponentHelper::getParams('com_media'); // Load the helper class -require_once JPATH_COMPONENT_ADMINISTRATOR . '/helpers/media.php'; +JLoader::register('MediaHelper', JPATH_ADMINISTRATOR . '/components/com_media/helpers/media.php'); // Set the path definitions $popup_upload = $input->get('pop_up', null); diff --git a/administrator/components/com_menus/controller.php b/administrator/components/com_menus/controller.php index 18aa9a4a9a8be..2d903fc27d082 100644 --- a/administrator/components/com_menus/controller.php +++ b/administrator/components/com_menus/controller.php @@ -28,10 +28,8 @@ class MenusController extends JControllerLegacy */ public function display($cachable = false, $urlparams = false) { - require_once JPATH_COMPONENT . '/helpers/menus.php'; + JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'); - parent::display(); - - return $this; + return parent::display(); } } diff --git a/administrator/components/com_menus/models/item.php b/administrator/components/com_menus/models/item.php index e45a8af7d65d7..4ff8cad4db369 100644 --- a/administrator/components/com_menus/models/item.php +++ b/administrator/components/com_menus/models/item.php @@ -12,7 +12,7 @@ use Joomla\Registry\Registry; jimport('joomla.filesystem.path'); -require_once JPATH_COMPONENT . '/helpers/menus.php'; +JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'); /** * Menu Item Model for Menus. diff --git a/administrator/components/com_messages/controller.php b/administrator/components/com_messages/controller.php index 447aab4285f9f..b732abc0deb04 100644 --- a/administrator/components/com_messages/controller.php +++ b/administrator/components/com_messages/controller.php @@ -28,7 +28,7 @@ class MessagesController extends JControllerLegacy */ public function display($cachable = false, $urlparams = false) { - require_once JPATH_COMPONENT . '/helpers/messages.php'; + JLoader::register('MessagesHelper', JPATH_ADMINISTRATOR . '/components/com_messages/helpers/messages.php'); $view = $this->input->get('view', 'messages'); $layout = $this->input->get('layout', 'default'); diff --git a/administrator/components/com_modules/controller.php b/administrator/components/com_modules/controller.php index 7f277519ba48e..ea6d201cc3452 100644 --- a/administrator/components/com_modules/controller.php +++ b/administrator/components/com_modules/controller.php @@ -57,7 +57,7 @@ public function display($cachable = false, $urlparams = false) return $view->display(); } - require_once JPATH_COMPONENT . '/helpers/modules.php'; + JLoader::register('ModulesHelper', JPATH_ADMINISTRATOR . '/components/com_modules/helpers/modules.php'); $layout = $this->input->get('layout', 'edit'); $id = $this->input->getInt('id'); diff --git a/administrator/components/com_modules/helpers/html/modules.php b/administrator/components/com_modules/helpers/html/modules.php index 14e68d8185d2f..1d14eacfbebb8 100644 --- a/administrator/components/com_modules/helpers/html/modules.php +++ b/administrator/components/com_modules/helpers/html/modules.php @@ -136,7 +136,8 @@ public static function state($value, $i, $enabled = true, $checkbox = 'cb') public static function positions($clientId, $state = 1, $selectedPosition = '') { - require_once JPATH_ADMINISTRATOR . '/components/com_templates/helpers/templates.php'; + JLoader::register('TemplatesHelper', JPATH_ADMINISTRATOR . '/components/com_templates/helpers/templates.php'); + $templates = array_keys(ModulesHelper::getTemplates($clientId, $state)); $templateGroups = array(); diff --git a/administrator/components/com_modules/models/fields/modulesmodule.php b/administrator/components/com_modules/models/fields/modulesmodule.php index 05727c2f13a08..81c3586a416c1 100644 --- a/administrator/components/com_modules/models/fields/modulesmodule.php +++ b/administrator/components/com_modules/models/fields/modulesmodule.php @@ -11,7 +11,7 @@ JFormHelper::loadFieldClass('list'); -require_once __DIR__ . '/../../helpers/modules.php'; +JLoader::register('ModulesHelper', JPATH_ADMINISTRATOR . '/components/com_modules/helpers/modules.php'); /** * ModulesPosition Field class for the Joomla Framework. diff --git a/administrator/components/com_modules/models/fields/modulesposition.php b/administrator/components/com_modules/models/fields/modulesposition.php index fd00ef4e787a2..8cda336e44462 100644 --- a/administrator/components/com_modules/models/fields/modulesposition.php +++ b/administrator/components/com_modules/models/fields/modulesposition.php @@ -11,7 +11,7 @@ JFormHelper::loadFieldClass('list'); -require_once __DIR__ . '/../../helpers/modules.php'; +JLoader::register('ModulesHelper', JPATH_ADMINISTRATOR . '/components/com_modules/helpers/modules.php'); /** * ModulesPosition Field class for the Joomla Framework. diff --git a/administrator/components/com_modules/models/module.php b/administrator/components/com_modules/models/module.php index b7af812801f55..55b9643f21dab 100644 --- a/administrator/components/com_modules/models/module.php +++ b/administrator/components/com_modules/models/module.php @@ -872,7 +872,7 @@ protected function preprocessForm(JForm $form, $data, $group = 'content') */ public function validate($form, $data, $group = null) { - require_once JPATH_ADMINISTRATOR . '/components/com_content/helpers/content.php'; + JLoader::register('ContentHelper', JPATH_ADMINISTRATOR . '/components/com_content/helpers/content.php'); return parent::validate($form, $data, $group); } diff --git a/administrator/components/com_modules/views/module/tmpl/edit_assignment.php b/administrator/components/com_modules/views/module/tmpl/edit_assignment.php index d1c1594f81708..b30b020a1a98b 100644 --- a/administrator/components/com_modules/views/module/tmpl/edit_assignment.php +++ b/administrator/components/com_modules/views/module/tmpl/edit_assignment.php @@ -9,8 +9,8 @@ defined('_JEXEC') or die; -// Initiasile related data. -require_once JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'; +// Initialise related data. +JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'); $menuTypes = MenusHelper::getMenuLinks(); JHtml::_('script', 'jui/treeselectmenu.jquery.min.js', false, true); diff --git a/administrator/components/com_modules/views/module/tmpl/edit_positions.php b/administrator/components/com_modules/views/module/tmpl/edit_positions.php index eaf28009a72fb..2ee47fcd436bc 100644 --- a/administrator/components/com_modules/views/module/tmpl/edit_positions.php +++ b/administrator/components/com_modules/views/module/tmpl/edit_positions.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once JPATH_ADMINISTRATOR . '/components/com_templates/helpers/templates.php'; +JLoader::register('TemplatesHelper', JPATH_ADMINISTRATOR . '/components/com_templates/helpers/templates.php'); JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); $clientId = $this->item->client_id; diff --git a/administrator/components/com_newsfeeds/controller.php b/administrator/components/com_newsfeeds/controller.php index cda85773ddd0f..2f4f415f40f2e 100644 --- a/administrator/components/com_newsfeeds/controller.php +++ b/administrator/components/com_newsfeeds/controller.php @@ -28,7 +28,7 @@ class NewsfeedsController extends JControllerLegacy */ public function display($cachable = false, $urlparams = array()) { - require_once JPATH_COMPONENT . '/helpers/newsfeeds.php'; + JLoader::register('NewsfeedsHelper', JPATH_ADMINISTRATOR . '/components/com_newsfeeds/helpers/newsfeeds.php'); $view = $this->input->get('view', 'newsfeeds'); $layout = $this->input->get('layout', 'default'); diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php index 139db4d59c164..cb002e8360bdf 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once JPATH_ROOT . '/components/com_newsfeeds/helpers/route.php'; +JLoader::register('NewsfeedsHelperRoute', JPATH_ROOT . '/components/com_newsfeeds/helpers/route.php'); JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); diff --git a/administrator/components/com_plugins/controller.php b/administrator/components/com_plugins/controller.php index 725b064e86c7c..55966d9696072 100644 --- a/administrator/components/com_plugins/controller.php +++ b/administrator/components/com_plugins/controller.php @@ -28,7 +28,7 @@ class PluginsController extends JControllerLegacy */ public function display($cachable = false, $urlparams = false) { - require_once JPATH_COMPONENT . '/helpers/plugins.php'; + JLoader::register('PluginsHelper', JPATH_ADMINISTRATOR . '/components/com_plugins/helpers/plugins.php'); // Load the submenu. PluginsHelper::addSubmenu($this->input->get('view', 'plugins')); diff --git a/administrator/components/com_plugins/models/fields/plugintype.php b/administrator/components/com_plugins/models/fields/plugintype.php index abfc25a69ab69..16e0ebd8dcee6 100644 --- a/administrator/components/com_plugins/models/fields/plugintype.php +++ b/administrator/components/com_plugins/models/fields/plugintype.php @@ -11,7 +11,7 @@ JFormHelper::loadFieldClass('list'); -require_once __DIR__ . '/../../helpers/plugins.php'; +JLoader::register('PluginsHelper', JPATH_ADMINISTRATOR . '/components/com_plugins/helpers/plugins.php'); /** * Plugin Type Field class for the Joomla Framework. diff --git a/administrator/components/com_postinstall/postinstall.php b/administrator/components/com_postinstall/postinstall.php index 38bd2f398f22b..1745aa617b165 100644 --- a/administrator/components/com_postinstall/postinstall.php +++ b/administrator/components/com_postinstall/postinstall.php @@ -9,11 +9,5 @@ defined('_JEXEC') or die; -// Load the RAD layer. -if (!defined('FOF_INCLUDED')) -{ - require_once JPATH_LIBRARIES . '/fof/include.php'; -} - // Dispatch the component. FOFDispatcher::getTmpInstance('com_postinstall')->dispatch(); diff --git a/administrator/components/com_redirect/controller.php b/administrator/components/com_redirect/controller.php index edba4e74f4c25..4cef71f97c069 100644 --- a/administrator/components/com_redirect/controller.php +++ b/administrator/components/com_redirect/controller.php @@ -34,7 +34,7 @@ class RedirectController extends JControllerLegacy */ public function display($cachable = false, $urlparams = false) { - require_once JPATH_COMPONENT . '/helpers/redirect.php'; + JLoader::register('RedirectHelper', JPATH_ADMINISTRATOR . '/components/com_redirect/helpers/redirect.php'); // Load the submenu. RedirectHelper::addSubmenu($this->input->get('view', 'links')); diff --git a/administrator/components/com_search/controller.php b/administrator/components/com_search/controller.php index 4b94a2f3b3379..5aa407396e0f9 100644 --- a/administrator/components/com_search/controller.php +++ b/administrator/components/com_search/controller.php @@ -28,17 +28,17 @@ class SearchController extends JControllerLegacy * @param boolean $cachable If true, the view output will be cached * @param array $urlparams An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}. * - * @return JController This object to support chaining. + * @return SearchController This object to support chaining. * * @since 1.5 */ public function display($cachable = false, $urlparams = false) { - require_once JPATH_COMPONENT . '/helpers/search.php'; + JLoader::register('SearchHelper', JPATH_ADMINISTRATOR . '/components/com_search/helpers/search.php'); // Load the submenu. SearchHelper::addSubmenu($this->input->get('view', 'searches')); - parent::display(); + return parent::display(); } } diff --git a/administrator/components/com_search/models/searches.php b/administrator/components/com_search/models/searches.php index 6484490d44307..43b0de054e15a 100644 --- a/administrator/components/com_search/models/searches.php +++ b/administrator/components/com_search/models/searches.php @@ -143,7 +143,7 @@ public function getItems() if (!class_exists('JSite')) { // This fools the routers in the search plugins into thinking it's in the frontend - JLoader::register('JSite', JPATH_COMPONENT . '/helpers/site.php'); + JLoader::register('JSite', JPATH_ADMINISTRATOR . '/components/com_search/helpers/site.php'); } foreach ($items as &$item) diff --git a/administrator/components/com_templates/models/fields/templatelocation.php b/administrator/components/com_templates/models/fields/templatelocation.php index 0c8c67774e25f..a7fd6ab1736cc 100644 --- a/administrator/components/com_templates/models/fields/templatelocation.php +++ b/administrator/components/com_templates/models/fields/templatelocation.php @@ -11,7 +11,7 @@ JFormHelper::loadFieldClass('list'); -require_once __DIR__ . '/../../helpers/templates.php'; +JLoader::register('TemplatesHelper', JPATH_ADMINISTRATOR . '/components/com_templates/helpers/templates.php'); /** * Template Style Field class for the Joomla Framework. diff --git a/administrator/components/com_templates/models/fields/templatename.php b/administrator/components/com_templates/models/fields/templatename.php index 00e7522445551..954fc4f10f791 100644 --- a/administrator/components/com_templates/models/fields/templatename.php +++ b/administrator/components/com_templates/models/fields/templatename.php @@ -11,7 +11,7 @@ JFormHelper::loadFieldClass('list'); -require_once __DIR__ . '/../../helpers/templates.php'; +JLoader::register('TemplatesHelper', JPATH_ADMINISTRATOR . '/components/com_templates/helpers/templates.php'); /** * Template Style Field class for the Joomla Framework. diff --git a/administrator/components/com_templates/models/template.php b/administrator/components/com_templates/models/template.php index 582d4f478f58d..8906d2d9e456c 100644 --- a/administrator/components/com_templates/models/template.php +++ b/administrator/components/com_templates/models/template.php @@ -888,7 +888,7 @@ public function uploadFile($file, $location) $fileName = JFile::makeSafe($file['name']); $err = null; - JLoader::register('TemplateHelper', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/template.php'); + JLoader::register('TemplateHelper', JPATH_ADMINISTRATOR . '/components/com_templates/helpers/template.php'); if (!TemplateHelper::canUpload($file, $err)) { diff --git a/administrator/components/com_templates/views/style/tmpl/edit_assignment.php b/administrator/components/com_templates/views/style/tmpl/edit_assignment.php index c0daf57be4cd5..8e33453613b8e 100644 --- a/administrator/components/com_templates/views/style/tmpl/edit_assignment.php +++ b/administrator/components/com_templates/views/style/tmpl/edit_assignment.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; // Initiasile related data. -require_once JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'; +JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'); $menuTypes = MenusHelper::getMenuLinks(); $user = JFactory::getUser(); ?> diff --git a/administrator/components/com_users/controllers/profile.json.php b/administrator/components/com_users/controllers/profile.json.php index b9390f4a97786..eed7aba5eaddf 100644 --- a/administrator/components/com_users/controllers/profile.json.php +++ b/administrator/components/com_users/controllers/profile.json.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once JPATH_SITE . '/components/com_users/controllers/profile_base_json.php'; +JLoader::register('UsersControllerProfile_Base_Json', JPATH_SITE . '/components/com_users/controllers/profile_base_json.php'); /** * Profile controller class for Users. diff --git a/administrator/components/com_users/helpers/users.php b/administrator/components/com_users/helpers/users.php index 90e76467d7ecf..fb8b4820ba11d 100644 --- a/administrator/components/com_users/helpers/users.php +++ b/administrator/components/com_users/helpers/users.php @@ -193,12 +193,6 @@ public static function getRangeOptions() */ public static function getTwoFactorMethods() { - // Load the Joomla! RAD layer - if (!defined('FOF_INCLUDED')) - { - include_once JPATH_LIBRARIES . '/fof/include.php'; - } - FOFPlatform::getInstance()->importPlugin('twofactorauth'); $identities = FOFPlatform::getInstance()->runPlugins('onUserTwofactorIdentify', array()); diff --git a/administrator/components/com_users/models/debuggroup.php b/administrator/components/com_users/models/debuggroup.php index dd9ed7526d218..dd085870950eb 100644 --- a/administrator/components/com_users/models/debuggroup.php +++ b/administrator/components/com_users/models/debuggroup.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once JPATH_COMPONENT . '/helpers/debug.php'; +JLoader::register('UsersHelperDebug', JPATH_ADMINISTRATOR . '/components/com_users/helpers/debug.php'); /** * Methods supporting a list of user records. diff --git a/administrator/components/com_users/models/debuguser.php b/administrator/components/com_users/models/debuguser.php index 94e155af43f0c..2b41aee566091 100644 --- a/administrator/components/com_users/models/debuguser.php +++ b/administrator/components/com_users/models/debuguser.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once JPATH_COMPONENT . '/helpers/debug.php'; +JLoader::register('UsersHelperDebug', JPATH_ADMINISTRATOR . '/components/com_users/helpers/debug.php'); /** * Methods supporting a list of user records. diff --git a/administrator/components/com_users/models/user.php b/administrator/components/com_users/models/user.php index 0a2f517bce256..5cc0eb03ad15c 100644 --- a/administrator/components/com_users/models/user.php +++ b/administrator/components/com_users/models/user.php @@ -38,12 +38,6 @@ public function __construct($config = array()) ); parent::__construct($config); - - // Load the Joomla! RAD layer - if (!defined('FOF_INCLUDED')) - { - include_once JPATH_LIBRARIES . '/fof/include.php'; - } } /** @@ -1231,12 +1225,6 @@ public function isValidSecretKey($user_id, $secretkey, $options = array()) 'secretkey' => $secretkey, ); - // Load the Joomla! RAD layer - if (!defined('FOF_INCLUDED')) - { - include_once JPATH_LIBRARIES . '/fof/include.php'; - } - // Try to validate the OTP FOFPlatform::getInstance()->importPlugin('twofactorauth'); diff --git a/administrator/modules/mod_feed/mod_feed.php b/administrator/modules/mod_feed/mod_feed.php index 274246033913f..d2e1755a65f4e 100644 --- a/administrator/modules/mod_feed/mod_feed.php +++ b/administrator/modules/mod_feed/mod_feed.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; // Include the feed functions only once -require_once __DIR__ . '/helper.php'; +JLoader::register('ModFeedHelper', __DIR__ . '/helper.php'); $rssurl = $params->get('rssurl', ''); $rssrtl = $params->get('rssrtl', 0); diff --git a/administrator/modules/mod_latest/mod_latest.php b/administrator/modules/mod_latest/mod_latest.php index fd15cee9ee4ee..e6dab1c4d911a 100644 --- a/administrator/modules/mod_latest/mod_latest.php +++ b/administrator/modules/mod_latest/mod_latest.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; // Include dependencies. -require_once __DIR__ . '/helper.php'; +JLoader::register('ModLatestHelper', __DIR__ . '/helper.php'); $list = ModLatestHelper::getList($params); diff --git a/administrator/modules/mod_logged/mod_logged.php b/administrator/modules/mod_logged/mod_logged.php index fb0c9b12d1f83..983d0d726ee4e 100644 --- a/administrator/modules/mod_logged/mod_logged.php +++ b/administrator/modules/mod_logged/mod_logged.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; // Include dependencies. -require_once __DIR__ . '/helper.php'; +JLoader::register('ModLoggedHelper', __DIR__ . '/helper.php'); $users = ModLoggedHelper::getList($params); diff --git a/administrator/modules/mod_login/helper.php b/administrator/modules/mod_login/helper.php index 906c2a59986f1..3bac8a84318e8 100644 --- a/administrator/modules/mod_login/helper.php +++ b/administrator/modules/mod_login/helper.php @@ -80,7 +80,7 @@ public static function getReturnUri() */ public static function getTwoFactorMethods() { - require_once JPATH_ADMINISTRATOR . '/components/com_users/helpers/users.php'; + JLoader::register('UsersHelper', JPATH_ADMINISTRATOR . '/components/com_users/helpers/users.php'); return UsersHelper::getTwoFactorMethods(); } diff --git a/administrator/modules/mod_login/mod_login.php b/administrator/modules/mod_login/mod_login.php index 435226c9abc4b..0577d589bbdaf 100644 --- a/administrator/modules/mod_login/mod_login.php +++ b/administrator/modules/mod_login/mod_login.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; // Include the login functions only once -require_once __DIR__ . '/helper.php'; +JLoader::register('ModLoginHelper', __DIR__ . '/helper.php'); $langs = ModLoginHelper::getLanguageList(); $twofactormethods = ModLoginHelper::getTwoFactorMethods(); diff --git a/administrator/modules/mod_menu/mod_menu.php b/administrator/modules/mod_menu/mod_menu.php index f1a9092ef935b..5f2e811c19006 100644 --- a/administrator/modules/mod_menu/mod_menu.php +++ b/administrator/modules/mod_menu/mod_menu.php @@ -10,20 +10,13 @@ defined('_JEXEC') or die; // Include the module helper classes. -if (!class_exists('ModMenuHelper')) -{ - require __DIR__ . '/helper.php'; -} - -if (!class_exists('JAdminCssMenu')) -{ - require __DIR__ . '/menu.php'; -} +JLoader::register('ModMenuHelper', __DIR__ . '/helper.php'); +JLoader::register('JAdminCssMenu', __DIR__ . '/menu.php'); $lang = JFactory::getLanguage(); $user = JFactory::getUser(); $input = JFactory::getApplication()->input; -$menu = new JAdminCSSMenu; +$menu = new JAdminCssMenu; $enabled = $input->getBool('hidemainmenu') ? false : true; // Render the module layout diff --git a/administrator/modules/mod_popular/mod_popular.php b/administrator/modules/mod_popular/mod_popular.php index 114a5a3e065aa..24462df1d0883 100644 --- a/administrator/modules/mod_popular/mod_popular.php +++ b/administrator/modules/mod_popular/mod_popular.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; // Include the mod_popular functions only once. -require_once __DIR__ . '/helper.php'; +JLoader::register('ModPopularHelper', __DIR__ . '/helper.php'); // Get module data. $list = ModPopularHelper::getList($params); diff --git a/administrator/modules/mod_quickicon/mod_quickicon.php b/administrator/modules/mod_quickicon/mod_quickicon.php index b52bf4525dab1..52cbe3838842d 100644 --- a/administrator/modules/mod_quickicon/mod_quickicon.php +++ b/administrator/modules/mod_quickicon/mod_quickicon.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once __DIR__ . '/helper.php'; +JLoader::register('ModQuickIconHelper', __DIR__ . '/helper.php'); $buttons = ModQuickIconHelper::getButtons($params); diff --git a/administrator/modules/mod_stats_admin/mod_stats_admin.php b/administrator/modules/mod_stats_admin/mod_stats_admin.php index 20624106c09cc..d66d624e410f6 100644 --- a/administrator/modules/mod_stats_admin/mod_stats_admin.php +++ b/administrator/modules/mod_stats_admin/mod_stats_admin.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; // Include the mod_stats functions only once -require_once __DIR__ . '/helper.php'; +JLoader::register('ModStatsHelper', __DIR__ . '/helper.php'); $serverinfo = $params->get('serverinfo'); $siteinfo = $params->get('siteinfo'); diff --git a/administrator/modules/mod_version/mod_version.php b/administrator/modules/mod_version/mod_version.php index 15a2858a98340..d2848caa4ec84 100644 --- a/administrator/modules/mod_version/mod_version.php +++ b/administrator/modules/mod_version/mod_version.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -require_once __DIR__ . '/helper.php'; +JLoader::register('ModVersionHelper', __DIR__ . '/helper.php'); $version = ModVersionHelper::getVersion($params); diff --git a/administrator/templates/hathor/html/com_content/articles/modal.php b/administrator/templates/hathor/html/com_content/articles/modal.php index 7a03a43a507ba..e2aa9fb8b810f 100644 --- a/administrator/templates/hathor/html/com_content/articles/modal.php +++ b/administrator/templates/hathor/html/com_content/articles/modal.php @@ -16,7 +16,7 @@ JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN')); } -require_once JPATH_ROOT . '/components/com_content/helpers/route.php'; +JLoader::register('ContentHelperRoute', JPATH_ROOT . '/components/com_content/helpers/route.php'); JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); diff --git a/administrator/templates/hathor/html/com_modules/module/edit_assignment.php b/administrator/templates/hathor/html/com_modules/module/edit_assignment.php index 174fe4d4163aa..b05b23c1dacca 100644 --- a/administrator/templates/hathor/html/com_modules/module/edit_assignment.php +++ b/administrator/templates/hathor/html/com_modules/module/edit_assignment.php @@ -9,8 +9,8 @@ defined('_JEXEC') or die; -// Initiasile related data. -require_once JPATH_ADMINISTRATOR.'/components/com_menus/helpers/menus.php'; +// Initialise related data. +JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'); $menuTypes = MenusHelper::getMenuLinks(); JFactory::getDocument()->addScriptDeclaration(" diff --git a/administrator/templates/hathor/html/com_templates/style/edit_assignment.php b/administrator/templates/hathor/html/com_templates/style/edit_assignment.php index 9fb7a2f6b622d..50df87dff8b3a 100644 --- a/administrator/templates/hathor/html/com_templates/style/edit_assignment.php +++ b/administrator/templates/hathor/html/com_templates/style/edit_assignment.php @@ -9,8 +9,8 @@ defined('_JEXEC') or die; -// Initiasile related data. -require_once JPATH_ADMINISTRATOR.'/components/com_menus/helpers/menus.php'; +// Initialise related data. +JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'); $menuTypes = MenusHelper::getMenuLinks(); $user = JFactory::getUser();