From 9e2efb6029a6d98dbed7d8a98779514a67d40954 Mon Sep 17 00:00:00 2001
From: ozh <ozh@ozh.org>
Date: Mon, 17 Apr 2017 23:03:37 +0200
Subject: [PATCH] Use __DIR__ instead of dirname(__FILE__)

---
 admin/admin-ajax.php                   |  2 +-
 admin/index.php                        |  2 +-
 admin/install.php                      |  2 +-
 admin/plugins.php                      |  2 +-
 admin/tools.php                        |  2 +-
 admin/upgrade.php                      |  2 +-
 includes/functions-http.php            |  2 +-
 includes/functions-l10n.php            |  4 ++--
 includes/load-yourls.php               | 10 +++++-----
 includes/pomo/mo.php                   |  4 ++--
 includes/pomo/po.php                   |  2 +-
 includes/pomo/translations.php         |  2 +-
 user/plugins/random-bg/plugin.php      |  4 ++--
 user/plugins/sample-toolbar/plugin.php |  2 +-
 14 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/admin/admin-ajax.php b/admin/admin-ajax.php
index ba31536..a89912e 100644
--- a/admin/admin-ajax.php
+++ b/admin/admin-ajax.php
@@ -1,7 +1,7 @@
 <?php
 define( 'YOURLS_ADMIN', true );
 define( 'YOURLS_AJAX', true );
-require_once( dirname( dirname( __FILE__ ) ) .'/includes/load-yourls.php' );
+require_once( dirname( __DIR__ ) .'/includes/load-yourls.php' );
 yourls_maybe_require_auth();
 
 // This file will output a JSON string
diff --git a/admin/index.php b/admin/index.php
index 1b02e55..d00f713 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -1,6 +1,6 @@
 <?php
 define( 'YOURLS_ADMIN', true );
-require_once( dirname( dirname( __FILE__ ) ).'/includes/load-yourls.php' );
+require_once( dirname( __DIR__ ).'/includes/load-yourls.php' );
 yourls_maybe_require_auth();
 
 // Variables
diff --git a/admin/install.php b/admin/install.php
index 0461ec5..eff7e1d 100644
--- a/admin/install.php
+++ b/admin/install.php
@@ -1,7 +1,7 @@
 <?php
 define( 'YOURLS_ADMIN', true );
 define( 'YOURLS_INSTALLING', true );
-require_once( dirname(dirname(__FILE__)).'/includes/load-yourls.php' );
+require_once( dirname( __DIR__ ).'/includes/load-yourls.php' );
 require_once( YOURLS_INC.'/functions-install.php' );
 
 $error   = array();
diff --git a/admin/plugins.php b/admin/plugins.php
index 4763017..57b6616 100644
--- a/admin/plugins.php
+++ b/admin/plugins.php
@@ -1,6 +1,6 @@
 <?php
 define( 'YOURLS_ADMIN', true );
-require_once( dirname( dirname( __FILE__ ) ).'/includes/load-yourls.php' );
+require_once( dirname( __DIR__ ).'/includes/load-yourls.php' );
 yourls_maybe_require_auth();
 
 // Handle plugin administration pages
diff --git a/admin/tools.php b/admin/tools.php
index 8858cc9..f5f5043 100644
--- a/admin/tools.php
+++ b/admin/tools.php
@@ -1,6 +1,6 @@
 <?php
 define( 'YOURLS_ADMIN', true );
-require_once( dirname( dirname( __FILE__ ) ).'/includes/load-yourls.php' );
+require_once( dirname( __DIR__ ).'/includes/load-yourls.php' );
 yourls_maybe_require_auth();
 
 yourls_html_head( 'tools', yourls__( 'Cool YOURLS Tools' ) );
diff --git a/admin/upgrade.php b/admin/upgrade.php
index fdca3f5..54a56b0 100644
--- a/admin/upgrade.php
+++ b/admin/upgrade.php
@@ -1,7 +1,7 @@
 <?php
 define( 'YOURLS_ADMIN', true );
 define( 'YOURLS_UPGRADING', true );
-require_once( dirname( dirname( __FILE__ ) ).'/includes/load-yourls.php' );
+require_once( dirname( __DIR__ ).'/includes/load-yourls.php' );
 require_once( YOURLS_INC.'/functions-upgrade.php' );
 require_once( YOURLS_INC.'/functions-install.php' );
 yourls_maybe_require_auth();
diff --git a/includes/functions-http.php b/includes/functions-http.php
index 8c234c4..c4b6b9b 100644
--- a/includes/functions-http.php
+++ b/includes/functions-http.php
@@ -233,7 +233,7 @@ function yourls_http_request( $type, $url, $headers, $data, $options ) {
  */
 function yourls_http_load_library() {
 	if ( !class_exists( 'Requests', false ) ) {
-		require_once dirname( __FILE__ ) . '/Requests/Requests.php';
+		require_once __DIR__ . '/Requests/Requests.php';
 		Requests::register_autoloader();
 	}
 }
diff --git a/includes/functions-l10n.php b/includes/functions-l10n.php
index 3b09658..bf3cd79 100644
--- a/includes/functions-l10n.php
+++ b/includes/functions-l10n.php
@@ -12,8 +12,8 @@
 /**
  * Load POMO files required to run library
  */
-require_once dirname(__FILE__) . '/pomo/mo.php';
-require_once dirname(__FILE__) . '/pomo/translations.php';
+require_once __DIR__ . '/pomo/mo.php';
+require_once __DIR__ . '/pomo/translations.php';
 
 /**
  * Gets the current locale.
diff --git a/includes/load-yourls.php b/includes/load-yourls.php
index 5737ea9..e986dc4 100644
--- a/includes/load-yourls.php
+++ b/includes/load-yourls.php
@@ -2,12 +2,12 @@
 // This file initialize everything needed for YOURLS
 
 // Include settings
-if( file_exists( dirname( dirname( __FILE__ ) ) . '/user/config.php' ) ) {
+if( file_exists( dirname( __DIR__ ) . '/user/config.php' ) ) {
 	// config.php in /user/
-	define( 'YOURLS_CONFIGFILE', str_replace( '\\', '/', dirname( dirname( __FILE__ ) ) ) . '/user/config.php' );
-} elseif ( file_exists( dirname( __FILE__ ) . '/config.php' ) ) {
+	define( 'YOURLS_CONFIGFILE', str_replace( '\\', '/', dirname( __DIR__ ) ) . '/user/config.php' );
+} elseif ( file_exists( __DIR__ . '/config.php' ) ) {
 	// config.php in /includes/
-	define( 'YOURLS_CONFIGFILE', str_replace( '\\', '/', dirname( __FILE__ ) ) . '/config.php' );
+	define( 'YOURLS_CONFIGFILE', str_replace( '\\', '/', __DIR__ ) . '/config.php' );
 } else {
 	// config.php not found :(
 	die( '<p class="error">Cannot find <tt>config.php</tt>.</p><p>Please read the <tt><a href="../readme.html#Install">readme.html</a></tt> to learn how to install YOURLS</p>' );
@@ -23,7 +23,7 @@ if( !defined( 'YOURLS_DB_PREFIX' ) )
 
 // physical path of YOURLS root
 if( !defined( 'YOURLS_ABSPATH' ) )
-	define( 'YOURLS_ABSPATH', str_replace( '\\', '/', dirname( dirname( __FILE__ ) ) ) );
+	define( 'YOURLS_ABSPATH', str_replace( '\\', '/', dirname( __DIR__ ) ) );
 
 // physical path of includes directory
 if( !defined( 'YOURLS_INC' ) )
diff --git a/includes/pomo/mo.php b/includes/pomo/mo.php
index a206da1..6937408 100644
--- a/includes/pomo/mo.php
+++ b/includes/pomo/mo.php
@@ -7,8 +7,8 @@
  * @subpackage mo
  */
 
-require_once dirname(__FILE__) . '/translations.php';
-require_once dirname(__FILE__) . '/streams.php';
+require_once __DIR__ . '/translations.php';
+require_once __DIR__ . '/streams.php';
 
 if ( !class_exists( 'MO', false ) ):
 class MO extends Gettext_Translations {
diff --git a/includes/pomo/po.php b/includes/pomo/po.php
index 6082d7a..f565748 100644
--- a/includes/pomo/po.php
+++ b/includes/pomo/po.php
@@ -7,7 +7,7 @@
  * @subpackage po
  */
 
-require_once dirname(__FILE__) . '/translations.php';
+require_once __DIR__ . '/translations.php';
 
 define('PO_MAX_LINE_LEN', 79);
 
diff --git a/includes/pomo/translations.php b/includes/pomo/translations.php
index 9bbd65a..4081ebc 100644
--- a/includes/pomo/translations.php
+++ b/includes/pomo/translations.php
@@ -7,7 +7,7 @@
  * @subpackage translations
  */
 
-require_once dirname(__FILE__) . '/entry.php';
+require_once __DIR__ . '/entry.php';
 
 if ( !class_exists( 'Translations', false ) ):
 class Translations {
diff --git a/user/plugins/random-bg/plugin.php b/user/plugins/random-bg/plugin.php
index e0c1ef1..a6768ff 100644
--- a/user/plugins/random-bg/plugin.php
+++ b/user/plugins/random-bg/plugin.php
@@ -14,8 +14,8 @@ if( !defined( 'YOURLS_ABSPATH' ) ) die();
 // Add the inline style
 yourls_add_action( 'html_head', 'ozh_yourls_randombg' );
 function ozh_yourls_randombg() {
-	$bg = glob( dirname( __FILE__ ).'/img/*png' );
-	$url = yourls_plugin_url( dirname( __FILE__ ) );
+	$bg = glob( __DIR__.'/img/*png' );
+	$url = yourls_plugin_url( __DIR__ );
 	$rnd = yourls_plugin_url( $bg[ mt_rand( 0, count( $bg ) - 1 ) ] );
 	echo <<<CSS
 <style type="text/css">
diff --git a/user/plugins/sample-toolbar/plugin.php b/user/plugins/sample-toolbar/plugin.php
index ed0745c..2467bb9 100644
--- a/user/plugins/sample-toolbar/plugin.php
+++ b/user/plugins/sample-toolbar/plugin.php
@@ -67,7 +67,7 @@ function ozh_toolbar_do( $args ) {
 	$hits = $hits . ' ' . yourls_n( 'view', 'views', $hits );
 	
 	// Plugin URL (no URL is hardcoded)
-	$pluginurl = YOURLS_PLUGINURL . '/'.yourls_plugin_basename( dirname(__FILE__) );
+	$pluginurl = YOURLS_PLUGINURL . '/'.yourls_plugin_basename( __DIR__ );
 
 	// All set. Draw the toolbar itself.
 	echo <<<PAGE
-- 
2.42.0