Deduplicating definitions: More variables in config.inc.php

fbouynot · Jul 11, 2018 · 794df10 · 794df10
1 parent 212f05d
commit 794df10
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/check.php b/check.php
diff --git a/config.inc.php b/config.inc.php
@@ -1,7 +1,9 @@
 <?php
 
 // sensible defaults
-$mapdir=dirname(__FILE__)."/configs/";
+
+$conf_dir = 'configs/';
+$mapdir=dirname(__FILE__)."/". $conf_dir;
 
 $librenms_base = '../../../';
 $librenms_url = '/';
@@ -15,3 +17,7 @@
 $use_relative_overlay = FALSE; // set to TRUE to enable experimental overlay showing relative-positioning
 $grid_snap_value = 0; // set non-zero to snap to a grid of that spacing
 
+
+$basehref='/plugins/Weathermap/';
+
+
diff --git a/map-poller.php b/map-poller.php
@@ -21,8 +21,8 @@
 **/
 
 
-// Set variables for map-poller.php
-$basehref='/plugins/Weathermap/';
+// Import the config.inc.php file for variables
+include_once 'config.inc.php';
 
 if (php_sapi_name() != 'cli') {
 	echo "ERROR: map-poller.php should ONLY be run as a CGI script!\n";
@@ -56,7 +56,6 @@
 // and fix for includes being set incorrectly and changing map-poller to chdir from
 // where it's run.
 chdir(dirname($argv[0]));
-$conf_dir = 'configs/';
 
 if (is_dir($conf_dir)) {
 	if ($dh = opendir($conf_dir)) {