Take advantage of PHP 5.3's new __DIR__ constant.

administrator/components/com_banners/models/fields/bannerclient.php

@@ -11,7 +11,7 @@ defined('JPATH_BASE') or die;
 
 JFormHelper::loadFieldClass('list');
 
-require_once dirname(__FILE__) . '/../../helpers/banners.php';
+require_once __DIR__ . '/../../helpers/banners.php';
 
 /**
  * Bannerclient Field class for the Joomla Framework.

administrator/components/com_content/content.php

@@ -14,8 +14,7 @@ if (!JFactory::getUser()->authorise('core.manage', 'com_content'))
 	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
 }
 
-// Register helper class
-JLoader::register('ContentHelper', dirname(__FILE__) . '/helpers/content.php');
+JLoader::register('ContentHelper', __DIR__ . '/helpers/content.php');
 
 $controller = JControllerLegacy::getInstance('Content');
 $controller->execute(JFactory::getApplication()->input->get('task'));

administrator/components/com_content/controllers/featured.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once dirname(__FILE__).'/articles.php';
+require_once __DIR__ . '/articles.php';
 
 /**
  * @package     Joomla.Administrator

administrator/components/com_content/models/feature.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once dirname(__FILE__).'/article.php';
+require_once __DIR__ . '/article.php';
 
 /**
  * Feature model.

administrator/components/com_content/models/featured.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once dirname(__FILE__) . '/articles.php';
+require_once __DIR__ . '/articles.php';
 
 /**
  * About Page Model

administrator/components/com_finder/helpers/indexer/adapter.php

@@ -9,11 +9,10 @@
 
 defined('_JEXEC') or die;
 
-// Register dependent classes.
-JLoader::register('FinderIndexer', dirname(__FILE__) . '/indexer.php');
-JLoader::register('FinderIndexerHelper', dirname(__FILE__) . '/helper.php');
-JLoader::register('FinderIndexerResult', dirname(__FILE__) . '/result.php');
-JLoader::register('FinderIndexerTaxonomy', dirname(__FILE__) . '/taxonomy.php');
+JLoader::register('FinderIndexer', __DIR__ . '/indexer.php');
+JLoader::register('FinderIndexerHelper', __DIR__ . '/helper.php');
+JLoader::register('FinderIndexerResult', __DIR__ . '/result.php');
+JLoader::register('FinderIndexerTaxonomy', __DIR__ . '/taxonomy.php');
 
 /**
  * Prototype adapter class for the Finder indexer package.

administrator/components/com_finder/helpers/indexer/helper.php

@@ -9,8 +9,8 @@
 
 defined('_JEXEC') or die;
 
-JLoader::register('FinderIndexerStemmer', dirname(__FILE__) . '/stemmer.php');
-JLoader::register('FinderIndexerToken', dirname(__FILE__) . '/token.php');
+JLoader::register('FinderIndexerStemmer', __DIR__ . '/stemmer.php');
+JLoader::register('FinderIndexerToken', __DIR__ . '/token.php');
 
 /**
  * Helper class for the Finder indexer package.

administrator/components/com_finder/helpers/indexer/indexer.php

@@ -9,11 +9,11 @@
 
 defined('_JEXEC') or die;
 
-JLoader::register('FinderIndexerHelper', dirname(__FILE__) . '/helper.php');
-JLoader::register('FinderIndexerParser', dirname(__FILE__) . '/parser.php');
-JLoader::register('FinderIndexerStemmer', dirname(__FILE__) . '/stemmer.php');
-JLoader::register('FinderIndexerTaxonomy', dirname(__FILE__) . '/taxonomy.php');
-JLoader::register('FinderIndexerToken', dirname(__FILE__) . '/token.php');
+JLoader::register('FinderIndexerHelper', __DIR__ . '/helper.php');
+JLoader::register('FinderIndexerParser', __DIR__ . '/parser.php');
+JLoader::register('FinderIndexerStemmer', __DIR__ . '/stemmer.php');
+JLoader::register('FinderIndexerTaxonomy', __DIR__ . '/taxonomy.php');
+JLoader::register('FinderIndexerToken', __DIR__ . '/token.php');
 
 jimport('joomla.filesystem.file');
 

administrator/components/com_finder/helpers/indexer/parser.php

@@ -46,7 +46,7 @@ abstract class FinderIndexerParser
 
 		// Setup the adapter for the parser.
 		$format = JFilterInput::getInstance()->clean($format, 'cmd');
-		$path = dirname(__FILE__) . '/parser/' . $format . '.php';
+		$path = __DIR__ . '/parser/' . $format . '.php';
 		$class = 'FinderIndexerParser' . ucfirst($format);
 
 		// Check if a parser exists for the format.

administrator/components/com_finder/helpers/indexer/query.php

@@ -9,9 +9,8 @@
 
 defined('_JEXEC') or die;
 
-// Register dependent classes.
-JLoader::register('FinderIndexerHelper', dirname(__FILE__) . '/helper.php');
-JLoader::register('FinderIndexerTaxonomy', dirname(__FILE__) . '/taxonomy.php');
+JLoader::register('FinderIndexerHelper', __DIR__ . '/helper.php');
+JLoader::register('FinderIndexerTaxonomy', __DIR__ . '/taxonomy.php');
 JLoader::register('FinderHelperRoute', JPATH_SITE . '/components/com_finder/helpers/route.php');
 JLoader::register('FinderHelperLanguage', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/language.php');
 

administrator/components/com_finder/helpers/indexer/result.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-JLoader::register('FinderIndexer', dirname(__FILE__) . '/indexer.php');
+JLoader::register('FinderIndexer', __DIR__ . '/indexer.php');
 
 /**
  * Result class for the Finder indexer package.

administrator/components/com_finder/helpers/indexer/stemmer.php

@@ -54,7 +54,7 @@ abstract class FinderIndexerStemmer
 
 		// Setup the adapter for the stemmer.
 		$adapter = JFilterInput::getInstance()->clean($adapter, 'cmd');
-		$path = dirname(__FILE__) . '/stemmer/' . $adapter . '.php';
+		$path = __DIR__ . '/stemmer/' . $adapter . '.php';
 		$class = 'FinderIndexerStemmer' . ucfirst($adapter);
 
 		// Check if a stemmer exists for the adapter.

administrator/components/com_installer/models/database.php

@@ -9,8 +9,7 @@
 
 defined('_JEXEC') or die;
 
-// Import library dependencies
-JLoader::register('InstallerModel', dirname(__FILE__) . '/extension.php');
+JLoader::register('InstallerModel', __DIR__ . '/extension.php');
 JLoader::register('joomlaInstallerScript', JPATH_ADMINISTRATOR . '/components/com_admin/script.php');
 
 /**

administrator/components/com_installer/models/discover.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once dirname(__FILE__) . '/extension.php';
+require_once __DIR__ . '/extension.php';
 
 /**
  * Installer Manage Model

administrator/components/com_installer/models/manage.php

@@ -9,8 +9,7 @@
 
 defined('_JEXEC') or die;
 
-// Import library dependencies
-require_once dirname(__FILE__) . '/extension.php';
+require_once __DIR__ . '/extension.php';
 
 /**
  * Installer Manage Model

administrator/components/com_installer/views/database/view.html.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-include_once dirname(__FILE__).'/../default/view.php';
+include_once __DIR__ . '/../default/view.php';
 
 /**
  * Extension Manager Manage View

administrator/components/com_installer/views/discover/view.html.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-include_once dirname(__FILE__).'/../default/view.php';
+include_once __DIR__ . '/../default/view.php';
 
 /**
  * Extension Manager Manage View

administrator/components/com_installer/views/install/view.html.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-include_once dirname(__FILE__).'/../default/view.php';
+include_once __DIR__ . '/../default/view.php';
 
 /**
  * Extension Manager Install View

administrator/components/com_installer/views/manage/view.html.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-include_once dirname(__FILE__).'/../default/view.php';
+include_once __DIR__ . '/../default/view.php';
 
 /**
  * Extension Manager Manage View

administrator/components/com_installer/views/update/view.html.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-include_once dirname(__FILE__).'/../default/view.php';
+include_once __DIR__ . '/../default/view.php';
 
 /**
  * Extension Manager Update View

administrator/components/com_installer/views/warnings/view.html.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-include_once dirname(__FILE__).'/../default/view.php';
+include_once __DIR__ . '/../default/view.php';
 
 /**
  * Extension Manager Templates View

administrator/components/com_templates/templates.php

@@ -14,7 +14,7 @@ if (!JFactory::getUser()->authorise('core.manage', 'com_templates'))
 	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
 }
 
-JLoader::register('TemplatesHelper', dirname(__FILE__) . '/helpers/templates.php');
+JLoader::register('TemplatesHelper', __DIR__ . '/helpers/templates.php');
 
 $controller	= JControllerLegacy::getInstance('Templates');
 $controller->execute(JFactory::getApplication()->input->get('task'));

administrator/components/com_users/users.php

@@ -14,7 +14,7 @@ if (!JFactory::getUser()->authorise('core.manage', 'com_users'))
 	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
 }
 
-JLoader::register('UsersHelper', dirname(__FILE__) . '/helpers/users.php');
+JLoader::register('UsersHelper', __DIR__ . '/helpers/users.php');
 
 $controller	= JControllerLegacy::getInstance('Users');
 $controller->execute(JFactory::getApplication()->input->get('task'));

administrator/index.php

@@ -9,12 +9,12 @@
 // Set flag that this is a parent file
 const _JEXEC = 1;
 
-if (file_exists(dirname(__FILE__) . '/defines.php')) {
-	include_once dirname(__FILE__) . '/defines.php';
+if (file_exists(__DIR__ . '/defines.php')) {
+	include_once __DIR__ . '/defines.php';
 }
 
 if (!defined('_JDEFINES')) {
-	define('JPATH_BASE', dirname(__FILE__));
+	define('JPATH_BASE', __DIR__);
 	require_once JPATH_BASE.'/includes/defines.php';
 }
 

administrator/modules/mod_feed/mod_feed.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $rssurl	= $params->get('rssurl', '');
 $rssrtl	= $params->get('rssrtl', 0);

administrator/modules/mod_latest/mod_latest.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include dependancies.
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $list = modLatestHelper::getList($params);
 require JModuleHelper::getLayoutPath('mod_latest', $params->get('layout', 'default'));

administrator/modules/mod_logged/mod_logged.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include dependancies.
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $users = modLoggedHelper::getList($params);
 require JModuleHelper::getLayoutPath('mod_logged', $params->get('layout', 'default'));

administrator/modules/mod_login/mod_login.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $langs	= modLoginHelper::getLanguageList();
 $return	= modLoginHelper::getReturnURI();

administrator/modules/mod_menu/mod_menu.php

@@ -10,12 +10,14 @@
 defined('_JEXEC') or die;
 
 // Include the module helper classes.
-if (!class_exists('ModMenuHelper')) {
-	require dirname(__FILE__).'/helper.php';
+if (!class_exists('ModMenuHelper'))
+{
+	require __DIR__ . '/helper.php';
 }
 
-if (!class_exists('JAdminCssMenu')) {
-	require dirname(__FILE__).'/menu.php';
+if (!class_exists('JAdminCssMenu'))
+{
+	require __DIR__ . '/menu.php';
 }
 
 // Initialise variables.

administrator/modules/mod_popular/mod_popular.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the mod_popular functions only once.
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 // Get module data.
 $list = modPopularHelper::getList($params);

administrator/modules/mod_quickicon/mod_quickicon.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $buttons = modQuickIconHelper::getButtons($params);
 

administrator/modules/mod_submenu/mod_submenu.php

@@ -9,9 +9,9 @@
 
 defined('_JEXEC') or die;
 
-// Include dependancies.
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
-if ($list = modSubmenuHelper::getItems()) {
+if ($list = modSubmenuHelper::getItems())
+{
 	require JModuleHelper::getLayoutPath('mod_submenu', $params->get('layout', 'default'));
 }

administrator/modules/mod_version/mod_version.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $version = modVersionHelper::getVersion($params);
 

administrator/templates/system/index.php

@@ -9,4 +9,4 @@
 
 defined('_JEXEC') or die;
 
-include dirname(__FILE__).DIRECTORY_SEPARATOR.'component.php';
+include __DIR__ . '/component.php';

cli/finder_indexer.php

@@ -16,14 +16,14 @@
 const _JEXEC = 1;
 
 // Load system defines
-if (file_exists(dirname(dirname(__FILE__)) . '/defines.php'))
+if (file_exists(dirname(__DIR__) . '/defines.php'))
 {
-	require_once dirname(dirname(__FILE__)) . '/defines.php';
+	require_once dirname(__DIR__) . '/defines.php';
 }
 
 if (!defined('_JDEFINES'))
 {
-	define('JPATH_BASE', dirname(dirname(__FILE__)));
+	define('JPATH_BASE', dirname(__DIR__));
 	require_once JPATH_BASE . '/includes/defines.php';
 }
 

cli/garbagecron.php

@@ -10,14 +10,14 @@
 const _JEXEC = 1;
 
 // Load system defines
-if (file_exists(dirname(dirname(__FILE__)) . '/defines.php'))
+if (file_exists(dirname(__DIR__) . '/defines.php'))
 {
-	require_once dirname(dirname(__FILE__)) . '/defines.php';
+	require_once dirname(__DIR__) . '/defines.php';
 }
 
 if (!defined('_JDEFINES'))
 {
-	define('JPATH_BASE', dirname(dirname(__FILE__)));
+	define('JPATH_BASE', dirname(__DIR__));
 	require_once JPATH_BASE . '/includes/defines.php';
 }
 

cli/update_cron.php

@@ -19,14 +19,14 @@ error_reporting(E_ALL | E_NOTICE);
 ini_set('display_errors', 1);
 
 // Load system defines
-if (file_exists(dirname(dirname(__FILE__)) . '/defines.php'))
+if (file_exists(dirname(__DIR__) . '/defines.php'))
 {
-	require_once dirname(dirname(__FILE__)) . '/defines.php';
+	require_once dirname(__DIR__) . '/defines.php';
 }
 
 if (!defined('_JDEFINES'))
 {
-	define('JPATH_BASE', dirname(dirname(__FILE__)));
+	define('JPATH_BASE', dirname(__DIR__));
 	require_once JPATH_BASE . '/includes/defines.php';
 }
 

components/com_content/models/archive.php

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

components/com_content/models/featured.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once dirname(__FILE__) . '/articles.php';
+require_once __DIR__ . '/articles.php';
 
 /**
  * Frontpage Component Model

index.php

@@ -9,12 +9,12 @@
 // Set flag that this is a parent file.
 const _JEXEC = 1;
 
-if (file_exists(dirname(__FILE__) . '/defines.php')) {
-	include_once dirname(__FILE__) . '/defines.php';
+if (file_exists(__DIR__ . '/defines.php')) {
+	include_once __DIR__ . '/defines.php';
 }
 
 if (!defined('_JDEFINES')) {
-	define('JPATH_BASE', dirname(__FILE__));
+	define('JPATH_BASE', __DIR__);
 	require_once JPATH_BASE.'/includes/defines.php';
 }
 

libraries/cms.php

@@ -10,7 +10,7 @@ defined('_JEXEC') or die;
 
 // Set the platform root path as a constant if necessary.
 if (!defined('JPATH_PLATFORM')) {
-	define('JPATH_PLATFORM', dirname(__FILE__));
+	define('JPATH_PLATFORM', __DIR__);
 }
 
 // Import the library loader if necessary.

libraries/cms/schema/changeitem.php

@@ -137,7 +137,7 @@ abstract class JSchemaChangeitem extends JObject
 
 		// Get the class name (mysql and mysqli both use mysql)
 		$dbname = (substr($db->name, 0, 5) == 'mysql') ? 'mysql' : $db->name;
-		$path = dirname(__FILE__) . '/' . 'changeitem' . $dbname . '.php';
+		$path = __DIR__ . '/' . 'changeitem' . $dbname . '.php';
 		$class = 'JSchemaChangeitem' . $dbname;
 
 		// If the file exists register the class with our class loader.

libraries/cms/schema/changeitemsqlazure.php

@@ -8,7 +8,7 @@
  */
 
 defined('_JEXEC') or die;
-JLoader::register('JDatabaseSQLSrv', dirname(__FILE__) . '/Changeitemsqlsrv.php');
+JLoader::register('JDatabaseSQLSrv', __DIR__ . '/Changeitemsqlsrv.php');
 
 /**
  * Checks the database schema against one MySQL DDL query to see if it has been run.

modules/mod_articles_archive/mod_articles_archive.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $params->def('count', 10);
 $moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'));

modules/mod_articles_categories/mod_articles_categories.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the helper functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $list = modArticlesCategoriesHelper::getList($params);
 if (!empty($list)) {

modules/mod_articles_category/mod_articles_category.php

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

modules/mod_articles_latest/mod_articles_latest.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $list = modArticlesLatestHelper::getList($params);
 $moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'));

modules/mod_articles_news/mod_articles_news.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $list = modArticlesNewsHelper::getList($params);
 $moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'));

modules/mod_articles_popular/mod_articles_popular.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $list = modArticlesPopularHelper::getList($params);
 $moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'));

modules/mod_banners/mod_banners.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $headerText	= trim($params->get('header_text'));
 $footerText	= trim($params->get('footer_text'));

modules/mod_breadcrumbs/mod_breadcrumbs.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 // Get the breadcrumbs
 $list	= modBreadCrumbsHelper::getList($params);

modules/mod_feed/mod_feed.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $rssurl	= $params->get('rssurl', '');
 $rssrtl	= $params->get('rssrtl', 0);

modules/mod_finder/mod_finder.php

@@ -13,7 +13,7 @@ JLoader::register('FinderHelperRoute', JPATH_SITE . '/components/com_finder/help
 JLoader::register('FinderHelperLanguage', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/language.php');
 
 // Include the helper.
-require_once dirname(__FILE__) . '/helper.php';
+require_once __DIR__ . '/helper.php';
 
 if (!defined('FINDER_PATH_INDEXER'))
 {

modules/mod_languages/mod_languages.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $headerText	= JString::trim($params->get('header_text'));
 $footerText	= JString::trim($params->get('footer_text'));

modules/mod_login/mod_login.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $params->def('greeting', 1);
 

modules/mod_menu/mod_menu.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $list	= modMenuHelper::getList($params);
 $app	= JFactory::getApplication();

modules/mod_random_image/mod_random_image.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $link	= $params->get('link');
 

modules/mod_related_items/mod_related_items.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $cacheparams = new stdClass;
 $cacheparams->cachemode = 'safeuri';

modules/mod_search/mod_search.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $lang = JFactory::getLanguage();
 $app  = JFactory::getApplication();

modules/mod_stats/mod_stats.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $serverinfo = $params->get('serverinfo');
 $siteinfo	= $params->get('siteinfo');

modules/mod_syndicate/mod_syndicate.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $params->def('format', 'rss');
 

modules/mod_users_latest/mod_users_latest.php

@@ -10,7 +10,8 @@
 defined('_JEXEC') or die;
 
 // Include the latest functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
+
 $shownumber = $params->get('shownumber', 5);
 $names	= moduserslatestHelper::getUsers($params);
 $linknames = $params->get('linknames', 0);

modules/mod_weblinks/mod_weblinks.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the weblinks functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $list = modWeblinksHelper::getList($params);
 

modules/mod_whosonline/mod_whosonline.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the whosonline functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $showmode = $params->get('showmode', 0);
 

modules/mod_wrapper/mod_wrapper.php

@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 // Include the syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $params = modWrapperHelper::getParams($params);
 

plugins/content/geshi/geshi.php

@@ -49,7 +49,7 @@ class plgContentGeshi extends JPlugin
 	{
 		jimport('joomla.utilities.utility');
 
-		require_once dirname(__FILE__).'/geshi/geshi.php';
+		require_once __DIR__ . '/geshi/geshi.php';
 
 		$args = JUtility::parseAttributes($matches[1]);
 		$text = $matches[2];

plugins/user/profile/profile.php

@@ -30,7 +30,7 @@ class plgUserProfile extends JPlugin
 	{
 		parent::__construct($subject, $config);
 		$this->loadLanguage();
-		JFormHelper::addFieldPath(dirname(__FILE__) . '/fields');
+		JFormHelper::addFieldPath(__DIR__ . '/fields');
 	}
 
 	/**
@@ -169,7 +169,7 @@ class plgUserProfile extends JPlugin
 		}
 
 		// Add the registration fields to the form.
-		JForm::addFormPath(dirname(__FILE__) . '/profiles');
+		JForm::addFormPath(__DIR__ . '/profiles');
 		$form->loadFile('profile', false);
 
 		$fields = array(

templates/system/index.php

@@ -9,4 +9,4 @@
 
 defined('_JEXEC') or die;
 
-include dirname(__FILE__).DIRECTORY_SEPARATOR.'component.php';
+include __DIR__ . '/component.php';