SQL Statements simplified and some bugfixing

natdel.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);
@@ -48,28 +48,31 @@
 		$smarty->assign("node_id_ext", $node_id);
 		$smarty->assign("node_ip_ext", $node[0]['node_ip_ext']);
 	
-	// setup node
+	// setup options
 		// 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_ip,
+				x.nat_ext
 			FROM
-				asset,
-				nat,
-				node
+				asset AS a,
+				nat AS x,
+				node AS n
 			WHERE
-				nat.nat_ext="  . $node_id . "
-				AND node.node_id=nat.nat_int
-				AND asset.asset_id=node.asset_id
+				x.nat_ext="  . $node_id . "
+				AND n.node_id=x.nat_int
+				AND a.asset_id=n.asset_id
 			ORDER BY
-				INET_ATON(node.node_ip)";
-		
+				INET_ATON(n.node_ip)";
+
 		// run query
 		$nodes = $db->db_select($query);
-        $smarty->assign("nodes", $nodes);
 
-// *** <option value="{node_id_int}">{node_ip_int}/{asset_name}</option>
+        $options = array();
+        foreach ($nodes as $rec) {
+            $options[$rec['nat_ext']] = $rec['node_ip'] . '/' . $rec['asset_name'];
+        }
+        $smarty->assign("nat_options", $options);
 
 	// end page
 		// output