Frontend & plugins using the autoloader

components/com_contact/contact.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_COMPONENT . '/helpers/route.php';
+JLoader::register('ContactHelperRoute', JPATH_COMPONENT . '/helpers/route.php');
 
 $controller = JControllerLegacy::getInstance('Contact');
 $controller->execute(JFactory::getApplication()->input->get('task'));

components/com_contact/models/contact.php

@@ -359,7 +359,7 @@ protected function buildContactExtendedData($contact)
 		}
 
 		// Get the profile information for the linked user
-		require_once JPATH_ADMINISTRATOR . '/components/com_users/models/user.php';
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_users/models', 'UsersModel');
 		$userModel = JModelLegacy::getInstance('User', 'UsersModel', array('ignore_request' => true));
 		$data = $userModel->getItem((int) $contact->user_id);
 
@@ -542,7 +542,7 @@ protected function getContactQuery($pk = null)
 				}
 
 				// Get the profile information for the linked user
-				require_once JPATH_ADMINISTRATOR . '/components/com_users/models/user.php';
+				JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_users/models', 'UsersModel');
 				$userModel = JModelLegacy::getInstance('User', 'UsersModel', array('ignore_request' => true));
 				$data = $userModel->getItem((int) $result->user_id);
 

components/com_contact/views/contact/tmpl/default_articles.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_SITE . '/components/com_content/helpers/route.php';
+JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
 
 ?>
 <?php if ($this->params->get('show_articles')) : ?>

components/com_contact/views/contact/view.html.php

@@ -9,8 +9,6 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_COMPONENT . '/models/category.php';
-
 /**
  * HTML Contact View class for the Contact component
  *

components/com_content/content.php

@@ -9,8 +9,8 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_COMPONENT . '/helpers/route.php';
-require_once JPATH_COMPONENT . '/helpers/query.php';
+JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
+JLoader::register('ContentHelperQuery', JPATH_SITE . '/components/com_content/helpers/query.php');
 
 $input = JFactory::getApplication()->input;
 $user  = JFactory::getUser();

components/com_content/helpers/icon.php

@@ -81,13 +81,13 @@ public static function create($category, $params, $attribs = array(), $legacy =
 	 */
 	public static function email($article, $params, $attribs = array(), $legacy = false)
 	{
-		require_once JPATH_SITE . '/components/com_mailto/helpers/mailto.php';
+		JLoader::register('MailtoHelper', JPATH_SITE . '/components/com_mailto/helpers/mailto.php');
 
 		$uri      = JUri::getInstance();
 		$base     = $uri->toString(array('scheme', 'host', 'port'));
 		$template = JFactory::getApplication()->getTemplate();
 		$link     = $base . JRoute::_(ContentHelperRoute::getArticleRoute($article->slug, $article->catid, $article->language), false);
-		$url      = 'index.php?option=com_mailto&tmpl=component&template=' . $template . '&link=' . MailToHelper::addLink($link);
+		$url      = 'index.php?option=com_mailto&tmpl=component&template=' . $template . '&link=' . MailtoHelper::addLink($link);
 
 		$status = 'width=400,height=350,menubar=yes,resizable=yes';
 

components/com_content/models/archive.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once __DIR__ . '/articles.php';
+JLoader::register('ContentModelArticles', __DIR__ . '/articles.php');
 
 /**
  * Content Component Archive Model

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');
 
 /**
  * Frontpage Component Model

components/com_content/models/form.php

@@ -13,7 +13,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 // Base this model on the backend version.
-require_once JPATH_ADMINISTRATOR . '/components/com_content/models/article.php';
+JLoader::register('ContentModelArticle', JPATH_ADMINISTRATOR . '/components/com_content/models/article.php');
 
 /**
  * Content Component Article Model

components/com_finder/finder.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_COMPONENT . '/helpers/route.php';
+JLoader::register('FinderHelperRoute', JPATH_COMPONENT . '/helpers/route.php');
 
 $controller = JControllerLegacy::getInstance('Finder');
 $controller->execute(JFactory::getApplication()->input->get('task'));

components/com_mailto/mailto.php

@@ -9,8 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_COMPONENT . '/helpers/mailto.php';
-require_once JPATH_COMPONENT . '/controller.php';
+JLoader::register('MailtoHelper', JPATH_COMPONENT . '/helpers/mailto.php');
 
 $controller = JControllerLegacy::getInstance('Mailto');
 $controller->registerDefaultTask('mailto');

components/com_newsfeeds/newsfeeds.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_COMPONENT . '/helpers/route.php';
+JLoader::register('NewsfeedsHelperRoute', JPATH_COMPONENT . '/helpers/route.php');
 JTable::addIncludePath(JPATH_COMPONENT_ADMINISTRATOR . '/tables');
 
 $controller = JControllerLegacy::getInstance('Newsfeeds');

components/com_search/views/search/view.html.php

@@ -27,7 +27,7 @@ class SearchViewSearch extends JViewLegacy
 	 */
 	public function display($tpl = null)
 	{
-		require_once JPATH_COMPONENT_ADMINISTRATOR . '/helpers/search.php';
+		JLoader::register('SearchHelper', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/search.php');
 
 		$app     = JFactory::getApplication();
 		$uri     = JUri::getInstance();
@@ -140,7 +140,7 @@ public function display($tpl = null)
 			$total      = $this->get('total');
 			$pagination = $this->get('pagination');
 
-			require_once JPATH_SITE . '/components/com_content/helpers/route.php';
+			JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
 
 			for ($i = 0, $count = count($results); $i < $count; $i++)
 			{

components/com_tags/tags.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_COMPONENT . '/helpers/route.php';
+JLoader::register('TagsHelperRoute', JPATH_COMPONENT . '/helpers/route.php');
 
 $controller = JControllerLegacy::getInstance('Tags');
 $controller->execute(JFactory::getApplication()->input->get('task'));

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', __DIR__ . '/profile_base_json.php');
 
 /**
  * Profile controller class for Users.

components/com_users/controllers/profile.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_COMPONENT . '/controller.php';
+JLoader::register('UsersController', JPATH_COMPONENT . '/controller.php');
 
 /**
  * Profile controller class for Users.

components/com_users/controllers/registration.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_COMPONENT . '/controller.php';
+JLoader::register('UsersController', JPATH_COMPONENT . '/controller.php');
 
 /**
  * Registration controller class for Users.

components/com_users/controllers/remind.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_COMPONENT . '/controller.php';
+JLoader::register('UsersController', JPATH_COMPONENT . '/controller.php');
 
 /**
  * Reset controller class for Users.

components/com_users/controllers/reset.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_COMPONENT . '/controller.php';
+JLoader::register('UsersController', JPATH_COMPONENT . '/controller.php');
 
 /**
  * Reset controller class for Users.

components/com_users/controllers/user.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_COMPONENT . '/controller.php';
+JLoader::register('UsersController', JPATH_COMPONENT . '/controller.php');
 
 /**
  * Registration controller class for Users.

components/com_users/models/profile.php

@@ -43,15 +43,9 @@ public function __construct($config = array())
 
 		parent::__construct($config);
 
-		// Load the Joomla! RAD layer
-		if (!defined('FOF_INCLUDED'))
-		{
-			include_once JPATH_LIBRARIES . '/fof/include.php';
-		}
-
 		// Load the helper and model used for two factor authentication
-		require_once JPATH_ADMINISTRATOR . '/components/com_users/models/user.php';
-		require_once JPATH_ADMINISTRATOR . '/components/com_users/helpers/users.php';
+		JLoader::register('UsersModelUser', JPATH_ADMINISTRATOR . '/components/com_users/models/user.php');
+		JLoader::register('UsersHelper', JPATH_ADMINISTRATOR . '/components/com_users/helpers/users.php');
 	}
 
 	/**

components/com_users/users.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_COMPONENT . '/helpers/route.php';
+JLoader::register('UsersHelperRoute', JPATH_COMPONENT . '/helpers/route.php');
 
 $controller = JControllerLegacy::getInstance('Users');
 $controller->execute(JFactory::getApplication()->input->get('task', 'display'));

components/com_users/views/profile/tmpl/default_custom.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-JLoader::register('JHtmlUsers', JPATH_COMPONENT . '/helpers/html/users.php');
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 JHtml::register('users.spacer', array('JHtmlUsers', 'spacer'));
 
 $fieldsets = $this->form->getFieldsets();

components/com_users/views/profile/tmpl/default_params.php

@@ -9,13 +9,7 @@
 
 defined('_JEXEC') or die;
 
-JLoader::register('JHtmlUsers', JPATH_COMPONENT . '/helpers/html/users.php');
-JHtml::register('users.spacer', array('JHtmlUsers', 'spacer'));
-JHtml::register('users.helpsite', array('JHtmlUsers', 'helpsite'));
-JHtml::register('users.templatestyle', array('JHtmlUsers', 'templatestyle'));
-JHtml::register('users.admin_language', array('JHtmlUsers', 'admin_language'));
-JHtml::register('users.language', array('JHtmlUsers', 'language'));
-JHtml::register('users.editor', array('JHtmlUsers', 'editor'));
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 
 ?>
 <?php $fields = $this->form->getFieldset('params'); ?>

modules/mod_articles_archive/mod_articles_archive.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the archive functions only once
-require_once __DIR__ . '/helper.php';
+JLoader::register('ModArchiveHelper', __DIR__ . '/helper.php');
 
 $params->def('count', 10);
 $moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');

modules/mod_articles_categories/helper.php

@@ -9,15 +9,12 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_SITE . '/components/com_content/helpers/route.php';
+JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
 
 /**
  * Helper for mod_articles_categories
  *
- * @package     Joomla.Site
- * @subpackage  mod_articles_categories
- *
- * @since       1.5
+ * @since  1.5
  */
 abstract class ModArticlesCategoriesHelper
 {

modules/mod_articles_categories/mod_articles_categories.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the helper functions only once
-require_once __DIR__ . '/helper.php';
+JLoader::register('ModArticlesCategoriesHelper', __DIR__ . '/helper.php');
 
 JLoader::register('JCategoryNode', JPATH_BASE . '/libraries/legacy/categories/categories.php');
 

modules/mod_articles_category/mod_articles_category.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the helper functions only once
-require_once __DIR__ . '/helper.php';
+JLoader::register('ModArticlesCategoryHelper', __DIR__ . '/helper.php');
 
 $input = JFactory::getApplication()->input;
 

modules/mod_articles_latest/helper.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_SITE . '/components/com_content/helpers/route.php';
+JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
 
 JModelLegacy::addIncludePath(JPATH_SITE . '/components/com_content/models', 'ContentModel');
 
@@ -18,9 +18,7 @@
 /**
  * Helper for mod_articles_latest
  *
- * @package     Joomla.Site
- * @subpackage  mod_articles_latest
- * @since       1.6
+ * @since  1.6
  */
 abstract class ModArticlesLatestHelper
 {

modules/mod_articles_latest/mod_articles_latest.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the latest functions only once
-require_once __DIR__ . '/helper.php';
+JLoader::register('ModArticlesLatestHelper', __DIR__ . '/helper.php');
 
 $list            = ModArticlesLatestHelper::getList($params);
 $moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');

modules/mod_articles_news/helper.php

@@ -9,17 +9,14 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_SITE . '/components/com_content/helpers/route.php';
+JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
 
 JModelLegacy::addIncludePath(JPATH_SITE . '/components/com_content/models', 'ContentModel');
 
 /**
  * Helper for mod_articles_news
  *
- * @package     Joomla.Site
- * @subpackage  mod_articles_news
- *
- * @since       1.6
+ * @since  1.6
  */
 abstract class ModArticlesNewsHelper
 {

modules/mod_articles_news/mod_articles_news.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the news functions only once
-require_once __DIR__ . '/helper.php';
+JLoader::register('ModArticlesNewsHelper', __DIR__ . '/helper.php');
 
 $list            = ModArticlesNewsHelper::getList($params);
 $moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');

modules/mod_articles_popular/helper.php

@@ -9,17 +9,14 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_SITE . '/components/com_content/helpers/route.php';
+JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
 
 JModelLegacy::addIncludePath(JPATH_SITE . '/components/com_content/models', 'ContentModel');
 
 /**
  * Helper for mod_articles_popular
  *
- * @package     Joomla.Site
- * @subpackage  mod_articles_popular
- *
- * @since       1.6.0
+ * @since  1.6.0
  */
 abstract class ModArticlesPopularHelper
 {

modules/mod_articles_popular/mod_articles_popular.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the popular functions only once
-require_once __DIR__ . '/helper.php';
+JLoader::register('ModArticlesPopularHelper', __DIR__ . '/helper.php');
 
 $list = ModArticlesPopularHelper::getList($params);
 $moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');