Finished config file and defines closes #23

predict/ajax.php

@@ -35,7 +35,7 @@ case "locationSave":
     $lon = $_POST['req_lon'];
     $alt = $_POST['req_alt'];
     $locname = $_POST['req_name'];
-    if ( $locname == '' || !$c_location_save_enable ) {
+    if ( $locname == '' || !LOCATION_SAVE_ENABLE ) {
         echo "false";
         return;
     }
@@ -43,8 +43,8 @@ case "locationSave":
         "Longitude: " . $lon . "\n" .
         "Altitude: " . $alt . "\n" .
         "Name: " . $locname . "\n";
-    $headers = "From: ". $c_admin_email ."\r\nReply-To:blackhole@hexoc.com\r\nX-Mailer: PHP/".phpversion();
-    if ( mail($c_admin_email, "Location Request Save", $str, $headers) ) {
+    $headers = "From: ". ADMIN_EMAIL ."\r\nReply-To:blackhole@hexoc.com\r\nX-Mailer: PHP/".phpversion();
+    if ( mail(ADMIN_EMAIL, "Location Request Save", $str, $headers) ) {
         echo "true";
     } else {
         echo "false";

predict/includes/config.inc.php

@@ -1,9 +1,8 @@
 <?php
 
-$c_admin_email = "jon@hexoc.com";
+define("ADMIN_EMAIL", "jon@hexoc.com");
 
 define("LOCATION_SAVE_ENABLE", true);
-$c_location_save_enable = true;
 
 define("DEBUG", true);
 define("AT_LOG", "/tmp/pred_log");
@@ -13,15 +12,9 @@ define("ROOT", "/var/www/hab/predict/");
 
 // Path to prediction data dir from predict/
 define("PREDS_PATH", "preds/");
-$c_preds_path = "preds/";
 
 define("SCENARIO_FILE", "scenario.ini");
-$c_scenario_file = "scenario.ini";
-
 define("FLIGHT_CSV", "flight_path.csv");
-$c_flight_csv = "flight_path.csv";
-
 define("PROGRESS_JSON", "progress.json");
-$c_progress_json = "progress.json";
 
 ?>