diff --git a/Weathermap.php b/Weathermap.php
index 430c390d..bd87d231 100644
--- a/Weathermap.php
+++ b/Weathermap.php
@@ -1,35 +1,39 @@
 <?php
 
+namespace LibreNMS\Plugins;
+
 include_once 'lib/editor.inc.php';
 
-class Weathermap {
+class Weathermap
+{
+    public static $name = 'Weathermap';
+
+    public static function menu()
+    {
 
-  public static function menu() {
         //Include config
-        include_once 'config.inc.php';
+        include 'config.inc.php';
 
-	//Parse config files
+        //Parse config files
         $files = list_weathermaps($mapdir);
 
-	//Create submenu 
-	$submenu = ' <ul class="dropdown-menu scrollable-menu">';
-	$count = 0;
-	foreach ($files as $file=>$data) {
-            $nicefile = htmlspecialchars($file);
-            $submenu .= '   <li><a href="/plugins/'.get_class().'/'.htmlspecialchars($data['page']).'"><i class="fa fa-map fa-fw fa-lg" aria-hidden="true"></i> '.htmlspecialchars($data['title']).'</a></li>';
-            $count ++;
+        //Create submenu
+        $submenu = ' <ul class="dropdown-menu scrollable-menu">';
+        $count = 0;
+        foreach ($files as $file => $data) {
+            $submenu .= '   <li><a href="/plugins/' . self::$name . '/' . htmlspecialchars($data['page']) . '"><i class="fa fa-map fa-fw fa-lg" aria-hidden="true"></i> ' . htmlspecialchars($data['title']) . '</a></li>';
+            $count++;
         }
-	$submenu .= ' </ul>';
+        $submenu .= ' </ul>';
 
         //Display it if not empty
         if ($count > 0) {
-            echo('<li class="dropdown-submenu"><a href="plugin/p='.get_class().'">'.get_class().'</a>');
+            echo('<li class="dropdown-submenu"><a href="plugin/p=' . self::$name . '">' . self::$name . '</a>');
             echo $submenu;
-            echo ('</li>');
+            echo('</li>');
         } else {
             //Create menu without submenu
-            echo('<li><a href="plugin/p='.get_class().'">'.get_class().'</a></li>');
+            echo('<li><a href="plugin/p=' . self::$name . '">' . self::$name . '</a></li>');
         }
-  }
+    }
 }
-?>
diff --git a/config.inc.php b/config.inc.php
index 0dfc2ac2..d2773150 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -5,7 +5,7 @@
 $conf_dir = 'configs/';
 $mapdir=dirname(__FILE__)."/". $conf_dir;
 
-$librenms_base = '../../../';
+$librenms_base = realpath(dirname(__FILE__) . '/../../../');
 $librenms_url = '/';
 $ignore_librenms=FALSE;
 $configerror = '';
diff --git a/data-pick.php b/data-pick.php
index 3d9726dd..b995691d 100755
--- a/data-pick.php
+++ b/data-pick.php
@@ -2,12 +2,9 @@
 
 // ******************************************
 // sensible defaults
-$mapdir='configs';
-$ignore_librenms=FALSE;
-$config['base_url'] = '/';
+include 'config.inc.php';
 $whats_installed = '';
 
-$librenms_base = '../../../';
 
 $weathermap_config = array (
 	'show_interfaces' => 'all',
@@ -38,15 +35,16 @@
 	 */
 	/* Load Weathermap config defaults, see file for description. */
 
-    $init_modules = array('web', 'auth');
-    require realpath(__DIR__ . '/../../..') . '/includes/init.php';
+    $init_modules = ['web', 'auth'];
+    require $librenms_base . '/includes/init.php';
 
-	if (empty($_SESSION['authenticated']) || !isset($_SESSION['authenticated'])) {
+	if (!Auth::check()) {
 		header('Location: /');
+		exit;
 	}
 
-	chdir('plugins/Weathermap');
-	$librenms_found = TRUE;
+	chdir($librenms_base . '/plugins/Weathermap');
+	$librenms_found = true;
 
 	/* Validate configuration, see defaults.inc.php for explaination */
 	if (in_array ($config['plugins']['Weathermap']['sort_if_by'], $valid_sort_if_by))
@@ -57,8 +55,6 @@
 	elseif (validate_device_id ($config['plugins']['Weathermap']['show_interfaces']))
 		$weathermap_config['show_interfaces'] = $config['plugins']['Weathermap']['show_interfaces'];
 
-$link = mysqli_connect($config['db_host'],$config['db_user'],$config['db_pass'],$config['db_name'],$config['db_port'])
-                or die('Could not connect: ' . mysqli_error($link));
 
 // ******************************************
 
@@ -76,13 +72,6 @@ function js_escape($str)
 {
 	$dataid = intval($_REQUEST['dataid']);
 
-	//$SQL_graphid = sprintf("SELECT graph_templates_item.local_graph_id, title_cache FROM graph_templates_item,graph_templates_graph,data_template_rrd where graph_templates_graph.local_graph_id = graph_templates_item.local_graph_id  and task_item_id=data_template_rrd.id and local_data_id=%d LIMIT 1;",$dataid);
-
-	//mysql_selectdb($config['db_name'],$link) or die('Could not select database: '.mysql_error());
-
-	//$result = mysql_query($SQL_graphid) or die('Query failed: ' . mysql_error());
-	//$line = mysql_fetch_array($result, MYSQL_ASSOC);
-	//$graphid = $line['local_graph_id'];
 
 ?>
 <html>
@@ -107,7 +96,7 @@ function update_source_step2(graphid)
 		self.close();
 	}
 
-	window.onload = update_source_step2(<?php echo $graphid ?>);
+	window.onload = update_source_step2(<?php echo $dataid ?>);
 
 	</script>
 </head>
@@ -268,8 +257,6 @@ function applyDSFilterChange(objForm) {
 <body>
 <?php
 
-	//$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;
@@ -282,7 +269,6 @@ function applyDSFilterChange(objForm) {
 	if (isset ($_REQUEST['host_id']) and !empty ($_REQUEST['host_id']))
 	{
 		$host_id = intval ($_REQUEST['host_id']);
-		//if($host_id>=0) $SQL_picklist .= " and data_local.host_id=$host_id ";
 	}
 
 	/* If the editor gave us the links source node name, try to find the device_id
@@ -290,30 +276,25 @@ function applyDSFilterChange(objForm) {
 	if (isset ($_REQUEST['node1']) and !empty ($_REQUEST['node1']))
 	{
 		$node1 = strtolower ($_REQUEST['node1']);
-		$node1_id = dbFetchCell ("SELECT device_id FROM devices where hostname like ?", array ("%$node1%"));
+		$node1_id = \App\Models\Device::where('hostname', 'like', "%$node1%")->value('device_id');
 		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);
-	 //$result = mysql_query($SQL_picklist);
-	 $hosts = 1;
+     $hosts = \App\Models\Device::orderBy('hostname')->get(['device_id', 'hostname']);
 ?>
 
 <h3>Pick a data source:</h3>
 
 <form name="mini">
 <?php 
-if(sizeof($hosts) > 0) {
+if($hosts->isNotEmpty()) {
 	print 'Host: <select name="host_id"  onChange="applyDSFilterChange(document.mini)">';
 
 	print '<option '.($host_id==-1 ? 'SELECTED' : '' ).' value="-1">Any</option>';
 	print '<option '.($host_id==0 ? 'SELECTED' : '' ).' value="0">None</option>';
-	while ($host = mysqli_fetch_assoc($result))
+	foreach ($hosts as $host)
 	{
 		print '<option ';
 		if($host_id==$host['device_id']) print " SELECTED ";
@@ -334,43 +315,35 @@ function applyDSFilterChange(objForm) {
 	 */
 	$result = Null;
 	if ($host_id != 0) {
-		$query = "SELECT devices.device_id,hostname,ports.port_id,ports.ifAlias,ports.ifIndex,ports.ifDescr,ports.deleted FROM devices LEFT JOIN ports ON devices.device_id=ports.device_id WHERE ports.disabled=0";
-
-		/* ...of specific host/device? */
-		if($host_id > 0) {
-			$query .= " AND devices.device_id='$host_id'";
-		}
-
-		/* ...in specific order? */
-		$query .= " ORDER BY hostname,ports." . $weathermap_config['sort_if_by'];
-		$result = mysqli_query($link,$query);
+	    $devices = \App\Models\Device::when($host_id > 0, function ($query) use ($host_id) {
+	        $query->where('device_id', $host_id);
+        })
+        ->with(['ports' => function ($query) use ($weathermap_config) {
+            $query->orderBy($weathermap_config['sort_if_by']);
+        }])
+        ->orderBy('hostname')
+        ->get();
 	}
 
 	$i=0;
-	if( mysqli_num_rows($result) > 0 )
-	{
-			while ($queryrows = mysqli_fetch_assoc($result)) {
-			echo "<li class=\"row".($i%2)."\">";
-			$key = $queryrows['device_id']."','".$queryrows['hostname']."','".$queryrows['port_id']."','".addslashes($queryrows['ifAlias'])."','".addslashes($queryrows['ifDescr'])."','".$queryrows['ifIndex'];
-			// Indicated if port is marked deleted
-			$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++;
-		}
-	}
-	else
-	{
+    if ($devices->isNotEmpty()) {
+        foreach ($devices as $device) {
+            if (!is_null($device->ports)) {
+                foreach ($device->ports as $port) {
+                    echo "<li class=\"row" . ($i % 2) . "\">";
+                    $key = $device->device_id . "','" . $device->hostname . "','" . $port->port_id . "','" . addslashes($port->ifAlias) . "','" . addslashes($port->ifDescr) . "','" . (int)$port->ifIndex;
+
+                    echo "<a href=\"#\" onclick=\"update_source_step1('$key')\">" . $device->displayName() . "/$port->ifDescr Desc: $port->ifAlias</a>";
+                    echo "</li>\n";
+                }
+                $i++;
+            }
+
+        }
+    } else {
 		print "<li>No results...</li>";
 	}
 
-	// Free resultset
-	//mysql_free_result($result);
-
-	// Closing connection
-	//mysql_close($link);
-
 ?>
 </ul>
 </div>
@@ -382,8 +355,7 @@ function applyDSFilterChange(objForm) {
 if(isset($_REQUEST['command']) && $_REQUEST["command"]=='node_step1')
 {
 	$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;
@@ -395,12 +367,9 @@ function applyDSFilterChange(objForm) {
 	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";	
-	
-	 $query = mysqli_query($link,"SELECT id,hostname AS name FROM `devices` ORDER BY hostname");
-	 $hosts = mysqli_fetch_assoc($query);	
+
+	 $hosts = \App\Models\Device::orderBy('hostname')->get(['device_id AS id', 'hostname AS name']);
 
 ?>
 <html>
@@ -500,7 +469,7 @@ function update_source_step1(graphid,name)
 
 <form name="mini">
 <?php 
-if(sizeof($hosts) > 0) {
+if($hosts->isNotEmpty()) {
 	print 'Host: <select name="host_id"  onChange="applyDSFilterChange(document.mini)">';
 
 	print '<option '.($host_id==-1 ? 'SELECTED' : '' ).' value="-1">Any</option>';
@@ -518,15 +487,15 @@ function update_source_step1(graphid,name)
 	print '<input id="overlib" name="overlib" type="checkbox" value="yes" '.($overlib ? 'CHECKED' : '' ).'> <label for="overlib">Set both OVERLIBGRAPH and INFOURL.</label><br />';
 
 	print '</form><div class="listcontainer"><ul id="dslist">';
-	$result = mysqli_query($link,$SQL_picklist);
-	if( mysqli_num_rows($result) > 0)
+
+	if($hosts->isNotEmpty())
 	{
 		$i=0;
-		while($queryrows = mysqli_fetch_assoc($result)) {
+		foreach($hosts as $host) {
 			echo "<li class=\"row".($i%2)."\">";
-			$key = $queryrows['id'];
-			$name = $queryrows['name'];
-			echo "<a href=\"#\" onclick=\"update_source_step1('$key','$name')\">". $queryrows['name'] . "</a>";
+			$key = $host['id'];
+			$name = $host['name'];
+			echo "<a href=\"#\" onclick=\"update_source_step1('$key','$name')\">". $host['name'] . "</a>";
 			echo "</li>\n";
 			$i++;
 		}
diff --git a/editor.php b/editor.php
index 5a03d85f..8f051746 100755
--- a/editor.php
+++ b/editor.php
@@ -30,26 +30,20 @@
 }
 
 // check if the goalposts have moved
-if( is_dir($librenms_base) && file_exists($librenms_base."/config.php") )
-{
-  // include the cacti-config, so we know about the database
-  chdir('../../');
-  $init_modules = array('web', 'auth');
-  require realpath(__DIR__ . '/../../..') . '/includes/init.php';
-  if (empty($_SESSION['authenticated']) || !isset($_SESSION['authenticated']))
-  {
-    header('Location: /');
-  }
-  chdir('plugins/Weathermap');
-  $librenms_found = TRUE;
-}
-else
-{
-	$librenms_found = FALSE;
+$librenms_found = false;
+if (is_dir($librenms_base) && file_exists($librenms_base . "/.env")) {
+    // Boot LibreNMS
+    $init_modules = ['web', 'auth'];
+    require $librenms_base . '/includes/init.php';
+    if (!Auth::check()) {
+        header('Location: /');
+        exit;
+    }
+    chdir($librenms_base . '/html/plugins/Weathermap');
+    $librenms_found = true;
 }
 
-if(! is_writable($mapdir))
-{
+if(! is_writable($mapdir)) {
 	$configerror = "The map config directory is not writable by the web server user. You will not be able to edit any files until this is corrected. [WMEDIT01]";
 }
 
diff --git a/lib/editor.inc.php b/lib/editor.inc.php
index e78dd260..ad1b5e50 100755
--- a/lib/editor.inc.php
+++ b/lib/editor.inc.php
@@ -5,7 +5,7 @@
   * All the functions used by the editor.
   */
 
-/** @function fix_gpc_string 
+/** @function fix_gpc_string
   *
   * Take a string (that we got from $_REQUEST) and make it back to how the
   * user TYPED it, regardless of whether magic_quotes_gpc is turned on or off.
@@ -15,7 +15,7 @@
   * @returns string Fixed string
   *
   */
-function fix_gpc_string($input) 
+function fix_gpc_string($input)
 {
     if (true == function_exists('get_magic_quotes_gpc') && 1 == get_magic_quotes_gpc()) {
         $input = stripslashes($input);
@@ -42,7 +42,7 @@ function wm_editor_sanitize_string($str) {
 }
 
 function wm_editor_validate_bandwidth($bw) {
-  
+
     if(preg_match( "/^(\d+\.?\d*[KMGT]?)$/", $bw) ) {
 	return true;
     }
@@ -51,12 +51,12 @@ function wm_editor_validate_bandwidth($bw) {
 
 function wm_editor_validate_one_of($input,$valid=array(),$case_sensitive=false) {
     if(! $case_sensitive ) $input = strtolower($input);
-    
+
     foreach ($valid as $v) {
 	if(! $case_sensitive ) $v = strtolower($v);
 	if($v == $input) return true;
     }
-    
+
     return false;
 }
 
@@ -65,9 +65,9 @@ function wm_editor_sanitize_name($str) {
     return str_replace( array(" "), "", $str);
 }
 
-function wm_editor_sanitize_selected($str) {        
+function wm_editor_sanitize_selected($str) {
 	$res = urldecode($str);
-	
+
 	if( ! preg_match("/^(LINK|NODE):/",$res)) {
 	    return "";
 	}
@@ -75,30 +75,30 @@ function wm_editor_sanitize_selected($str) {
 }
 
 function wm_editor_sanitize_file($filename,$allowed_exts=array()) {
-    
+
     $filename = wm_editor_sanitize_uri($filename);
-    
+
     if ($filename == "") return "";
-        
+
     $ok = false;
     foreach ($allowed_exts as $ext) {
 	$match = ".".$ext;
-	
+
 	if( substr($filename, -strlen($match),strlen($match)) == $match) {
 	    $ok = true;
 	}
-    }    
+    }
     if(! $ok ) return "";
     return $filename;
 }
 
 function wm_editor_sanitize_conffile($filename) {
-    
+
     $filename = wm_editor_sanitize_uri($filename);
-    
+
     # If we've been fed something other than a .conf filename, just pretend it didn't happen
     if ( substr($filename,-5,5) != ".conf" ) {
-	$filename = ""; 
+	$filename = "";
      }
     return $filename;
 }
@@ -163,7 +163,6 @@ function list_weathermaps($mapdir)
         ksort($titles);
 		ksort($pages);
 		ksort($notes);
-		d_echo($titles);
         if ($n == 0) {
             $errorstring = "No files in mapdir";
         }
@@ -178,8 +177,8 @@ function show_editor_startpage()
 	global $mapdir, $WEATHERMAP_VERSION, $config_loaded, $cacti_found, $ignore_cacti,$configerror, $action;
 
 	$fromplug = false;
-	if (isset($_REQUEST['plug']) && (intval($_REQUEST['plug'])==1) ) { 
-	    $fromplug = true; 
+	if (isset($_REQUEST['plug']) && (intval($_REQUEST['plug'])==1) ) {
+	    $fromplug = true;
 	}
 
 	$matches=0;
@@ -191,21 +190,21 @@ function show_editor_startpage()
 	print 'Sorry, it\'s partly laziness on my part, but you really need JavaScript enabled and DOM support in your browser to use this editor. It\'s a visual tool, so accessibility is already an issue, if it is, and from a security viewpoint, you\'re already running my ';
 	print 'code on your <i>server</i> so either you trust it all having read it, or you\'re already screwed.<P>';
 	print 'If it\'s a major issue for you, please feel free to complain. It\'s mainly laziness as I said, and there could be a fallback (not so smooth) mode for non-javascript browsers if it was seen to be worthwhile (I would take a bit of convincing, because I don\'t see a benefit, personally).</div>';
-	
+
 	$errormessage = "";
 
     if ($configerror!='') {
         $errormessage .= $configerror.'<p>';
     }
-		
+
 	if ( !$librenms_found && !$ignore_librenms) {
 		//$errormessage .= '$cacti_base is not set correctly. Cacti integration will be disabled in the editor.';
 		//$errormessage .= "$librenms_found and $ignore_librenms";
-		//if ($config_loaded != 1) { 
-            	//$errormessage .= " You might need to copy editor-config.php-dist to editor-config.php and edit it."; 
+		//if ($config_loaded != 1) {
+            	//$errormessage .= " You might need to copy editor-config.php-dist to editor-config.php and edit it.";
         	//}
 	}
-	
+
 	if ($errormessage != '') {
 		print '<div class="alert" id="nocacti">'.htmlspecialchars($errormessage).'</div>';
 	}
@@ -216,7 +215,7 @@ function show_editor_startpage()
 	print '<div style="border: 3px dashed red; background: #055; padding: 5px; font-size: 90%;"><b>NOTE:</b> This editor is not finished! There are many features of ';
 	print 'Weathermap that you will be missing out on if you choose to use the editor only.';
 	print 'These include: curves, node offsets, font definitions, colour changing, per-node/per-link settings and image uploading. You CAN use the editor without damaging these features if you added them by hand, however.</div><p>';
-	
+
 	print 'Do you want to:<p>';
 	print 'Create A New Map:<br>';
     if($action == 'newmap') {
@@ -243,7 +242,7 @@ function show_editor_startpage()
 		    while (false !== ($file = readdir($dh))) {
 			$realfile=$mapdir . DIRECTORY_SEPARATOR . $file;
 			$note = "";
-	
+
 			// skip directories, unreadable files, .files and anything that doesn't come through the sanitiser unchanged
 			if ( (is_file($realfile)) && (is_readable($realfile)) && (!preg_match("/^\./",$file) )  && ( wm_editor_sanitize_conffile($file) == $file ) ) {
 				if (!is_writable($realfile)) {
@@ -254,12 +253,12 @@ function show_editor_startpage()
 				if ($fd) {
 					while (!feof($fd)) {
 						$buffer=fgets($fd, 4096);
-	
-						if (preg_match("/^\s*TITLE\s+(.*)/i", $buffer, $matches)) { 
-						    $title= wm_editor_sanitize_string($matches[1]); 
+
+						if (preg_match("/^\s*TITLE\s+(.*)/i", $buffer, $matches)) {
+						    $title= wm_editor_sanitize_string($matches[1]);
 						}
 					}
-	
+
 					fclose ($fd);
 					$titles[$file] = $title;
 					$notes[$file] = $note;
@@ -269,17 +268,17 @@ function show_editor_startpage()
 		    }
 
 		    closedir ($dh);
-		} else { 
-            $errorstring = "Can't open mapdir to read."; 
+		} else {
+            $errorstring = "Can't open mapdir to read.";
         }
-		
+
 		ksort($titles);
-		
-		if ($n == 0) { 
-		    $errorstring = "No files in mapdir"; 
+
+		if ($n == 0) {
+		    $errorstring = "No files in mapdir";
 		}
-	} else { 
-	    $errorstring = "NO DIRECTORY named $mapdir"; 
+	} else {
+	    $errorstring = "NO DIRECTORY named $mapdir";
 	}
 
 	print 'OR<br />Create A New Map as a copy of an existing map:<br>';
@@ -289,7 +288,7 @@ function show_editor_startpage()
 	print '<input name="action" type="hidden" value="newmapcopy">';
 	print '<input name="plug" type="hidden" value="'.$fromplug.'">';
 	print '<select name="sourcemap">';
-	
+
 	if ($errorstring == '') {
 		foreach ($titles as $file=>$title) {
 			$nicefile = htmlspecialchars($file);
@@ -298,7 +297,7 @@ function show_editor_startpage()
 	} else {
 		print '<option value="">'.htmlspecialchars($errorstring).'</option>';
 	}
-	
+
 	print '</select>';
 	print '<input type="submit" value="Create Copy">';
 	print '</form>';
@@ -306,7 +305,7 @@ function show_editor_startpage()
 	print 'Open An Existing Map (looking in ' . htmlspecialchars($mapdir) . '):<ul class="filelist">';
 
 	if ($errorstring == '') {
-		foreach ($titles as $file=>$title) {			
+		foreach ($titles as $file=>$title) {
 			# $title = $titles[$file];
 			$note = $notes[$file];
 			$nicefile = htmlspecialchars($file);
@@ -332,7 +331,7 @@ function snap($coord, $gridsnap = 0)
 {
     if ($gridsnap == 0) {
         return ($coord);
-    } else {        
+    } else {
         $rest = $coord % $gridsnap;
         return ($coord - $rest + round($rest/$gridsnap) * $gridsnap );
     }
@@ -349,8 +348,8 @@ function extract_with_validation($array, $paramarray)
 		$vartype=$var[1];
 		$varreqd=$var[2];
 
-		if ($varreqd == 'req' && !array_key_exists($varname, $array)) { 
-	            $all_present=false; 
+		if ($varreqd == 'req' && !array_key_exists($varname, $array)) {
+	            $all_present=false;
 	        }
 
 		if (array_key_exists($varname, $array)) {
@@ -361,29 +360,29 @@ function extract_with_validation($array, $paramarray)
 			switch ($vartype)
 			{
 			case 'int':
-				if (!preg_match('/^\-*\d+$/', $varvalue)) { 
-                    $all_present=false; 
+				if (!preg_match('/^\-*\d+$/', $varvalue)) {
+                    $all_present=false;
                 }
 
 				break;
 
 			case 'float':
-				if (!preg_match('/^\d+\.\d+$/', $varvalue)) { 
-                    $all_present=false; 
+				if (!preg_match('/^\d+\.\d+$/', $varvalue)) {
+                    $all_present=false;
                 }
 
 				break;
 
 			case 'yesno':
-				if (!preg_match('/^(y|n|yes|no)$/i', $varvalue)) { 
-                    $all_present=false; 
+				if (!preg_match('/^(y|n|yes|no)$/i', $varvalue)) {
+                    $all_present=false;
                 }
 
 				break;
 
 			case 'sqldate':
-				if (!preg_match('/^\d\d\d\d\-\d\d\-\d\d$/i', $varvalue)) { 
-                    $all_present=false; 
+				if (!preg_match('/^\d\d\d\d\-\d\d\-\d\d$/i', $varvalue)) {
+                    $all_present=false;
                 }
 
 				break;
@@ -393,29 +392,29 @@ function extract_with_validation($array, $paramarray)
 				break;
 
 			case 'ip':
-				if (!preg_match( '/^((\d|[1-9]\d|2[0-4]\d|25[0-5]|1\d\d)(?:\.(\d|[1-9]\d|2[0-4]\d|25[0-5]|1\d\d)){3})$/', $varvalue)) { 
-                    $all_present=false; 
+				if (!preg_match( '/^((\d|[1-9]\d|2[0-4]\d|25[0-5]|1\d\d)(?:\.(\d|[1-9]\d|2[0-4]\d|25[0-5]|1\d\d)){3})$/', $varvalue)) {
+                    $all_present=false;
                 }
 
 				break;
 
 			case 'alpha':
-				if (!preg_match('/^[A-Za-z]+$/', $varvalue)) { 
-                    $all_present=false; 
+				if (!preg_match('/^[A-Za-z]+$/', $varvalue)) {
+                    $all_present=false;
                 }
 
 				break;
 
 			case 'alphanum':
-				if (!preg_match('/^[A-Za-z0-9]+$/', $varvalue)) { 
-                    $all_present=false; 
+				if (!preg_match('/^[A-Za-z0-9]+$/', $varvalue)) {
+                    $all_present=false;
                 }
 
 				break;
 
 			case 'bandwidth':
-				if (!preg_match('/^\d+\.?\d*[KMGT]*$/i', $varvalue)) { 
-                    $all_present=false; 
+				if (!preg_match('/^\d+\.?\d*[KMGT]*$/i', $varvalue)) {
+                    $all_present=false;
                 }
 				break;
 
@@ -425,7 +424,7 @@ function extract_with_validation($array, $paramarray)
 
 				break;
 			}
-			
+
 			if ($all_present) {
 				$candidates["{$prefix}{$varname}"]=$varvalue;
 			}
@@ -433,8 +432,8 @@ function extract_with_validation($array, $paramarray)
 	}
 
 	if ($all_present) {
-	    foreach ($candidates as $key => $value) { 
-		$GLOBALS[$key]=$value; 
+	    foreach ($candidates as $key => $value) {
+		$GLOBALS[$key]=$value;
 	    }
 	}
 
@@ -468,11 +467,11 @@ function get_imagelist($imagedir)
 
 function handle_inheritance(&$map, &$inheritables)
 {
-	foreach ($inheritables as $inheritable) {		
+	foreach ($inheritables as $inheritable) {
 		$fieldname = $inheritable[1];
 		$formname = $inheritable[2];
 		$validation = $inheritable[3];
-		
+
 		$new = $_REQUEST[$formname];
 		if($validation != "") {
 		    switch($validation) {
@@ -484,9 +483,9 @@ function handle_inheritance(&$map, &$inheritables)
 			    break;
 		    }
 		}
-		
-		$old = ($inheritable[0]=='node' ? $map->nodes['DEFAULT']->$fieldname : $map->links['DEFAULT']->$fieldname);	
-		
+
+		$old = ($inheritable[0]=='node' ? $map->nodes['DEFAULT']->$fieldname : $map->links['DEFAULT']->$fieldname);
+
 		if ($old != $new) {
 			if ($inheritable[0]=='node') {
 				$map->nodes['DEFAULT']->$fieldname = $new;
@@ -496,11 +495,11 @@ function handle_inheritance(&$map, &$inheritables)
 					}
 				}
 			}
-			
+
 			if ($inheritable[0]=='link') {
 				$map->links['DEFAULT']->$fieldname = $new;
 				foreach ($map->links as $link) {
-					
+
 					if ($link->name != ":: DEFAULT ::" && $link->$fieldname == $old) {
 						$map->links[$link->name]->$fieldname = $new;
 					}
@@ -513,17 +512,17 @@ function handle_inheritance(&$map, &$inheritables)
 function get_fontlist(&$map,$name,$current)
 {
     $output = '<select class="fontcombo" name="'.$name.'">';
-        
+
     ksort($map->fonts);
 
-    foreach ($map->fonts as $fontnumber => $font) {		
+    foreach ($map->fonts as $fontnumber => $font) {
         $output .= '<option ';
         if ($current == $fontnumber) {
             $output .= 'SELECTED';
         }
         $output .= ' value="'.$fontnumber.'">'.$fontnumber.' ('.$font->type.')</option>';
     }
-        
+
     $output .= "</select>";
 
     return($output);
diff --git a/map-poller.php b/map-poller.php
index 839bfd7d..56e3782f 100755
--- a/map-poller.php
+++ b/map-poller.php
@@ -22,7 +22,7 @@
 
 
 // Import the config.inc.php file for variables
-include_once 'config.inc.php';
+include 'config.inc.php';
 
 if (php_sapi_name() != 'cli') {
 	echo "ERROR: map-poller.php should ONLY be run as a CGI script!\n";
@@ -46,26 +46,22 @@
 	ini_set('error_reporting', 0);
 }
 
-// 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';
+// Load the librenms config
+chdir($librenms_base);
+$config = json_decode(`./config_to_json.php`, true);
 
-// Change to directory that map-poller was run from.
-// Thank you to Supun Rathnayake (https://twitter.com/supunr) for the bug report
-// and fix for includes being set incorrectly and changing map-poller to chdir from
-// where it's run.
-chdir(dirname($argv[0]));
+// Change to directory that map-poller is in.
+chdir(__DIR__);
 
 if (is_dir($conf_dir)) {
-	if ($dh = opendir($conf_dir)) {
+    if ($dh = opendir($conf_dir)) {
 		while (($file = readdir($dh)) !== false) {
 			if ("." != $file && ".." != $file && ".htaccess" != $file && "index.php" != $file) {
 			    	$cmd = "php ./weathermap.php --config $conf_dir/$file --base-href $basehref --chdir ".$config['rrd_dir'];
-                                if ($config['rrdcached']) {
+                                if (!empty($config['rrdcached'])) {
                                     $cmd = $cmd." --daemon ".$config['rrdcached'];
-                                } 
-				$fp = popen($cmd, 'r'); 
+                                }
+				$fp = popen($cmd, 'r');
 				while (!feof($fp)) {
 					$read = fgets($fp);
 					echo $read;