SQL Statements simplified and some bugfixing

nodeedit.php

@@ -36,24 +36,24 @@
 	// setup node
 		// build query
 		$query = "SELECT
-				asset.asset_id AS asset_id,
-				node.node_id AS node_id,
-				node.node_ip AS node_ip,
-				node.node_mac AS node_mac,
-				node.node_dns1 AS node_dns1,
-				node.node_dns2 AS node_dns2,
-				node.node_info AS node_info,
-				subnet.subnet_id AS subnet_id,
-                node.zone_id AS zone_id
+				a.asset_id,
+				n.node_id,
+				n.node_ip,
+				n.node_mac,
+				n.node_dns1,
+				n.node_dns2,
+				n.node_info,
+				s.subnet_id,
+				n.zone_id
 			FROM
-				asset,
-				node,
-				subnet
+				asset AS a,
+				node AS n,
+				subnet AS s
 			WHERE
-				asset.asset_id=node.asset_id
-				AND node.node_id=" . $node_id . "
-				AND subnet.subnet_id=node.subnet_id";
-		
+				a.asset_id=n.asset_id
+				AND n.node_id=" . $node_id . "
+				AND s.subnet_id=n.subnet_id";
+
 		// run query
 		$node = $db->db_select($query);