Code formatting improved and some bugfixng

locationsubnetdel.php

@@ -1,76 +1,47 @@
 <?php
-	/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
-	
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
-	
-	// start page
-		// includes
-		include("includes.php");
-		
-		// get ip and id
-		$location_id = sanitize($_GET['location_id']);
-		
-		// start output
-		include("header.php");
-		
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup location
-		// build query
-		$query = "SELECT
-				location.location_name AS location_name
-			FROM
-				location
-			WHERE
-				location.location_id=" . $location_id;
-		
-		// run query
-		$location = $db->db_select($query);
-		
-		$smarty->assign("location_id", $location_id);
-		$smarty->assign("location_name", $location[0]['location_name']);
-	
-	// setup subnet
-		// build query
-		$query = "SELECT
-				subnet.subnet_id AS subnet_id,
-				subnet.subnet_address AS subnet_address,
-				subnet.subnet_mask AS subnet_mask
-			FROM
-				subnetlocation,
-				subnet
-			WHERE
-				subnetlocation.location_id="  . $location_id . "
-				AND subnet.subnet_id=subnetlocation.subnet_id
-			ORDER BY
-				INET_ATON(subnet.subnet_address)";
-		
-		// run query
-		$subnets = $db->db_select($query);
-        $smarty->assign($subnets);
+/*****************************************************************************
+IP Reg, a PHP/MySQL IPAM tool
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	// end page
-		// output
-		$smarty->display("locationsubnetdel.tpl");
+SPDX-License-Identifier: GPL-3.0-or-later
+*****************************************************************************/
+	
+include("includes.php");
+		
+$location_id = sanitize($_GET['location_id']);
+		
+include("header.php");
 
-		// end output
-		include("footer.php");
-?>
+// location		
+$query = "SELECT
+	location_name
+FROM
+	location
+WHERE
+	location_id=" . $location_id;
+		
+$location = $db->db_select($query);
+		
+$smarty->assign("location_id", $location_id);
+$smarty->assign("location_name", $location[0]['location_name']);
+	
+// subnet
+$query = "SELECT
+		s.subnet_id,
+		s.subnet_address,
+		s.subnet_mask
+	FROM
+		subnetlocation AS l LEFT JOIN subnet AS s USING (subnet_id)
+	WHERE
+		l.location_id="  . $location_id . "
+	ORDER BY
+		INET_ATON(s.subnet_address)";
+
+$subnets = $db->db_select($query);
+$smarty->assign($subnets);
+
+$smarty->display("locationsubnetdel.tpl");
+
+include("footer.php");
+?>