Change dirname(__FILE__) to shorter __DIR__

petk · petk · commit b5edd2d17bc2 · 2018-10-23T17:30:55.000+02:00
diff --git a/images/elephpants.php b/images/elephpants.php
@@ -45,7 +45,7 @@
 }
 
 // read out photo metadata
-$path   = dirname(__FILE__) . '/elephpants';
+$path   = __DIR__ . '/elephpants';
 $json   = @file_get_contents($path . '/flickr.json');
 $photos = json_decode($json, true);
 
diff --git a/include/footer.inc b/include/footer.inc
@@ -87,7 +87,7 @@
 <?php
  $jsfiles = array("ext/modernizr.js", "ext/hogan-2.0.0.min.js", "ext/typeahead.min.js", "ext/mousetrap.min.js", "search.js", "common.js");
  foreach ($jsfiles as $filename) {
-   $path = dirname(dirname(__FILE__)).'/js/'.$filename;
+   $path = dirname(__DIR__).'/js/'.$filename;
    echo '<script type="text/javascript" src="/cached.php?t=' . @filemtime($path) . '&amp;f=/js/' . $filename . '"></script>'."\n";
  }
 ?>
diff --git a/include/layout.inc b/include/layout.inc
@@ -521,17 +521,17 @@ function site_header($title = '', $config = array())
         $shorturl = "http://php.net/" . $shortname;
     }
 
-    require dirname(__FILE__) ."/header.inc";
+    require __DIR__ ."/header.inc";
 }
 function site_footer($config = array())
 {
     global $MYSITE;
-    require dirname(__FILE__) . "/footer.inc";
+    require __DIR__ . "/footer.inc";
 }
 
 function get_news_changes()
 {
-    include dirname(__FILE__) . "/pregen-news.inc";
+    include __DIR__ . "/pregen-news.inc";
     $date = date_create($NEWS_ENTRIES[0]["updated"]);
     if (isset($_COOKIE["LAST_NEWS"]) && $_COOKIE["LAST_NEWS"] >= $date->getTimestamp()) {
         return false;
@@ -607,7 +607,7 @@ function get_usergroups_in($country, &$allcountries = array()) {
 }
 
 function news_toc($sections = null) {
-    include dirname(__FILE__) . "/pregen-news.inc";
+    include __DIR__ . "/pregen-news.inc";
     $items = array(
         "news" => array(
             "title" => "News",
@@ -640,12 +640,12 @@ function news_toc($sections = null) {
     }
 }
 function doc_toc($lang) {
-    $file = dirname(__FILE__) . "/../manual/$lang/toc/index.inc";
+    $file = __DIR__ . "/../manual/$lang/toc/index.inc";
     if (!file_exists($file)) {
         $lang = "en"; // Fallback on english if the translation doesn't exist
-        $file = dirname(__FILE__) . "/../manual/en/toc/index.inc";
+        $file = __DIR__ . "/../manual/en/toc/index.inc";
     }
-    require dirname(__FILE__) . "/../manual/$lang/toc/index.inc";
+    require __DIR__ . "/../manual/$lang/toc/index.inc";
 
     echo "<dl>\n";
     doc_toc_list($lang, $TOC, "getting-started");
@@ -687,7 +687,7 @@ function doc_toc($lang) {
 
 }
 function doc_toc_list($lang, $index, $file) {
-    include dirname(__FILE__) . "/../manual/$lang/toc/$file.inc";
+    include __DIR__ . "/../manual/$lang/toc/$file.inc";
 
     doc_toc_title($lang, $index, $file);
     foreach($TOC as $entry) {
diff --git a/manual/en/book.var.php b/manual/en/book.var.php
@@ -2,7 +2,7 @@
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/shared-manual.inc';
 $TOC = array();
 $PARENTS = array();
-include_once dirname(__FILE__) ."/toc/refs.basic.vartype.inc";
+include_once __DIR__ ."/toc/refs.basic.vartype.inc";
 $setup = array (
   'home' =>
   array (
diff --git a/manual/en/class.exception.php b/manual/en/class.exception.php
@@ -2,7 +2,7 @@
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/shared-manual.inc';
 $TOC = array();
 $PARENTS = array();
-include_once dirname(__FILE__) ."/toc/reserved.exceptions.inc";
+include_once __DIR__ ."/toc/reserved.exceptions.inc";
 $setup = array (
   'home' =>
   array (
diff --git a/manual/en/context.http.php b/manual/en/context.http.php
@@ -2,7 +2,7 @@
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/shared-manual.inc';
 $TOC = array();
 $PARENTS = array();
-include_once dirname(__FILE__) ."/toc/context.inc";
+include_once __DIR__ ."/toc/context.inc";
 $setup = array (
   'home' =>
   array (
diff --git a/manual/en/funcref.php b/manual/en/funcref.php
@@ -2,7 +2,7 @@
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/shared-manual.inc';
 $TOC = array();
 $PARENTS = array();
-include_once dirname(__FILE__) ."/toc/index.inc";
+include_once __DIR__ ."/toc/index.inc";
 $setup = array (
   'home' =>
   array (
diff --git a/manual/en/function.strpos.php b/manual/en/function.strpos.php
@@ -2,7 +2,7 @@
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/shared-manual.inc';
 $TOC = array();
 $PARENTS = array();
-include_once dirname(__FILE__) ."/toc/ref.strings.inc";
+include_once __DIR__ ."/toc/ref.strings.inc";
 $setup = array (
   'home' =>
   array (
diff --git a/manual/en/language.exceptions.php b/manual/en/language.exceptions.php
@@ -2,7 +2,7 @@
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/shared-manual.inc';
 $TOC = array();
 $PARENTS = array();
-include_once dirname(__FILE__) ."/toc/langref.inc";
+include_once __DIR__ ."/toc/langref.inc";
 $setup = array (
   'home' =>
   array (
diff --git a/manual/en/refs.basic.vartype.php b/manual/en/refs.basic.vartype.php
@@ -2,7 +2,7 @@
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/shared-manual.inc';
 $TOC = array();
 $PARENTS = array();
-include_once dirname(__FILE__) ."/toc/funcref.inc";
+include_once __DIR__ ."/toc/funcref.inc";
 $setup = array (
   'home' =>
   array (

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`// read out photo metadata`
`48`		`-$path = dirname(__FILE__) . '/elephpants';`
	`48`	`+$path = __DIR__ . '/elephpants';`
`49`	`49`	`$json = @file_get_contents($path . '/flickr.json');`
`50`	`50`	`$photos = json_decode($json, true);`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@`
`87`	`87`	`<?php`
`88`	`88`	`$jsfiles = array("ext/modernizr.js", "ext/hogan-2.0.0.min.js", "ext/typeahead.min.js", "ext/mousetrap.min.js", "search.js", "common.js");`
`89`	`89`	`foreach ($jsfiles as $filename) {`
`90`		`- $path = dirname(dirname(__FILE__)).'/js/'.$filename;`
	`90`	`+ $path = dirname(__DIR__).'/js/'.$filename;`
`91`	`91`	`echo '<script type="text/javascript" src="/cached.php?t=' . @filemtime($path) . '&f=/js/' . $filename . '"></script>'."\n";`
`92`	`92`	`}`
`93`	`93`	`?>`
Original file line number	Diff line number	Diff line change
`@@ -521,17 +521,17 @@ function site_header($title = '', $config = array())`
`521`	`521`	`$shorturl = "http://php.net/" . $shortname;`
`522`	`522`	`}`
`523`	`523`
`524`		`- require dirname(__FILE__) ."/header.inc";`
	`524`	`+ require __DIR__ ."/header.inc";`
`525`	`525`	`}`
`526`	`526`	`function site_footer($config = array())`
`527`	`527`	`{`
`528`	`528`	`global $MYSITE;`
`529`		`- require dirname(__FILE__) . "/footer.inc";`
	`529`	`+ require __DIR__ . "/footer.inc";`
`530`	`530`	`}`
`531`	`531`
`532`	`532`	`function get_news_changes()`
`533`	`533`	`{`
`534`		`- include dirname(__FILE__) . "/pregen-news.inc";`
	`534`	`+ include __DIR__ . "/pregen-news.inc";`
`535`	`535`	`$date = date_create($NEWS_ENTRIES[0]["updated"]);`
`536`	`536`	`if (isset($_COOKIE["LAST_NEWS"]) && $_COOKIE["LAST_NEWS"] >= $date->getTimestamp()) {`
`537`	`537`	`return false;`
`@@ -607,7 +607,7 @@ function get_usergroups_in($country, &$allcountries = array()) {`
`607`	`607`	`}`
`608`	`608`
`609`	`609`	`function news_toc($sections = null) {`
`610`		`- include dirname(__FILE__) . "/pregen-news.inc";`
	`610`	`+ include __DIR__ . "/pregen-news.inc";`
`611`	`611`	`$items = array(`
`612`	`612`	`"news" => array(`
`613`	`613`	`"title" => "News",`
`@@ -640,12 +640,12 @@ function news_toc($sections = null) {`
`640`	`640`	`}`
`641`	`641`	`}`
`642`	`642`	`function doc_toc($lang) {`
`643`		`- $file = dirname(__FILE__) . "/../manual/$lang/toc/index.inc";`
	`643`	`+ $file = __DIR__ . "/../manual/$lang/toc/index.inc";`
`644`	`644`	`if (!file_exists($file)) {`
`645`	`645`	`$lang = "en"; // Fallback on english if the translation doesn't exist`
`646`		`- $file = dirname(__FILE__) . "/../manual/en/toc/index.inc";`
	`646`	`+ $file = __DIR__ . "/../manual/en/toc/index.inc";`
`647`	`647`	`}`
`648`		`- require dirname(__FILE__) . "/../manual/$lang/toc/index.inc";`
	`648`	`+ require __DIR__ . "/../manual/$lang/toc/index.inc";`
`649`	`649`
`650`	`650`	`echo "<dl>\n";`
`651`	`651`	`doc_toc_list($lang, $TOC, "getting-started");`
`@@ -687,7 +687,7 @@ function doc_toc($lang) {`
`687`	`687`
`688`	`688`	`}`
`689`	`689`	`function doc_toc_list($lang, $index, $file) {`
`690`		`- include dirname(__FILE__) . "/../manual/$lang/toc/$file.inc";`
	`690`	`+ include __DIR__ . "/../manual/$lang/toc/$file.inc";`
`691`	`691`
`692`	`692`	`doc_toc_title($lang, $index, $file);`
`693`	`693`	`foreach($TOC as $entry) {`