From 93944f924c666c92d9c37ef1ab9d18dca126c00d Mon Sep 17 00:00:00 2001
From: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Date: Mon, 3 Jun 2024 15:04:38 +0100
Subject: [PATCH] feat: Make merge_javascript relative to file

This patch makes the merge_javascript script relative to the location of
the file and not the location that the script was called from. Ensures
the script will always run as intended regardless of where you ran the
script from.
---
 .../themes/responsive/js/merge_javascript.php          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/web/interface/themes/responsive/js/merge_javascript.php b/code/web/interface/themes/responsive/js/merge_javascript.php
index 58a356a600..782c855555 100644
--- a/code/web/interface/themes/responsive/js/merge_javascript.php
+++ b/code/web/interface/themes/responsive/js/merge_javascript.php
@@ -1,16 +1,16 @@
 <?php
 header('Content-type: text/plain');
 date_default_timezone_set('America/Denver');
-$mergeListFile = fopen("./javascript_files.txt", 'r');
-$mergedFile = fopen("./aspen.js", 'w');
+$mergeListFile = fopen(__DIR__ . "/javascript_files.txt", 'r');
+$mergedFile = fopen(__DIR__ . "/aspen.js", 'w');
 while (($fileToMerge = fgets($mergeListFile)) !== false){
 	$fileToMerge = trim($fileToMerge);
 	if (strpos($fileToMerge, '#') !== 0){
-		if (file_exists($fileToMerge)){
-			fwrite($mergedFile, file_get_contents($fileToMerge, true));
+	    if (file_exists(__DIR__ . '/' . $fileToMerge)){
+		    fwrite($mergedFile, file_get_contents(__DIR__ . '/' . $fileToMerge, true));
 			fwrite($mergedFile, "\r\n");
 		}else{
-			echo("$fileToMerge does not exist\r\n");
+		    echo("$fileToMerge does not exist\r\n");
 		}
 	}
 }