From fa9fc6c5f7975d94bcab29908523a91f0d7267aa Mon Sep 17 00:00:00 2001
From: unlishema <unlishema@jtryba.com>
Date: Sat, 26 Oct 2024 11:11:29 -0400
Subject: [PATCH] Moved creds out of source

---
 dist/pages/data/assignments.php | 27 ++++++++++++++++++++++-----
 dist/pages/data/creatures.php   | 27 ++++++++++++++++++++++-----
 dist/pages/data/masters.php     | 27 ++++++++++++++++++++++-----
 src/pages/data/assignments.php  | 27 ++++++++++++++++++++++-----
 src/pages/data/creatures.php    | 27 ++++++++++++++++++++++-----
 src/pages/data/masters.php      | 27 ++++++++++++++++++++++-----
 6 files changed, 132 insertions(+), 30 deletions(-)

diff --git a/dist/pages/data/assignments.php b/dist/pages/data/assignments.php
index 7937230..4e11ed9 100644
--- a/dist/pages/data/assignments.php
+++ b/dist/pages/data/assignments.php
@@ -1,9 +1,26 @@
 <?php
-// Database credentials
-$host = 'localhost';  
-$db = 'slayer.unlishema.org'; 
-$user = 'slayer.db'; 
-$pass = 'r2YWbde6V9hr'; 
+// Database credentials with default values
+$host = "localhost";
+$user = "username";
+$pass = "password";
+$db = "database";
+
+// Load database creds so they aren't public
+$configPath = $_SERVER['DOCUMENT_ROOT'] . '/../../slayer_assistant_private.json';
+
+if (file_exists($configPath)) {
+    $config = json_decode(file_get_contents($configPath), true);
+    if ($config === null) {
+        die("Invalid configuration format.");
+    }
+    // Update variables with config values if the file is found
+    $host = $config['host'];
+    $user = $config['username'];  // Overrides initial $user = "username"
+    $pass = $config['password'];
+    $db = $config['dbname'];
+} else {
+    die("Configuration file not found.");
+}
 
 // Function to return error as JSON and exit
 function respondWithError($message) {
diff --git a/dist/pages/data/creatures.php b/dist/pages/data/creatures.php
index 8e3cb97..2e1d9a3 100644
--- a/dist/pages/data/creatures.php
+++ b/dist/pages/data/creatures.php
@@ -1,9 +1,26 @@
 <?php
-// Database credentials
-$host = 'localhost';  
-$db = 'slayer.unlishema.org'; 
-$user = 'slayer.db'; 
-$pass = 'r2YWbde6V9hr'; 
+// Database credentials with default values
+$host = "localhost";
+$user = "username";
+$pass = "password";
+$db = "database";
+
+// Load database creds so they aren't public
+$configPath = $_SERVER['DOCUMENT_ROOT'] . '/../../slayer_assistant_private.json';
+
+if (file_exists($configPath)) {
+    $config = json_decode(file_get_contents($configPath), true);
+    if ($config === null) {
+        die("Invalid configuration format.");
+    }
+    // Update variables with config values if the file is found
+    $host = $config['host'];
+    $user = $config['username'];  // Overrides initial $user = "username"
+    $pass = $config['password'];
+    $db = $config['dbname'];
+} else {
+    die("Configuration file not found.");
+}
 
 // Function to return error as JSON and exit
 function respondWithError($message) {
diff --git a/dist/pages/data/masters.php b/dist/pages/data/masters.php
index d9a6aed..a68b881 100644
--- a/dist/pages/data/masters.php
+++ b/dist/pages/data/masters.php
@@ -1,9 +1,26 @@
 <?php
-// Database credentials
-$host = 'localhost';  
-$db = 'slayer.unlishema.org'; 
-$user = 'slayer.db'; 
-$pass = 'r2YWbde6V9hr'; 
+// Database credentials with default values
+$host = "localhost";
+$user = "username";
+$pass = "password";
+$db = "database";
+
+// Load database creds so they aren't public
+$configPath = $_SERVER['DOCUMENT_ROOT'] . '/../../slayer_assistant_private.json';
+
+if (file_exists($configPath)) {
+    $config = json_decode(file_get_contents($configPath), true);
+    if ($config === null) {
+        die("Invalid configuration format.");
+    }
+    // Update variables with config values if the file is found
+    $host = $config['host'];
+    $user = $config['username'];  // Overrides initial $user = "username"
+    $pass = $config['password'];
+    $db = $config['dbname'];
+} else {
+    die("Configuration file not found.");
+}
 
 // Function to return error as JSON and exit
 function respondWithError($message) {
diff --git a/src/pages/data/assignments.php b/src/pages/data/assignments.php
index 7937230..4e11ed9 100644
--- a/src/pages/data/assignments.php
+++ b/src/pages/data/assignments.php
@@ -1,9 +1,26 @@
 <?php
-// Database credentials
-$host = 'localhost';  
-$db = 'slayer.unlishema.org'; 
-$user = 'slayer.db'; 
-$pass = 'r2YWbde6V9hr'; 
+// Database credentials with default values
+$host = "localhost";
+$user = "username";
+$pass = "password";
+$db = "database";
+
+// Load database creds so they aren't public
+$configPath = $_SERVER['DOCUMENT_ROOT'] . '/../../slayer_assistant_private.json';
+
+if (file_exists($configPath)) {
+    $config = json_decode(file_get_contents($configPath), true);
+    if ($config === null) {
+        die("Invalid configuration format.");
+    }
+    // Update variables with config values if the file is found
+    $host = $config['host'];
+    $user = $config['username'];  // Overrides initial $user = "username"
+    $pass = $config['password'];
+    $db = $config['dbname'];
+} else {
+    die("Configuration file not found.");
+}
 
 // Function to return error as JSON and exit
 function respondWithError($message) {
diff --git a/src/pages/data/creatures.php b/src/pages/data/creatures.php
index 8e3cb97..2e1d9a3 100644
--- a/src/pages/data/creatures.php
+++ b/src/pages/data/creatures.php
@@ -1,9 +1,26 @@
 <?php
-// Database credentials
-$host = 'localhost';  
-$db = 'slayer.unlishema.org'; 
-$user = 'slayer.db'; 
-$pass = 'r2YWbde6V9hr'; 
+// Database credentials with default values
+$host = "localhost";
+$user = "username";
+$pass = "password";
+$db = "database";
+
+// Load database creds so they aren't public
+$configPath = $_SERVER['DOCUMENT_ROOT'] . '/../../slayer_assistant_private.json';
+
+if (file_exists($configPath)) {
+    $config = json_decode(file_get_contents($configPath), true);
+    if ($config === null) {
+        die("Invalid configuration format.");
+    }
+    // Update variables with config values if the file is found
+    $host = $config['host'];
+    $user = $config['username'];  // Overrides initial $user = "username"
+    $pass = $config['password'];
+    $db = $config['dbname'];
+} else {
+    die("Configuration file not found.");
+}
 
 // Function to return error as JSON and exit
 function respondWithError($message) {
diff --git a/src/pages/data/masters.php b/src/pages/data/masters.php
index d9a6aed..a68b881 100644
--- a/src/pages/data/masters.php
+++ b/src/pages/data/masters.php
@@ -1,9 +1,26 @@
 <?php
-// Database credentials
-$host = 'localhost';  
-$db = 'slayer.unlishema.org'; 
-$user = 'slayer.db'; 
-$pass = 'r2YWbde6V9hr'; 
+// Database credentials with default values
+$host = "localhost";
+$user = "username";
+$pass = "password";
+$db = "database";
+
+// Load database creds so they aren't public
+$configPath = $_SERVER['DOCUMENT_ROOT'] . '/../../slayer_assistant_private.json';
+
+if (file_exists($configPath)) {
+    $config = json_decode(file_get_contents($configPath), true);
+    if ($config === null) {
+        die("Invalid configuration format.");
+    }
+    // Update variables with config values if the file is found
+    $host = $config['host'];
+    $user = $config['username'];  // Overrides initial $user = "username"
+    $pass = $config['password'];
+    $db = $config['dbname'];
+} else {
+    die("Configuration file not found.");
+}
 
 // Function to return error as JSON and exit
 function respondWithError($message) {
-- 
2.43.0