SQL Statements simplified and some bugfixing

natadd.php

@@ -36,11 +36,11 @@
 	// setup node_ext
 		// build query
 		$query = "SELECT
-				node.node_ip AS node_ip_ext
+				node_ip AS node_ip_ext
 			FROM
 				node
 			WHERE
-				node.node_id=" . $node_id;
+				node_id=" . $node_id;
 
 		// run query
 		$node = $db->db_select($query);
@@ -51,14 +51,13 @@
 	// setup node_int
 		// build query
 		$query = "SELECT
-				asset.asset_name AS asset_name,
-				node.node_id AS node_id_int,
-				node.node_ip AS node_ip_int
+				a.asset_name,
+				n.node_id AS node_id_int,
+				n.node_ip AS node_ip_int
 			FROM
-				asset,
-				node
+				asset AS a LEFT JOIN node AS n USING (asset_id)
 			WHERE
-				node.node_id NOT IN (
+				n.node_id NOT IN (
 					SELECT
 						nat_int
 					FROM
@@ -66,10 +65,9 @@
 					WHERE
 						nat_ext=" . $node_id . "
 				)
-				AND node.node_id!=" . $node_id . "
-				AND asset.asset_id=node.asset_id
+				AND n.node_id!=" . $node_id . "
 			ORDER BY
-				INET_ATON(node.node_ip)";
+				INET_ATON(n.node_ip)";
 		
 		// run query
 		$nodes = $db->db_select($query);