Take advantage of PHP 5.3's new __DIR__ constant.

joomla · Aug 2, 2012 · a5c90d3 · a5c90d3
1 parent 0fc0e90
commit a5c90d3
Show file tree

Hide file tree

Showing 68 changed files with 96 additions and 98 deletions.
diff --git a/administrator/components/com_banners/models/fields/bannerclient.php b/administrator/components/com_banners/models/fields/bannerclient.php
@@ -11,7 +11,7 @@
 
 JFormHelper::loadFieldClass('list');
 
-require_once dirname(__FILE__) . '/../../helpers/banners.php';
+require_once __DIR__ . '/../../helpers/banners.php';
 
 /**
  * Bannerclient Field class for the Joomla Framework.

diff --git a/administrator/components/com_content/content.php b/administrator/components/com_content/content.php
@@ -14,8 +14,7 @@
 	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'));

diff --git 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 dirname(__FILE__).'/articles.php';
+require_once __DIR__ . '/articles.php';
 
 /**
  * @package     Joomla.Administrator

diff --git 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 dirname(__FILE__).'/article.php';
+require_once __DIR__ . '/article.php';
 
 /**
  * Feature model.

diff --git 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 dirname(__FILE__) . '/articles.php';
+require_once __DIR__ . '/articles.php';
 
 /**
  * About Page Model

diff --git a/administrator/components/com_finder/helpers/indexer/adapter.php b/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.

diff --git a/administrator/components/com_finder/helpers/indexer/helper.php b/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.

diff --git a/administrator/components/com_finder/helpers/indexer/indexer.php b/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');
 

diff --git a/administrator/components/com_finder/helpers/indexer/parser.php b/administrator/components/com_finder/helpers/indexer/parser.php
@@ -46,7 +46,7 @@ public static function getInstance($format)
 
 		// 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.

diff --git a/administrator/components/com_finder/helpers/indexer/query.php b/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');
 

diff --git a/administrator/components/com_finder/helpers/indexer/result.php b/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.

diff --git a/administrator/components/com_finder/helpers/indexer/stemmer.php b/administrator/components/com_finder/helpers/indexer/stemmer.php
@@ -54,7 +54,7 @@ public static function getInstance($adapter)
 
 		// 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.

diff --git a/administrator/components/com_installer/models/database.php b/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');
 
 /**

diff --git 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 dirname(__FILE__) . '/extension.php';
+require_once __DIR__ . '/extension.php';
 
 /**
  * Installer Manage Model

diff --git a/administrator/components/com_installer/models/manage.php b/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

diff --git 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 dirname(__FILE__).'/../default/view.php';
+include_once __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
@@ -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

diff --git 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 dirname(__FILE__).'/../default/view.php';
+include_once __DIR__ . '/../default/view.php';
 
 /**
  * Extension Manager Install View

diff --git 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 dirname(__FILE__).'/../default/view.php';
+include_once __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
@@ -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

diff --git 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 dirname(__FILE__).'/../default/view.php';
+include_once __DIR__ . '/../default/view.php';
 
 /**
  * Extension Manager Templates View

diff --git a/administrator/components/com_templates/templates.php b/administrator/components/com_templates/templates.php
@@ -14,7 +14,7 @@
 	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'));

diff --git a/administrator/components/com_users/users.php b/administrator/components/com_users/users.php
@@ -14,7 +14,7 @@
 	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'));

diff --git a/administrator/index.php b/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';
 }
 

diff --git 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 syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __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
@@ -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'));
diff --git 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 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'));
diff --git 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 syndicate functions only once
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $langs	= modLoginHelper::getLanguageList();
 $return	= modLoginHelper::getReturnURI();

diff --git a/administrator/modules/mod_menu/mod_menu.php b/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.

diff --git 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 dirname(__FILE__).'/helper.php';
+require_once __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
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $buttons = modQuickIconHelper::getButtons($params);
 

diff --git a/administrator/modules/mod_submenu/mod_submenu.php b/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'));
 }
diff --git 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 dirname(__FILE__).'/helper.php';
+require_once __DIR__ . '/helper.php';
 
 $version = modVersionHelper::getVersion($params);
 

diff --git a/administrator/templates/system/index.php b/administrator/templates/system/index.php
@@ -9,4 +9,4 @@
 
 defined('_JEXEC') or die;
 
-include dirname(__FILE__).DIRECTORY_SEPARATOR.'component.php';
+include __DIR__ . '/component.php';
diff --git a/cli/finder_indexer.php b/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';
 }
 

diff --git a/cli/garbagecron.php b/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';
 }