diff --git a/config.php b/config.php
new file mode 100644
index 00000000..ebb8c97e
--- /dev/null
+++ b/config.php
@@ -0,0 +1,7 @@
+<?php
+
+$librenms_base = realpath(__DIR__ . '/../../..');
+//this is for the docker version
+//$librenms_base = '/opt/librenms/';
+$mapdir='configs';
+$librenms_url = '/';
diff --git a/data-pick.php b/data-pick.php
index b95d62c9..b42aba77 100755
--- a/data-pick.php
+++ b/data-pick.php
@@ -1,14 +1,11 @@
 <?php
-
+require_once 'config.php';
 // ******************************************
 // sensible defaults
-$mapdir='configs';
 $ignore_librenms=FALSE;
 $config['base_url'] = '/';
 $whats_installed = '';
 
-$librenms_base = '../../../';
-
 $weathermap_config = array (
 	'show_interfaces' => 'all',
 	'sort_if_by' => 'ifAlias',
@@ -39,7 +36,7 @@
 	/* Load Weathermap config defaults, see file for description. */
 
     $init_modules = array('web', 'auth');
-    require realpath(__DIR__ . '/../../..') . '/includes/init.php';
+    require $librenms_base . '/includes/init.php';
 
 	if (empty($_SESSION['authenticated']) || !isset($_SESSION['authenticated'])) {
 		header('Location: /');
@@ -129,8 +126,8 @@ function update_source_step2(graphid)
 
 	function filterlist(previous)
 	{
-		var filterstring = $('input#filterstring').val();	
-		
+		var filterstring = $('input#filterstring').val();
+
 		if(filterstring=='')
 		{
 			$('ul#dslist > li').show();
@@ -138,9 +135,9 @@ function filterlist(previous)
 				$("ul#dslist > li:contains('Desc::')").hide();
 			}
 			return;
-		
+
 		} else if(filterstring!=previous)
-		{	
+		{
 				$('ul#dslist > li').hide();
 				$("ul#dslist > li:contains('" + filterstring + "')").show();
 				if($('#ignore_desc').is(':checked')) {
@@ -229,7 +226,7 @@ function update_source_step1(dataid,name,portid,ifAlias,ifDesc,ifIndex)
 			self.close();
 		}
 	}
-	
+
 	function applyDSFilterChange(objForm) {
                 strURL = '?host_id=' + objForm.host_id.value;
                 strURL = strURL + '&command=link_step1';
@@ -252,7 +249,7 @@ function applyDSFilterChange(objForm) {
 				}
                 document.location = strURL;
         }
-	
+
 	</script>
 <style type="text/css">
 	body { font-family: sans-serif; font-size: 10pt; }
@@ -271,13 +268,13 @@ function applyDSFilterChange(objForm) {
 	//$SQL_picklist = "select data_local.host_id, data_template_data.local_data_id, data_template_data.name_cache, data_template_data.active, data_template_data.data_source_path from data_local,data_template_data,data_input,data_template where data_local.id=data_template_data.local_data_id and data_input.id=data_template_data.data_input_id and data_local.data_template_id=data_template.id ";
 
 	$host_id = $weathermap_config['show_interfaces'];
-	
+
 	$overlib = true;
 	$aggregate = false;
-	
+
 	if(isset($_REQUEST['aggregate'])) $aggregate = ( $_REQUEST['aggregate']==0 ? false : true);
 	if(isset($_REQUEST['overlib'])) $overlib= ( $_REQUEST['overlib']==0 ? false : true);
-	
+
 	/* Explicit device_id given? */
 	if (isset ($_REQUEST['host_id']) and !empty ($_REQUEST['host_id']))
 	{
@@ -294,9 +291,9 @@ function applyDSFilterChange(objForm) {
 		if ($node1_id)
 			$host_id = $node1_id;
 	}
-	
+
 	//$SQL_picklist .= " order by name_cache;";
-	
+
 	 // Link query
 	 $result = mysqli_query($link,"SELECT device_id,hostname FROM devices ORDER BY hostname");
 	 //$hosts = mysql_fetch_assoc($result);
@@ -307,7 +304,7 @@ function applyDSFilterChange(objForm) {
 <h3>Pick a data source:</h3>
 
 <form name="mini">
-<?php 
+<?php
 if(sizeof($hosts) > 0) {
 	print 'Host: <select name="host_id"  onChange="applyDSFilterChange(document.mini)">';
 
@@ -356,7 +353,7 @@ function applyDSFilterChange(objForm) {
 			$deleted = $queryrows['deleted'] ? " (D)" : "";
 			echo "<a href=\"#\" onclick=\"update_source_step1('$key')\">". $queryrows['hostname'] . "/" . $queryrows['ifDescr'] . " Desc:" . $queryrows['ifAlias'] . "$deleted</a>";
 			echo "</li>\n";
-			
+
 			$i++;
 		}
 	}
@@ -384,23 +381,23 @@ function applyDSFilterChange(objForm) {
 	$host_id = -1;
 	$SQL_picklist = "SELECT `device_id` AS `id`,`hostname` AS `name` FROM devices ORDER BY hostname";
 	//$SQL_picklist = "SELECT 1,2,'Test','Y','/dsad'";
-	
+
 	$overlib = true;
 	$aggregate = false;
-	
+
 	if(isset($_REQUEST['aggregate'])) $aggregate = ( $_REQUEST['aggregate']==0 ? false : true);
 	if(isset($_REQUEST['overlib'])) $overlib= ( $_REQUEST['overlib']==0 ? false : true);
-	
-	
+
+
 	if(isset($_REQUEST['host_id']))
 	{
 		$host_id = intval($_REQUEST['host_id']);
 		//if($host_id>=0) $SQL_picklist .= " and graph_local.host_id=$host_id ";
 	}
-	//$SQL_picklist .= " order by title_cache";	
-	
+	//$SQL_picklist .= " order by title_cache";
+
 	 $query = mysqli_query($link,"SELECT id,hostname AS name FROM `devices` ORDER BY hostname");
-	 $hosts = mysqli_fetch_assoc($query);	
+	 $hosts = mysqli_fetch_assoc($query);
 
 ?>
 <html>
@@ -410,16 +407,16 @@ function applyDSFilterChange(objForm) {
 
 	function filterlist(previous)
 	{
-		var filterstring = $('input#filterstring').val();	
-		
+		var filterstring = $('input#filterstring').val();
+
 		if(filterstring=='')
 		{
 			$('ul#dslist > li').show();
 			return;
 		}
-		
+
 		if(filterstring!=previous)
-		{	
+		{
 				$('ul#dslist > li').hide();
 				$("ul#dslist > li:contains('" + filterstring + "')").show();
 				//$('ul#dslist > li').contains(filterstring).show();
@@ -444,7 +441,7 @@ function applyDSFilterChange(objForm) {
 				{
 					strURL = strURL + "&overlib=0";
 				}
-				
+
 				//if( objForm.aggregate.checked)
 				//{
 				//	strURL = strURL + "&aggregate=1";
@@ -455,7 +452,7 @@ function applyDSFilterChange(objForm) {
 				//}
                 document.location = strURL;
         }
-	
+
 	</script>
 	<script type="text/javascript">
 
@@ -480,7 +477,7 @@ function update_source_step1(graphid,name)
                         opener.document.forms["frmMain"].node_new_name.value = graphid;
                         opener.document.forms["frmMain"].node_label.value = name;
 		}
-		self.close();		
+		self.close();
 	}
 	</script>
 <style type="text/css">
@@ -499,7 +496,7 @@ function update_source_step1(graphid,name)
 <h3>Pick a graph:</h3>
 
 <form name="mini">
-<?php 
+<?php
 if(sizeof($hosts) > 0) {
 	print 'Host: <select name="host_id"  onChange="applyDSFilterChange(document.mini)">';
 
diff --git a/editor.php b/editor.php
index fb75018a..7e987968 100755
--- a/editor.php
+++ b/editor.php
@@ -1,5 +1,6 @@
 <?php
-	
+
+require_once 'config.php';
 require_once 'lib/editor.inc.php';
 require_once 'lib/Weathermap.class.php';
 
@@ -14,9 +15,6 @@
 }
 
 // sensible defaults
-$mapdir='configs';
-$librenms_base = '../../../';
-$librenms_url = '/';
 $ignore_librenms=FALSE;
 $configerror = '';
 
@@ -30,10 +28,10 @@
 if( isset($_COOKIE['wmeditor']))
 {
     //$parts = preg_split(":",$_COOKIE['wmeditor']);
-    
+
     if( (isset($parts[0])) && (intval($parts[0]) == 1) ) { $use_overlay = TRUE; }
     if( (isset($parts[1])) && (intval($parts[1]) == 1) ) { $use_relative_overlay = TRUE; }
-    if( (isset($parts[2])) && (intval($parts[2]) != 0) ) { $grid_snap_value = intval($parts[2]); }   
+    if( (isset($parts[2])) && (intval($parts[2]) != 0) ) { $grid_snap_value = intval($parts[2]); }
 }
 
 if( isset($config) )
@@ -45,9 +43,9 @@
 if( is_dir($librenms_base) && file_exists($librenms_base."/config.php") )
 {
   // include the cacti-config, so we know about the database
-  chdir('../../');
+  chdir($librenms_base);
   $init_modules = array('web', 'auth');
-  require realpath(__DIR__ . '/../../..') . '/includes/init.php';
+  require $librenms_base . '/includes/init.php';
   if (empty($_SESSION['authenticated']) || !isset($_SESSION['authenticated']))
   {
     header('Location: /');
@@ -98,23 +96,23 @@
 	show_editor_startpage();
 }
 else
-{  
+{
 	// everything else in this file is inside this else
-	$mapfile = $mapdir.'/'.$mapname;        
+	$mapfile = $mapdir.'/'.$mapname;
 
 	wm_debug("==========================================================================================================\n");
 	wm_debug("Starting Edit Run: action is $action on $mapname\n");
 	wm_debug("==========================================================================================================\n");
-	
+
 	# editor_log("\n\n-----------------------------------------------------------------------------\nNEW REQUEST:\n\n");
 	# editor_log(var_log($_REQUEST));
-	
+
 	$map = new WeatherMap;
 	$map->context = 'editor';
-	
+
 	$fromplug = FALSE;
 	if(isset($_REQUEST['plug']) && (intval($_REQUEST['plug'])==1) ) { $fromplug = TRUE; }
-	
+
 	switch($action)
 	{
 	case 'newmap':
@@ -123,9 +121,9 @@
 
 	case 'newmapcopy':
 		if(isset($_REQUEST['sourcemap'])) { $sourcemapname = $_REQUEST['sourcemap']; }
-		
+
 		$sourcemapname = wm_editor_sanitize_conffile($sourcemapname);
-		
+
 		if($sourcemapname != "") {
 		    $sourcemap = $mapdir.'/'.$sourcemapname;
 		    if( file_exists($sourcemap) && is_readable($sourcemap) ) {
@@ -142,7 +140,7 @@
 
 		$keyfont = 2;
 		$keyheight = imagefontheight($keyfont)+2;
-		
+
 		$sampleheight = 32;
 		// $im = imagecreate(250,imagefontheight(5)+5);
 		$im = imagecreate(2000,$sampleheight);
@@ -161,13 +159,13 @@
 			$keystring = "Font $fontnumber";
 			list($width,$height) = $map->myimagestringsize($fontnumber,$string);
 			list($kwidth,$kheight) = $map->myimagestringsize($keyfont,$keystring);
-			
+
 			if($kwidth > $width) $width = $kwidth;
-			
+
 			$y = ($sampleheight/2) + $height/2;
 			$map->myimagestring($im, $fontnumber, $x, $y, $string, $black);
 			$map->myimagestring($imkey, $keyfont,$x,$keyheight,"Font $fontnumber",$blackkey);
-						
+
 			$x = $x + $width + 6;
 		}
 		$im2 = imagecreate($x,$sampleheight + $keyheight);
@@ -177,7 +175,7 @@
 		imagepng($im2);
 		imagedestroy($im2);
 
-		exit();        
+		exit();
 		break;
 
 	case 'draw':
@@ -199,7 +197,7 @@
 			}
 		}
 
-		$map->sizedebug = TRUE;		
+		$map->sizedebug = TRUE;
 		$map->DrawMap('','',250,TRUE,$use_overlay,$use_relative_overlay);
 		exit();
 		break;
@@ -210,7 +208,7 @@
                 // Temp fix for CVE-2013-3739 exploit
                 $check_base = realpath($mapdir);
                 $check_path = realpath($mapfile);
-                
+
                 if($check_path === false || strpos($check_path, $check_base) !== 0)
                 {
                   echo('Bad mapname');
@@ -227,13 +225,13 @@
 
 		exit();
 		break;
-        
+
     case 'fetch_config':
 	    $map->ReadConfig($mapfile);
 	    header('Content-type: text/plain');
 	    $item_name = $_REQUEST['item_name'];
 	    $item_type = $_REQUEST['item_type'];
-	    
+
 	    $ok=FALSE;
 
 	    if($item_type == 'node'){
@@ -248,11 +246,11 @@
 		    $ok = TRUE;
 		}
 	    }
-		
-	    if (! $ok) { 
-	        print "# the request item didn't exist. That's probably a bug.\n"; 
+
+	    if (! $ok) {
+	        print "# the request item didn't exist. That's probably a bug.\n";
 	    }
-		
+
 	    exit();
 	    break;
 
@@ -262,9 +260,9 @@
 		$link_name = $_REQUEST['link_name'];
 		$link_config = fix_gpc_string($_REQUEST['item_configtext']);
 
-		if(isset($map->links[$link_name])) {		                
+		if(isset($map->links[$link_name])) {
 		    $map->links[$link_name]->config_override = $link_config;
-		    
+
 		    $map->WriteConfig($mapfile);
 		    // now clear and reload the map object, because the in-memory one is out of sync
 		    // - we don't know what changes the user made here, so we just have to reload.
@@ -280,10 +278,10 @@
 
 		$node_name = $_REQUEST['node_name'];
 		$node_config = fix_gpc_string($_REQUEST['item_configtext']);
-		
-		if(isset($map->nodes[$node_name])) {		                
+
+		if(isset($map->nodes[$node_name])) {
 		    $map->nodes[$node_name]->config_override = $node_config;
-		    
+
 		    $map->WriteConfig($mapfile);
 		    // now clear and reload the map object, because the in-memory one is out of sync
 		    // - we don't know what changes the user made here, so we just have to reload.
@@ -305,14 +303,14 @@
 		{
 		    if(!isset($map->nodes[$new_node_name]))
 		    {
-			    // we need to rename the node first.					
+			    // we need to rename the node first.
 			    $newnode = $map->nodes[$node_name];
 			    $newnode->name = $new_node_name;
 			    $map->nodes[$new_node_name] = $newnode;
 			    unset($map->nodes[$node_name]);
 
 			    // find the references elsewhere to the old node name.
-			    // First, relatively-positioned NODEs	
+			    // First, relatively-positioned NODEs
 			    foreach ($map->nodes as $node)
 			    {
 				    if($node->relative_to == $node_name)
@@ -320,7 +318,7 @@
 					    $map->nodes[$node->name]->relative_to = $new_node_name;
 				    }
 			    }
-			    // Next, LINKs that use this NODE as an end.	
+			    // Next, LINKs that use this NODE as an end.
 			    foreach ($map->links as $link)
 			    {
 				if(isset($link->a))
@@ -346,7 +344,7 @@
 						$map->links[$link->name]->vialist[$vv][2] = $new_node_name;
 					    }
 					    $vv++;
-					}                                            
+					}
 				    }
 				}
 			    }
@@ -361,23 +359,23 @@
 		// by this point, and renaming has been done, and new_node_name will always be the right name
 		$map->nodes[$new_node_name]->label = wm_editor_sanitize_string($_REQUEST['node_label']);
 		$map->nodes[$new_node_name]->infourl[IN] = wm_editor_sanitize_string($_REQUEST['node_infourl']);
-		
+
 		$urls = preg_split('/\s+/', $_REQUEST['node_hover'], -1, PREG_SPLIT_NO_EMPTY);
 		$map->nodes[$new_node_name]->overliburl[IN] = $urls;
 		$map->nodes[$new_node_name]->overliburl[OUT] = $urls;
-		
+
 		$map->nodes[$new_node_name]->x = intval($_REQUEST['node_x']);
 		$map->nodes[$new_node_name]->y = intval($_REQUEST['node_y']);
 
 		if($_REQUEST['node_iconfilename'] == '--NONE--')
 		{
-		    $map->nodes[$new_node_name]->iconfile='';   
+		    $map->nodes[$new_node_name]->iconfile='';
 		}
 		else
 		{
 		    // AICONs mess this up, because they're not fully supported by the editor, but it can still break them
 		    if($_REQUEST['node_iconfilename'] != '--AICON--') {
-			    $iconfile = stripslashes($_REQUEST['node_iconfilename']);			    
+			    $iconfile = stripslashes($_REQUEST['node_iconfilename']);
 			    $map->nodes[$new_node_name]->iconfile = $iconfile;
 		    }
 		}
@@ -396,15 +394,15 @@
 		    $urls = preg_split('/\s+/', $_REQUEST['link_hover'], -1, PREG_SPLIT_NO_EMPTY);
 		    $map->links[$link_name]->overliburl[IN] = $urls;
 		    $map->links[$link_name]->overliburl[OUT] = $urls;
-		    
+
 		    $map->links[$link_name]->comments[IN] =  wm_editor_sanitize_string($_REQUEST['link_commentin']);
 		    $map->links[$link_name]->comments[OUT] = wm_editor_sanitize_string($_REQUEST['link_commentout']);
 		    $map->links[$link_name]->commentoffset_in =  intval($_REQUEST['link_commentposin']);
-		    $map->links[$link_name]->commentoffset_out = intval($_REQUEST['link_commentposout']); 
+		    $map->links[$link_name]->commentoffset_out = intval($_REQUEST['link_commentposout']);
 
 		    // $map->links[$link_name]->target = $_REQUEST['link_target'];
 
-		    $targets = preg_split('/\s+/',$_REQUEST['link_target'],-1,PREG_SPLIT_NO_EMPTY); 
+		    $targets = preg_split('/\s+/',$_REQUEST['link_target'],-1,PREG_SPLIT_NO_EMPTY);
 		    $new_target_list = array();
 
 		    foreach ($targets as $target)
@@ -437,14 +435,14 @@
 		    if(wm_editor_validate_bandwidth($bwin)) {
 			$map->links[$link_name]->max_bandwidth_in_cfg = $bwin;
 			$map->links[$link_name]->max_bandwidth_in = unformat_number($bwin, $map->kilo);
-		    
+
 		    }
 		    if(wm_editor_validate_bandwidth($bwout)) {
-			$map->links[$link_name]->max_bandwidth_out_cfg = $bwout;		    
+			$map->links[$link_name]->max_bandwidth_out_cfg = $bwout;
 			$map->links[$link_name]->max_bandwidth_out = unformat_number($bwout, $map->kilo);
 		    }
 		    // $map->links[$link_name]->SetBandwidth($bwin,$bwout);
-		    
+
 		    $map->WriteConfig($mapfile);
 		}
 		break;
@@ -465,10 +463,10 @@
 		// XXX sanitise this a bit
 		if($_REQUEST['map_bgfile'] == '--NONE--')
 		{
-		    $map->background='';    
+		    $map->background='';
 		}
 		else
-		{		    
+		{
 		    $map->background = wm_editor_sanitize_file(stripslashes($_REQUEST['map_bgfile']),array("png","jpg","gif","jpeg") );
 		}
 
@@ -476,23 +474,23 @@
 			array('link','width','map_linkdefaultwidth',"float"),
 		);
 
-		handle_inheritance($map, $inheritables);	
+		handle_inheritance($map, $inheritables);
 		$map->links['DEFAULT']->width = intval($_REQUEST['map_linkdefaultwidth']);
 		$map->links['DEFAULT']->add_note("my_width", intval($_REQUEST['map_linkdefaultwidth']));
-                
+
 		$bwin = $_REQUEST['map_linkdefaultbwin'];
 		$bwout = $_REQUEST['map_linkdefaultbwout'];
-		
+
 		$bwin_old = $map->links['DEFAULT']->max_bandwidth_in_cfg;
 		$bwout_old = $map->links['DEFAULT']->max_bandwidth_out_cfg;
-		
+
 		if(! wm_editor_validate_bandwidth($bwin)) {
 		    $bwin = $bwin_old;
 		}
 
 		if(! wm_editor_validate_bandwidth($bwout)) {
 		    $bwout = $bwout_old;
-		}		
+		}
 
 		if( ($bwin_old != $bwin) || ($bwout_old != $bwout) )
 		{
@@ -500,7 +498,7 @@
 			$map->links['DEFAULT']->max_bandwidth_out_cfg = $bwout;
 			$map->links['DEFAULT']->max_bandwidth_in = unformat_number($bwin, $map->kilo);
                         $map->links['DEFAULT']->max_bandwidth_out = unformat_number($bwout, $map->kilo);
-			
+
 			// $map->defaultlink->SetBandwidth($bwin,$bwout);
 			foreach ($map->links as $link)
 			{
@@ -517,13 +515,13 @@
 		}
 
 		$map->WriteConfig($mapfile);
-		break; 
+		break;
 
 	case 'set_map_style':
 		$map->ReadConfig($mapfile);
 
 		if(wm_editor_validate_one_of($_REQUEST['mapstyle_htmlstyle'],array('static','overlib'),false)) {
-		    $map->htmlstyle = strtolower($_REQUEST['mapstyle_htmlstyle']); 		    
+		    $map->htmlstyle = strtolower($_REQUEST['mapstyle_htmlstyle']);
 		}
 
 		$map->keyfont = intval($_REQUEST['mapstyle_legendfont']);
@@ -536,7 +534,7 @@
 			);
 
 		handle_inheritance($map, $inheritables);
-		
+
 		$map->WriteConfig($mapfile);
 		break;
 
@@ -548,7 +546,7 @@
 		$newaction = 'add_link2';
               #  print $newaction;
 		$selected = 'NODE:'.$param2;
-                
+
 		break;
 
 	case "add_link2":
@@ -562,12 +560,12 @@
 		{
 			$newlink = new WeatherMapLink;
 			$newlink->Reset($map);
-			
+
 			$newlink->a = $map->nodes[$a];
 			$newlink->b = $map->nodes[$b];
-			
+
 			// $newlink->SetBandwidth($map->defaultlink->max_bandwidth_in_cfg, $map->defaultlink->max_bandwidth_out_cfg);
-						
+
 			$newlink->width = $map->links['DEFAULT']->width;
 
 			// make sure the link name is unique. We can have multiple links between
@@ -583,7 +581,7 @@
 			array_push($map->seen_zlayers[$newlink->zorder], $newlink);
 
 			$map->WriteConfig($mapfile);
-		}          
+		}
 		break;
 
 	case "place_legend":
@@ -611,7 +609,7 @@
 		$map->WriteConfig($mapfile);
 		break;
 
-		
+
 	case "via_link":
 		$x = intval($_REQUEST['x']);
 		$y = intval($_REQUEST['y']);
@@ -623,10 +621,10 @@
 		    $map->links[$link_name]->vialist = array(array(0 =>$x, 1=>$y));
 		    $map->WriteConfig($mapfile);
 		}
-		
+
 		break;
 
-		
+
 	case "move_node":
 		$x = snap( intval($_REQUEST['x']),  $grid_snap_value);
 		$y = snap( intval($_REQUEST['y']), $grid_snap_value);
@@ -641,18 +639,18 @@
 		    foreach ($map->links as $link)
 		    {
 			    if( (count($link->vialist)>0)  && (($link->a->name == $node_name) || ($link->b->name == $node_name)) )
-			    {	
+			    {
 				    // get the other node from us
 				    if($link->a->name == $node_name) $pivot = $link->b;
-				    if($link->b->name == $node_name) $pivot = $link->a; 
-				    
+				    if($link->b->name == $node_name) $pivot = $link->a;
+
 				    if( ($link->a->name == $node_name) && ($link->b->name == $node_name) )
 				    {
 					    // this is a wierd special case, but it is possible
 					    # $log .= "Special case for node1->node1 links\n";
 					    $dx = $link->a->x - $x;
 					    $dy = $link->a->y - $y;
-					    
+
 					    for($i=0; $i<count($link->vialist); $i++)
 					    {
 						    $link->vialist[$i][0] = $link->vialist[$i][0]-$dx;
@@ -663,20 +661,20 @@
 				    {
 					    $pivx = $pivot->x;
 					    $pivy = $pivot->y;
-					    
+
 					    $dx_old = $pivx - $map->nodes[$node_name]->x;
 					    $dy_old = $pivy - $map->nodes[$node_name]->y;
 					    $dx_new = $pivx - $x;
 					    $dy_new = $pivy - $y;
 					    $l_old = sqrt($dx_old*$dx_old + $dy_old*$dy_old);
 					    $l_new = sqrt($dx_new*$dx_new + $dy_new*$dy_new);
-					    
+
 					    $angle_old = rad2deg(atan2(-$dy_old,$dx_old));
 					    $angle_new = rad2deg(atan2(-$dy_new,$dx_new));
-										    
+
 					    # $log .= "$pivx,$pivy\n$dx_old $dy_old $l_old => $angle_old\n";
 					    # $log .= "$dx_new $dy_new $l_new => $angle_new\n";
-				    
+
 					    // the geometry stuff uses a different point format, helpfully
 					    $points = array();
 					    foreach($link->vialist as $via)
@@ -684,10 +682,10 @@
 						    $points[] = $via[0];
 						    $points[] = $via[1];
 					    }
-					    
+
 					    $scalefactor = $l_new/$l_old;
 					    # $log .= "Scale by $scalefactor along link-line";
-					    
+
 					    // rotate so that link is along the axis
 					    RotateAboutPoint($points,$pivx, $pivy, deg2rad($angle_old));
 					    // do the scaling in here
@@ -698,7 +696,7 @@
 					    }
 					    // rotate back so that link is along the new direction
 					    RotateAboutPoint($points,$pivx, $pivy, deg2rad(-$angle_new));
-					    
+
 					    // now put the modified points back into the vialist again
 					    $v = 0; $i = 0;
 					    foreach($points as $p)
@@ -709,15 +707,15 @@
 							    $link->vialist[$v][$i]=$p;
 						    }
 						    $i++;
-						    if($i==2) { $i=0; $v++;}					
+						    if($i==2) { $i=0; $v++;}
 					    }
 				    }
 			    }
 		    }
-		    
+
 		    $map->nodes[$node_name]->x = $x;
 		    $map->nodes[$node_name]->y = $y;
-    
+
 		    $map->WriteConfig($mapfile);
 		}
 		break;
@@ -726,16 +724,16 @@
 		$map->ReadConfig($mapfile);
 
 		$target = wm_editor_sanitize_name($_REQUEST['param']);
-		
+
 		if(isset($map->links[target])) {
-		    $log = "align link ".$target;	
-		    
+		    $log = "align link ".$target;
+
 		    $a_y = $map->links[$target]->a->y;
 		    $b_y = $map->links[$target]->b->y;
-		    
+
 		    $diff = $b_y - $a_y;
 		    $newoffset = "0:$diff";
-		    
+
 		    // if we've already done this once, try the other way around...
 		    if($map->links[$target]->a_offset == $newoffset)
 		    {
@@ -749,8 +747,8 @@
 			// the standard thing
 			$map->links[$target]->a_offset = $newoffset;
 			$map->links[$target]->b_offset = "C";
-		    }     
-    
+		    }
+
 		    $map->WriteConfig($mapfile);
 		}
                 break;
@@ -759,16 +757,16 @@
 		$map->ReadConfig($mapfile);
 
 		$target = wm_editor_sanitize_name($_REQUEST['param']);
-		
-		if(isset($map->links[target])) {		    
+
+		if(isset($map->links[target])) {
 		    $log = "align link ".$target;
-    
+
 		    $a_x = $map->links[$target]->a->x;
 		    $b_x = $map->links[$target]->b->x;
-		    
+
 		    $diff = $b_x - $a_x;
 		    $newoffset = "$diff:0";
-		    
+
 		    // if we've already done this once, try the other way around...
 		    if($map->links[$target]->a_offset == $newoffset)
 		    {
@@ -782,8 +780,8 @@
 			// the standard thing
 			$map->links[$target]->a_offset = $newoffset;
 			$map->links[$target]->b_offset = "C";
-		    }     
-    
+		    }
+
 		    $map->WriteConfig($mapfile);
 		}
                 break;
@@ -796,7 +794,7 @@
 
 		if(isset($map->links[$target])) {
 		    unset($map->links[$target]);
-		    
+
 		    $map->WriteConfig($mapfile);
 		}
 		break;
@@ -806,34 +804,34 @@
 		$y = snap(intval($_REQUEST['y']), $grid_snap_value);
 
 		$map->ReadConfig($mapfile);
-		
+
 		$newnodename = sprintf("node%05d",time()%10000);
 		while(array_key_exists($newnodename,$map->nodes))
 		{
 			$newnodename .= "a";
 		}
-		
+
 		$node = new WeatherMapNode;
 		$node->name = $newnodename;
 		$node->template = "DEFAULT";
 		$node->Reset($map);
-				
+
 		$node->x = $x;
 		$node->y = $y;
 		$node->defined_in = $map->configfile;
-				
-		array_push($map->seen_zlayers[$node->zorder], $node);			
-		
+
+		array_push($map->seen_zlayers[$node->zorder], $node);
+
 		// only insert a label if there's no LABEL in the DEFAULT node.
 		// otherwise, respect the template.
 		if($map->nodes['DEFAULT']->label == $map->nodes[':: DEFAULT ::']->label)
 		{
 			$node->label = "Node";
 		}
-		
+
 		$map->nodes[$node->name] = $node;
 		$log = "added a node called $newnodename at $x,$y to $mapfile";
-						
+
 		$map->WriteConfig($mapfile);
 		break;
 
@@ -844,16 +842,16 @@
 	    $use_overlay = (isset($_REQUEST['editorsettings_showvias']) ? intval($_REQUEST['editorsettings_showvias']) : FALSE);
 	    $use_relative_overlay = (isset($_REQUEST['editorsettings_showrelative']) ? intval($_REQUEST['editorsettings_showrelative']) : FALSE);
 	    $grid_snap_value = (isset($_REQUEST['editorsettings_gridsnap']) ? intval($_REQUEST['editorsettings_gridsnap']) : 0);
-			    
+
 	    break;
-		
+
 	case "delete_node":
 		$map->ReadConfig($mapfile);
 
 		$target = wm_editor_sanitize_name($_REQUEST['param']);
 		if(isset($map->nodes[$target])) {
 		    $log = "delete node ".$target;
-    
+
 		    foreach ($map->links as $link)
 		    {
 			    if( isset($link->a) )
@@ -863,10 +861,10 @@
 					    unset($map->links[$link->name]);
 				    }
 			    }
-		    }           
-    
+		    }
+
 		    unset($map->nodes[$target]);
-    
+
 		    $map->WriteConfig($mapfile);
 		}
 		break;
@@ -877,26 +875,26 @@
 		$target = wm_editor_sanitize_name($_REQUEST['param']);
 		if(isset($map->nodes[$target])) {
 		    $log = "clone node ".$target;
-    
+
 		    $newnodename = $target;
 		    do
 		    {
 			    $newnodename = $newnodename."_copy";
 		    } while(isset($map->nodes[$newnodename]));
-		    
+
 		    $node = new WeatherMapNode;
 		    $node->Reset($map);
 		    $node->CopyFrom($map->nodes[$target]);
-    
+
 		    $node->name = $newnodename;
 		    $node->x += 30;
 		    $node->y += 30;
 		    $node->defined_in = $mapfile;
-    
-    
+
+
 		    $map->nodes[$newnodename] = $node;
 		    array_push($map->seen_zlayers[$node->zorder], $node);
-    
+
 		    $map->WriteConfig($mapfile);
 		}
 		break;
@@ -904,9 +902,9 @@
 		// no action was defined - starting a new map?
 	default:
 		$map->ReadConfig($mapfile);
-		break;   
-	}	
-	
+		break;
+	}
+
 	//by here, there should be a valid $map - either a blank one, the existing one, or the existing one with requested changes
 	wm_debug("Finished modifying\n");
 
@@ -925,14 +923,14 @@
 	foreach ($map->nodes as $n)
 	{
 		if($n->iconfile != '' && ! preg_match("/^(none|nink|inpie|outpie|box|rbox|gauge|round)$/",$n->iconfile))
-			$map->used_images[] = $n->iconfile;		
+			$map->used_images[] = $n->iconfile;
 	}
 
 	// get the list from the images/ folder too
 	$imlist = get_imagelist("images");
-	
+
 	$fontlist = array();
-	
+
 	setcookie("wmeditor", ($use_overlay ? "1":"0") .":". ($use_relative_overlay ? "1":"0") . ":" . intval($grid_snap_value), time()+60*60*24*30 );
 
 ?>
@@ -941,7 +939,7 @@
 <head>
 <style type="text/css">
 <?php
-		// if the cacti config was included properly, then 
+		// if the cacti config was included properly, then
 		// this will be non-empty, and we can unhide the cacti links in the Link Properties box
 		if( ! isset($config['install_dir']) )
 		{
@@ -954,9 +952,9 @@
 <script src="editor-resources/jquery-latest.min.js" type="text/javascript"></script>
 <script src="editor-resources/editor.js" type="text/javascript"></script>
 	<script type="text/javascript">
-	
+
 	var fromplug=<?php echo ($fromplug==TRUE ? 1:0); ?>;
-	
+
 	// the only javascript in here should be the objects representing the map itself
 	// all code should be in editor.js
 	<?php print $map->asJS() ?>
@@ -1001,16 +999,16 @@
 	  src="<?php echo $imageurl; ?>" id="xycapture" /><img src=
 	  "<?php echo $imageurl; ?>" id="existingdata" alt="Weathermap" usemap="#weathermap_imap"
 	   />
-	   <div class="debug"><p><strong>Debug:</strong> <a href="?<?php echo ($fromplug==TRUE ? 'plug=1&amp;' : ''); ?>action=nothing&amp;mapname=<?php echo  htmlspecialchars($mapname) ?>">Do Nothing</a> 
+	   <div class="debug"><p><strong>Debug:</strong> <a href="?<?php echo ($fromplug==TRUE ? 'plug=1&amp;' : ''); ?>action=nothing&amp;mapname=<?php echo  htmlspecialchars($mapname) ?>">Do Nothing</a>
 	   <span><label for="mapname">mapfile</label><input type="text" name="mapname" value="<?php echo htmlspecialchars($mapname); ?>" /></span>
 	   <span><label for="action">action</label><input type="text" id="action" name="action" value="<?php echo htmlspecialchars($newaction); ?>" /></span>
 	  <span><label for="param">param</label><input type="text" name="param" id="param" value="" /></span>
-            <span><label for="param2">param2</label><input type="text" name="param2" id="param2" value="<?php echo htmlspecialchars($param2); ?>" /></span> 
-	  <span><label for="debug">debug</label><input id="debug" value="" name="debug" /></span> 
+            <span><label for="param2">param2</label><input type="text" name="param2" id="param2" value="<?php echo htmlspecialchars($param2); ?>" /></span>
+	  <span><label for="debug">debug</label><input id="debug" value="" name="debug" /></span>
 	  <a target="configwindow" href="?<?php echo ($fromplug==TRUE ? 'plug=1&amp;':''); ?>action=show_config&amp;mapname=<?php echo  urlencode($mapname) ?>">See config</a></p>
 	<pre><?php echo  htmlspecialchars($log) ?></pre>
 	  </div>
-<?php        	
+<?php
 	// we need to draw and throw away a map, to get the
 	// dimensions for the imagemap. Oh well.
 	$map->DrawMap('null');
@@ -1023,7 +1021,7 @@
 	#print $map->imap->subHTML("TIMESTAMP");
 	#print $map->imap->subHTML("NODE:");
 	#print $map->imap->subHTML("LINK:");
-                
+
 ?>
 	</div><!-- Node Properties -->
 
@@ -1181,8 +1179,8 @@
                                                     <option value=50>50%</option>
                                         </select>
                                </td>
-                        </tr> 
-		  
+                        </tr>
+
 			<tr>
 			  <th></th>
 			  <td>&nbsp;</td>
@@ -1192,8 +1190,8 @@
 			  <td><a class="dlgTitlebar" id="link_delete">Delete
 			  Link</a><a class="dlgTitlebar" id="link_edit">Edit</a><a
                             class="dlgTitlebar" id="link_vert">Vert</a><a
-                            class="dlgTitlebar" id="link_horiz">Horiz</a><a 
-							class="dlgTitlebar" id="link_via">Via</a> 
+                            class="dlgTitlebar" id="link_horiz">Horiz</a><a
+							class="dlgTitlebar" id="link_via">Via</a>
                         </td>
 			</tr>
 		  </table>
@@ -1272,7 +1270,7 @@ class="dlgTitlebar" id="link_via">Via</a>
 		print '<option value="--NONE--">--NONE--</option>';
 		foreach ($imlist as $im)
 		{
-			print "<option ";		
+			print "<option ";
     			if($map->background == $im) print " selected ";
 			print "value=\"".htmlspecialchars($im)."\">".htmlspecialchars($im)."</option>\n";
 		}
@@ -1280,7 +1278,7 @@ class="dlgTitlebar" id="link_via">Via</a>
 ?>
 			</select></td>
 		  </tr>
-		
+
 		</table>
 	  </div>
 
@@ -1409,7 +1407,7 @@ class="dlgTitlebar" id="link_via">Via</a>
 	  <div class="dlgBody">
 		<p>Nothing in here works yet. </p>
 		The aim is to have some nice way to upload images which can be used as icons or backgrounds.
-		These images are what would appear in the dropdown boxes that don't currently do anything in the Node and Map Properties dialogs. This may end up being a seperate page rather than a dialog box...       
+		These images are what would appear in the dropdown boxes that don't currently do anything in the Node and Map Properties dialogs. This may end up being a seperate page rather than a dialog box...
 	  </div>
 
 	  <div class="dlgHelp" id="images_help">
@@ -1439,8 +1437,8 @@ class="dlgTitlebar" id="link_via">Via</a>
 		necessary for it to do that.
 	  </div>
 	</div><!-- TextEdit -->
-	
-	
+
+
 	<div id="dlgEditorSettings" class="dlgProperties">
 	  <div class="dlgTitlebar">
 		Editor Settings
@@ -1482,7 +1480,7 @@ class="dlgTitlebar" id="link_via">Via</a>
 			</td>
 		    </tr>
 		</table>
-                
+
 	  </div>
 
 	  <div class="dlgHelp" id="images_help">
@@ -1491,8 +1489,8 @@ class="dlgTitlebar" id="link_via">Via</a>
 		necessary for it to do that.
 	  </div>
 	</div><!-- TextEdit -->
-	
-	
+
+
     </form>
 </body>
 </html>
diff --git a/map-poller.php b/map-poller.php
index 0ddf54e2..619b50a2 100755
--- a/map-poller.php
+++ b/map-poller.php
@@ -1,6 +1,6 @@
 #!/usr/bin/env php
 <?php
-
+require_once 'config.php';
 // Copyright (C) 2013 Neil Lathwood neil@lathwood.co.uk
 // Copyright (C) 2016 Maximilan Wilhelm <max@rfc2324.org>
 /**
@@ -49,7 +49,7 @@
 // Include config first to get install dir, then load defaults and config
 // again to get full set of config values.
 $init_modules = array('web');
-require realpath(__DIR__ . '/../../..') . '/includes/init.php';
+require $librenms_base . '/includes/init.php';
 
 // Change to directory that map-poller was run from.
 // Thank you to Supun Rathnayake (https://twitter.com/supunr) for the bug report
@@ -65,8 +65,8 @@
 			    	$cmd = "php ./weathermap.php --config $conf_dir/$file --base-href $basehref --chdir ".$config['rrd_dir'];
                                 if ($config['rrdcached']) {
                                     $cmd = $cmd." --daemon ".$config['rrdcached'];
-                                } 
-				$fp = popen($cmd, 'r'); 
+                                }
+				$fp = popen($cmd, 'r');
 				while (!feof($fp)) {
 					$read = fgets($fp);
 					echo $read;