Moved creds out of source

diff --git a/dist/pages/data/assignments.php b/dist/pages/data/assignments.php
index 79372301f7743c4d3ca04cfe6962cfd8eb5f076b..4e11ed94b47b3627bca879a525c34068ea13309d 100644 (file)
--- 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 8e3cb97b1c7cea7a106dc2f5765d912f11e21a12..2e1d9a3c9bf5a666d28a6e8d8d5f05f10e713ddc 100644 (file)
--- 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 d9a6aedc798230ad9e72380a252d3dca95020c58..a68b881fd2ff201c23ba53ccb728cbdd22e592b2 100644 (file)
--- 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 79372301f7743c4d3ca04cfe6962cfd8eb5f076b..4e11ed94b47b3627bca879a525c34068ea13309d 100644 (file)
--- 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 8e3cb97b1c7cea7a106dc2f5765d912f11e21a12..2e1d9a3c9bf5a666d28a6e8d8d5f05f10e713ddc 100644 (file)
--- 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 d9a6aedc798230ad9e72380a252d3dca95020c58..a68b881fd2ff201c23ba53ccb728cbdd22e592b2 100644 (file)
--- 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) {