Updated PHP script dir references

More efficient and readable this way. Found while working with PHP script updates and paths were getting mixed in a refactoring. Some various whitespace cleanup too.
Zelda-Universe · Feb 22, 2022 · bcc4b5b · bcc4b5b
1 parent b292446
commit bcc4b5b
Show file tree

Hide file tree

Showing 30 changed files with 42 additions and 41 deletions.
diff --git a/ajax.php b/ajax.php
@@ -4,7 +4,7 @@
     }
     $cmd = $_GET["command"];
     $cmd = preg_replace("#[^a-zA-Z_]#","",$cmd);
-    $path = DIRNAME(__FILE__);
+    $path = __DIR__;
     $cmdpath = "$path/ajax/$cmd.php";
     if(!file_exists($cmdpath)) {
         die(json_encode(array("success"=>false,"code"=>-1,"msg"=>"Invalid command!")));

diff --git a/ajax/add_bulk_complete_marker.php b/ajax/add_bulk_complete_marker.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include_once("$path/../config.php");
 
 	begin();
@@ -25,11 +25,11 @@
                        , marker_id
                        , complete_date
                        , visible
-                ) values ";   
-                
+                ) values ";
+
       // @TODO: Move to a Config in the DB?
       $commitEvery = 10;
-      
+
       for ($i = 0; $i < count($markerList); $i++) {
          $query = $query . "(" .$_POST['userId'] . ", " . $markerList[$i] . ", now(), 1)";
          if ($i == count($markerList) - 1) {
@@ -38,23 +38,23 @@
             $query = $query . ",";
          } else {
             $query = $query . " ON DUPLICATE KEY UPDATE user_id=user_id;";
-            
+
             $result = @$mysqli->query($query); // or die(mysql_error());
             if ($result) {
-               
+
             } else {
                echo json_encode(array("success"=>false, "msg"=>$mysqli->error()));
                rollback();
                exit(0);
             }
-            
+
             if ($i != count($markerList) - 1) {
                $query = "insert into " . $map_prefix . "user_completed_marker (
                                   user_id
                                 , marker_id
                                 , complete_date
                                 , visible
-                         ) values ";   
+                         ) values ";
             }
          }
       }

diff --git a/ajax/add_complete_marker.php b/ajax/add_complete_marker.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include_once("$path/../config.php");
 
 	begin();

diff --git a/ajax/add_marker.php b/ajax/add_marker.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include_once("$path/../config.php");
 
 	begin();

diff --git a/ajax/change_password.php b/ajax/change_password.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
 	begin();

diff --git a/ajax/del_complete_marker.php b/ajax/del_complete_marker.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include_once("$path/../config.php");
 
 	begin();

diff --git a/ajax/del_completed_marker_all.php b/ajax/del_completed_marker_all.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include_once("$path/../config.php");
 
 	begin();

diff --git a/ajax/del_marker.php b/ajax/del_marker.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include_once("$path/../config.php");
 
 	begin();

diff --git a/ajax/get_categories.php b/ajax/get_categories.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
    $map = $_GET["game"];

diff --git a/ajax/get_category_tree.php b/ajax/get_category_tree.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
    $map = $_GET["game"];

diff --git a/ajax/get_changelog.php b/ajax/get_changelog.php
@@ -1,5 +1,5 @@
 <?php
-  $path = DIRNAME(__FILE__);
+  $path = __DIR__;
   include("$path/../config.php");
 
   if(isset($_GET["sinceVersion"]))

diff --git a/ajax/get_container.php b/ajax/get_container.php
@@ -1,9 +1,10 @@
 <?php
-   $path = DIRNAME(__FILE__);
+
+   $path = __DIR__;
    include("$path/../config.php");
-   
+
    $map = $_GET["game"];
-    
+
    $query = 'select id
                   , name
                   , short_name as shortName
@@ -41,7 +42,7 @@
       print($mysqli->error);
       return;
    }
-   
+
    $res = array();
    while($row = $result->fetch_assoc()) {
         $res[] = $row;

diff --git a/ajax/get_container_name.php b/ajax/get_container_name.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
    $game = $_GET["game"];

diff --git a/ajax/get_games.php b/ajax/get_games.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
    $query = "select c.id

diff --git a/ajax/get_map.php b/ajax/get_map.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
    $map = $_GET["game"];

diff --git a/ajax/get_markers.php b/ajax/get_markers.php
@@ -1,6 +1,6 @@
 <?php
    if (!isset($_GET['newMarkerId'])) {
-     $path = DIRNAME(__FILE__);
+     $path = __DIR__;
    	 include_once("$path/../config.php");
    }
    /*

diff --git a/ajax/get_user_completed_markers.php b/ajax/get_user_completed_markers.php
@@ -1,6 +1,6 @@
 <?php
    if (!isset($_GET['newMarkerId'])) {
-     $path = DIRNAME(__FILE__);
+     $path = __DIR__;
    	 include_once("$path/../config.php");
    }
 

diff --git a/ajax/get_user_info.php b/ajax/get_user_info.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
 	start_session("zmap");

diff --git a/ajax/login.php b/ajax/login.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
 	begin();

diff --git a/ajax/logout.php b/ajax/logout.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
 	start_session("zmap");

diff --git a/ajax/lost_password.php b/ajax/lost_password.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
 	begin();

diff --git a/ajax/search_markers.php b/ajax/search_markers.php
@@ -1,6 +1,6 @@
 <?php
    if (!isset($_GET['newMarkerId'])) {
-     $path = DIRNAME(__FILE__);
+     $path = __DIR__;
      include("$path/../config.php");
    }
    /*

diff --git a/ajax/update_user_version.php b/ajax/update_user_version.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
 	start_session("zmap");

diff --git a/ajax/user_add.php b/ajax/user_add.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include("$path/../config.php");
 
 	begin();

diff --git a/content/upload.php b/content/upload.php
@@ -1,5 +1,5 @@
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include_once("$path/../config.php");
 
 	start_session("zmap");

diff --git a/lib/minify.php b/lib/minify.php
@@ -1,6 +1,6 @@
 <?php
 function includeMini() {
-    $path = DIRNAME(__FILE__);
+    $path = __DIR__;
     include_once("$path/JSMin.php");
     include_once("$path/CSSmin.php");
 }

diff --git a/lib/zmailer.php b/lib/zmailer.php
@@ -1,6 +1,6 @@
 <?php
 
-$path = DIRNAME(__FILE__);
+$path = __DIR__;
 include_once("$path/../config.php");
 
 function prepareMailTransport() {

diff --git a/res.php b/res.php
@@ -1,5 +1,5 @@
 <?php
-    $path = DIRNAME(__FILE__);
+  $path=__DIR__;
 
     if(!isset($_GET["type"])) {
       print("A type must be provided! javascript or css.");

diff --git a/sitemap/index.php b/sitemap/index.php
@@ -4,7 +4,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"> 
 <?php
-   $path = DIRNAME(__FILE__);
+   $path = __DIR__;
    include_once("$path/../config.php");
 
    $query = 'select c.short_name

diff --git a/tests/res.php b/tests/res.php
@@ -1,10 +1,10 @@
 <?php
-  $path = DIRNAME(__FILE__);
+  $path = __DIR__;
 
   include_once("$path/../config.php");
   if(!$enableTests) exit;
 
-  $path = DIRNAME(__FILE__);
+  $path = __DIR__;
 
   include "$path/../lib/minify.php";