Make all PATH declarations consistent to project root.

davmillar · Oct 24, 2021 · d4e9b78 · d4e9b78
1 parent 50798ac
commit d4e9b78
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 14 deletions.
diff --git a/admin/index.php b/admin/index.php
@@ -1,7 +1,9 @@
 <?php
-  define('PATH', dirname(__FILE__));
+  if(!defined('PATH')) {
+    define('PATH', dirname(dirname(__FILE__)));
+  }
 
-  include PATH . "/../cgi-bin/db_start.php";
+  include PATH . "/cgi-bin/db_start.php";
   session_start();
 
   $artist_icon_query = $pdo->query("SELECT icon FROM artists ORDER BY icon ASC");
@@ -435,4 +437,4 @@ function bounceOut(){ header("Location: /admin/"); exit; }
     </script>
   </body>
 </html>
-<?php include PATH . "/../cgi-bin/db_end.php"; ?>
+<?php include PATH . "/cgi-bin/db_end.php"; ?>
diff --git a/contribute.php b/contribute.php
@@ -1,5 +1,7 @@
 <?php
-  define('PATH', dirname(__FILE__));
+  if(!defined('PATH')) {
+    define('PATH', dirname(__FILE__));
+  }
   include PATH . "/cgi-bin/db_start.php";
 ?>
 <!DOCTYPE html>

diff --git a/fullmap.php b/fullmap.php
@@ -1,5 +1,7 @@
 <?php
-  define('PATH', dirname(__FILE__));
+  if(!defined('PATH')) {
+    define('PATH', dirname(__FILE__));
+  }
 
   include PATH . "/cgi-bin/db_start.php";
 

diff --git a/includes/magic.php b/includes/magic.php
@@ -4,9 +4,11 @@
   <div class="downcontainer">
     <a class="main" href="/supporters">About Us</a>
     <div class="downpanel"><?php
-      define('PATH', dirname(__FILE__));
+      if(!defined('PATH')) {
+        define('PATH', dirname(dirname(__FILE__)));
+      }
 
-      include PATH . "/../cgi-bin/db_start.php";
+      include PATH . "/cgi-bin/db_start.php";
 
       $navdata = $pdo->query("SELECT url_slug, name FROM dmillar_cartography.artists ORDER BY name ASC");
       if ($navdata->rowCount() > 0) {

diff --git a/index.php b/index.php
@@ -1,5 +1,7 @@
 <?php
-  define('PATH', dirname(__FILE__));
+  if(!defined('PATH')) {
+    define('PATH', dirname(__FILE__));
+  }
 
   include PATH . "/cgi-bin/db_start.php";
 

diff --git a/profile.php b/profile.php
@@ -1,5 +1,7 @@
 <?php
-  define('PATH', dirname(__FILE__));
+  if(!defined('PATH')) {
+    define('PATH', dirname(__FILE__));
+  }
   include PATH . "/cgi-bin/db_start.php";
 
   if ($_REQUEST['artist']) {

diff --git a/scripts/load_authors.php b/scripts/load_authors.php
@@ -1,5 +1,7 @@
 <?php
-  define('PATH', dirname(__FILE__) . '/..');
+  if(!defined('PATH')) {
+    define('PATH', dirname(dirname(__FILE__) ));
+  }
 
   include PATH . "/cgi-bin/db_start.php";
 

diff --git a/scripts/load_morphs.php b/scripts/load_morphs.php
@@ -1,12 +1,14 @@
 <?php
-  define('PATH', dirname(__FILE__));
+  if(!defined('PATH')) {
+    define('PATH', dirname(dirname(__FILE__)));
+  }
 	$map_type = intval($_POST['map_kind']);
   $map_type = ($map_type > 0) ? $map_type : 1;
   $datafile = PATH . "/datacache/" . $map_type . ".json";
   if (file_exists($datafile) && (time() - filemtime($datafile) >= 60 * 60 *24 * 5)) {
     include($datafile);
   } else {
-    include PATH . "/../cgi-bin/db_start.php";
+    include PATH . "/cgi-bin/db_start.php";
 	  $map_type_phr = ($map_type == 3) ? "IN (1,2,3)" : "= ". $map_type;
 
 		$query = "SELECT id, image, artist_id, tile_type FROM tiles WHERE map_type ".$map_type_phr." AND approved = 1";
@@ -28,7 +30,7 @@
       echo '';
     }
 
-  	include PATH . "/../cgi-bin/db_end.php";
+  	include PATH . "/cgi-bin/db_end.php";
 	  echo $our_json;
   }
 ?>
diff --git a/supporters-all.php b/supporters-all.php
@@ -1,5 +1,7 @@
 <?php
-  define('PATH', dirname(__FILE__));
+  if(!defined('PATH')) {
+    define('PATH', dirname(__FILE__));
+  }
   include PATH . "/cgi-bin/db_start.php";
 ?>
 <!DOCTYPE html>