Bumped version to 0.8

.gitignore

@@ -0,0 +1,3 @@
+*~
+tpl_c/*.php
+config.php

about.php

@@ -1,43 +1,16 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
+include("header.php");
-	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
+$smarty->display("about.tpl");
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("footer.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
-	
-	// start page
-		// includes
-		include("includes.php");
-		
-		// start output
-		include("header.php");
-		
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup page
-		// set vars
-		$smarty->assign("config_version", $config_version);
-
-	// end page
-		// output
-		$smarty->display("about.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

asset.php

@@ -1,84 +1,55 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+include("header.php");
-	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
+// create letter links
-		// includes
+$query = "SELECT
-		include("includes.php");
+		SUBSTRING(UPPER(asset.asset_name),1,1) AS asset_letter
+	FROM
+		asset
+	GROUP BY
+		asset_letter
+	ORDER BY
+		asset_letter";
 
-		// start output
+$alphabet = $db->db_select($query);
-		include("header.php");
+$smarty->assign("alphabet", $alphabet);
 
-		// set language variables
+// setup current letter
-		$smarty->assign($lang);
+if(isset($_GET['asset_letter'])) {
+	$asset_letter = sanitize($_GET['asset_letter']);
+} else {
+	$asset_letter = $alphabet[0]['asset_letter'];
+}
 		
-	// create letter links
+$query = "SELECT
-		// build query
+		a.asset_id,
-		$query = "SELECT
+		IF(LENGTH(a.asset_name)>0, a.asset_name, '...') AS asset_name,
-				SUBSTRING(UPPER(asset.asset_name),1,1) AS asset_letter
+		a.asset_info,
-			FROM
+		c.assetclass_id,
-				asset
+		c.assetclass_name
-			GROUP BY
+	FROM
-				asset_letter
+		asset AS a LEFT OUTER JOIN assetclass AS c USING (assetclass_id)
-			ORDER BY
+	WHERE
-				asset_letter";
+		SUBSTRING(a.asset_name,1,1) = '" . $asset_letter . "'
+	ORDER BY
+		a.asset_name";
 
-		// run query
+$assets = $db->db_select($query);
-		$alphabet = $db->db_select($query);
-		$smarty->assign("alphabet", $alphabet);
 
-	// setup asset
+$smarty->assign("assets", $assets);
-		// setup current letter
-		if(isset($_GET['asset_letter'])) {
-			$asset_letter = sanitize($_GET['asset_letter']);
-		} else {
-			$asset_letter = $alphabet[0]['asset_letter'];
-		}
 
-		// build query
+$smarty->display("asset.tpl");
-		$query = "SELECT
-				asset.asset_id AS asset_id,
-				IF(LENGTH(asset.asset_name)>0, asset.asset_name, '...') AS asset_name,
-				asset.asset_info AS asset_info,
-				assetclass.assetclass_id AS assetclass_id,
-				assetclass.assetclass_name AS assetclass_name
-			FROM
-				asset,
-				assetclass
-			WHERE
-				SUBSTRING(asset.asset_name,1,1) = '" . $asset_letter . "'
-				AND assetclass.assetclass_id=asset.assetclass_id
-			ORDER BY
-				asset.asset_name";
 		
-		// run query
+include("footer.php");
-		$assets = $db->db_select($query);
-		
-		// counter to tpl
-		$smarty->assign("assets", $assets);
-
-	// end page
-		// output
-		$smarty->display("asset.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

assetadd.php

@@ -1,59 +1,33 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+if((isset($_GET['assetclass_id'])) ? $assetclass_id = sanitize($_GET['assetclass_id']) : $assetclass_id = "");
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 		
-	// start page
+$query = "SELECT
-		// includes
+	assetclass_id,
-		include("includes.php");
+	assetclass_name
+FROM
+	assetclass
+ORDER BY
+	assetclass_name";
 		
-		// get id
+$assetclasses = $db->db_select($query);
-		if((isset($_GET['assetclass_id'])) ? $assetclass_id = sanitize($_GET['assetclass_id']) : $assetclass_id = "");
+foreach ($assetclasses as $assetclass) {
+	$assetclass_options[$assetclass['assetclass_id']] =  $assetclass['assetclass_name'];
+}
 
-		// start output
+$smarty->assign("assetclass_options", $assetclass_options);
-		include("header.php");
+$smarty->display("assetadd.tpl");
 
-		// set language variables
+include("footer.php");
-		$smarty->assign($lang);
-	
-	// setup assetclass
-		// build query
-		$query = "SELECT
-				assetclass.assetclass_id AS assetclass_id,
-				assetclass.assetclass_name AS assetclass_name
-			FROM
-				assetclass
-			ORDER BY
-				assetclass.assetclass_name";
-		
-		// run query
-		$assetclasses = $db->db_select($query);
-        foreach ($assetclasses as $assetclass) {
-            $assetclass_options[$assetclass['assetclass_id']] =  $assetclass['assetclass_name'];
-        }
-        $smarty->assign("assetclass_options", $assetclass_options);
-
-	// end page
-		// output
-		$smarty->display("assetadd.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

assetclass.php

@@ -1,61 +1,30 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
+include("header.php");
-	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
+$query = "SELECT
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+		a.assetclass_id,
+		a.assetclass_name,
+		g.assetclassgroup_id,
+		g.assetclassgroup_name,
+		g.assetclassgroup_color
+	FROM
+		assetclass AS a LEFT OUTER JOIN assetclassgroup AS g USING (assetclassgroup_id)
+	ORDER BY
+		a.assetclass_name";
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+$assetclasses = $db->db_select($query);
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 	
-	// start page
+$smarty->assign("assetclasses", $assetclasses);
-		// includes
+$smarty->display("assetclass.tpl");
-		include("includes.php");
 
-		// start output
+include("footer.php");
-		include("header.php");
-			
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup assetclass
-		// build query
-		$query = "SELECT
-				assetclass.assetclass_id AS assetclass_id,
-				assetclass.assetclass_name AS assetclass_name,
-				assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
-				assetclassgroup.assetclassgroup_name AS assetclassgroup_name
-			FROM
-				assetclass,
-				assetclassgroup
-			WHERE
-				assetclassgroup.assetclassgroup_id=assetclass.assetclassgroup_id
-			ORDER BY
-				assetclass.assetclass_name";
-		
-		// run query
-		$assetclasses = $db->db_select($query);
-            
-		// counter to tpl
-		$smarty->assign("assetclasses", $assetclasses);
-		
-	
-	// end page
-		// output
-		$smarty->display("assetclass.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

assetclassadd.php

@@ -1,45 +1,20 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+if((isset($_GET['assetclassgroup_id'])) ? $assetclassgroup_id = sanitize($_GET['assetclassgroup_id']) : $assetclassgroup_id = "");
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
+$smarty->assign("assetclassgroup_options", $db->options_assetclassgroup());
-		// includes
+$smarty->display("assetclassadd.tpl");
-		include("includes.php");
 		
-		// get id
+include("footer.php");
-		if((isset($_GET['assetclassgroup_id'])) ? $assetclassgroup_id = sanitize($_GET['assetclassgroup_id']) : $assetclassgroup_id = "");
-		
-		// start output
-		include("header.php");
-		
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup assetclassgroup
-		$smarty->assign("assetclassgroup_options", $db->options_assetclassgroup());
-	
-	// end page
-		// output
-		$smarty->display("assetclassadd.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

assetclassdel.php

@@ -1,59 +1,32 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$assetclass_id = sanitize($_GET['assetclass_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
+$query = "SELECT
-		// includes
+		assetclass_id,
-		include("includes.php");
+		assetclass_name
+	FROM
+		assetclass
+	WHERE
+		assetclass_id=" . $assetclass_id;
 
-		// get id
+$assetclass = $db->db_select($query);
-		$assetclass_id = sanitize($_GET['assetclass_id']);
 
-		// start output
+$smarty->assign("assetclass_id", $assetclass[0]['assetclass_id']);
-		include("header.php");
+$smarty->assign("assetclass_name", $assetclass[0]['assetclass_name']);
 
-		// set language variables
+$smarty->display("assetclassdel.tpl");
-		$smarty->assign($lang);
 
-	// setup assetclass
+include("footer.php");
-		// build query
-		$query = "SELECT
-				assetclass.assetclass_id AS assetclass_id,
-				assetclass.assetclass_name AS assetclass_name
-			FROM
-				assetclass
-			WHERE
-				assetclass.assetclass_id=" . $assetclass_id;
-		
-		// run query
-		$assetclass = $db->db_select($query);
-		
-		// send to tpl
-		$smarty->assign("assetclass_id", $assetclass[0]['assetclass_id']);
-		$smarty->assign("assetclass_name", $assetclass[0]['assetclass_name']);
-	
-	// end page
-		// output
-		$smarty->display("assetclassdel.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

assetclassedit.php

@@ -1,65 +1,35 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$assetclass_id = sanitize($_GET['assetclass_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+include("header.php");
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+$query = "SELECT
-	or contact me at wietsew@users.sourceforge.net
+		assetclass_id,
-	*****************************************************************************/
+		assetclass_name,
+		assetclassgroup_id
+	FROM
+		assetclass
+	WHERE
+		assetclass_id=" . $assetclass_id;
 
-	// start page
+$assetclass = $db->db_select($query);
-		// includes
-		include("includes.php");
 
-		// get id
+$smarty->assign("assetclass_id", $assetclass[0]['assetclass_id']);
-		$assetclass_id = sanitize($_GET['assetclass_id']);
+$smarty->assign("assetclass_name", $assetclass[0]['assetclass_name']);
+$smarty->assign("assetclassgroup_id", $assetclass[0]['assetclassgroup_id']);
 
-		// start output
+$smarty->assign("assetclassgroup_options", $db->options_assetclassgroup());
-		include("header.php");
 
-		// set language variables
+$smarty->display("assetclassedit.tpl");
-		$smarty->assign($lang);
 
-	// setup assetclass
+include("footer.php");
-		// build query
-		$query = "SELECT
-				assetclass.assetclass_id AS assetclass_id,
-				assetclass.assetclass_name AS assetclass_name,
-				assetclass.assetclassgroup_id AS assetclassgroup_id
-			FROM
-				assetclass
-			WHERE
-				assetclass.assetclass_id=" . $assetclass_id;
-		
-		// run query
-		$assetclass = $db->db_select($query);
-
-		// send to tpl
-		$smarty->assign("assetclass_id", $assetclass[0]['assetclass_id']);
-		$smarty->assign("assetclass_name", $assetclass[0]['assetclass_name']);
-		$smarty->assign("assetclassgroup_id", $assetclass[0]['assetclassgroup_id']);
-
-	// setup assetclassgroup
-		// build query
-		$smarty->assign("assetclassgroup_options", $db->options_assetclassgroup());
-
-    // end page
-		// output
-		$smarty->display("assetclassedit.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

assetclassgroup.php

@@ -1,54 +1,29 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+include("header.php");
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	
-	For more information, visit http://sourceforge.net/projects/ipreg,
+$query = "SELECT
-	or contact me at wietsew@users.sourceforge.net
+	assetclassgroup_id,
-	*****************************************************************************/
+	assetclassgroup_name,
+	assetclassgroup_color
+FROM
+	assetclassgroup
+ORDER BY
+	assetclassgroup_name";
 		
-	// start page
+$assetclassgroups = $db->db_select($query);
-		// includes
-		include("includes.php");
 
-		// start output
+$smarty->assign("assetclassgroups", $assetclassgroups);
-		include("header.php");
+$smarty->display("assetclassgroup.tpl");
 		
-		// set language variables
+include("footer.php");
-		$smarty->assign($lang);
-	
-	// setup assetclassgroup
-		// build query
-		$query = "SELECT
-				assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
-				assetclassgroup.assetclassgroup_name AS assetclassgroup_name,
-				assetclassgroup.assetclassgroup_color AS assetclassgroup_color
-			FROM
-				assetclassgroup
-			ORDER BY
-				assetclassgroup.assetclassgroup_name";
-		
-		// run query
-		$assetclassgroups = $db->db_select($query);
-        $smarty->assign("assetclassgroups", $assetclassgroups);
-
-	// end page
-		// output
-		$smarty->display("assetclassgroup.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

assetclassgroupadd.php

@@ -1,39 +1,16 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
+include("header.php");
-	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
+$smarty->display("assetclassgroupadd.tpl");
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("footer.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
-	
-	// start page
-		// includes
-		include("includes.php");
-		
-		// start output
-		include("header.php");
-		
-		// set language variables
-		$smarty->assign($lang);
-	
-	// end page
-		// output
-		$smarty->display("assetclassgroupadd.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

assetclassgroupdel.php

@@ -1,59 +1,34 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$assetclassgroup_id = sanitize($_GET['assetclassgroup_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
+$smarty->assign($lang);
-		// includes
-		include("includes.php");
 
-		// get id
+$query = "SELECT
-		$assetclassgroup_id = sanitize($_GET['assetclassgroup_id']);
+		assetclassgroup_id,
+		assetclassgroup_name
+	FROM
+		assetclassgroup
+	WHERE
+		assetclassgroup_id=" . $assetclassgroup_id;
 
-		// start output
+$assetclassgroup = $db->db_select($query);
-		include("header.php");
 
-		// set language variables
+$smarty->assign("assetclassgroup_id", $assetclassgroup[0]['assetclassgroup_id']);
-		$smarty->assign($lang);
+$smarty->assign("assetclassgroup_name", $assetclassgroup[0]['assetclassgroup_name']);
 
-	// setup assetclassgroup
+$smarty->display("assetclassgroupdel.tpl");
-		// build query
-		$query = "SELECT
-				assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
-				assetclassgroup.assetclassgroup_name AS assetclassgroup_name
-			FROM
-				assetclassgroup
-			WHERE
-				assetclassgroup.assetclassgroup_id=" . $assetclassgroup_id;
 
-		// run query
+include("footer.php");
-		$assetclassgroup = $db->db_select($query);
-		
-		// send to tpl
-		$smarty->assign("assetclassgroup_id", $assetclassgroup[0]['assetclassgroup_id']);
-		$smarty->assign("assetclassgroup_name", $assetclassgroup[0]['assetclassgroup_name']);
-	
-	// end page
-		// output
-		$smarty->display("assetclassgroupdel.tpl");
-
-		// end output
-		include("footer.php");
 ?>

assetclassgroupedit.php

@@ -1,62 +1,37 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$assetclassgroup_id = sanitize($_GET['assetclassgroup_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+$smarty->assign("scripts", 'jscolor.js');
-	or contact me at wietsew@users.sourceforge.net
+include("header.php");
-	*****************************************************************************/
 
-	// start page
+$smarty->assign($lang);
-		// includes
-		include("includes.php");
 
-		// get id
+$query = "SELECT
-		$assetclassgroup_id = sanitize($_GET['assetclassgroup_id']);
+		assetclassgroup_id,
+		assetclassgroup_name,
+		assetclassgroup_color
+	FROM
+		assetclassgroup
+	WHERE
+		assetclassgroup_id=" . $assetclassgroup_id;
 
-		// start output
+$assetclassgroup = $db->db_select($query);
-        $smarty->assign("scripts", 'jscolor.js');
-		include("header.php");
 
-		// set language variables
+$smarty->assign("assetclassgroup_id", $assetclassgroup[0]['assetclassgroup_id']);
-		$smarty->assign($lang);
+$smarty->assign("assetclassgroup_name", $assetclassgroup[0]['assetclassgroup_name']);
+$smarty->assign("assetclassgroup_color", $assetclassgroup[0]['assetclassgroup_color']);
 
-	// setup assetclassgroup
+$smarty->display("assetclassgroupedit.tpl");
-		// build query
-		$query = "SELECT
-				assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
-				assetclassgroup.assetclassgroup_name AS assetclassgroup_name,
-				assetclassgroup.assetclassgroup_color AS assetclassgroup_color
-			FROM
-				assetclassgroup
-			WHERE
-				assetclassgroup.assetclassgroup_id=" . $assetclassgroup_id;
 
-		// run query
+include("footer.php");
-		$assetclassgroup = $db->db_select($query);
-		
-		// send to tpl
-		$smarty->assign("assetclassgroup_id", $assetclassgroup[0]['assetclassgroup_id']);
-		$smarty->assign("assetclassgroup_name", $assetclassgroup[0]['assetclassgroup_name']);
-		$smarty->assign("assetclassgroup_color", $assetclassgroup[0]['assetclassgroup_color']);
-	
-	// end page
-		// output
-		$smarty->display("assetclassgroupedit.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

assetclassgroupview.php

@@ -1,77 +1,47 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$assetclassgroup_id = sanitize($_GET['assetclassgroup_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
+$query = "SELECT
-		// includes
+		assetclassgroup_id,
-		include("includes.php");
+		assetclassgroup_name,
+		assetclassgroup_color
+	FROM
+		assetclassgroup
+	WHERE
+		assetclassgroup_id=" . $assetclassgroup_id;
 
-		// get id
+$assetclassgroup = $db->db_select($query);
-		$assetclassgroup_id = sanitize($_GET['assetclassgroup_id']);
 
-		// start output
+$smarty->assign("assetclassgroup_id", $assetclassgroup[0]['assetclassgroup_id']);
-		include("header.php");
+$smarty->assign("assetclassgroup_name", $assetclassgroup[0]['assetclassgroup_name']);
+$smarty->assign("assetclassgroup_color", $assetclassgroup[0]['assetclassgroup_color']);
 
-		// set language variables
+$query = "SELECT
-		$smarty->assign($lang);
+		assetclass_id,
+		assetclass_name
+	FROM
+		assetclass
+	WHERE
+		assetclassgroup_id=" . $assetclassgroup_id . "
+	ORDER BY
+		assetclass_name";
 
-	// setup assetclassgroup
+$assetclasses = $db->db_select($query);
-		// build query
+$smarty->assign("assetclasses", $assetclasses);
-		$query = "SELECT
-				assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
-				assetclassgroup.assetclassgroup_name AS assetclassgroup_name,
-				assetclassgroup.assetclassgroup_color AS assetclassgroup_color
-			FROM
-				assetclassgroup
-			WHERE
-				assetclassgroup.assetclassgroup_id=" . $assetclassgroup_id;
 
-		// run query
+$smarty->display("assetclassgroupview.tpl");
-		$assetclassgroup = $db->db_select($query);
 
-		// send to tpl
+include("footer.php");
-		$smarty->assign("assetclassgroup_id", $assetclassgroup[0]['assetclassgroup_id']);
-		$smarty->assign("assetclassgroup_name", $assetclassgroup[0]['assetclassgroup_name']);
-		$smarty->assign("assetclassgroup_color", $assetclassgroup[0]['assetclassgroup_color']);
-		
-	// setup assetclass
-		// build query
-		$query = "SELECT
-				assetclass.assetclass_id AS assetclass_id,
-				assetclass.assetclass_name AS assetclass_name
-			FROM
-				assetclass
-			WHERE
-				assetclass.assetclassgroup_id=" . $assetclassgroup_id . "
-			ORDER BY
-				assetclass.assetclass_name";
-		
-		// run query
-		$assetclasses = $db->db_select($query);
-		$smarty->assign("assetclasses", $assetclasses);
-		
-	// end page
-		// output
-        $smarty->display("assetclassgroupview.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

assetclassview.php

@@ -1,85 +1,51 @@
 <?php
-    /*****************************************************************************
+/*****************************************************************************
-    IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-    Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-    This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-    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,
+include("includes.php");
-    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
+$assetclass_id = sanitize($_GET['assetclass_id']);
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-    For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-    or contact me at wietsew@users.sourceforge.net
-    *****************************************************************************/
 
-    // start page
+  $query = "SELECT
-        // includes
+		a.assetclass_id, a.assetclass_name,
-        include("includes.php");
+		g.assetclassgroup_id, g.assetclassgroup_name, g.assetclassgroup_color
+	FROM
+		assetclass AS a LEFT OUTER JOIN assetclassgroup AS g USING (assetclassgroup_id)
+	WHERE
+		a.assetclass_id=" . $assetclass_id;
 
-        // get id
+$assetclass = $db->db_select($query);
-        $assetclass_id = sanitize($_GET['assetclass_id']);
 
-        // start output
+$smarty->assign("assetclass_id", $assetclass[0]['assetclass_id']);
-        include("header.php");
+$smarty->assign("assetclass_name", $assetclass[0]['assetclass_name']);
+$smarty->assign("assetclass_selected", "");
 
-        // set language variables
+$smarty->assign("assetclassgroup_id", $assetclass[0]['assetclassgroup_id']);
-        $smarty->assign($lang);
+$smarty->assign("assetclassgroup_name", $assetclass[0]['assetclassgroup_name']);
+$smarty->assign("assetclassgroup_color", $assetclass[0]['assetclassgroup_color']);
 
-    // setup assetclass
+$query = "SELECT
-        // build query
+		asset_id,
-        $query = "SELECT
+		asset_name,
-                assetclass.assetclass_id,
+		CONCAT(LEFT(asset_info, 80), IF(CHAR_LENGTH(asset_info)>80,'...','')) AS asset_info
-                assetclass.assetclass_name,
+	FROM
-                assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
+		asset
-                assetclassgroup.assetclassgroup_name AS assetclassgroup_name
+	WHERE
-            FROM
+		assetclass_id='" . $assetclass_id . "'
-                assetclass,
+	ORDER BY
-                assetclassgroup
+		asset_name";
-            WHERE
-                assetclass.assetclass_id=" . $assetclass_id . "
-                AND assetclassgroup.assetclassgroup_id=assetclass.assetclassgroup_id";
 
-        // run query
+$assets = $db->db_select($query);
-        $assetclass = $db->db_select($query);
+$smarty->assign("assets", $assets);
 
-        // send to tpl
+$smarty->display("assetclassview.tpl");
-        $smarty->assign("assetclass_id", $assetclass[0]['assetclass_id']);
-        $smarty->assign("assetclass_name", $assetclass[0]['assetclass_name']);
-        $smarty->assign("assetclass_selected", "");
 
-        $smarty->assign("assetclassgroup_id", $assetclass[0]['assetclassgroup_id']);
+include("footer.php");
-        $smarty->assign("assetclassgroup_name", $assetclass[0]['assetclassgroup_name']);
-
-        // send to tpl
-    // setup asset
-        // build query
-        $query = "SELECT
-                asset_id,
-                asset_name,
-                CONCAT(LEFT(asset_info, 80), IF(CHAR_LENGTH(asset_info)>80,'...','')) AS asset_info
-            FROM
-                asset
-            WHERE
-                assetclass_id='" . $assetclass_id . "'
-            ORDER BY
-                asset_name";
-
-        // run query
-        $assets = $db->db_select($query);
-        $smarty->assign("assets", $assets);
-
-    // end page
-        // output
-        $smarty->display("assetclassview.tpl");
-
-        // footer
-        include("footer.php");
 ?>

assetdel.php

@@ -1,74 +1,44 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$asset_id = sanitize($_GET['asset_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 	
-	// start page
+$query = "SELECT
-		// includes
+		asset_name
-		include("includes.php");
+	FROM
+		asset
+	WHERE
+		asset_id=" . $asset_id;
 
-		// get id	
+$asset = $db->db_select($query);
-		$asset_id = sanitize($_GET['asset_id']);
 
-		// start output
+$smarty->assign("asset_id", $asset_id);
-		include("header.php");
+$smarty->assign("asset_name", $asset[0]['asset_name']);
 
-		// set language variables
+$query = "SELECT
-		$smarty->assign($lang);
+		node_id,
+		node_ip
+	FROM
+		node
+	WHERE
+		asset_id=" . $asset_id . "
+	ORDER BY
+		INET_ATON(node_ip)";
 
-	// setup asset
+$nodes = $db->db_select($query);
-		// build query
+$smarty->assign("nodes", $nodes);
-		$query = "SELECT
-				asset.asset_name AS asset_name
-			FROM
-				asset
-			WHERE
-				asset.asset_id=" . $asset_id;
 
-		// run query
+$smarty->display("assetdel.tpl");
-		$asset = $db->db_select($query);
 
-		// send to tpl
+include("footer.php");
-		$smarty->assign("asset_id", $asset_id);
-		$smarty->assign("asset_name", $asset[0]['asset_name']);
-	
-	// setup node		
-		// build query
-		$query = "SELECT
-				node.node_id AS node_id,
-				node.node_ip AS node_ip
-			FROM
-				node
-			WHERE
-				node.asset_id=" . $asset_id . "
-			ORDER BY
-				INET_ATON(node.node_ip)";
-		
-		// run query
-		$nodes = $db->db_select($query);
-		$smarty->assign("nodes", $nodes);
-	
-	// end page
-		// output
-		$smarty->display("assetdel.tpl");
-
-		// footer
-		include("footer.php");
 ?>

assetedit.php

@@ -1,62 +1,35 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$asset_id = sanitize($_GET['asset_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 	
-	// start page
+$query = "SELECT
-		// includes
+		asset_id,
-		include("includes.php");
+		asset_name,
+		asset_hostname,
+		asset_info,
+		assetclass_id
+	FROM
+		asset
+	WHERE
+		asset_id=" . $asset_id;
 
-		// get id	
+$asset = $db->db_select($query);
-		$asset_id = sanitize($_GET['asset_id']);
+$smarty->assign("asset", $asset[0]);
 
-		// start output
+$smarty->assign("assetclass_options", $db->options_assetclass());
-		include("header.php");
 
-		// set language variables
+$smarty->display("assetedit.tpl");
-		$smarty->assign($lang);
 
-	// setup asset
+include("footer.php");
-		// build query
-		$query = "SELECT
-                asset_id,
-				asset.asset_name AS asset_name,
-				asset.asset_hostname AS asset_hostname,
-				asset.asset_info AS asset_info,
-				asset.assetclass_id AS assetclass_id
-			FROM
-				asset
-			WHERE
-				asset.asset_id=" . $asset_id;
-		
-		// run query
-		$asset = $db->db_select($query);
-        $smarty->assign("asset", $asset[0]);
-
-	// setup assetclass
-        $smarty->assign("assetclass_options", $db->options_assetclass());
-
-	// end page
-		// output
-		$smarty->display("assetedit.tpl");
-		
-		// footer
-		include("footer.php");
 ?>

assetview.php

@@ -1,86 +1,54 @@
 <?php
-    /*****************************************************************************
+/*****************************************************************************
-    IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-    Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-    This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-    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,
+include("includes.php");
-    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
+$asset_id = sanitize($_GET['asset_id']);
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-    For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-    or contact me at wietsew@users.sourceforge.net
-    *****************************************************************************/
 
-    // start page
+$query = "SELECT
-        // includes
+		a.asset_name,
-        include("includes.php");
+		a.asset_hostname,
+		a.asset_info,
+		c.assetclass_id,
+		c.assetclass_name
+	FROM
+		asset AS a LEFT OUTER JOIN assetclass AS c USING (assetclass_id)
+	WHERE
+		a.asset_id=" . $asset_id;
 
-        // get id
+$asset = $db->db_select($query);
-        $asset_id = sanitize($_GET['asset_id']);
 
-        // start output
+$smarty->assign("asset_id", $asset_id);
-        include("header.php");
+$smarty->assign("asset_name", $asset[0]['asset_name']);
+$smarty->assign("asset_hostname", $asset[0]['asset_hostname']);
+$smarty->assign("asset_info", nl2br($asset[0]['asset_info']));
 
-        // set language variables
+$smarty->assign("assetclass_id", $asset[0]['assetclass_id']);
-        $smarty->assign($lang);
+$smarty->assign("assetclass_name", $asset[0]['assetclass_name']);
 
-    // setup asset
+$query = "SELECT
-        // build query
+		node_id,
-        $query = "SELECT
+		node_ip,
-                asset.asset_name,
+		LEFT(node_info, 40) as node_info
-                asset.asset_hostname,
+	FROM
-                asset.asset_info,
+		node
-                assetclass.assetclass_id AS assetclass_id,
+	WHERE
-                assetclass.assetclass_name AS assetclass_name
+		asset_id=" . $asset_id . "
-            FROM
+	ORDER BY
-                asset,
+		INET_ATON(node_ip)";
-                assetclass
-            WHERE
-                asset.asset_id=" . $asset_id . "
-                AND assetclass.assetclass_id=asset.assetclass_id";
 
-        // run query
+$nodes = $db->db_select($query);
-        $asset = $db->db_select($query);
+$smarty->assign("nodes", $nodes);
 
-        // send to tpl
+$smarty->display("assetview.tpl");
-        $smarty->assign("asset_id", $asset_id);
-        $smarty->assign("asset_name", $asset[0]['asset_name']);
-        $smarty->assign("asset_hostname", $asset[0]['asset_hostname']);
-        $smarty->assign("asset_info", nl2br($asset[0]['asset_info']));
 
-        $smarty->assign("assetclass_id", $asset[0]['assetclass_id']);
+include("footer.php");
-        $smarty->assign("assetclass_name", $asset[0]['assetclass_name']);
-
-    // setup node
-        // build query
-        $query = "SELECT
-                node_id,
-                node_ip,
-                LEFT(node_info, 40) as node_info
-            FROM
-                node
-            WHERE
-                node.asset_id=" . $asset_id . "
-            ORDER BY
-                INET_ATON(node.node_ip)";
-
-        // run query
-        $nodes = $db->db_select($query);
-        $smarty->assign("nodes", $nodes);
-
-    // end page
-        // output
-        $smarty->display("assetview.tpl");
-
-        // footer
-        include("footer.php");
 ?>

assigniptonode.php

@@ -1,61 +1,35 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$node_ip = sanitize($_GET['node_ip']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+$subnet_id = sanitize($_GET['subnet_id']);
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
+$query = "SELECT
-		// includes
+		subnet_address,
-		include("includes.php");
+		subnet_mask
+	FROM
+		subnet
+	WHERE
+		subnet_id=" . $subnet_id;
 
-		// get ip and id
+$subnet = $db->db_select($query);
-		$node_ip = sanitize($_GET['node_ip']);
-		$subnet_id = sanitize($_GET['subnet_id']);
 
-		// start output
+$smarty->assign("subnet_id", $subnet_id);
-		include("header.php");
+$smarty->assign("subnet_address", $subnet[0]['subnet_address']);
+$smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
+$smarty->assign("node_ip", $node_ip);
 
-		// set language variables
+$smarty->display("assigniptonode.tpl");
-		$smarty->assign($lang);
 
-	// build query
+include("footer.php");
-		$query = "SELECT
-				subnet.subnet_address AS subnet_address,
-				subnet.subnet_mask AS subnet_mask
-			FROM
-				subnet
-			WHERE
-				subnet.subnet_id=" . $subnet_id;
-		
-		// run query
-		$subnet = $db->db_select($query);
-
-		// send to tpl
-		$smarty->assign("subnet_id", $subnet_id);
-		$smarty->assign("subnet_address", $subnet[0]['subnet_address']);
-		$smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
-		$smarty->assign("node_ip", $node_ip);
-	
-	// end page
-		// output
-		$smarty->display("assigniptonode.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

assignnodetoasset.php

@@ -1,79 +1,49 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$asset_id = sanitize($_GET['asset_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+$node_ip = sanitize($_GET['node_ip']);
+$subnet_id = sanitize($_GET['subnet_id']);
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
+$smarty->assign("node_ip", $node_ip);
-		// includes
+$smarty->assign("asset_id", $asset_id);
-		include("includes.php");
 
-		// get id	
+$query = "SELECT
-		$asset_id = sanitize($_GET['asset_id']);
+		asset_id,
-		$node_ip = sanitize($_GET['node_ip']);
+		asset_name
-		$subnet_id = sanitize($_GET['subnet_id']);
+	FROM
+		asset
+	ORDER BY
+		asset_name";
 
-		// start output
+$assets = $db->db_select($query);
-		include("header.php");
+foreach ($assets as $asset) {
+	$asset_options[$asset['asset_id']] =  $asset['asset_name'];
+}
+$smarty->assign("asset_options", $asset_options);
 
-		// set language variables
+$query = "SELECT subnet_id,
-		$smarty->assign($lang);
+		CONCAT_WS('/', subnet_address, subnet_mask) AS subnet_name
+	FROM subnet
+	ORDER BY INET_ATON(subnet_address)";
 
-	// to tpl
+$subnets = $db->db_select($query);
-		$smarty->assign("node_ip", $node_ip);
+foreach ($subnets as $subnet) {
+	$subnet_options[$subnet['subnet_id']] =  $subnet['subnet_name'];
+}
+$smarty->assign("subnet_options", $subnet_options);
 
-	// setup asset
+$smarty->display("assignnodetoasset.tpl");
-	$smarty->assign("asset_id", $asset_id);
-		// build query
-		$query = "SELECT
-				asset.asset_id AS asset_id,
-				asset.asset_name AS asset_name
-			FROM
-				asset
-			ORDER BY
-				asset.asset_name";
 
-		// run query
+include("footer.php");
-		$assets = $db->db_select($query);
-        foreach ($assets as $asset) {
-            $asset_options[$asset['asset_id']] =  $asset['asset_name'];
-        }
-        $smarty->assign("asset_options", $asset_options);
-	
-	// setup subnet
-		// build query
-		$query = "SELECT subnet_id,
-				CONCAT_WS('/', subnet_address, subnet_mask) AS subnet_name
-			FROM subnet
-			ORDER BY INET_ATON(subnet_address)";
-
-		// run query
-		$subnets = $db->db_select($query);
-        foreach ($subnets as $subnet) {
-            $subnet_options[$subnet['subnet_id']] =  $subnet['subnet_name'];
-        }
-        $smarty->assign("subnet_options", $subnet_options);
-
-	// end page
-		// output
-		$smarty->display("assignnodetoasset.tpl");
-
-        // end output
-		include("footer.php");
 ?>

comments.php

@@ -1,42 +1,22 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+include("header.php");
-	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
-	*****************************************************************************/
 
-	// includes
+$comments = sanitize($_GET['comments']);
-	include("includes.php");
 
-	// start output
+$smarty->assign("comments", $lang['lang_comments_' . $comments]);
-	include("header.php");
 
-	// set language variables
+$smarty->display("comments.tpl");
-	$smarty->assign($lang);
 
-	// get error
+include("footer.php");
-	$comments = sanitize($_GET['comments']);
-	
-	// set veriables
-	$smarty->assign("comments", $lang['lang_comments_' . $comments]);
-	
-	// output
-	$smarty->display("comments.tpl");
-		
-	include("footer.php");
 ?>

config.php

@@ -1,41 +0,0 @@
-<?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
-	*****************************************************************************/
-	
-	// version
-	$config_version = 'v0.7';
-
-	// db connection
-	$config_mysql_host = 'localhost';
-	$config_mysql_username = 'ipreg';
-	$config_mysql_password = 'changeme!';
-	$config_mysql_dbname = 'ipreg';
-
-	// default values for IP blocks
-	$config_color_blocked = 'dcdcdc';
-	$config_color_unused = 'ffffff';
-	$config_color_dynamic = 'e0e0e0';
-
-	// language
-	$config_lang = array('de', 'en');
-	$config_lang_default = 'en';
-
-?>

config.php-sample

@@ -0,0 +1,24 @@
+<?php	
+/*****************************************************************************
+IP Reg, a PHP/MySQL IPAM tool
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
+
+SPDX-License-Identifier: GPL-3.0-or-later
+*****************************************************************************/
+
+// db connection
+$config_mysql_host = 'localhost';
+$config_mysql_username = 'ipreg';
+$config_mysql_password = 'changeme!';
+$config_mysql_dbname = 'ipreg';
+
+// default values for IP blocks
+$config_color_blocked = 'dcdcdc';
+$config_color_unused = 'ffffff';
+$config_color_dynamic = 'e0e0e0';
+
+// language
+$config_lang_default = 'en';
+
+?>

dbconnect.php

@@ -1,28 +1,13 @@
 <?php
-    /*****************************************************************************
+/*****************************************************************************
-    IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-    Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-    This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-    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,
+$dblink = mysqli_connect($config_mysql_host,$config_mysql_username,$config_mysql_password);
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+mysqli_select_db($dblink, $config_mysql_dbname);
-    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
-    *****************************************************************************/
-
-    // build connection
-    $dblink = mysqli_connect($config_mysql_host,$config_mysql_username,$config_mysql_password);
-
-    // select db
-    mysqli_select_db($dblink, $config_mysql_dbname);
 ?>

footer.php

@@ -1,31 +1,13 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+$smarty->assign("config_version", $config_version);
-	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
+$smarty->display("footer.tpl");
-	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
-				
-		// get version for the footer-stamp
-		$smarty->assign("config_version", $config_version);
-	
-	// end page
-		// output
-		$smarty->display("footer.tpl");
 ?>

header.php

@@ -1,69 +1,41 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include('lang/' . $_SESSION['suser_language'] . '.php');
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
+$smarty->assign($lang);
-	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
+// search box
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+if (isset($_POST['search'])) {
+	$search = sanitize($_POST['search']);
+	$_SESSION['search'] = $search;
+} else {
+	if (isset($_SESSION['search'])) {
+		$search = $_SESSION['search'];
+	} else {
+		$search = '';
+	}
+}
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+$smarty->assign("config_version", $config_version);
-	or contact me at wietsew@users.sourceforge.net
+$smarty->assign("suser_name", $_SESSION['suser_displayname']);
-	*****************************************************************************/
+$smarty->assign("search", $search);
 	
-	// start page
+// menu
-		// include language file
+$smarty->assign("menu_assets", $_SESSION['suser_menu_assets']=='on');
-		include('lang/' . $_SESSION['suser_language'] . '.php');
+$smarty->assign("menu_assetclasses", $_SESSION['suser_menu_assetclasses']=='on');
+$smarty->assign("menu_assetclassgroups", $_SESSION['suser_menu_assetclassgroups']=='on');
+$smarty->assign("menu_locations", $_SESSION['suser_menu_locations']=='on');
+$smarty->assign("menu_nodes", $_SESSION['suser_menu_nodes']=='on');
+$smarty->assign("menu_subnets", $_SESSION['suser_menu_subnets']=='on');
+$smarty->assign("menu_users", $_SESSION['suser_menu_users']=='on');
+$smarty->assign("menu_vlans", $_SESSION['suser_menu_vlans']=='on');
+$smarty->assign("menu_zones", $_SESSION['suser_menu_zones']=='on');
 
-		// set language variables
+$smarty->display("header.tpl");
-		$smarty->assign($lang);
-	
-	// search box
-		// new search?
-		if (isset($_POST['search'])) {
-			// set var
-			$search = sanitize($_POST['search']);
-			
-			// store var
-			$_SESSION['search'] = $search;
-		} else {
-			// check for stored var
-			if(isset($_SESSION['search'])) {
-				// set var
-				$search = $_SESSION['search'];
-			} else {
-				// empty var
-				$search = '';
-			}
-		}
-	
-		// to tpl
-		// set global template vars
-		$smarty->assign("config_version", $config_version);
-		$smarty->assign("suser_name", $_SESSION['suser_displayname']);
-		$smarty->assign("search", $search);
-	
-	// menu
-		$smarty->assign("menu_assets", $_SESSION['suser_menu_assets']=='on');
-		$smarty->assign("menu_assetclasses", $_SESSION['suser_menu_assetclasses']=='on');
-		$smarty->assign("menu_assetclassgroups", $_SESSION['suser_menu_assetclassgroups']=='on');
-		$smarty->assign("menu_locations", $_SESSION['suser_menu_locations']=='on');
-		$smarty->assign("menu_nodes", $_SESSION['suser_menu_nodes']=='on');
-		$smarty->assign("menu_subnets", $_SESSION['suser_menu_subnets']=='on');
-		$smarty->assign("menu_users", $_SESSION['suser_menu_users']=='on');
-		$smarty->assign("menu_vlans", $_SESSION['suser_menu_vlans']=='on');
-        $smarty->assign("menu_zones", $_SESSION['suser_menu_zones']=='on');
-
-    // end page
-		// output
-		$smarty->display("header.tpl");
 ?>

image.php

@@ -1,109 +1,81 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+if(isset($_GET['icon'])) {
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	$icon = sanitize($_GET['icon']);
 	
-	For more information, visit http://sourceforge.net/projects/ipreg,
+	switch($icon) {
-	or contact me at wietsew@users.sourceforge.net
+		case ("add") :
-	*****************************************************************************/
+			$png = 'page_add';
+		break;
+		case ("back") :
+			$png = 'control_rewind_blue';
+		break;
+		case ("cancel") :
+			$png = 'control_rewind_blue';
+		break;
+		case ("comment") :
+			$png = 'comment';
+		break;
+		case ("delete") :
+			$png = 'page_delete';
+		break;
+		case ("shred") :
+			$png = 'bin';
+		break;
+		case ("edit") :
+			$png = 'page_edit';
+		break;
+		case ("error") :
+			$png = 'error';
+		break;
+		case ("help") :
+			$png = 'help';
+		break;
+		case ("logo") :
+			$png = 'logo';
+		break;
+		case ("next") :
+			$png = 'control_fastforward_blue';
+		break;
+		case ("save") :
+			$png = 'page_save';
+		break;
+		case ("search") :
+			$png = 'magnifier';
+		break;
+	}
 	
-	// start page
+	$image = imagecreatefrompng("images/" . $png . ".png");
-		// includes
-		include("includes.php");
 	
-	// icon image
+	imagealphablending($image, true);
-		if(isset($_GET['icon'])) {
-			// get desired image
-			$icon = sanitize($_GET['icon']);
 	
-			// switch selected
+	imagesavealpha($image, true);
-			switch($icon) {
-				case ("add") :
-					$png = 'page_add';
-				break;
-				case ("back") :
-					$png = 'control_rewind_blue';
-				break;
-				case ("cancel") :
-					$png = 'control_rewind_blue';
-				break;
-				case ("comment") :
-					$png = 'comment';
-				break;
-				case ("delete") :
-					$png = 'page_delete';
-				break;
-				case ("shred") :
-					$png = 'bin';
-				break;
-				case ("edit") :
-					$png = 'page_edit';
-				break;
-				case ("error") :
-					$png = 'error';
-				break;
-				case ("help") :
-					$png = 'help';
-				break;
-				case ("logo") :
-					$png = 'logo';
-				break;
-				case ("next") :
-					$png = 'control_fastforward_blue';
-				break;
-				case ("save") :
-					$png = 'page_save';
-				break;
-				case ("search") :
-					$png = 'magnifier';
-				break;
-			}
 	
-			// get image
+	header('Content-type: image/png');
-			$image = imagecreatefrompng("images/" . $png . ".png");
+	imagepng($image);
+	imagedestroy($image);
+}
 
-			// alpha blending
+if(isset($_GET['color'])) {
-			imagealphablending($image, true);
+	$color = sanitize($_GET['color']);
 	
-			// save alphablending setting
+	$image = imagecreatetruecolor($_SESSION['suser_imagesize'], $_SESSION['suser_imagesize']);
-			imagesavealpha($image, true);
 	
-			// display image
+	$color = imagecolorallocate($image, hexdec(substr($color,0,2)), hexdec(substr($color,2,2)), hexdec(substr($color,4,2)));
-			header('Content-type: image/png');
-			imagepng($image);
-			imagedestroy($image);
-		}
 	
-	// colored block
+	imagefill($image, 0, 0, $color);
-		if(isset($_GET['color'])) {
-			// get desired color
-			$color = sanitize($_GET['color']);
 	
-			// create base image
+	header('Content-type: image/png');
-			$image = imagecreatetruecolor($_SESSION['suser_imagesize'], $_SESSION['suser_imagesize']);
+	imagepng($image);
-			
+	imagedestroy($image);
-			// build color
+}
-			$color = imagecolorallocate($image, hexdec(substr($color,0,2)), hexdec(substr($color,2,2)), hexdec(substr($color,4,2)));
-			
-			// fill image with color
-			imagefill($image, 0, 0, $color);
-			
-			// display image
-			header('Content-type: image/png');
-			imagepng($image);
-			imagedestroy($image);
-		}
 ?>

includes.php

@@ -1,50 +1,26 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+session_name('ipreg');
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
+session_start();
-	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
+// check for user_id, if unnkown, redirect to login
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+if(empty($_SESSION['suser_id'])) {
+	header("Location: login.php");
+	exit;
+}
 	
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("config.php");
-	or contact me at wietsew@users.sourceforge.net
+include("dbconnect.php");
-	*****************************************************************************/
 		
-	// session
+include("lib.php");
-		// start session
-		session_name('ipreg');
-		session_start();
 
-		// check for user_id, if unnkown, redirect to login
+$language = lang_getfrombrowser($config_lang, $config_lang_default, null, false);
-		if(empty($_SESSION['suser_id'])) {
-			// redirect
-			header("Location: login.php");
-			exit;
-		}
-	
-	// headers
-		// raw http headers
-		header("Content-Type: text/html; charset=utf-8"); 
-	
-	// includes
-		// includes
-		include("config.php");
-		include("dbconnect.php");
-		
-		// load lib
-		include("lib.php");
-
-	// set language
-		$language = lang_getfrombrowser($config_lang, $config_lang_default, null, false);
 
 ?>

index.php

@@ -1,118 +1,69 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+include("header.php");
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+// asset
-	or contact me at wietsew@users.sourceforge.net
+$query = "SELECT
-	*****************************************************************************/
+		COUNT(asset_id) AS asset_counter
+	FROM
+		asset";
 
-	// start page
+$assets = $db->db_select($query);
-		// includes
+$smarty->assign("asset_counter", $assets[0]['asset_counter']);
-		include("includes.php");
 
-		// start output
+// location
-		include("header.php");
+$query = "SELECT
+		COUNT(location_id) AS location_counter
+	FROM
+		location";
 
-		// set language variables
+$locations = $db->db_select($query);
-		$smarty->assign($lang);
+$smarty->assign("location_counter", $locations[0]['location_counter']);
 
-	// setup asset
+// node
-		// build query
+$query = "SELECT
-		$query = "SELECT
+		COUNT(node_id) AS node_counter
-				COUNT(asset.asset_id) AS asset_counter
+	FROM
-			FROM
+		node";
-				asset";
 
-		// run query
+$nodes = $db->db_select($query);
-		$assets = $db->db_select($query);
+$smarty->assign("node_counter", $nodes[0]['node_counter']);
 
-		// counter to tpl
+// subnet
-		$smarty->assign("asset_counter", $assets[0]['asset_counter']);
+$query = "SELECT
+		COUNT(subnet_id) AS subnet_counter
+	FROM
+		subnet";
+$subnets = $db->db_select($query);
+$smarty->assign("subnet_counter", $subnets[0]['subnet_counter']);
 
-	// setup location
+//  vlan
-		// build query
+$query = "SELECT
-		$query = "SELECT
+		COUNT(vlan_id) AS vlan_counter
-				COUNT(location.location_id) AS location_counter
+	FROM
-			FROM
+		vlan";
-				location";
 
-		// run query
+$vlans = $db->db_select($query);
-		$locations = $db->db_select($query);
+$smarty->assign("vlan_counter", $vlans[0]['vlan_counter']);
 
-		// counter to tpl
+// zone
-		$smarty->assign("location_counter", $locations[0]['location_counter']);
+$query = "SELECT
+		COUNT(zone_id) AS zone_counter
+	FROM
+		zone";
+$zones = $db->db_select($query);
+$smarty->assign("zone_counter", $zones[0]['zone_counter']);
 
-	// setup node
+$smarty->display("index.tpl");
-		// build query
-		$query = "SELECT
-				COUNT(node.node_id) AS node_counter
-			FROM
-				node";
 
-		// run query
+include("footer.php");
-		$nodes = $db->db_select($query);
-		
-		// counter to tpl
-		$smarty->assign("node_counter", $nodes[0]['node_counter']);
-	
-	// setup subnet
-		// build query
-		$query = "SELECT
-				COUNT(subnet.subnet_id) AS subnet_counter
-			FROM
-				subnet";
-		
-		// run query
-		$subnets = $db->db_select($query);
-		
-		// counter to tpl
-		$smarty->assign("subnet_counter", $subnets[0]['subnet_counter']);
-	
-	// setup vlan
-		// build query
-		$query = "SELECT
-				COUNT(vlan.vlan_id) AS vlan_counter
-			FROM
-				vlan";
-		
-		// run query
-		$vlans = $db->db_select($query);
-		
-		// counter to tpl
-		$smarty->assign("vlan_counter", $vlans[0]['vlan_counter']);
-
-	// setup zone
-		// build query
-		$query = "SELECT
-				COUNT(zone_id) AS zone_counter
-			FROM
-				zone";
-		
-		// run query
-		$zones = $db->db_select($query);
-		
-		// counter to tpl
-		$smarty->assign("zone_counter", $zones[0]['zone_counter']);
-
-
-	// end page
-		// output
-        $smarty->display("index.tpl");
-
-        // footer
-		include("footer.php");
 ?>

install/install.txt

@@ -2,8 +2,9 @@ IP Reg Installation
 
 1. Install requirements
 IP Reg version 0.6 and up depends on smarty template engine.
-In Debian install ist with: "apt-get install smarty3".
+In Debian install it with: "apt-get install smarty3".
-The GHP-GD module is also required: "apt-get install php-gd".
+The PHP-GD module is also required: "apt-get install php-gd".
+
 
 2. Create database
 Create a database for IP Reg on your web server, as well as a MySQL user who
@@ -16,27 +17,39 @@ Create database-user for application with minimum necessary rights.
   CREATE USER 'ipreg'@'localhost' IDENTIFIED BY '********';
   GRANT SELECT, INSERT, UPDATE, DELETE ON ipreg.* TO 'ipreg'@'localhost';
 
-3. Run import
+
+3. Run database import
 Import the mysql.sql file into your database, which will create the tables
-and some sample data.
 
   mysql ipreg < mysql.sql
 
-4. Edit config file
+Optional import some sample data
-Open config.php in a text editor and fill in your database details.
 
-5. Upload files
+  mysql ipreg < mysql_sample.sql
-Upload all files and directory's (except the install directory) to your
+
+
+4. Upload files
+Upload all files and directories (except the install directory) to your
 webserver.
 
+
+5. Create and edit config file
+Rename sample configfile config.php-sample:
+  mv config.php-sample config.php
+
+Open config.php in a text editor and fill in your database details.
+
+
 6. Check file access rights for security
-Only directory tpl_c should be writeble by webserver
+Only directory tpl_c should be writeble by webserver.
+Configfile should be readable by webserver but not writeable.
 
   chmod 640 config.php
   chgrp www-data config.php
 
   chown www-data tpl_c
 
+
 7. Start using IP Reg
 Start your browser and login to IP Reg with the default username/password:
 admin/admin

install/mysql.sql

@@ -4,38 +4,26 @@ CREATE TABLE asset (
   asset_hostname varchar(100) DEFAULT NULL,
   assetclass_id int(10) NOT NULL,
   asset_info text DEFAULT NULL,
-  PRIMARY KEY (asset_id)
+  PRIMARY KEY (asset_id),
+  INDEX ix_asset_name (asset_name)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-INSERT INTO asset (asset_name, assetclass_id) VALUES
-('My Computer', 1),
-('My Server', 2);
-
-
 CREATE TABLE assetclass (
   assetclass_id int(10) NOT NULL AUTO_INCREMENT,
   assetclassgroup_id int(10) NOT NULL,
   assetclass_name varchar(100) NOT NULL,
-  PRIMARY KEY (assetclass_id)
+  PRIMARY KEY (assetclass_id),
+  INDEX ix_assetclass_name (assetclass_name)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-INSERT INTO assetclass (assetclassgroup_id, assetclass_name) VALUES
-(1, 'PC'),
-(2, 'Server');
-
-
 CREATE TABLE assetclassgroup (
   assetclassgroup_id int(10) NOT NULL AUTO_INCREMENT,
   assetclassgroup_name varchar(100) NOT NULL,
   assetclassgroup_color varchar(6) NOT NULL DEFAULT '000000',
-  PRIMARY KEY (assetclassgroup_id)
+  PRIMARY KEY (assetclassgroup_id),
+  INDEX ix_assetclassgroup_name (assetclassgroup_name)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-INSERT INTO assetclassgroup (assetclassgroup_name, assetclassgroup_color) VALUES
-('Workstations', '000000'),
-('Servers', '0000CC');
-
-
 CREATE TABLE location (
   location_id int(10) NOT NULL AUTO_INCREMENT,
   location_name varchar(100) NOT NULL,
@@ -43,13 +31,10 @@ CREATE TABLE location (
   location_info text DEFAULT NULL,
   location_sort int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (location_id),
-  KEY location_sort (location_sort)
+  INDEX ix_location_sort (location_sort),
+  INDEX ix_location_name (location_name)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-INSERT INTO location (location_name, location_parent) VALUES
-('Main Office', 0);
-
-
 CREATE TABLE nat (
   nat_id int(10) NOT NULL AUTO_INCREMENT,
   nat_type int(1) NOT NULL,
@@ -72,11 +57,6 @@ CREATE TABLE node (
   PRIMARY KEY (node_id)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-INSERT INTO node (node_ip, node_mac, subnet_id, asset_id) VALUES
-('192.168.1.2', '001122334455', 1, 1),
-('192.168.1.1', 'aabbccddeeff', 1, 2);
-
-
 CREATE TABLE subnet (
   subnet_id int(10) NOT NULL AUTO_INCREMENT,
   subnet_address varchar(45) NOT NULL,
@@ -89,10 +69,6 @@ CREATE TABLE subnet (
   PRIMARY KEY (subnet_id)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-INSERT INTO subnet (subnet_address, subnet_mask) VALUES
-('192.168.0.0', 24);
-
-
 CREATE TABLE subnetlocation (
   subnetlocation_id int(10) NOT NULL AUTO_INCREMENT,
   subnet_id int(10) NOT NULL,
@@ -100,7 +76,6 @@ CREATE TABLE subnetlocation (
   PRIMARY KEY (subnetlocation_id)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-
 CREATE TABLE subnetvlan (
   subnetvlan_id int(10) NOT NULL AUTO_INCREMENT,
   subnet_id int(10) NOT NULL,
@@ -108,10 +83,6 @@ CREATE TABLE subnetvlan (
   PRIMARY KEY (subnetvlan_id)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-INSERT INTO subnetvlan (subnet_id, vlan_id) VALUES
-(1, 1);
-
-
 CREATE TABLE user (
   user_id int(10) NOT NULL AUTO_INCREMENT,
   user_name varchar(100) NOT NULL,
@@ -134,12 +105,12 @@ CREATE TABLE user (
   user_menu_vlans varchar(2) NOT NULL DEFAULT 'on',
   user_menu_zones varchar(2) NOT NULL DEFAULT 'on',
   user_tooltips varchar(2) NOT NULL DEFAULT 'on',
-  PRIMARY KEY (user_id)
+  PRIMARY KEY (user_id),
+  UNIQUE INDEX ix_username (user_name)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-INSERT INTO user (user_name, user_pass, user_displayname, user_imagesize, user_imagecount, user_mac, user_dateformat, user_menu_assets, user_menu_assetclasses, user_menu_assetclassgroups, user_menu_locations, user_menu_nodes, user_menu_subnets, user_menu_users, user_menu_vlans) VALUES
+INSERT INTO user (user_name, user_pass, user_displayname) VALUES
-('admin', '21232f297a57a5a743894a0e4a801fc3', 'administrator', 6, 64, 'xxxxxxxxxxxx', 'd M Y H:i', 'on', 'on', 'on', 'on', 'on', 'on', 'on', 'on');
+('admin', '21232f297a57a5a743894a0e4a801fc3', 'administrator');
-
 
 CREATE TABLE vlan (
   vlan_id int(10) NOT NULL AUTO_INCREMENT,
@@ -149,10 +120,6 @@ CREATE TABLE vlan (
   PRIMARY KEY (vlan_id)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-INSERT INTO vlan (vlan_number, vlan_name) VALUES
-(1, 'DEFAULT_VLAN');
-
-
 CREATE TABLE zone (
   zone_id int(10) NOT NULL AUTO_INCREMENT,
   zone_soa varchar(40) CHARACTER SET utf8 NOT NULL,
@@ -172,6 +139,3 @@ CREATE TABLE zone (
   zone_info text CHARACTER SET utf8 DEFAULT NULL,
   PRIMARY KEY (zone_id)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-INSERT INTO zone (zone_soa, zone_origin, zone_hostmaster, zone_serial, zone_ns1) VALUES
-('ns1.example.com.', 'example.com.', 'hostmaster@example.com', '2023021301', 'ns1.example.com');

install/mysql_sample.sql

@@ -0,0 +1,56 @@
+INSERT INTO asset (asset_name, assetclass_id) VALUES
+('Computer', 1),
+('Server', 3),
+('Printer', 4),
+('Firewall', 6);
+
+INSERT INTO assetclass (assetclassgroup_id, assetclass_name) VALUES
+(1, 'Desktop'),
+(1, 'Notebook'),
+(2, 'Server'),
+(3, 'Printer'),
+(4, 'Switch'),
+(4, 'Firewall'),
+(5, 'Scanner');
+
+INSERT INTO assetclassgroup (assetclassgroup_name, assetclassgroup_color) VALUES
+('Personal Computer', '000000'),
+('Servers', '0000CC'),
+('Periphery', '00CC00'),
+('Network', 'CCCC00'),
+('Miscellaneous', 'CC0000');
+
+INSERT INTO location (location_name, location_parent) VALUES
+('Main Office', 0),
+('Branch Office A', 1),
+('Branch Office B', 1);
+
+INSERT INTO node (node_ip, node_mac, subnet_id, asset_id) VALUES
+('192.168.0.10', '001122334455', 1, 1),
+('192.168.0.11', 'aabbccddeeff', 1, 2),
+('192.168.0.12', '775544881199', 1, 3),
+('192.168.0.1', '667755441122', 1, 4),
+('192.168.1.1', '667755441123', 2, 4),
+('192.168.10.1', '667755441124', 3, 4),
+('192.168.20.1', '667755441125', 4, 4);
+
+INSERT INTO subnet (subnet_address, subnet_mask) VALUES
+('192.168.0.0', 24),
+('192.168.1.0', 24),
+('192.168.10.0', 24),
+('192.168.20.0', 24);
+
+INSERT INTO subnetlocation (subnet_id, location_id) VALUES
+(1, 1),
+(2, 1),
+(3, 2),
+(4, 3);
+
+INSERT INTO subnetvlan (subnet_id, vlan_id) VALUES
+(1, 1);
+
+INSERT INTO vlan (vlan_number, vlan_name) VALUES
+(1, 'DEFAULT_VLAN');
+
+INSERT INTO zone (zone_soa, zone_origin, zone_hostmaster, zone_serial, zone_ns1) VALUES
+('ns1.example.com.', 'example.com.', 'hostmaster@example.com', '2023021301', 'ns1.example.com');

lang/de.php

@@ -88,6 +88,7 @@ $lang = array(
     'lang_location_name' => 'Standortname',
     'lang_location_parent' => 'Übergeordneter Standort',
     'lang_sublocation_add' => 'Unterstandort hinzufügen',
+    'lang_location_none' => 'Es sind keine Standorte vorhanden',
 
     'lang_locationsubnet' => 'Standort/Subnetz',
     'lang_locationsubnet_edit' => 'Standort/Subnetz bearbeiten',
@@ -96,6 +97,7 @@ $lang = array(
     'lang_node_del' => 'Knoten löschen',
     'lang_node_edit' => 'Knoten ändern',
     'lang_node_info' => 'Knoteninfo',
+    'lang_node_none' => 'Es sind keine Knoten vorhanden',
     'lang_dns1' => 'DNS-Name',
     'lang_dns2' => 'DNS-Alias',
     'lang_ip' => 'IP-Adresse',
@@ -128,6 +130,7 @@ $lang = array(
     'lang_subnet_dhcpstart' => 'DHCP Anfang',
     'lang_subnet_dhcpend' => 'DHCP Ende',
     'lang_subnet_ntp_server' => 'NTP-Server',
+    'lang_subnet_none' => 'Es sind keine Subnetze vorhanden',
 
     'lang_subnetlocation' => 'Subnetz/Ort',
     'lang_subnetlocation_edit' => 'Subnetz/Ort bearbeiten',
@@ -145,7 +148,7 @@ $lang = array(
     'lang_zone_add' => 'Zone hinzufügen',
     'lang_zone_del' => 'Zone löschen',
     'lang_zone_edit' => 'Zone bearbeiten',
-
+    'lang_zone_none' => 'Es sind keine Zonen vorhanden',
 
     'lang_vlan_add' => 'VLAN hinzufügen',
     'lang_vlan_del' => 'VLAN löschen',
@@ -154,6 +157,7 @@ $lang = array(
     'lang_vlan_info' => 'VLAN Info',
     'lang_vlan_new' => 'VLAN Info',
     'lang_vlan_name' => 'VLAN Name',
+    'lang_vlan_none' => 'Es sind keine VLANs vorhanden',
 
     'lang_vlansubnet' => 'VLAN/Subnetz',
     'lang_vlansubnet_edit' => 'VLAN/Subnetz bearbeiten',
@@ -181,9 +185,9 @@ $lang = array(
     'lang_options_dateformat' => 'Datumsformat',
     'lang_options_dateformat_help' => 'Format in which dates are displayed using the php-date-format (see http://www.php.net/date for more info)',
     'lang_options_dns1suffix' => 'DNS Name suffix',
-    'lang_options_dns1suffix_help' => 'Default DNS Name suffix f<EFBFBD>r neue Knoten',
+    'lang_options_dns1suffix_help' => 'Default DNS Name suffix für neue Knoten',
     'lang_options_dns2suffix' => 'DNS Alias suffix',
-    'lang_options_dns2suffix_help' => 'Default DNS Alias suffix f<EFBFBD>r neue Knoten',
+    'lang_options_dns2suffix_help' => 'Default DNS Alias suffix für neue Knoten',
     'lang_options_currentpassword' => 'Aktuelles Kennwort',
     'lang_options_currentpassword_help' => 'Bitte geben Sie hier Ihr bisheriges Kennwort ein',
     'lang_options_newpassword1' => 'Neues Kennwort',
@@ -193,7 +197,8 @@ $lang = array(
     'lang_options_tooltips_help' => 'Tooltips anzeigen',
     'lang_options_language_help' => 'Sprache für diesen Benutzer',
 
-    'lang_about_sfprojectpage' => 'Sourceforge Project Page',
+    'lang_about_projectpage' => 'Aktuelle Projektseite',
+    'lang_about_sfprojectpage' => 'Sourceforge Projektseite',
     'lang_about_license' => 'Lizenz',
     'lang_about_gpl' => 'GNU General Public License (GPL)',
     'lang_about_smarty' => 'Smarty Template Engine',
@@ -202,12 +207,14 @@ $lang = array(
     'lang_about_license_ext' => 'Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)<br>Copyright (C) 2011-2023 Thomas Hooge<p>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.<p>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.<p> You should have received a copy of the GNU General Public License along with this program.  If not, see http://www.gnu.org/licenses/.',
 
     'lang_about_changelog' => 'Changelog (major changes only)',
+    'lang_about_changelog_v08' => 'v0.8 (feb 2023)',
+    'lang_about_changelog_v08_ext' => '- Some small improvements and bugfixing<br>- Code simplification as preparation for big refactoring',
     'lang_about_changelog_v07' => 'v0.7 (oct 2018)',
     'lang_about_changelog_v07_ext' => '- Added support for PHP7, switched to mysqli',
     'lang_about_changelog_v06' => 'v0.6 (may 2011)',
-    'lang_about_changelog_v06_ext' => '- Moved towards smarty template engine<br />- language support finalized<br />- added german language<br />- some small bug fixes',
+    'lang_about_changelog_v06_ext' => '- Moved towards smarty template engine<br />- language support finalized<br>- added german language<br>- some small bug fixes',
     'lang_about_changelog_v05' => 'v0.5 (dec 2009)',
-    'lang_about_changelog_v05_ext' => '- Complete code rewrite<br>- Input sanitation<br>- Background image<br>- Added multiple counters<br>- HTML is now 100% W3C valid<br>More user options',
+    'lang_about_changelog_v05_ext' => '- Complete code rewrite<br>- Input sanitation<br>- Background image<br>- Added multiple counters<br>- HTML is now 100% W3C valid<br>- More user options',
     'lang_about_changelog_v04' => 'v0.4 (jun 2008)',
     'lang_about_changelog_v04_ext' => '- SQL vulnerability fixed<br>- PHP-generated images in subnet overview',
     'lang_about_changelog_v03' => 'v0.3 (dec 2007)',

lang/en.php

@@ -88,6 +88,7 @@ $lang = array(
     'lang_location_name' => 'Location name',
     'lang_location_parent' => 'Parent',
     'lang_sublocation_add' => 'Add Sub-location',
+    'lang_location_none' => 'There are no locations defined',
 
     'lang_locationsubnet' => 'Location/Subnet',
     'lang_locationsubnet_edit' => 'Edit Location/Subnet',
@@ -96,6 +97,7 @@ $lang = array(
     'lang_node_del' => 'Delete node',
     'lang_node_edit' => 'Modify node',
     'lang_node_info' => 'Node info',
+    'lang_node_none' => 'There are no nodes defined',
     'lang_dns1' => 'DNS name',
     'lang_dns2' => 'DNS Alias',
     'lang_ip' => 'IP Address',
@@ -128,6 +130,7 @@ $lang = array(
     'lang_subnet_dhcpstart' => 'DHCP Start',
     'lang_subnet_dhcpend' => 'DHCP End',
     'lang_subnet_ntp_server' => 'NTP Server',
+    'lang_subnet_none' => 'There are no subnets defined',
 
     'lang_subnetlocation' => 'Subnet/Location',
     'lang_subnetlocation_edit' => 'Edit Subnet/Location',
@@ -144,6 +147,7 @@ $lang = array(
     'lang_zone_add' => 'Add zone',
     'lang_zone_del' => 'Delete zone',
     'lang_zone_edit' => 'Mofidy zone',
+    'lang_zone_none' => 'There are no zones defined',
 
     'lang_vlan_add' => 'Add VLAN',
     'lang_vlan_del' => 'Delete VLAN',
@@ -152,6 +156,7 @@ $lang = array(
     'lang_vlan_info' => 'VLAN info',
     'lang_vlan_new' => 'VLAN info',
     'lang_vlan_name' => 'VLAN name',
+    'lang_vlan_none' => 'There are no VLANs defined',
     'lang_user_language' => 'Language',
 
     'lang_vlansubnet' => 'VLAN/Subnet',
@@ -192,6 +197,7 @@ $lang = array(
     'lang_options_tooltips_help' => 'Show tooltips',
     'lang_options_language_help' => 'Language for this user',
 
+    'lang_about_projectpage' => 'Current Project Page',
     'lang_about_sfprojectpage' => 'Sourceforge Project Page',
     'lang_about_license' => 'License',
     'lang_about_gpl' => 'GNU General Public License (GPL)',
@@ -201,12 +207,14 @@ $lang = array(
     'lang_about_license_ext' => 'Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)<br>Copyright (C) 2011-2023 Thomas Hooge<p>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.<p>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.<p> You should have received a copy of the GNU General Public License along with this program.  If not, see http://www.gnu.org/licenses/.',
 
     'lang_about_changelog' => 'Changelog (major changes only)',
+    'lang_about_changelog_v08' => 'v0.8 (feb 2023)',
+    'lang_about_changelog_v08_ext' => '- Some small improvements and bugfixing<br>- Code simplification as preparation for big refactoring',
     'lang_about_changelog_v07' => 'v0.7 (oct 2018)',
     'lang_about_changelog_v07_ext' => '- Added support for PHP7, switched to mysqli',
     'lang_about_changelog_v06' => 'v0.6 (may 2011)',
-    'lang_about_changelog_v06_ext' => '- Moved towards smarty template engine<br />- language support finalized<br />- added german language<br />- some small bug fixes',
+    'lang_about_changelog_v06_ext' => '- Moved towards smarty template engine<br />- language support finalized<br>- added german language<br>- some small bug fixes',
     'lang_about_changelog_v05' => 'v0.5 (dec 2009)',
-    'lang_about_changelog_v05_ext' => '- Complete code rewrite<br>- Input sanitation<br>- Background image<br>- Added multiple counters<br>- HTML is now 100% W3C valid<br>More user options',
+    'lang_about_changelog_v05_ext' => '- Complete code rewrite<br>- Input sanitation<br>- Background image<br>- Added multiple counters<br>- HTML is now 100% W3C valid<br>- More user options',
     'lang_about_changelog_v04' => 'v0.4 (jun 2008)',
     'lang_about_changelog_v04_ext' => '- SQL vulnerability fixed<br>- PHP-generated images in subnet overview',
     'lang_about_changelog_v03' => 'v0.3 (dec 2007)',

lib.php

@@ -1,48 +1,31 @@
 <?php
-    /*****************************************************************************
+/*****************************************************************************
-    IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-    Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-    This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-    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,
+// global version string
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+$config_version = 'v0.8';
-    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
+// available languages
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+$config_lang = array('de', 'en');
 
-    For more information, visit http://sourceforge.net/projects/ipreg,
+include("lib/functions.php");
-    or contact me at wietsew@users.sourceforge.net
-    *****************************************************************************/
 
-    // functions
+require("lib/db.class.php");
-        include("lib/functions.php");
+$db = new Db($dblink);
 
-    // classes
+require("lib/user.class.php");
-        // db
+$user = new User();
-            // load class
-            require("lib/db.class.php");
 
-            // create instance
+require_once('smarty3/Smarty.class.php');
-            $db = new Db($dblink);
+$smarty = new Smarty();
+$smarty->template_dir = 'tpl';
+$smarty->compile_dir = 'tpl_c';
+$smarty->registerPlugin('function', 'treelist', 'print_tree');
+$smarty->assign("suser_tooltips", $_SESSION['suser_tooltips']);
 
-        // user
-            // load class
-            require("lib/user.class.php");
-
-            // create instance
-            $user = new User();
-
-        // tpl
-            require_once('smarty3/Smarty.class.php');
-            $smarty = new Smarty();
-            $smarty->template_dir = 'tpl';
-            $smarty->compile_dir = 'tpl_c';
-            $smarty->registerPlugin('function', 'treelist', 'print_tree');
-            $smarty->assign("suser_tooltips", $_SESSION['suser_tooltips']);
 ?>

location.php

@@ -1,70 +1,46 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+include("header.php");
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+$query = "SELECT
-	or contact me at wietsew@users.sourceforge.net
+	location_id AS id,
-	*****************************************************************************/
+	location_name AS value,
+	location_parent AS parent_id
+FROM
+	location
+ORDER BY location_parent, location_sort, location_name";
 
-	// start page
+$locations = $db->db_select($query);
-		// includes
-		include("includes.php");
 
-		// start output
+// function for recursion
-		include("header.php");
+function build_tree($parent_id, $level) {
+    global $locations;
+    $children = array();
+    foreach ($locations as $key => $location) {
+        if ($location['parent_id'] == $parent_id) {
+            unset($location['parent_id']);
+            $location['children'] = build_tree($location['id'], $level+1);
+            $location['level'] = $level;
+            $location['href'] = 'locationview.php?location_id=' . $location['id'];
+            $children[] = $location;
+        }
+    }
+    return $children;
+}
 
-		// set language variables
+$tree = build_tree(0, 0);
-		$smarty->assign($lang);
+$smarty->assign("locations", $tree);
 
-	// start location
+$smarty->display("location.tpl");
-		// look for locations
-			// build query
-			$query = "SELECT
-					location_id AS id,
-					location_name AS value,
-					location_parent AS parent_id
-				FROM
-					location
-                                ORDER BY location_parent, location_sort, location_name";
 
-			// run query
+include("footer.php");
-			$locations = $db->db_select($query);
-
-            function build_tree($parent_id, $level) {
-                global $locations;
-                $children = array();
-                foreach ($locations as $key => $location) {
-                    if ($location['parent_id'] == $parent_id) {
-                        unset($location['parent_id']);
-                        $location['children'] = build_tree($location['id'], $level+1);
-                        $location['level'] = $level;
-                        $location['href'] = 'locationview.php?location_id=' . $location['id'];
-                        $children[] = $location;
-                    }
-                }
-                return $children;
-            }           
-            $tree = build_tree(0, 0);
-            $smarty->assign("locations", $tree);
-
-	// end page
-		// output
-		$smarty->display("location.tpl");
-
-		// footer
-		include("footer.php");
 ?>

locationadd.php

@@ -1,109 +1,78 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$location_parent = sanitize($_GET['location_parent']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
-	
-	// start page
-		// includes
-		include("includes.php");
-		
-		// get id	
-		$location_parent = sanitize($_GET['location_parent']);
-
-		// start output
-		include("header.php");
-
-		// set language variables
-		$smarty->assign($lang);
 
 
 // *************   <option value="0">{$lang_option_none}</option>
 
+$query = "SELECT location_id, location_name, location_parent, location_sort
+	FROM location
+	ORDER BY location_parent, location_sort, location_name";
 
-	// start parent
+$locations = $db->db_select($query);
-		// look for locations
-			// build query
-			$query = "SELECT location_id, location_name, location_parent, location_sort
-				FROM location
-				ORDER BY location_parent, location_sort, location_name";
 			
-			// run query
+$location_counter = count($locations);
-			$locations = $db->db_select($query);
 
-			// count results
+if ($location_counter>0) {
-			$location_counter = count($locations);
+	// get objects
+	foreach ($locations AS $location) {
+		// create arrays
+		$location_names[$location['location_id']] = $location['location_name'];
+		$parents[$location['location_parent']][] = $location['location_id'];
+	}
+}
 
-			// any loactions?
+// look for parents
-			if ($location_counter>0) {
+// function to look for parents and create a new array for every child
-				// get objects
+function location($parents, $parent = 0) {
-				foreach($locations AS $location) {
+	// loop array to check
-					// create arrays
+	foreach ($parents[$parent] as $child) {
-					$location_names[$location['location_id']] = $location['location_name'];
+		if (isset($parents[$child])) {
-					$parents[$location['location_parent']][] = $location['location_id'];
+			// element has children
-				}
+			$children[$child] = location($parents, $child);
-			}
+		} else {
+			// no children, set NULL
+			$children[$child] = NULL;
+		}
+	}
 	
-		// look for parents
+	// and again...
-			// function to look for parents and create a new array for every child
+	return $children;
-			function location($parents, $parent = 0) {
+}
-				// loop array to check
-				foreach($parents[$parent] as $child) {
-					if(isset($parents[$child])) {
-						// element has children
-						$children[$child] = location($parents, $child);
-					} else {
-						// no children, set NULL
-						$children[$child] = NULL;
-					}
-				}
 		
-				// and again...
+// recursive children check to template
-				return $children;
+function checkchildren($locations, $level) {
-			}
+	global $location_options;
+	global $location_names;
+	global $location_parent;
 
-			// recursive children check to template
+	foreach ($locations as $parent=>$child) {
-			function checkchildren($locations, $level) {
+		$row = str_repeat("-&nbsp;&nbsp;", $level) . $location_names[$parent];
-				global $location_options;
+		$location_options[$parent] = $row;
-				global $location_names;
+		if (isset($child)) {
-				global $location_parent;
+			checkchildren($child, $level+1);
+		}
+	}
+}
 
-				foreach ($locations as $parent=>$child) {
+$tree = location($parents);
-		                	$row = str_repeat("-&nbsp;&nbsp;", $level) . $location_names[$parent];
+$location_options = array(0 => '-');
-					$location_options[$parent] = $row;
+checkchildren($tree, 0);
-					if(isset($child)) {
+$smarty->assign("location_options", $location_options);
-			                	checkchildren($child, $level+1);
+$smarty->assign("location_parent", $location_parent);
-					}
-				}
 	
-			}
+$smarty->display("locationadd.tpl");
 		
-			$tree = location($parents);
+include("footer.php");
-			$location_options = array(0 => '-');
-		        checkchildren($tree, 0);
-			$smarty->assign("location_options", $location_options);
-			$smarty->assign("location_parent", $location_parent);
-	
-	// end page
-		// output
-        $smarty->display("locationadd.tpl");
-		
-		// footer
-		include("footer.php");
 ?>

locationdel.php

@@ -1,58 +1,31 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$location_id = sanitize($_GET['location_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 		
-	// start page
+$query = "SELECT
-		// includes
+	location_name
-		include("includes.php");
+FROM
+	location
+WHERE
+	location_id=" . $location_id;
 		
-		// get id	
+$location = $db->db_select($query);
-		$location_id = sanitize($_GET['location_id']);
 		
-		// start output
+$smarty->assign("location_id", $location_id);
-		include("header.php");
+$smarty->assign("location_name", $location[0]['location_name']);
 
-		// set language variables
+$smarty->display("locationdel.tpl");
-		$smarty->assign($lang);
 		
-	// setup location
+include("footer.php");
-		// 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);
-		
-		// send to tpl
-		$smarty->assign("location_id", $location_id);
-		$smarty->assign("location_name", $location[0]['location_name']);
-
-	// end page
-		// output
-		$smarty->display("locationdel.tpl");
-		
-		// footer
-		include("footer.php");
 ?>

locationedit.php

@@ -1,137 +1,104 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$location_id = sanitize($_GET['location_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
+// location			
-		// includes
+$query = "SELECT
-		include("includes.php");
+	location_name,
+	location_parent,
+	location_info,
+	location_sort
+FROM
+	location
+WHERE
+	location_id=" . $location_id;
 		
-		// get id	
+$location = $db->db_select($query);
-		$location_id = sanitize($_GET['location_id']);
 		
-		// start output
+$location_parent = $location[0]['location_parent'];
-		include("header.php");
 		
-		// set language variables
+$smarty->assign("location_id", $location_id);
-		$smarty->assign($lang);
+$smarty->assign("location_name", $location[0]['location_name']);
+$smarty->assign("location_info", $location[0]['location_info']);
+$smarty->assign("location_sort", $location[0]['location_sort']);
 
-	// setup location
+// parent location
-		// build query
+$query = "SELECT
-		$query = "SELECT
+	location_id,
-				location_name,
+	location_name,
-				location_parent,
+	location_parent
-				location_info,
+FROM
-				location_sort
+	location
-			FROM
+WHERE
-				location
+	location_id != " . $location_id . "
-			WHERE
+ORDER BY
-				location.location_id=" . $location_id;
+	location_name";
 			
-		// run query
+$locations = $db->db_select($query);
-		$location = $db->db_select($query);
 			
-		// get parent
+$location_counter = count($locations);
-		$location_parent = $location[0]['location_parent'];
 			
-		// send to tpl
+$smarty->assign("location_counter", $location_counter);
-		$smarty->assign("location_id", $location_id);
-		$smarty->assign("location_name", $location[0]['location_name']);
-		$smarty->assign("location_info", $location[0]['location_info']);
-		$smarty->assign("location_sort", $location[0]['location_sort']);
 			
-	// setup parent location
+// any loactions?
-		// look for locations
+if ($location_counter>0) {
-			// build query
+	foreach($locations AS $location) {
-			$query = "SELECT
+		$location_names[$location['location_id']] = $location['location_name'];
-					location.location_id AS location_id,
+		$parents[$location['location_parent']][] = $location['location_id'];
-					location.location_name AS location_name,
+	}
-					location.location_parent AS location_parent
+}
-				FROM
-					location
-				ORDER BY
-					location.location_name";
 		
-			// run query
+// look for parents
-			$locations = $db->db_select($query);
+// function to look for parents and create a new array for every child
+function location($parents, $parent = 0) {
+	// loop array to check
+	foreach($parents[$parent] as $child) {
+		if(isset($parents[$child])) {
+			// element has children
+			$children[$child] = location($parents, $child);
+		} else {
+			// no children, set NULL
+			$children[$child] = NULL;
+		}
+	}
 	
-			// count results
+	// and again...
-			$location_counter = count($locations);
+	return $children;
+}
 
-			// counter to tpl
+// recursive children check to template
-			$smarty->assign("location_counter", $location_counter);
+function checkchildren($locations, $level) {
+	global $location_options;
+	global $location_names;
+	global $location_parent;
 	
-			// any loactions?
+	foreach ($locations as $parent=>$child) {
-			if ($location_counter>0) {
+		$row = str_repeat("-&nbsp;&nbsp;", $level) . $location_names[$parent];
-				// get objects
+		$location_options[$parent] = $row;
-				foreach($locations AS $location) {
+		if(isset($child)) {
-					// create arrays
+			checkchildren($child, $level+1);
-					$location_names[$location['location_id']] = $location['location_name'];
+		}
-					$parents[$location['location_parent']][] = $location['location_id'];
+	}
-				}
+}
-			}
 		
-		// look for parents
+$tree = location($parents);
-			// function to look for parents and create a new array for every child
+$location_options = array(0 => '-');
-			function location($parents, $parent = 0) {
+checkchildren($tree, 0);
-				// loop array to check
+$smarty->assign("location_options", $location_options);
-				foreach($parents[$parent] as $child) {
+$smarty->assign("location_parent", $location_parent);
-					if(isset($parents[$child])) {
-						// element has children
-						$children[$child] = location($parents, $child);
-					} else {
-						// no children, set NULL
-						$children[$child] = NULL;
-					}
-				}
 
-				// and again...
+$smarty->display("locationedit.tpl");
-				return $children;
-			}
 
-			// recursive children check to template
+include("footer.php");
-			function checkchildren($locations, $level) {
-				global $location_options;
-				global $location_names;
-				global $location_parent;
-				
-				foreach ($locations as $parent=>$child) {
-		                	$row = str_repeat("-&nbsp;&nbsp;", $level) . $location_names[$parent];
-					$location_options[$parent] = $row;
-					if(isset($child)) {
-			                	checkchildren($child, $level+1);
-					}
-				}
-			}
-		
-			$tree = location($parents);
-			$location_options = array(0 => '-');
-			checkchildren($tree, 0);
-			$smarty->assign("location_options", $location_options);
-			$smarty->assign("location_parent", $location_parent);
-
-		
-	// end page
-		// output
-        $smarty->display("locationedit.tpl");
-
-        // end output
-		include("footer.php");
 ?>

locationsubnetadd.php

@@ -1,60 +1,31 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$location_id = sanitize($_GET['location_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 		
-	// start page
+$query = "SELECT
-		// includes
+		location_name
-		include("includes.php");
+	FROM
+		location
+	WHERE
+		location_id=" . $location_id;
 
-		// get ip and id
+$location = $db->db_select($query);
-		$location_id = sanitize($_GET['location_id']);
 		
-		// start output
+$smarty->assign("location_id", $location_id);
-		include("header.php");
+$smarty->assign("location_name", $location[0]['location_name']);
+$smarty->assign("subnet_options", $db->options_subnet());
+$smarty->display("locationsubnetadd.tpl");
 		
-		// set language variables
+include("footer.php");
-		$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
-        $smarty->assign("subnet_options", $db->options_subnet());
-	
-	// end page
-		// output
-		$smarty->display("locationsubnetadd.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

locationsubnetdel.php

@@ -1,76 +1,47 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$location_id = sanitize($_GET['location_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
+// location		
-		// includes
+$query = "SELECT
-		include("includes.php");
+	location_name
+FROM
+	location
+WHERE
+	location_id=" . $location_id;
 		
-		// get ip and id
+$location = $db->db_select($query);
-		$location_id = sanitize($_GET['location_id']);
 		
-		// start output
+$smarty->assign("location_id", $location_id);
-		include("header.php");
+$smarty->assign("location_name", $location[0]['location_name']);
 	
-		// set language variables
+// subnet
-		$smarty->assign($lang);
+$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)";
 
-	// setup location
+$subnets = $db->db_select($query);
-		// build query
+$smarty->assign($subnets);
-		$query = "SELECT
-				location.location_name AS location_name
-			FROM
-				location
-			WHERE
-				location.location_id=" . $location_id;
 
-		// run query
+$smarty->display("locationsubnetdel.tpl");
-		$location = $db->db_select($query);
 
-		$smarty->assign("location_id", $location_id);
+include("footer.php");
-		$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);
-
-	// end page
-		// output
-		$smarty->display("locationsubnetdel.tpl");
-
-		// end output
-		include("footer.php");
 ?>

locationsubnetedit.php

@@ -1,58 +1,31 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$location_id = sanitize($_GET['location_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
+// location
-	*****************************************************************************/
+$query = "SELECT
+		location_name
+	FROM
+		location
+	WHERE
+		location_id=" . $location_id;
 
-	// start page
+$location = $db->db_select($query);
-		// includes
-		include("includes.php");
 
-		// get ip and id
+$smarty->assign("location_id", $location_id);
-		$location_id = sanitize($_GET['location_id']);
+$smarty->assign("location_name", $location[0]['location_name']);
 	
-		// start output
+$smarty->display("locationsubnetedit.tpl");
-		include("header.php");
 		
-		// set language variables
+include("footer.php");
-		$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);
-		
-		// send to tpl
-		$smarty->assign("location_id", $location_id);
-		$smarty->assign("location_name", $location[0]['location_name']);
-	
-	// end page
-		// output
-		$smarty->display("locationsubnetedit.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

locationview.php

@@ -1,110 +1,80 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$location_id = sanitize($_GET['location_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
-	
-	// start page
-		// includes
-		include("includes.php");
-		
-		// get id
-		$location_id = sanitize($_GET['location_id']);
-		
-		// start output
-		include("header.php");
-
-		// set language variables
-		$smarty->assign($lang);
-	
-	// start locationcrumb
-		// get location crumbs
-
-            $query = "SELECT location_id AS id,
-                    location_name AS name,
-                    location_parent AS parent_id,
-                    location_info
-                FROM location
-                WHERE location_id=" . $location_id;
-            $location = $db->db_select($query);
-            $location[0]['url'] = 'locationview.php?location_id=' . $location[0]['id'];
-            $crumbs[] = $location[0];
-            $level = 1;
-            while ($crumbs[0]['parent_id'] != 0) {
-                $query = "SELECT location_id AS id, 
-                        location_name AS name,
-                        location_parent AS parent_id
-                    FROM location
-                    WHERE location_id=" . $crumbs[0]['parent_id'];
-                $result = $db->db_select($query);
-                $result[0]['url'] = 'locationview.php?location_id=' . $result[0]['id'];
-                array_unshift($crumbs, $result[0]);
-                $level++;
-            }
-
-        // send to tpl
-            $smarty->assign("location_id", $location_id);
-            $smarty->assign("location_info", nl2br($location[0]['location_info']));
-            $smarty->assign("crumbs", $crumbs);
 
 	
-	// setup sublocations		
+// locationcrumb
-		// build query
-		$query = "SELECT
-				location_id AS sublocation_id,
-				location_name AS sublocation_name,
-				LEFT(location_info, 40) AS info_short,
-				CHAR_LENGTH(location_info) AS info_length
-			FROM
-				location
-			WHERE
-				location_parent=" . $location_id . "
-			ORDER BY
-				location_name";
 
-		// run query
+$query = "SELECT location_id AS id,
-		$sublocations = $db->db_select($query);
+	    location_name AS name,
-        $smarty->assign("sublocations", $sublocations);
+	    location_parent AS parent_id,
+	    location_info
+	FROM location
+	WHERE location_id=" . $location_id;
+$location = $db->db_select($query);
+$location[0]['url'] = 'locationview.php?location_id=' . $location[0]['id'];
+$crumbs[] = $location[0];
+$level = 1;
+while ($crumbs[0]['parent_id'] != 0) {
+	$query = "SELECT location_id AS id, 
+		location_name AS name,
+		location_parent AS parent_id
+	    FROM location
+	    WHERE location_id=" . $crumbs[0]['parent_id'];
+	$result = $db->db_select($query);
+	$result[0]['url'] = 'locationview.php?location_id=' . $result[0]['id'];
+	array_unshift($crumbs, $result[0]);
+	$level++;
+}
 
-	// setup subnets
+$smarty->assign("location_id", $location_id);
-		// build query
+$smarty->assign("location_info", nl2br($location[0]['location_info']));
-		$query = "SELECT
+$smarty->assign("crumbs", $crumbs);
-				subnet.subnet_id AS subnet_id,
-				subnet.subnet_address AS subnet_address,
-				subnet.subnet_mask AS subnet_mask
-			FROM
-				subnet,
-				subnetlocation
-			WHERE
-				subnetlocation.location_id=" . $location_id . "
-				AND subnetlocation.subnet_id=subnet.subnet_id
-			ORDER BY
-				INET_ATON(subnet.subnet_address)";
 
-		// run query
-		$subnets = $db->db_select($query);
-		$smarty->assign("subnets", $subnets);
 
-	// end page
+// sublocations		
-		// output
+$query = "SELECT
-		$smarty->display("locationview.tpl");
+		location_id AS sublocation_id,
+		location_name AS sublocation_name,
+		LEFT(location_info, 40) AS info_short,
+		CHAR_LENGTH(location_info) AS info_length
+	FROM
+		location
+	WHERE
+		location_parent=" . $location_id . "
+	ORDER BY
+		location_name";
 
-		// footer
+$sublocations = $db->db_select($query);
-		include("footer.php");
+$smarty->assign("sublocations", $sublocations);
+	
+// subnets
+$query = "SELECT
+		s.subnet_id,
+		s.subnet_address,
+		s.subnet_mask
+	FROM
+		subnet AS s LEFT JOIN subnetlocation USING (subnet_id)
+	WHERE
+		subnetlocation.location_id=" . $location_id . "
+	ORDER BY
+		INET_ATON(s.subnet_address)";
+
+$subnets = $db->db_select($query);
+$smarty->assign("subnets", $subnets);
+	
+$smarty->display("locationview.tpl");
+		
+include("footer.php");
 ?>

login.php

@@ -1,77 +1,47 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+session_name('ipreg');
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
+session_start();
-	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
+include("config.php");
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+include("dbconnect.php");
 	
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("lib.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 		
-	// session
+// include language file
-		// start session
+$language = lang_getfrombrowser($config_lang, $config_lang_default, null, false);
-		session_name('ipreg');
+include('lang/' . $language . '.php');
-		session_start();
 
-	// headers
+// check for submit
-		// raw http headers
+if ($_SERVER['REQUEST_METHOD']=="POST" ) {
-		header("Content-Type: text/html; charset=utf-8"); 
+	/// get post info
+	$user_name = sanitize($_POST['user_name']);
+	$user_pass = sanitize($_POST['user_pass']);
 	
-	// includes
+	// login
-		// includes
+	$login = $user->user_login($user_name, $user_pass);
-		include("config.php");
-		include("dbconnect.php");
 
-		// load lib
+	if($login==TRUE) {
-		include("lib.php");
+		// redirect
+		header_location("index.php");
+	} else {
+		// not ok, break session
+		$_SESSION = array();
+		session_destroy();
+	}
+}
 		
-		// include language file
+$smarty->assign("config_version", $config_version);
-		$language = lang_getfrombrowser($config_lang, $config_lang_default, null, false);
+$smarty->assign($lang);
-		include('lang/' . $language . '.php');
 
-	// try login?
+$smarty->display("login.tpl");
-		// check for submit
-		if ($_SERVER['REQUEST_METHOD']=="POST" ) {
-			/// get post info
-			$user_name = sanitize($_POST['user_name']);
-			$user_pass = sanitize($_POST['user_pass']);
 
-			// login
+include("footer.php");
-			$login = $user->user_login($user_name, $user_pass);
-			
-			if($login==TRUE) {
-				// redirect
-				header_location("index.php");
-			} else {
-				// not ok, break session
-				$_SESSION = array();
-				session_destroy();
-			}
-		}
-		
-	// start output
-		// get version for the footer-stamp
-		$smarty->assign("config_version", $config_version);
-		
-		// set language variables
-		$smarty->assign($lang);
-	
-	// end page
-		// output
-		$smarty->display("login.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

logout.php

@@ -1,33 +1,17 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+// user logout: clear session
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+$_SESSION = array();
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+// redirect to start page
-	or contact me at wietsew@users.sourceforge.net
+header("Location: index.php");
-	*****************************************************************************/
-	
-	// start page
-		// includes
-		include("includes.php");
-	
-	// logout
-		// user logout
-		$user->user_logout();
-	
-		// redirect
-		header("Location: index.php");
 ?> 

natadd.php

@@ -1,92 +1,63 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$node_id = sanitize($_GET['node_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 	
-	// start page
+// node_ext
-		// includes
+$query = "SELECT
-		include("includes.php");
+		node_ip AS node_ip_ext
+	FROM
+		node
+	WHERE
+		node_id=" . $node_id;
 
-		// get ip and id
+$node = $db->db_select($query);
-		$node_id = sanitize($_GET['node_id']);
 
-		// start output
+$smarty->assign("node_id_ext", $node_id);
-		include("header.php");
+$smarty->assign("node_ip_ext", $node[0]['node_ip_ext']);
 
-		// set language variables
+// node_int
-		$smarty->assign($lang);
+$query = "SELECT
-
+		a.asset_name,
-	// setup node_ext
+		n.node_id AS node_id_int,
-		// build query
+		n.node_ip AS node_ip_int
-		$query = "SELECT
+	FROM
-				node.node_ip AS node_ip_ext
+		asset AS a LEFT JOIN node AS n USING (asset_id)
+	WHERE
+		n.node_id NOT IN (
+			SELECT
+				nat_int
 			FROM
-				node
+				nat
 			WHERE
-				node.node_id=" . $node_id;
+				nat_ext=" . $node_id . "
+		)
+		AND n.node_id!=" . $node_id . "
+	ORDER BY
+		INET_ATON(n.node_ip)";
 
-		// run query
+$nodes = $db->db_select($query);
-		$node = $db->db_select($query);
+foreach ($nodes as $rec) {
+     $node_options[$rec['node_id_int']] = $rec['node_ip_int'] . '/' . $rec['asset_name'];
+}
+$smarty->assign("node_options", $node_options);
 
-		$smarty->assign("node_id_ext", $node_id);
+$nat_type_options[1] = $lang['lang_nat_type_1'];
-		$smarty->assign("node_ip_ext", $node[0]['node_ip_ext']);
+$nat_type_options[2] = $lang['lang_nat_type_2'];
+$nat_type_options[3] = $lang['lang_nat_type_3'];
+$smarty->assign("nat_type_options", $nat_type_options);
 
-	// setup node_int
+$smarty->display("natadd.tpl");
-		// build query
-		$query = "SELECT
-				asset.asset_name AS asset_name,
-				node.node_id AS node_id_int,
-				node.node_ip AS node_ip_int
-			FROM
-				asset,
-				node
-			WHERE
-				node.node_id NOT IN (
-					SELECT
-						nat_int
-					FROM
-						nat
-					WHERE
-						nat_ext=" . $node_id . "
-				)
-				AND node.node_id!=" . $node_id . "
-				AND asset.asset_id=node.asset_id
-			ORDER BY
-				INET_ATON(node.node_ip)";
 	
-		// run query
+include("footer.php");
-		$nodes = $db->db_select($query);
-        foreach ($nodes as $rec) {
-             $node_options[$rec['node_id_int']] = $rec['node_ip_int'] . '/' . $rec['asset_name'];
-        }
-        $smarty->assign("node_options", $node_options);
-
-        $nat_type_options[1] = $lang['lang_nat_type_1'];
-        $nat_type_options[2] = $lang['lang_nat_type_2'];
-        $nat_type_options[3] = $lang['lang_nat_type_3'];
-        $smarty->assign("nat_type_options", $nat_type_options);
-
-	// end page
-		// output
-        $smarty->display("natadd.tpl");
-	
-		// end output
-		include("footer.php");
 ?>

natdel.php

@@ -1,80 +1,55 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$node_id = sanitize($_GET['node_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
+// node_ext
-		// includes
+$query = "SELECT
-		include("includes.php");
+		node_ip AS node_ip_ext
+	FROM
+		node
+	WHERE
+		node_id=" . $node_id;
 
-		// get ip and id
+$node = $db->db_select($query);
-		$node_id = sanitize($_GET['node_id']);
 
-		// start output
+$smarty->assign("node_id_ext", $node_id);
-		include("header.php");
+$smarty->assign("node_ip_ext", $node[0]['node_ip_ext']);
 
-		// set language variables
+// options
-		$smarty->assign($lang);
+$query = "SELECT
+		a.asset_name,
+		n.node_ip,
+		x.nat_ext
+	FROM
+		asset AS a,
+		nat AS x,
+		node AS n
+	WHERE
+		x.nat_ext="  . $node_id . "
+		AND n.node_id=x.nat_int
+		AND a.asset_id=n.asset_id
+	ORDER BY
+		INET_ATON(n.node_ip)";
 
-	// setup node_ext
+$nodes = $db->db_select($query);
-		// build query
-		$query = "SELECT
-				node.node_ip AS node_ip_ext
-			FROM
-				node
-			WHERE
-				node.node_id=" . $node_id;
 
-		// run query
+$options = array();
-		$node = $db->db_select($query);
+foreach ($nodes as $rec) {
+    $options[$rec['nat_ext']] = $rec['node_ip'] . '/' . $rec['asset_name'];
+}
+$smarty->assign("nat_options", $options);
+$smarty->display("natdel.tpl");
 
-		$smarty->assign("node_id_ext", $node_id);
+include("footer.php");
-		$smarty->assign("node_ip_ext", $node[0]['node_ip_ext']);
-	
-	// setup node
-		// build query
-		$query = "SELECT
-				asset.asset_name AS asset_name,
-				node.node_id AS node_id_int,
-				node.node_ip AS node_ip_int
-			FROM
-				asset,
-				nat,
-				node
-			WHERE
-				nat.nat_ext="  . $node_id . "
-				AND node.node_id=nat.nat_int
-				AND asset.asset_id=node.asset_id
-			ORDER BY
-				INET_ATON(node.node_ip)";
-		
-		// run query
-		$nodes = $db->db_select($query);
-        $smarty->assign("nodes", $nodes);
-
-// *** <option value="{node_id_int}">{node_ip_int}/{asset_name}</option>
-
-	// end page
-		// output
-        $smarty->display("natdel.tpl");
-
-		// end output
-		include("footer.php");
 ?>

natedit.php

@@ -1,57 +1,31 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$node_id = sanitize($_GET['node_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
+$query = "SELECT
-		// includes
+	node_ip
-		include("includes.php");
+FROM
+	node
+WHERE
+	node.node_id=" . $node_id;
 
-		// get id
+$node = $db->db_select($query);
-		$node_id = sanitize($_GET['node_id']);
 		
-		// start output
+$smarty->assign("node_id", $node_id);
-		include("header.php");
+$smarty->assign("node_ip", $node[0]['node_ip']);
 	
-		// set language variables
+$smarty->display("natedit.tpl");
-		$smarty->assign($lang);
 
-	// setup node
+include("footer.php");
-		// build query
-		$query = "SELECT
-				node.node_ip AS node_ip
-			FROM
-				node
-			WHERE
-				node.node_id=" . $node_id;
-		
-		// run query
-		$node = $db->db_select($query);
-		
-		$smarty->assign("node_id", $node_id);
-		$smarty->assign("node_ip", $node[0]['node_ip']);
-	
-	// end page
-		// output
-        $smarty->display("natedit.tpl");
-
-		// end output
-		include("footer.php");
 ?>

node.php

@@ -1,78 +1,40 @@
 <?php
-    /*****************************************************************************
+/*****************************************************************************
-    IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-    Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-    This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-    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,
+include("includes.php");
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+include("header.php");
-    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
+if(isset($_GET['subnet_id'])) {
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    $subnet_id = sanitize($_GET['subnet_id']);
+    $subnet_view = "WHERE node.subnet_id=" . $subnet_id;
+    $smarty->assign("subnet_id", $subnet_id);
+} else {
+    $smarty->assign("subnet_id", "");
+}
 
-    For more information, visit http://sourceforge.net/projects/ipreg,
+$query = "SELECT
-    or contact me at wietsew@users.sourceforge.net
+        asset.asset_id,
-    *****************************************************************************/
+        REPLACE(asset.asset_name, ' ', '&nbsp;') AS asset_name,
+        asset.asset_info,
+        node.node_id,
+        node.node_ip
+    FROM
+        asset LEFT JOIN node USING (asset_id)
+    " . $subnet_view . "
+    GROUP BY
+        node.node_id
+    ORDER BY
+        INET_ATON(node.node_ip)";
 
-    // start page
+$nodes = $db->db_select($query);
-        // includes
+$smarty->assign("nodes", $nodes);
-        include("includes.php");
+$smarty->display("node.tpl");
 
-        // start output
+include("footer.php");
-        include("header.php");
-
-        // set language variables
-        $smarty->assign($lang);
-
-    // start node
-        // setup view
-            // subnet
-            if(isset($_GET['subnet_id'])) {
-                // get id
-                $subnet_id = sanitize($_GET['subnet_id']);
-
-                // build query part
-                $subnet_view = "AND node.subnet_id=" . $subnet_id;
-
-                // to tpl
-                $smarty->assign("subnet_id", $subnet_id);
-            } else {
-                // to tpl
-                $smarty->assign("subnet_id", "");
-            }
-
-        // build query
-        $query = "SELECT
-                asset.asset_id,
-                REPLACE(asset.asset_name, ' ', '&nbsp;') AS asset_name,
-                asset.asset_info,
-                node.node_id,
-                node.node_ip
-            FROM
-                asset,
-                node
-            WHERE
-                asset.asset_id=node.asset_id
-                " . $subnet_view . "
-            GROUP BY
-                node.node_id
-            ORDER BY
-                INET_ATON(node.node_ip)";
-
-        // run query
-        $nodes = $db->db_select($query);
-        $smarty->assign("nodes", $nodes);
-
-    // end page
-        // output
-        $smarty->display("node.tpl");
-
-        // end output
-        include("footer.php");
 ?>

nodeadd.php

@@ -1,54 +1,26 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+if ((isset($_GET['node_ip'])) ? $node_ip = sanitize($_GET['node_ip']) : $node_ip = '');
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+if ((isset($_GET['subnet_id'])) ?  $subnet_id = sanitize($_GET['subnet_id']) : $subnet_id = '');
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
+$smarty->assign("user_dns1suffix", $_SESSION['suser_dns1suffix']);
-		// includes
+$smarty->assign("user_dns2suffix", $_SESSION['suser_dns2suffix']);
-		include("includes.php");
+$smarty->assign("node_ip", $node_ip);
 	
-		// check for set ip and/or subnet_id
+$smarty->assign("subnet_options", $db->options_subnet());
-		if ((isset($_GET['node_ip'])) ? $node_ip = sanitize($_GET['node_ip']) : $node_ip = '');
+$smarty->assign("assetclass_options", $db->options_assetclass());
-		if ((isset($_GET['subnet_id'])) ?  $subnet_id = sanitize($_GET['subnet_id']) : $subnet_id = '');
+$smarty->display("nodeadd.tpl");
 
-		// start output
+include("footer.php");
-		include("header.php");
-
-		// set language variables
-		$smarty->assign($lang);
-
-	// set vars
-		$smarty->assign("user_dns1suffix", $_SESSION['suser_dns1suffix']);
-		$smarty->assign("user_dns2suffix", $_SESSION['suser_dns2suffix']);
-		$smarty->assign("node_ip", $node_ip);
-	
-	// setup subnet
-        $smarty->assign("subnet_options", $db->options_subnet());
-
-	// setup assetclass
-        $smarty->assign("assetclass_options", $db->options_assetclass());
-
-	// end page
-		// output
-        $smarty->display("nodeadd.tpl");
-
-        // end output
-		include("footer.php");
 ?>

nodedel.php

@@ -1,60 +1,35 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$node_id = sanitize($_GET['node_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
+$query = "SELECT
-		// includes
+		asset_id,
-		include("includes.php");
+		node_ip
+	FROM
+		node
+	WHERE
+		node_id=" . $node_id;
 
-		// get id	
+// run query
-		$node_id = sanitize($_GET['node_id']);
+$node = $db->db_select($query);
 
-		// start output
+// send to tpl
-		include("header.php");
+$smarty->assign("node_id", $node_id);
+$smarty->assign("asset_id", $node[0]['asset_id']);
+$smarty->assign("node_ip", $node[0]['node_ip']);
 	
-		// set language variables
+$smarty->display("nodedel.tpl");
-		$smarty->assign($lang);
 		
-	// setup node
+include("footer.php");
-		// build query
-		$query = "SELECT
-				node.asset_id AS asset_id,
-				node.node_ip AS node_ip
-			FROM
-				node
-			WHERE
-				node.node_id=" . $node_id;
-		
-		// run query
-		$node = $db->db_select($query);
-		
-		// send to tpl
-		$smarty->assign("node_id", $node_id);
-		$smarty->assign("asset_id", $node[0]['asset_id']);
-		$smarty->assign("node_ip", $node[0]['node_ip']);
-	
-	// end page
-		// output
-        $smarty->display("nodedel.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

nodeedit.php

@@ -1,86 +1,54 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$node_id = sanitize($_GET['node_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 		
-	// start page
+$query = "SELECT
-		// includes
+		a.asset_id,
-		include("includes.php");
+		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 AS a,
+		node AS n,
+		subnet AS s
+	WHERE
+		a.asset_id=n.asset_id
+		AND n.node_id=" . $node_id . "
+		AND s.subnet_id=n.subnet_id";
 
-		// get id	
+$node = $db->db_select($query);
-		$node_id = sanitize($_GET['node_id']);
 
-		// start output
+$smarty->assign("node_id", $node[0]['node_id']);
-		include("header.php");
+$smarty->assign("node_ip", $node[0]['node_ip']);
+$smarty->assign("node_mac", write_mac($node[0]['node_mac']));
+$smarty->assign("node_dns1", $node[0]['node_dns1']);
+$smarty->assign("node_dns2", $node[0]['node_dns2']);
+$smarty->assign("node_info", $node[0]['node_info']);
+$smarty->assign("asset_id", $node[0]['asset_id']);
+$smarty->assign("subnet_id", $node[0]['subnet_id']);
+$smarty->assign("zone_id", $node[0]['zone_id']);
 
-		// set language variables
+$smarty->assign("asset_options", $db->options_asset());
-		$smarty->assign($lang);
+$smarty->assign("subnet_options", $db->options_subnet());
+$smarty->assign("zone_options", $db->options_zone("(keine)"));
 
-	// setup node
+$smarty->display("nodeedit.tpl");
-		// 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
-			FROM
-				asset,
-				node,
-				subnet
-			WHERE
-				asset.asset_id=node.asset_id
-				AND node.node_id=" . $node_id . "
-				AND subnet.subnet_id=node.subnet_id";
 		
-		// run query
+include("footer.php");
-		$node = $db->db_select($query);
-
-// send to tpl
-		$smarty->assign("node_id", $node[0]['node_id']);
-		$smarty->assign("node_ip", $node[0]['node_ip']);
-		$smarty->assign("node_mac", write_mac($node[0]['node_mac']));
-		$smarty->assign("node_dns1", $node[0]['node_dns1']);
-		$smarty->assign("node_dns2", $node[0]['node_dns2']);
-		$smarty->assign("node_info", $node[0]['node_info']);
-		$smarty->assign("asset_id", $node[0]['asset_id']);
-		$smarty->assign("subnet_id", $node[0]['subnet_id']);
-		$smarty->assign("zone_id", $node[0]['zone_id']);
-
-	// setup asset
-        $smarty->assign("asset_options", $db->options_asset());
-
-    // setup subnet
-        $smarty->assign("subnet_options", $db->options_subnet());
-
-    // setup zone
-        $smarty->assign("zone_options", $db->options_zone("(keine)"));
-
-	// end page
-		// output
-        $smarty->display("nodeedit.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

nodeview.php

@@ -1,105 +1,85 @@
 <?php
-    /*****************************************************************************
+/*****************************************************************************
-    IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-    Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-    This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-    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,
+include("includes.php");
-    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
+if (isset($_GET['node_id']) && (!empty($_GET['node_id']))) {
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    $node_id = sanitize($_GET['node_id']);
+} else {
+    // redirect to error page
+    header_location("comments.php?comments=error");
+    exit;
+}
 
-    For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-    or contact me at wietsew@users.sourceforge.net
+// node
-    *****************************************************************************/
+$query = "SELECT
+        asset.asset_id,
+        asset.asset_name,
+        node.node_id,
+        node.node_ip,
+        node.node_mac,
+        node.node_dns1,
+        node.node_dns2,
+        node.node_info,
+        node.node_type,
+        subnet.subnet_id,
+        subnet.subnet_address,
+        subnet.subnet_mask,
+        zone.zone_origin
+    FROM
+        node
+        JOIN asset USING (asset_id)
+        JOIN subnet USING (subnet_id)
+        LEFT JOIN zone USING (zone_id)
+    WHERE
+        node.node_id=" . $node_id;
 
-    // start page
+$node = $db->db_select($query);
-        // includes
+$node[0]['node_mac'] = write_mac($node[0]['node_mac']);
-        include("includes.php");
+$smarty->assign("node", $node[0]);
 
-        // get id
+// nat
-        $node_id = sanitize($_GET['node_id']);
+$query = "SELECT
+        asset_ext.asset_id AS asset_id_ext,
+        asset_int.asset_id AS asset_id_int,
+        asset_ext.asset_name AS asset_name_ext,
+        asset_int.asset_name AS asset_name_int,
+        nat.nat_id AS nat_id,
+        nat.nat_type AS nat_type,
+        nat.nat_ext AS nat_ext,
+        nat.nat_int AS nat_int,
+        node_ext.node_ip AS node_ip_ext,
+        node_int.node_ip AS node_ip_int,
+        node_int.node_id AS node_id_int,
+        node_ext.node_id AS node_id_ext
+    FROM
+        asset AS asset_ext,
+        asset AS asset_int,
+        nat,
+        node AS node_ext,
+        node AS node_int
+    WHERE
+        (nat.nat_ext=" . $node_id . "
+        OR nat.nat_int=" . $node_id . ")
+        AND node_ext.node_id=nat.nat_ext
+        AND node_int.node_id=nat.nat_int
+        AND asset_ext.asset_id=node_ext.asset_id
+        AND asset_int.asset_id=node_int.asset_id
+    ORDER BY
+        INET_ATON(node_ext.node_ip),
+        INET_ATON(node_int.node_ip)";
 
-        // start output
+$natrules = $db->db_select($query);
-        include("header.php");
+$smarty->assign("natrules", $natrules);
 
-        // set language variables
+$smarty->display("nodeview.tpl");
-        $smarty->assign($lang);
 
-    // setup node
+include("footer.php");
-        // build query
-        $query = "SELECT
-                asset.asset_id,
-                asset.asset_name,
-                node.node_id,
-                node.node_ip,
-                node.node_mac,
-                node.node_dns1,
-                node.node_dns2,
-                node.node_info,
-                node.node_type,
-                subnet.subnet_id,
-                subnet.subnet_address,
-                subnet.subnet_mask,
-                zone.zone_origin
-            FROM
-                node
-                JOIN asset USING (asset_id)
-                JOIN subnet USING (subnet_id)
-                LEFT JOIN zone USING (zone_id)
-            WHERE
-                node.node_id=" . $node_id;
-
-        // run query
-        $node = $db->db_select($query);
-        $node[0]['node_mac'] = write_mac($node[0]['node_mac']);
-        $smarty->assign("node", $node[0]);
-
-    // setup nat
-        // build query
-        $query = "SELECT
-                asset_ext.asset_id AS asset_id_ext,
-                asset_int.asset_id AS asset_id_int,
-                asset_ext.asset_name AS asset_name_ext,
-                asset_int.asset_name AS asset_name_int,
-                nat.nat_id AS nat_id,
-                nat.nat_type AS nat_type,
-                nat.nat_ext AS nat_ext,
-                nat.nat_int AS nat_int,
-                node_ext.node_ip AS node_ip_ext,
-                node_int.node_ip AS node_ip_int
-            FROM
-                asset asset_ext,
-                asset asset_int,
-                nat,
-                node node_ext,
-                node node_int
-            WHERE
-                (nat.nat_ext=" . $node_id . "
-                OR nat.nat_int=" . $node_id . ")
-                AND node_ext.node_id=nat.nat_ext
-                AND node_int.node_id=nat.nat_int
-                AND asset_ext.asset_id=node_ext.asset_id
-                AND asset_int.asset_id=node_int.asset_id
-            ORDER BY
-                INET_ATON(node_ext.node_ip),
-                INET_ATON(node_int.node_ip)";
-
-        // run query
-        $natrules = $db->db_select($query);
-        // counter to tpl
-        $smarty->assign("natrules", $natrules);
-
-    // end page
-        // output
-        $smarty->display("nodeview.tpl");
-
-        include("footer.php");
 ?>

options.php

@@ -1,39 +1,16 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
+include("header.php");
-	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
+$smarty->display("options.tpl");
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("footer.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
-
-	// start page
-		// includes
-		include("includes.php");
-
-		// start output
-		include("header.php");
-
-		// set language variables
-		$smarty->assign($lang);
-
-	// end page
-		// output
-		$smarty->display("options.tpl");
-
-		// end output
-		include("footer.php");
 ?>

optionseditdisplay.php

@@ -1,123 +1,99 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+include("header.php");
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+$smarty->assign("language", $language);
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
-		// includes
-		include("includes.php");
 	
-		// start output
+if($_SESSION['suser_menu_assets']=='on') {
-		include("header.php");
+	$user_menu_assets_checked = 'checked';
+} else {
+	$user_menu_assets_checked = '';
+}
+// assetclasses
+if($_SESSION['suser_menu_assetclasses']=='on') {
+	$user_menu_assetclasses_checked = 'checked';
+} else {
+	$user_menu_assetclasses_checked = '';
+}
+// assetclassgroups
+if($_SESSION['suser_menu_assetclassgroups']=='on') {
+	$user_menu_assetclassgroups_checked = 'checked';
+} else {
+	$user_menu_assetclassgroups_checked = '';
+}
+// locations
+if($_SESSION['suser_menu_locations']=='on') {
+	$user_menu_locations_checked = 'checked';
+} else {
+	$user_menu_locations_checked = '';
+}
+// nodes
+if($_SESSION['suser_menu_nodes']=='on') {
+	$user_menu_nodes_checked = 'checked';
+} else {
+	$user_menu_nodes_checked = '';
+}
+// subnets
+if($_SESSION['suser_menu_subnets']=='on') {
+	$user_menu_subnets_checked = 'checked';
+} else {
+	$user_menu_subnets_checked = '';
+}
+// users
+if($_SESSION['suser_menu_users']=='on') {
+	$user_menu_users_checked = 'checked';
+} else {
+	$user_menu_users_checked = '';
+}
+// vlans
+if($_SESSION['suser_menu_vlans']=='on') {
+	$user_menu_vlans_checked = 'checked';
+} else {
+	$user_menu_vlans_checked = '';
+}
+// zones
+if($_SESSION['suser_menu_zones']=='on') {
+	$user_menu_zones_checked = 'checked';
+} else {
+	$user_menu_zones_checked = '';
+}
+// tooltips
+if($_SESSION['suser_tooltips']=='on') {
+	$user_tooltips_checked = 'checked';
+} else {
+	$user_tooltips_checked = '';
+}
 
-		// set language variables
+$smarty->assign("user_id", $_SESSION['suser_id']);
-		$smarty->assign($lang);
+$smarty->assign("user_imagesize", $_SESSION['suser_imagesize']);
-		$smarty->assign("language", $language);
+$smarty->assign("user_imagecount", $_SESSION['suser_imagecount']);
+$smarty->assign("user_mac", $_SESSION['suser_mac']);
+$smarty->assign("user_dateformat", $_SESSION['suser_dateformat']);
+$smarty->assign("user_dns1suffix", $_SESSION['suser_dns1suffix']);
+$smarty->assign("user_dns2suffix", $_SESSION['suser_dns2suffix']);
+$smarty->assign("user_language", $_SESSION['suser_language']);
+$smarty->assign("user_menu_assets_checked", $user_menu_assets_checked);
+$smarty->assign("user_menu_assetclasses_checked", $user_menu_assetclasses_checked);
+$smarty->assign("user_menu_assetclassgroups_checked", $user_menu_assetclassgroups_checked);
+$smarty->assign("user_menu_locations_checked", $user_menu_locations_checked);
+$smarty->assign("user_menu_nodes_checked", $user_menu_nodes_checked);
+$smarty->assign("user_menu_subnets_checked", $user_menu_subnets_checked);
+$smarty->assign("user_menu_users_checked", $user_menu_users_checked);
+$smarty->assign("user_menu_vlans_checked", $user_menu_vlans_checked);
+$smarty->assign("user_menu_zones_checked", $user_menu_zones_checked);
+$smarty->assign("user_tooltips_checked", $user_tooltips_checked);
 
-	// setup options
+$smarty->display("optionseditdisplay.tpl");
-		// set menu checkboxes
-			// assets
-			if($_SESSION['suser_menu_assets']=='on') {
-				$user_menu_assets_checked = 'checked';
-			} else {
-				$user_menu_assets_checked = '';
-			}
-			// assetclasses
-			if($_SESSION['suser_menu_assetclasses']=='on') {
-				$user_menu_assetclasses_checked = 'checked';
-			} else {
-				$user_menu_assetclasses_checked = '';
-			}
-			// assetclassgroups
-			if($_SESSION['suser_menu_assetclassgroups']=='on') {
-				$user_menu_assetclassgroups_checked = 'checked';
-			} else {
-				$user_menu_assetclassgroups_checked = '';
-			}
-			// locations
-			if($_SESSION['suser_menu_locations']=='on') {
-				$user_menu_locations_checked = 'checked';
-			} else {
-				$user_menu_locations_checked = '';
-			}
-			// nodes
-			if($_SESSION['suser_menu_nodes']=='on') {
-				$user_menu_nodes_checked = 'checked';
-			} else {
-				$user_menu_nodes_checked = '';
-			}
-			// subnets
-			if($_SESSION['suser_menu_subnets']=='on') {
-				$user_menu_subnets_checked = 'checked';
-			} else {
-				$user_menu_subnets_checked = '';
-			}
-			// users
-			if($_SESSION['suser_menu_users']=='on') {
-				$user_menu_users_checked = 'checked';
-			} else {
-				$user_menu_users_checked = '';
-			}
-			// vlans
-			if($_SESSION['suser_menu_vlans']=='on') {
-				$user_menu_vlans_checked = 'checked';
-			} else {
-				$user_menu_vlans_checked = '';
-			}
-			// zones
-			if($_SESSION['suser_menu_zones']=='on') {
-				$user_menu_zones_checked = 'checked';
-			} else {
-				$user_menu_zones_checked = '';
-			}
-			// tooltips
-			if($_SESSION['suser_tooltips']=='on') {
-				$user_tooltips_checked = 'checked';
-			} else {
-				$user_tooltips_checked = '';
-			}
 
-		// send to tpl
+include("footer.php");
-		$smarty->assign("user_id", $_SESSION['suser_id']);
-		$smarty->assign("user_imagesize", $_SESSION['suser_imagesize']);
-		$smarty->assign("user_imagecount", $_SESSION['suser_imagecount']);
-		$smarty->assign("user_mac", $_SESSION['suser_mac']);
-		$smarty->assign("user_dateformat", $_SESSION['suser_dateformat']);
-		$smarty->assign("user_dns1suffix", $_SESSION['suser_dns1suffix']);
-		$smarty->assign("user_dns2suffix", $_SESSION['suser_dns2suffix']);
-		$smarty->assign("user_language", $_SESSION['suser_language']);
-		$smarty->assign("user_menu_assets_checked", $user_menu_assets_checked);
-		$smarty->assign("user_menu_assetclasses_checked", $user_menu_assetclasses_checked);
-		$smarty->assign("user_menu_assetclassgroups_checked", $user_menu_assetclassgroups_checked);
-		$smarty->assign("user_menu_locations_checked", $user_menu_locations_checked);
-		$smarty->assign("user_menu_nodes_checked", $user_menu_nodes_checked);
-		$smarty->assign("user_menu_subnets_checked", $user_menu_subnets_checked);
-		$smarty->assign("user_menu_users_checked", $user_menu_users_checked);
-		$smarty->assign("user_menu_vlans_checked", $user_menu_vlans_checked);
-		$smarty->assign("user_menu_zones_checked", $user_menu_zones_checked);
-		$smarty->assign("user_tooltips_checked", $user_tooltips_checked);
-
-	// end page
-		// output
-		$smarty->display("optionseditdisplay.tpl");
-
-		// end output
-		include("footer.php");
 ?>

optionseditpassword.php

@@ -1,39 +1,16 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
+include("header.php");
-	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
+$smarty->display("optionseditpassword.tpl");
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("footer.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
-	
-	// start page
-		// includes
-		include("includes.php");
-		
-		// start output
-		include("header.php");
-		
-		// set language variables
-		$smarty->assign($lang);
-	
-	// end page
-		// output
-		$smarty->display("optionseditpassword.tpl");
-
-		// end output
-		include("footer.php");
 ?>

search.php

@@ -1,178 +1,145 @@
 <?php
-    /*****************************************************************************
+/*****************************************************************************
-    IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-    Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-    This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-    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,
+include("includes.php");
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+include("header.php");
-    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,
+// get string that was searched for ($search is already set in header.php)
-    or contact me at wietsew@users.sourceforge.net
+if (empty($search)) {
-    *****************************************************************************/
+    // parse nosearch box
+    $smarty->assign("nosearch", TRUE);
+} else {
+    // hide nosearch box
+    $smarty->assign("nosearch", FALSE);
+    $smarty->assign("search", $search);
 
-    // start page
+    // set needle
-        // includes
+    $needle = '%' . $search . '%';
-        include("includes.php");
 
-        // start output
+    // set counter
-        include("header.php");
+    $resultcounter = 0;
 
-        // set language variables
+    // asset
-        $smarty->assign($lang);
+    $query = "SELECT
+            asset_id AS id,
+            asset_name AS name,
+            asset_info AS description
+        FROM
+            asset
+        WHERE
+            asset_name LIKE '" . $needle . "'
+            OR asset_hostname LIKE '" . $needle . "'
+            OR asset_info LIKE '" . $needle . "'
+        ORDER BY
+            asset_name";
 
-    // get string that was searched for ($search is already set in header.php)
+    $assets = $db->db_select($query);
-    if (empty($search)) {
+    $resultcounter += count($assets);
-        // parse nosearch box
+    $smarty->assign("assets", $assets);
-        $smarty->assign("nosearch", TRUE);
-    } else {
-        // hide nosearch box
-        $smarty->assign("nosearch", FALSE);
-        $smarty->assign("search", $search);
 
-        // set needle
+    // location
-        $needle = '%' . $search . '%';
+    $query = "SELECT
+            location_id AS id,
+            location_name AS name
+        FROM
+            location
+        WHERE
+            location_name LIKE '" . $needle . "'
+            OR location_info LIKE '" . $needle . "'
+        ORDER BY
+            location_name";
 
-        // set counter
+    $locations = $db->db_select($query);
-        $resultcounter = 0;
+    $resultcounter += count($locations);
+    $smarty->assign("locations", $locations);
 
-        // setup asset
+    // node
-            // build query
+    $query = "SELECT
-            $query = "SELECT
+            node_id AS id,
-                    asset.asset_id AS id,
+            node_ip AS ip
-                    asset.asset_name AS name,
+        FROM
-                    asset.asset_info AS description
+            node
-                FROM
+        WHERE
-                    asset
+            node_ip LIKE '" . $needle . "'
-                WHERE
+            OR node_mac LIKE '" . $needle . "'
-                    asset.asset_name LIKE '" . $needle . "'
+            OR node_dns1 LIKE '" . $needle . "'
-                    OR asset.asset_hostname LIKE '" . $needle . "'
+            OR node_dns2 LIKE '" . $needle . "'
-                    OR asset.asset_info LIKE '" . $needle . "'
+            OR node_info LIKE '" . $needle . "'
-                ORDER BY
+        ORDER BY
-                    asset.asset_name";
+            node_ip";
 
-            // run query
+    $nodes = $db->db_select($query);
-            $assets = $db->db_select($query);
+    $resultcounter += count($nodes);
-            $resultcounter += count($assets);
+    $smarty->assign("nodes", $nodes);
-            $smarty->assign("assets", $assets);
 
-        // setup location
+    // subnet
-            // build query
+    $query = "SELECT
-            $query = "SELECT
+            subnet_id AS id,
-                    location.location_id AS id,
+            subnet_address AS address
-                    location.location_name AS name
+        FROM
-                FROM
+            subnet
-                    location
+        WHERE
-                WHERE
+            subnet_address LIKE '" . $needle . "'
-                    location.location_name LIKE '" . $needle . "'
+            OR subnet_info LIKE '" . $needle . "'
-                    OR location.location_info LIKE '" . $needle . "'
+        ORDER BY
-                ORDER BY
+            subnet_address";
-                    location.location_name";
 
-            // run query
+    // run query
-            $locations = $db->db_select($query);
+    $subnets = $db->db_select($query);
-            $resultcounter += count($locations);
+    $resultcounter += count($subnets);
-            $smarty->assign("locations", $locations);
+    $smarty->assign("subnets", $subnets);
 
-        // setup node
+    // vlan
-            // build query
+    $query = "SELECT
-            $query = "SELECT
+            vlan_id AS id,
-                    node.node_id AS id,
+            vlan_name AS name
-                    node.node_ip AS ip
+        FROM
-                FROM
+            vlan
-                    node
+        WHERE
-                WHERE
+            vlan_name LIKE '" . $needle . "'
-                    node.node_ip LIKE '" . $needle . "'
+            OR vlan_info LIKE '" . $needle . "'
-                    OR node.node_mac LIKE '" . $needle . "'
+        ORDER BY
-                    OR node.node_dns1 LIKE '" . $needle . "'
+            vlan_name";
-                    OR node.node_dns2 LIKE '" . $needle . "'
-                    OR node.node_info LIKE '" . $needle . "'
-                ORDER BY
-                    node.node_ip";
 
-            // run query
+    $vlans = $db->db_select($query);
-            $nodes = $db->db_select($query);
+    $resultcounter += count($vlans);
-            $resultcounter += count($nodes);
+    $smarty->assign("vlans", $vlans);
-            $smarty->assign("nodes", $nodes);
 
-        // setup subnet
+    // setup zone
-            // build query
+    $query = "SELECT
-            $query = "SELECT
+            zone_id AS id,
-                    subnet.subnet_id AS id,
+            zone_origin AS origin
-                    subnet.subnet_address AS address
+        FROM
-                FROM
+            zone
-                    subnet
+        WHERE
-                WHERE
+            zone_origin LIKE '" . $needle . "'
-                    subnet.subnet_address LIKE '" . $needle . "'
+            OR zone_soa LIKE '" . $needle . "'
-                    OR subnet.subnet_info LIKE '" . $needle . "'
+            OR zone_hostmaster LIKE '" . $needle . "'
-                ORDER BY
+            OR zone_ns1 LIKE '" . $needle . "'
-                    subnet.subnet_address";
+            OR zone_ns2 LIKE '" . $needle . "'
+            OR zone_ns3 LIKE '" . $needle . "'
+            OR zone_mx1 LIKE '" . $needle . "'
+            OR zone_mx2 LIKE '" . $needle . "'
+            OR zone_info LIKE '" . $needle . "'
+        ORDER BY
+            zone_origin";
 
-            // run query
+    $zones = $db->db_select($query);
-            $subnets = $db->db_select($query);
+    $resultcounter += count($zones);
-            $resultcounter += count($subnets);
+    $smarty->assign("zones", $zones);
-            $smarty->assign("subnets", $subnets);
 
-        // setup vlan
+    // grand totals
-            // build query
+    $smarty->assign("resultcounter", $resultcounter);
-            $query = "SELECT
+}
-                    vlan.vlan_id AS id,
-                    vlan.vlan_name AS name
-                FROM
-                    vlan
-                WHERE
-                    vlan.vlan_name LIKE '" . $needle . "'
-                    OR vlan.vlan_info LIKE '" . $needle . "'
-                ORDER BY
-                    vlan.vlan_name";
 
-            // run query
+$smarty->display("search.tpl");
-            $vlans = $db->db_select($query);
-            $resultcounter += count($vlans);
-            $smarty->assign("vlans", $vlans);
 
-        // setup zone
+include("footer.php");
-            // build query
-            $query = "SELECT
-                    zone_id AS id,
-                    zone_origin AS origin
-                FROM
-                    zone
-                WHERE
-                    zone_origin LIKE '" . $needle . "'
-                    OR zone_soa LIKE '" . $needle . "'
-                    OR zone_hostmaster LIKE '" . $needle . "'
-                    OR zone_ns1 LIKE '" . $needle . "'
-                    OR zone_ns2 LIKE '" . $needle . "'
-                    OR zone_ns3 LIKE '" . $needle . "'
-                    OR zone_mx1 LIKE '" . $needle . "'
-                    OR zone_mx2 LIKE '" . $needle . "'
-                    OR zone_info LIKE '" . $needle . "'
-                ORDER BY
-                    zone_origin";
-
-            // run query
-            $zones = $db->db_select($query);
-            $resultcounter += count($zones);
-            $smarty->assign("zones", $zones);
-
-        // grand totals
-            $smarty->assign("resultcounter", $resultcounter);
-    }
-
-    // end page
-        // output
-        $smarty->display("search.tpl");
-
-        // end output
-        include("footer.php");
 ?>

subnet.php

@@ -1,64 +1,34 @@
 <?php
-    /*****************************************************************************
+/*****************************************************************************
-    IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-    Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-    This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-    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,
+include("includes.php");
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+include("header.php");
-    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
+$query = "SELECT
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+        s.subnet_id,
+        s.subnet_address,
+        s.subnet_mask,
+        s.ntp_server,
+        LEFT(s.subnet_info, 40) AS subnet_info,
+        CHAR_LENGTH(s.subnet_info) AS subnet_length,
+        COUNT(node.subnet_id) AS node_counter
+    FROM
+        subnet AS s LEFT JOIN node USING (subnet_id)
+    GROUP BY
+        s.subnet_id
+    ORDER BY
+        INET_ATON(s.subnet_address)";
 
-    For more information, visit http://sourceforge.net/projects/ipreg,
+$subnets = $db->db_select($query);
-    or contact me at wietsew@users.sourceforge.net
-    *****************************************************************************/
 
-    // start page
+$smarty->assign("subnets", $subnets);
-        // includes
+$smarty->display("subnet.tpl");
-        include("includes.php");
 
-        // start output
+include("footer.php");
-        include("header.php");
-
-        // set language variables
-        $smarty->assign($lang);
-
-    // setup subnet
-        // build query
-        $query = "SELECT
-                s.subnet_id,
-                s.subnet_address,
-                s.subnet_mask,
-                s.ntp_server,
-                LEFT(s.subnet_info, 40) AS subnet_info,
-                CHAR_LENGTH(s.subnet_info) AS subnet_length,
-                COUNT(node.subnet_id) AS node_counter
-            FROM
-                subnet AS s
-            LEFT JOIN
-                node
-            ON
-                node.subnet_id=s.subnet_id
-            GROUP BY
-                s.subnet_id
-            ORDER BY
-                INET_ATON(s.subnet_address)";
-
-        // run query
-        $subnets = $db->db_select($query);
-        $smarty->assign("subnets", $subnets);
-
-    // end page
-        // output
-        $smarty->display("subnet.tpl");
-
-        // end output
-        include("footer.php");
 ?>

subnetadd.php

@@ -1,61 +1,35 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+if((isset($_GET['vlan_id'])) ? $vlan_id = sanitize($_GET['vlan_id']) : $vlan_id = "");
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
+$query = "SELECT
-		// includes
+		vlan_id,
-		include("includes.php");
+		vlan_number,
+		vlan_name
+	FROM
+		vlan
+	ORDER BY
+		vlan_name";
 
-		// get id
+$vlans = $db->db_select($query);
-		if((isset($_GET['vlan_id'])) ? $vlan_id = sanitize($_GET['vlan_id']) : $vlan_id = "");
+$vlan_options[0] = $lang['lang_option_none'];
+foreach ($vlans as $vlan) {
+    $vlan_options[$vlan['vlan_id']] =  $vlan['vlan_name'];
+}
+$smarty->assign("vlan_options", $vlan_options);
 
-		// start output
+$smarty->display("subnetadd.tpl");
-		include("header.php");
 
-		// set language variables
+include("footer.php");
-		$smarty->assign($lang);
-
-	// setup vlan
-		// build query
-		$query = "SELECT
-				vlan.vlan_id AS vlan_id,
-				vlan.vlan_number AS vlan_number,
-				vlan.vlan_name AS vlan_name
-			FROM
-				vlan
-			ORDER BY
-				vlan.vlan_name";
-		
-		// run query
-		$vlans = $db->db_select($query);
-        $vlan_options[0] = $lang['lang_option_none'];
-        foreach ($vlans as $vlan) {
-            $vlan_options[$vlan['vlan_id']] =  $vlan['vlan_name'];
-        }
-        $smarty->assign("vlan_options", $vlan_options);
-
-	// end page
-		// output
-        $smarty->display("subnetadd.tpl");
-
-		// end output
-		include("footer.php");
 ?>

subnetdel.php

@@ -1,76 +1,48 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$subnet_id = sanitize($_GET['subnet_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 	
-	// start page
+// subnet
-		// includes
+$query = "SELECT
-		include("includes.php");
+		subnet_address,
+		subnet_mask
+	FROM
+		subnet
+	WHERE
+		subnet_id=" . $subnet_id;
 
-		// get id	
+$subnet = $db->db_select($query);
-		$subnet_id = sanitize($_GET['subnet_id']);
 
-		// start output
+$smarty->assign("subnet_id", $subnet_id);
-		include("header.php");
+$smarty->assign("subnet_address", $subnet[0]['subnet_address']);
+$smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
 	
-		// set language variables
+// node		
-		$smarty->assign($lang);
+$query = "SELECT
+		node_id,
+		node_ip
+	FROM
+		node
+	WHERE
+		subnet_id=" . $subnet_id . "
+	ORDER BY
+		INET_ATON(node_ip)";
 
-	// setup subnet
+$nodes = $db->db_select($query);
-		// build query
-		$query = "SELECT
-				subnet.subnet_address AS subnet_address,
-				subnet.subnet_mask AS subnet_mask
-			FROM
-				subnet
-			WHERE
-				subnet.subnet_id=" . $subnet_id;
 
-		// run query
+$smarty->assign("nodes", $nodes);
-		$subnet = $db->db_select($query);
+$smarty->display("subnetdel.tpl");
 		
-		// send to tpl
+include("footer.php");
-		$smarty->assign("subnet_id", $subnet_id);
-		$smarty->assign("subnet_address", $subnet[0]['subnet_address']);
-		$smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
-	
-	// setup node		
-		// build query
-		$query = "SELECT
-				node.node_id AS node_id,
-				node.node_ip AS node_ip
-			FROM
-				node
-			WHERE
-				node.subnet_id=" . $subnet_id . "
-			ORDER BY
-				INET_ATON(node.node_ip)";
-		
-		// run query
-		$nodes = $db->db_select($query);
-        $smarty->assign("nodes", $nodes);
-	
-	// end page
-		// output
-        $smarty->display("subnetdel.tpl");
-		
-		// footer
-		include("footer.php");
 ?>

subnetedit.php

@@ -1,70 +1,43 @@
 <?php
-    /*****************************************************************************
+/*****************************************************************************
-    IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-    Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-    This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-    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,
+include("includes.php");
-    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
+$subnet_id = sanitize($_GET['subnet_id']);
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-    For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-    or contact me at wietsew@users.sourceforge.net
-    *****************************************************************************/
 
-    // start page
+$query = "SELECT
-        // includes
+        subnet_address,
-        include("includes.php");
+        subnet_mask,
+        protocol_version,
+        subnet_dhcp_start,
+        subnet_dhcp_end,
+        ntp_server,
+        subnet_info AS subnet_info
+    FROM
+        subnet
+    WHERE
+        subnet_id=" . $subnet_id;
 
-        // get id
+$subnet = $db->db_select($query);
-        $subnet_id = sanitize($_GET['subnet_id']);
 
-        // start output
+$smarty->assign("subnet_id", $subnet_id);
-        include("header.php");
+$smarty->assign("subnet_address", $subnet[0]['subnet_address']);
+$smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
+$smarty->assign("subnet_proto_vers", $subnet[0]['protocol_version']);
+$smarty->assign("subnet_dhcpstart", $subnet[0]['subnet_dhcp_start']);
+$smarty->assign("subnet_dhcpend", $subnet[0]['subnet_dhcp_end']);
+$smarty->assign("subnet_ntp_server", $subnet[0]['ntp_server']);
+$smarty->assign("subnet_info", $subnet[0]['subnet_info']);
 
-        // set language variables
+$smarty->display("subnetedit.tpl");
-        $smarty->assign($lang);
 
-    // setup subnet
+include("footer.php");
-        // build query
-        $query = "SELECT
-                subnet_address,
-                subnet_mask,
-                protocol_version,
-                subnet_dhcp_start,
-                subnet_dhcp_end,
-                ntp_server,
-                subnet_info AS subnet_info
-            FROM
-                subnet
-            WHERE
-                subnet_id=" . $subnet_id;
-
-        // run query
-        $subnet = $db->db_select($query);
-
-        // send to tpl
-        $smarty->assign("subnet_id", $subnet_id);
-        $smarty->assign("subnet_address", $subnet[0]['subnet_address']);
-        $smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
-        $smarty->assign("subnet_proto_vers", $subnet[0]['protocol_version']);
-        $smarty->assign("subnet_dhcpstart", $subnet[0]['subnet_dhcp_start']);
-        $smarty->assign("subnet_dhcpend", $subnet[0]['subnet_dhcp_end']);
-        $smarty->assign("subnet_ntp_server", $subnet[0]['ntp_server']);
-        $smarty->assign("subnet_info", $subnet[0]['subnet_info']);
-
-    // end page
-        // output
-        $smarty->display("subnetedit.tpl");
-
-        // end output
-        include("footer.php");
 ?>

subnetlocationadd.php

@@ -1,63 +1,34 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$subnet_id = sanitize($_GET['subnet_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 		
-	// start page
+$query = "SELECT
-		// includes
+		subnet_address,
-		include("includes.php");
+		subnet_mask
+	FROM
+		subnet
+	WHERE
+		subnet_id=" . $subnet_id;
 
-		// get ip and id
+$subnet = $db->db_select($query);
-		$subnet_id = sanitize($_GET['subnet_id']);
 
-		// start output
+$smarty->assign("subnet_id", $subnet_id);
-		include("header.php");
+$smarty->assign("subnet_address", $subnet[0]['subnet_address']);
+$smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
 	
-		// set language variables
+$smarty->assign("location_options", $db->options_location());
-		$smarty->assign($lang);
+$smarty->display("subnetlocationadd.tpl");
 
-	// setup subnet
+include("footer.php");
-		// build query
-		$query = "SELECT
-				subnet.subnet_address AS subnet_address,
-				subnet.subnet_mask AS subnet_mask
-			FROM
-				subnet
-			WHERE
-				subnet.subnet_id=" . $subnet_id;
-		
-		// run query
-		$subnet = $db->db_select($query);
-		
-		$smarty->assign("subnet_id", $subnet_id);
-		$smarty->assign("subnet_address", $subnet[0]['subnet_address']);
-		$smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
-	
-	// start parent
-		// build query
-        $smarty->assign("location_options", $db->options_location());
-
-	// end page
-		// output
-        $smarty->display("subnetlocationadd.tpl");
-
-		// end output
-		include("footer.php");
 ?>

subnetlocationdel.php

@@ -1,82 +1,54 @@
 <?php
-    /*****************************************************************************
+/*****************************************************************************
-    IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-    Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-    This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-    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,
+include("includes.php");
-    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
+$subnet_id = sanitize($_GET['subnet_id']);
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-    For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-    or contact me at wietsew@users.sourceforge.net
-    *****************************************************************************/
 
-    // start page
+// subnet
-        // includes
+$query = "SELECT
-        include("includes.php");
+        subnet_address,
+        subnet_mask
+    FROM
+        subnet
+    WHERE
+        subnet_id=" . $subnet_id;
 
-        // get ip and id
+// run query
-        $subnet_id = sanitize($_GET['subnet_id']);
+$subnet = $db->db_select($query);
 
-        // start output
+$smarty->assign("subnet_id", $subnet_id);
-        include("header.php");
+$smarty->assign("subnet_address", $subnet[0]['subnet_address']);
+$smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
 
-        // set language variables
+// location
-        $smarty->assign($lang);
+$query = "SELECT
+        l.location_id,
+        l.location_name
+    FROM
+        subnetlocation AS s LEFT JOIN location USING (location_id)
+    WHERE
+        s.subnet_id="  . $subnet_id . "
+    ORDER BY
+        l.location_name";
 
-    // setup subnet
+// run query
-        // build query
+$records = $db->db_select($query);
-        $query = "SELECT
+$locations = array();
-                subnet.subnet_address AS subnet_address,
+foreach ($records as $rec) {
-                subnet.subnet_mask AS subnet_mask
+    $locations[$rec['location_id']] = $rec['location_name'];
-            FROM
+}
-                subnet
+$smarty->assign("location_options", $locations);
-            WHERE
-                subnet.subnet_id=" . $subnet_id;
 
-        // run query
+$smarty->display("subnetlocationdel.tpl");
-        $subnet = $db->db_select($query);
 
-        $smarty->assign("subnet_id", $subnet_id);
+include("footer.php");
-        $smarty->assign("subnet_address", $subnet[0]['subnet_address']);
-        $smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
-
-    // setup location
-        // build query
-        $query = "SELECT
-                location.location_id AS location_id,
-                location.location_name AS location_name
-            FROM
-                subnetlocation,
-                location
-            WHERE
-                subnetlocation.subnet_id="  . $subnet_id . "
-                AND location.location_id=subnetlocation.location_id
-            ORDER BY
-                location.location_name";
-
-        // run query
-        $records = $db->db_select($query);
-        $locations = array();
-        foreach ($records as $rec) {
-            $locations[$rec['location_id']] = $rec['location_name'];
-        }
-        $smarty->assign("location_options", $locations);
-
-
-    // end page
-        // output
-        $smarty->display("subnetlocationdel.tpl");
-
-        // end output
-        include("footer.php");
 ?>

subnetlocationedit.php

@@ -1,59 +1,34 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$subnet_id = sanitize($_GET['subnet_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 	
-	// start page
+$query = "SELECT
-		// includes
+		subnet_address,
-		include("includes.php");
+		subnet_mask
+	FROM
+		subnet
+	WHERE
+		subnet_id=" . $subnet_id;
 
-		// get ip and id
+// run query
-		$subnet_id = sanitize($_GET['subnet_id']);
+$subnet = $db->db_select($query);
 
-		// start output
+$smarty->assign("subnet_id", $subnet_id);
-		include("header.php");
+$smarty->assign("subnet_address", $subnet[0]['subnet_address']);
+$smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
 	
-		// set language variables
+$smarty->display("subnetlocationedit.tpl");
-		$smarty->assign($lang);
 
-	// setup subnet
+include("footer.php");
-		// build query
-		$query = "SELECT
-				subnet.subnet_address AS subnet_address,
-				subnet.subnet_mask AS subnet_mask
-			FROM
-				subnet
-			WHERE
-				subnet.subnet_id=" . $subnet_id;
-		
-		// run query
-		$subnet = $db->db_select($query);
-		
-		$smarty->assign("subnet_id", $subnet_id);
-		$smarty->assign("subnet_address", $subnet[0]['subnet_address']);
-		$smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
-	
-	// end page
-		// output
-        $smarty->display("subnetlocationedit.tpl");
-
-		// end output
-		include("footer.php");
 ?>

subnetview.php

@@ -1,440 +1,395 @@
 <?php
-    /*****************************************************************************
+/*****************************************************************************
-    IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-    Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-    This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-    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,
+include("includes.php");
-    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
+$subnet_id = sanitize($_GET['subnet_id']);
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-    For more information, visit http://sourceforge.net/projects/ipreg,
+if(isset($_GET['page'])) {
-    or contact me at wietsew@users.sourceforge.net
+    $page = sanitize($_GET['page']);
-    *****************************************************************************/
+}
 
-    // start page
+$smarty->assign("scripts",'changetext.js');
-        // includes
+include("header.php");
-        include("includes.php");
 
-        // get id
+// subnet
-        $subnet_id = sanitize($_GET['subnet_id']);
+$query = "SELECT
+        s.subnet_address,
+        s.subnet_mask,
+        s.subnet_dhcp_start,
+        s.subnet_dhcp_end,
+        s.subnet_info,
+        s.protocol_version,
+        s.ntp_server,
+        COUNT(node.subnet_id) AS node_counter
+    FROM
+        subnet AS s LEFT JOIN node USING (subnet_id)
+    WHERE
+        s.subnet_id=" . $subnet_id . "
+    GROUP BY
+        s.subnet_id";
 
-        // get page
+$subnet = $db->db_select($query);
-        if(isset($_GET['page'])) {
+
-            $page = sanitize($_GET['page']);
+// set needed variables
+$subnet_address = $subnet[0]['subnet_address'];
+$subnet_mask = $subnet[0]['subnet_mask'];
+$subnet_dhcpstart = $subnet[0]['subnet_dhcp_start'];
+$subnet_dhcpend = $subnet[0]['subnet_dhcp_end'];
+$subnet_proto_vers = $subnet[0]['protocol_version'];
+$subnet_ntp_server = $subnet[0]['ntp_server'];
+
+// set counters
+$host_counter = pow(2,(32-$subnet_mask));
+$node_counter = $subnet[0]['node_counter'];
+$subnet_usedpercentage = round((($node_counter/($host_counter-2))*100), 1);
+
+$smarty->assign("subnet_id", $subnet_id);
+$smarty->assign("subnet_address", $subnet_address);
+$smarty->assign("subnet_mask", $subnet_mask);
+$smarty->assign("subnet_dhcpstart", $subnet_dhcpstart);
+$smarty->assign("subnet_dhcpend", $subnet_dhcpend);
+$smarty->assign("subnet_info", nl2br($subnet[0]['subnet_info']));
+$smarty->assign("subnet_proto_vers", $subnet_proto_vers);
+$smarty->assign("subnet_ntp_server", $subnet_ntp_server);
+$smarty->assign("node_counter", $node_counter);
+$smarty->assign("subnet_usedpercentage", $subnet_usedpercentage);
+$smarty->assign("config_color_unused", $config_color_unused);
+$smarty->assign("host_counter", $host_counter-2);
+$smarty->assign("free_counter", (($host_counter-2)-$node_counter));
+
+// subnet
+
+// split up the range
+$iprange = explode('.', $subnet_address);
+$iprange1 = $iprange[0];
+$iprange2 = $iprange[1];
+$iprange3 = $iprange[2];
+$iprange4 = $iprange[3];
+
+// create empty subnet-array
+$subnet = array();
+
+// determine range (Class A/B/C)
+if ($subnet_mask>=24) {
+    // Class C
+    // fill subnet-array with addresses we want to see
+    for($i=0;$i<$host_counter;$i++) {
+        // build ip
+        $ip = $iprange1 . '.' . $iprange2 . '.' . $iprange3 . '.' . ($iprange4+$i);
+
+        // fill subnet-array
+        $subnet[$ip] = array();
+    }
+
+    // calculate broadcast address
+    $broadcast_address = $iprange1 . '.' . $iprange2 . '.' . $iprange3 .  '.' . ($iprange4+$i-1);
+
+    // to tpl
+    $smarty->assign("iprange1", $iprange1);
+    $smarty->assign("iprange2", $iprange2);
+    $smarty->assign("iprange3", $iprange3);
+    $smarty->assign("iprange4", $iprange4);
+    $smarty->assign("subnetmask1", 255);
+    $smarty->assign("subnetmask2", 255);
+    $smarty->assign("subnetmask3", 255);
+    $smarty->assign("subnetmask4", 256-$host_counter);
+
+    // no pagination needed
+    $smarty->assign("noselect", TRUE);
+    $smarty->assign("one_select", FALSE);
+    $smarty->assign("two_select", FALSE);
+
+    // set displayed nodes
+    $nodes_displayed = $host_counter;
+} else if ($subnet_mask>=16) {
+    // Class B
+    // which part do we want to see?
+    if((empty($page)) ? $page=$subnet_address : $page=$page);
+    $page = explode('.', $page);
+    $page2 = $page[2];
+
+    // fill subnet-array with addresses we want to see
+    for($i=0;$i<256;$i++) {
+        // build ip
+        $ip = $iprange1 . '.' . $iprange2 . '.' . $page2 .  '.' . $i;
+
+        // fill subnet-array
+        $subnet[$ip] = array();
+    }
+
+    // calculate broadcast address
+    $broadcast_address = $iprange1 . '.' . $iprange2 . '.' . ($iprange3+$i-1) .  '.255';
+
+    // to tpl
+    $smarty->assign("iprange1", $iprange1);
+    $smarty->assign("iprange2", $iprange2);
+
+    // loop addresses in range3
+    for($i=$iprange3;$i<(pow(2,(32-$subnet_mask))/256);$i++) {
+        // send to tpl
+        $smarty->assign("iprange3", $i);
+        $smarty->assign("iprange4", 0);
+
+        // set select box
+        if($i==$page2) {
+            $smarty->assign("row_selected", "selected");
+
+        } else {
+            $smarty->assign("row_selected", "");
         }
 
-        // start output
+    }
-        $smarty->assign("scripts",'changetext.js');
-        include("header.php");
 
-        // set language variables
+    $smarty->assign("subnetmask1", 255);
-        $smarty->assign($lang);
+    $smarty->assign("subnetmask2", 255);
+    $smarty->assign("subnetmask3", 256-($host_counter/256));
+    $smarty->assign("subnetmask4", 0);
 
-    // setup subnet
+    // one select box
-        // build query
+    $smarty->assign("noselect", FALSE);
-        $query = "SELECT
+    $smarty->assign("one_select", TRUE);
-                subnet.subnet_address,
+    $smarty->assign("two_select", FALSE);
-                subnet.subnet_mask,
-                subnet.subnet_dhcp_start,
-                subnet.subnet_dhcp_end,
-                subnet.subnet_info,
-                subnet.protocol_version,
-                subnet.ntp_server,
-                COUNT(node.subnet_id) AS node_counter
-            FROM
-                subnet
-            LEFT JOIN
-                node
-            ON
-                node.subnet_id=subnet.subnet_id
-            WHERE
-                subnet.subnet_id=" . $subnet_id . "
-            GROUP BY
-                subnet.subnet_id";
 
-        // run query
+    // set displayed nodes
-        $subnet = $db->db_select($query);
+    $nodes_displayed = 256;
+} else {
+    // Class A
+    // which part do we want to see?
+    if((empty($page)) ? $page=$subnet_address : $page=$page);
+    $page = explode('.', $page);
+    $page2 = $page[1];
+    $page3 = $page[2];
 
-        // set needed variables
+    // fill subnet-array with addresses we want to see
-        $subnet_address = $subnet[0]['subnet_address'];
+    for($i=0;$i<256;$i++) {
-        $subnet_mask = $subnet[0]['subnet_mask'];
+        // build ip
-        $subnet_dhcpstart = $subnet[0]['subnet_dhcp_start'];
+        $ip = $iprange1 . '.' . $page2 . '.' . $page3 .  '.' . $i;
-        $subnet_dhcpend = $subnet[0]['subnet_dhcp_end'];
-        $subnet_proto_vers = $subnet[0]['protocol_version'];
-        $subnet_ntp_server = $subnet[0]['ntp_server'];
 
-        // set counters
+        // fill subnet-array
-        $host_counter = pow(2,(32-$subnet_mask));
+        $subnet[$ip] = array();
-        $node_counter = $subnet[0]['node_counter'];
+    }
-        $subnet_usedpercentage = round((($node_counter/($host_counter-2))*100), 1);
 
+    // calculate broadcast address
+    $broadcast_address = $iprange1 . '.' . ($iprange2+$i-1) . '.255.255';
+
+    // to tpl
+    $smarty->assign("iprange1", $iprange1);
+    $smarty->assign("iprange2", $iprange2);
+
+    // loop addresses in range 2
+    for ($i=$iprange2; $i<(pow(2,(24-$subnet_mask))/256); $i++) {
         // send to tpl
-        $smarty->assign("subnet_id", $subnet_id);
+        $smarty->assign("iprange1", $iprange1);
-        $smarty->assign("subnet_address", $subnet_address);
+        $smarty->assign("iprange2", $i);
-        $smarty->assign("subnet_mask", $subnet_mask);
+        $smarty->assign("iprange3", $page3);
-        $smarty->assign("subnet_dhcpstart", $subnet_dhcpstart);
+        $smarty->assign("iprange4", $iprange4);
-        $smarty->assign("subnet_dhcpend", $subnet_dhcpend);
-        $smarty->assign("subnet_info", nl2br($subnet[0]['subnet_info']));
-        $smarty->assign("subnet_proto_vers", $subnet_proto_vers);
-        $smarty->assign("subnet_ntp_server", $subnet_ntp_server);
-        $smarty->assign("node_counter", $node_counter);
-        $smarty->assign("subnet_usedpercentage", $subnet_usedpercentage);
-        $smarty->assign("config_color_unused", $config_color_unused);
-        $smarty->assign("host_counter", $host_counter-2);
-        $smarty->assign("free_counter", (($host_counter-2)-$node_counter));
 
-    // setup subnet
+        // set select box
-        // split up the range
+        if($i==$page2) {
-        $iprange = explode('.', $subnet_address);
+            $smarty->assign("row1_selected", "selected");
-        $iprange1 = $iprange[0];
-        $iprange2 = $iprange[1];
-        $iprange3 = $iprange[2];
-        $iprange4 = $iprange[3];
 
-        // create empty subnet-array
+        } else {
-        $subnet = array();
+            $smarty->assign("row1_selected", "");
+        }
 
-        // determine range (Class A/B/C)
+        // parse block
-            if ($subnet_mask>=24) {
+        $tp->parse("two_select_row1");
-                // Class C
+    }
-                // fill subnet-array with addresses we want to see
-                for($i=0;$i<$host_counter;$i++) {
-                    // build ip
-                    $ip = $iprange1 . '.' . $iprange2 . '.' . $iprange3 . '.' . ($iprange4+$i);
 
-                    // fill subnet-array
+    // loop addresses in range 3
-                    $subnet[$ip] = array();
+    for($i=0;$i<256;$i++) {
-                }
+        // send to tpl
+        $smarty->assign("iprange1", $iprange1);
+        $smarty->assign("iprange2", $page2);
+        $smarty->assign("iprange3", $i);
+        $smarty->assign("iprange4", $iprange4);
 
-                // calculate broadcast address
+        // set select box
-                $broadcast_address = $iprange1 . '.' . $iprange2 . '.' . $iprange3 .  '.' . ($iprange4+$i-1);
+        if($i==$page3) {
+            $smarty->assign("row2_selected", "selected");
 
-                // to tpl
+        } else {
-                $smarty->assign("iprange1", $iprange1);
+            $smarty->assign("row2_selected", "");
-                $smarty->assign("iprange2", $iprange2);
+        }
-                $smarty->assign("iprange3", $iprange3);
-                $smarty->assign("iprange4", $iprange4);
-                $smarty->assign("subnetmask1", 255);
-                $smarty->assign("subnetmask2", 255);
-                $smarty->assign("subnetmask3", 255);
-                $smarty->assign("subnetmask4", 256-$host_counter);
 
-                // no pagination needed
+        // parse block
-                $smarty->assign("noselect", TRUE);
+        $tp->parse("two_select_row2");
-                $smarty->assign("one_select", FALSE);
+    }
-                $smarty->assign("two_select", FALSE);
 
-                // set displayed nodes
+    $smarty->assign("subnetmask1", 255);
-                $nodes_displayed = $host_counter;
+    $smarty->assign("subnetmask2", 256-($host_counter/65536));
-            } else if ($subnet_mask>=16) {
+    $smarty->assign("subnetmask3", 0);
-                // Class B
+    $smarty->assign("subnetmask4", 0);
-                // which part do we want to see?
-                if((empty($page)) ? $page=$subnet_address : $page=$page);
-                $page = explode('.', $page);
-                $page2 = $page[2];
 
-                // fill subnet-array with addresses we want to see
+    // one select box
-                for($i=0;$i<256;$i++) {
+    $smarty->assign("noselect", FALSE);
-                    // build ip
+    $smarty->assign("one_select", FALSE);
-                    $ip = $iprange1 . '.' . $iprange2 . '.' . $page2 .  '.' . $i;
+    $smarty->assign("two_select", TRUE);
 
-                    // fill subnet-array
+    // set displayed nodes
-                    $subnet[$ip] = array();
+    $nodes_displayed = 256;
-                }
+}
 
-                // calculate broadcast address
+// get nodes for this subnetview and implement the values into the array
-                $broadcast_address = $iprange1 . '.' . $iprange2 . '.' . ($iprange3+$i-1) .  '.255';
+$query = "SELECT
+        asset.asset_name,
+        assetclassgroup.assetclassgroup_color,
+        node.node_id,
+        node.node_ip
+    FROM
+        asset,
+        assetclass,
+        assetclassgroup,
+        node
+    WHERE
+        node.node_ip IN ('".implode("','",array_keys($subnet))."')
+        AND node.subnet_id='$subnet_id'
+        AND asset.asset_id=node.asset_id
+        AND assetclass.assetclass_id=asset.assetclass_id
+        AND assetclassgroup.assetclassgroup_id=assetclass.assetclassgroup_id";
 
-                // to tpl
+$nodes = $db->db_select($query);
-                $smarty->assign("iprange1", $iprange1);
-                $smarty->assign("iprange2", $iprange2);
 
-                // loop addresses in range3
+$node_counter = count($nodes);
-                for($i=$iprange3;$i<(pow(2,(32-$subnet_mask))/256);$i++) {
+if ($node_counter>0) {
-                    // send to tpl
+    // get objects
-                    $smarty->assign("iprange3", $i);
+    foreach($nodes AS $node) {
-                    $smarty->assign("iprange4", 0);
+        // add node-values to ip in subnet-array
+        $subnet[$node['node_ip']] = $node;
+    }
+}
 
-                    // set select box
+// replace ip's in subnet-array (if necessary)
-                    if($i==$page2) {
+// check for subnet address
-                        $smarty->assign("row_selected", "selected");
+if(array_key_exists($subnet_address, $subnet)) {
+    // replace
+    $subnet[$subnet_address] = array("subnet_address");
+}
 
-                    } else {
+// check for broadcast address
-                        $smarty->assign("row_selected", "");
+if(array_key_exists($broadcast_address, $subnet)) {
-                    }
+    // replace
+    $subnet[$broadcast_address] = array("broadcast_address");
+}
 
-                }
+$dhcpstart = 0;
-
+if ($subnet_dhcpstart && $subnet_dhcpend) {
-                $smarty->assign("subnetmask1", 255);
+    $dhcpstart = ip2long($subnet_dhcpstart);
-                $smarty->assign("subnetmask2", 255);
+    $dhcpend = ip2long($subnet_dhcpend);
-                $smarty->assign("subnetmask3", 256-($host_counter/256));
+}
-                $smarty->assign("subnetmask4", 0);
-
-                // one select box
-                $smarty->assign("noselect", FALSE);
-                $smarty->assign("one_select", TRUE);
-                $smarty->assign("two_select", FALSE);
-
-                // set displayed nodes
-                $nodes_displayed = 256;
-            } else {
-                // Class A
-                // which part do we want to see?
-                if((empty($page)) ? $page=$subnet_address : $page=$page);
-                $page = explode('.', $page);
-                $page2 = $page[1];
-                $page3 = $page[2];
-
-                // fill subnet-array with addresses we want to see
-                for($i=0;$i<256;$i++) {
-                    // build ip
-                    $ip = $iprange1 . '.' . $page2 . '.' . $page3 .  '.' . $i;
-
-                    // fill subnet-array
-                    $subnet[$ip] = array();
-                }
-
-                // calculate broadcast address
-                $broadcast_address = $iprange1 . '.' . ($iprange2+$i-1) . '.255.255';
-
-                // to tpl
-                $smarty->assign("iprange1", $iprange1);
-                $smarty->assign("iprange2", $iprange2);
-
-                // loop addresses in range 2
-                for($i=$iprange2;$i<(pow(2,(24-$subnet_mask))/256);$i++) {
-                    // send to tpl
-                    $smarty->assign("iprange1", $iprange1);
-                    $smarty->assign("iprange2", $i);
-                    $smarty->assign("iprange3", $page3);
-                    $smarty->assign("iprange4", $iprange4);
-
-                    // set select box
-                    if($i==$page2) {
-                        $smarty->assign("row1_selected", "selected");
-
-                    } else {
-                        $smarty->assign("row1_selected", "");
-                    }
-
-                    // parse block
-                    $tp->parse("two_select_row1");
-                }
-
-                // loop addresses in range 3
-                for($i=0;$i<256;$i++) {
-                    // send to tpl
-                    $smarty->assign("iprange1", $iprange1);
-                    $smarty->assign("iprange2", $page2);
-                    $smarty->assign("iprange3", $i);
-                    $smarty->assign("iprange4", $iprange4);
-
-                    // set select box
-                    if($i==$page3) {
-                        $smarty->assign("row2_selected", "selected");
-
-                    } else {
-                        $smarty->assign("row2_selected", "");
-                    }
-
-                    // parse block
-                    $tp->parse("two_select_row2");
-                }
-
-                $smarty->assign("subnetmask1", 255);
-                $smarty->assign("subnetmask2", 256-($host_counter/65536));
-                $smarty->assign("subnetmask3", 0);
-                $smarty->assign("subnetmask4", 0);
-
-                // one select box
-                $smarty->assign("noselect", FALSE);
-                $smarty->assign("one_select", FALSE);
-                $smarty->assign("two_select", TRUE);
-
-                // set displayed nodes
-                $nodes_displayed = 256;
-            }
-
-        // get nodes for this subnetview and implement the values into the array
-            // build query
-            $query = "SELECT
-                    asset.asset_name,
-                    assetclassgroup.assetclassgroup_color,
-                    node.node_id,
-                    node.node_ip
-                FROM
-                    asset,
-                    assetclass,
-                    assetclassgroup,
-                    node
-                WHERE
-                    node.node_ip IN ('".implode("','",array_keys($subnet))."')
-                    AND node.subnet_id='$subnet_id'
-                    AND asset.asset_id=node.asset_id
-                    AND assetclass.assetclass_id=asset.assetclass_id
-                    AND assetclassgroup.assetclassgroup_id=assetclass.assetclassgroup_id";
-
-            // run query
-            $nodes = $db->db_select($query);
-
-            // count results
-            $node_counter = count($nodes);
-
-            // any nodes?
-            if ($node_counter>0) {
-                // get objects
-                foreach($nodes AS $node) {
-                    // add node-values to ip in subnet-array
-                    $subnet[$node['node_ip']] = $node;
-
-                }
-            }
-
-        // replace ip's in subnet-array (if necessary)
-            // check for subnet address
-            if(array_key_exists($subnet_address, $subnet)) {
-                // replace
-                $subnet[$subnet_address] = array("subnet_address");
-            }
-
-            // check for broadcast address
-            if(array_key_exists($broadcast_address, $subnet)) {
-                // replace
-                $subnet[$broadcast_address] = array("broadcast_address");
-            }
-
-                        $dhcpstart = 0;
-                        if ($subnet_dhcpstart && $subnet_dhcpend) {
-                            $dhcpstart = ip2long($subnet_dhcpstart);
-                            $dhcpend = ip2long($subnet_dhcpend);
-                        }
 
         // loop subnet-array and send to template
             // start counter
 //            $i=1;
             // loop subnet-array
-            foreach($subnet AS $node_ip => $node) {
+foreach ($subnet AS $node_ip => $node) {
 
-                // make new line?
+// make new line?
-//              if(($i%$_SESSION['suser_imagecount']==0 && $i!=$nodes_displayed) ? $tr="</tr><tr>" : $tr="");
+//   if(($i%$_SESSION['suser_imagecount']==0 && $i!=$nodes_displayed) ? $tr="</tr><tr>" : $tr="");
 
-                                // check if node-ip in DHCP-area
+// check if node-ip in DHCP-area
-                                $subnet[$node_ip]["dynamic"] = False;
+    $subnet[$node_ip]["dynamic"] = false;
-                                if ($dhcpstart > 0) {
+    if ($dhcpstart > 0) {
-                                    $ipval = ip2long($node_ip);
+        $ipval = ip2long($node_ip);
-                                    if (($ipval >= $dhcpstart) and ($ipval <= $dhcpend)) {
+        if (($ipval >= $dhcpstart) and ($ipval <= $dhcpend)) {
-                                        $subnet[$node_ip]["dynamic"] = True;
+            $subnet[$node_ip]["dynamic"] = true;
-                                    }
+        }
-                                }
+    }
 
-                                // check node
+    // check node
-                if (empty($node)) {
+    if (empty($node)) {
-                    // empty node to tpl
+        // empty node to tpl
-                    $subnet[$node_ip]["url"] = 'assigniptonode.php?subnet_id=' . $subnet_id . '&amp;node_ip='. $node_ip;
+        $subnet[$node_ip]["url"] = 'assigniptonode.php?subnet_id=' . $subnet_id . '&amp;node_ip='. $node_ip;
-                    $subnet[$node_ip]["remotetext"] = $node_ip;
+        $subnet[$node_ip]["remotetext"] = $node_ip;
-                                        if ($subnet[$node_ip]["dynamic"]) {
+        if ($subnet[$node_ip]["dynamic"]) {
-                                            $subnet[$node_ip]["assetclassgroup_color"] = $config_color_dynamic;
+            $subnet[$node_ip]["assetclassgroup_color"] = $config_color_dynamic;
-                                        } else {
+        } else {
-                                            $subnet[$node_ip]["assetclassgroup_color"] = $config_color_unused;
+            $subnet[$node_ip]["assetclassgroup_color"] = $config_color_unused;
-                                        }
+        }
+    } else if (array_key_exists(0, $node) && $node[0]=="subnet_address") {
+       // subnet address to tpl
+        $subnet[$node_ip]["url"] = "";
+        $subnet[$node_ip]["remotetext"] = $node_ip . '&nbsp;' . $lang['lang_subnet_subnetaddress'];
+        $subnet[$node_ip]["assetclassgroup_color"] = $config_color_blocked;
+    } else if (array_key_exists(0, $node) && $node[0]=="broadcast_address") {
+        // broadcast address to tpl
+        $subnet[$node_ip]["url"] = "";
+        $subnet[$node_ip]["remotetext"] = $node_ip . '&nbsp;' . $lang['lang_subnet_broadcastaddress'];
+        $subnet[$node_ip]["assetclassgroup_color"] = $config_color_blocked;
+    } else {
+        // node to tpl
+        $subnet[$node_ip]["url"] = 'nodeview.php?node_id=' . $node['node_id'];
+        $subnet[$node_ip]["remotetext"] = $node_ip . '&nbsp;' . $node['asset_name'];
+        $subnet[$node_ip]["assetclassgroup_color"] = $node['assetclassgroup_color'];
+    }
 
-        } else if (array_key_exists(0, $node) && $node[0]=="subnet_address") {
+    // update counter
-                    // subnet address to tpl
+    //   $i++;
-                    $subnet[$node_ip]["url"] = "";
-                    $subnet[$node_ip]["remotetext"] = $node_ip . '&nbsp;' . $lang['lang_subnet_subnetaddress'];
-                    $subnet[$node_ip]["assetclassgroup_color"] = $config_color_blocked;
-                } else if (array_key_exists(0, $node) && $node[0]=="broadcast_address") {
-                    // broadcast address to tpl
-                    $subnet[$node_ip]["url"] = "";
-                    $subnet[$node_ip]["remotetext"] = $node_ip . '&nbsp;' . $lang['lang_subnet_broadcastaddress'];
-                    $subnet[$node_ip]["assetclassgroup_color"] = $config_color_blocked;
-                } else {
-                    // node to tpl
-                    $subnet[$node_ip]["url"] = 'nodeview.php?node_id=' . $node['node_id'];
-                    $subnet[$node_ip]["remotetext"] = $node_ip . '&nbsp;' . $node['asset_name'];
-                    $subnet[$node_ip]["assetclassgroup_color"] = $node['assetclassgroup_color'];
-                }
 
+} // foreach
 
-                // update counter
+$smarty->assign("subnet", $subnet);
-//              $i++;
+$smarty->assign("imagewrap", $_SESSION['suser_imagecount']);
-            }
 
-            $smarty->assign("subnet", $subnet);
+// vlan
-            $smarty->assign("imagewrap", $_SESSION['suser_imagecount']);
+$query = "SELECT
+        vlan.vlan_id AS vlan_id,
+        vlan.vlan_name AS vlan_name,
+        vlan.vlan_number AS vlan_number
+    FROM
+        subnetvlan,
+        vlan
+    WHERE
+        subnetvlan.subnet_id=" . $subnet_id . "
+        AND vlan.vlan_id=subnetvlan.vlan_id
+    ORDER BY
+        vlan.vlan_name";
 
-    // setup vlan
+// run query
-        // build query
+$vlans = $db->db_select($query);
-        $query = "SELECT
+$smarty->assign("vlans", $vlans);
-                vlan.vlan_id AS vlan_id,
-                vlan.vlan_name AS vlan_name,
-                vlan.vlan_number AS vlan_number
-            FROM
-                subnetvlan,
-                vlan
-            WHERE
-                subnetvlan.subnet_id=" . $subnet_id . "
-                AND vlan.vlan_id=subnetvlan.vlan_id
-            ORDER BY
-                vlan.vlan_name";
 
-        // run query
+// location
-        $vlans = $db->db_select($query);
+$query = "SELECT
-        $smarty->assign("vlans", $vlans);
+        l.location_id,
+        l.location_name
+    FROM
+        location AS l LEFT JOIN subnetlocation AS s USING (location_id)
+    WHERE
+        s.subnet_id=". $subnet_id . "
+    ORDER BY
+        l.location_name";
 
-    // setup location
+$locations = $db->db_select($query);
-        // build query
+$smarty->assign("locations", $locations);
-        $query = "SELECT
-                location.location_id,
-                location.location_name
-            FROM
-                location
-            LEFT JOIN
-                subnetlocation
-            ON
-                subnetlocation.location_id=location.location_id
-            WHERE
-                subnetlocation.subnet_id=". $subnet_id . "
-            ORDER BY
-                location.location_name";
 
-        // run query
+// assetclassgroup
-        $locations = $db->db_select($query);
+$query = "SELECT
-        $smarty->assign("locations", $locations);
+        assetclassgroup_id AS id,
+        assetclassgroup_name AS name,
+        assetclassgroup_color  AS color,
+        COUNT(assetclass_id) AS counter
+    FROM subnet
+        LEFT JOIN node USING (subnet_id)
+        LEFT JOIN asset USING (asset_id)
+        LEFT JOIN assetclass USING (assetclass_id)
+        LEFT JOIN assetclassgroup USING (assetclassgroup_id)
+    WHERE subnet_id=" . $subnet_id . "
+    GROUP BY assetclass_id
+    ORDER BY counter DESC";
 
-    // setup assetclassgroup
+// run query
-        // build query
+$assetclassgroups = $db->db_select($query);
-        $query = "SELECT
+$smarty->assign("assetclassgroups", $assetclassgroups);
-                assetclassgroup_id AS id,
-                assetclassgroup_name AS name,
-                assetclassgroup_color  AS color,
-                COUNT(assetclass_id) AS counter
-            FROM subnet
-                LEFT JOIN node USING (subnet_id)
-                LEFT JOIN asset USING (asset_id)
-                LEFT JOIN assetclass USING (assetclass_id)
-                LEFT JOIN assetclassgroup USING (assetclassgroup_id)
-            WHERE subnet_id=" . $subnet_id . "
-            GROUP BY assetclass_id
-            ORDER BY counter DESC";
 
-        // run query
+$smarty->display("subnetview.tpl");
-        $assetclassgroups = $db->db_select($query);
-        $smarty->assign("assetclassgroups", $assetclassgroups);
 
-    // end page
+include("footer.php");
-        // output
-        $smarty->display("subnetview.tpl");
-
-        // end output
-        include("footer.php");
 ?>

subnetvlanadd.php

@@ -1,89 +1,62 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$subnet_id = sanitize($_GET['subnet_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 		
-	// start page
-		// includes
-		include("includes.php");
 	
-		// get ip and id
+// subnet
-		$subnet_id = sanitize($_GET['subnet_id']);
+// build query
+$query = "SELECT
+		subnet_address,
+		subnet_mask
+	FROM
+		subnet
+	WHERE
+		subnet_id=" . $subnet_id;
 
-		// start output
+// run query
-		include("header.php");
+$subnet = $db->db_select($query);
 
-		// set language variables
+$smarty->assign("subnet_id", $subnet_id);
-		$smarty->assign($lang);
+$smarty->assign("subnet_address", $subnet[0]['subnet_address']);
+$smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
 
-	// setup subnet
+// vlan
-		// build query
+$query = " SELECT
-		$query = "SELECT
+		vlan_id,
-				subnet.subnet_address AS subnet_address,
+		vlan_number,
-				subnet.subnet_mask AS subnet_mask
+		vlan_name
+	FROM
+		vlan
+	WHERE
+		vlan_id NOT IN (
+			SELECT
+				vlan_id
 			FROM
-				subnet
+				subnetvlan
 			WHERE
-				subnet.subnet_id=" . $subnet_id;
+				subnet_id=" . $subnet_id . "
+		)
+	ORDER BY
+		vlan_number";
 		
-		// run query
+$vlans = $db->db_select($query);
-		$subnet = $db->db_select($query);
+foreach ($vlans as $vlan) {
+    $vlan_options[$vlan['vlan_id']] =  $vlan['vlan_name'];
+}
+$smarty->assign("vlan_options", $vlan_options);
 
-		$smarty->assign("subnet_id", $subnet_id);
+$smarty->display("subnetvlanadd.tpl");
-		$smarty->assign("subnet_address", $subnet[0]['subnet_address']);
-		$smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
 
-    // setup vlan
+include("footer.php");
-		// build query
-		$query = " SELECT
-				vlan.vlan_id AS vlan_id,
-				vlan.vlan_number AS vlan_number,
-				vlan.vlan_name AS vlan_name
-			FROM
-				vlan
-			WHERE
-				vlan.vlan_id NOT IN (
-					SELECT
-						vlan_id
-					FROM
-						subnetvlan
-					WHERE
-						subnet_id=" . $subnet_id . "
-				)
-			ORDER BY
-				vlan.vlan_number";
-		
-		// run query
-		$vlans = $db->db_select($query);
-        foreach ($vlans as $vlan) {
-            $vlan_options[$vlan['vlan_id']] =  $vlan['vlan_name'];
-        }
-        $smarty->assign("vlan_options", $vlan_options);
-
-        // $smarty->assign("vlans", $vlans);
-		
-
-	// end page
-		// output
-        $smarty->display("subnetvlanadd.tpl");
-
-		// end output
-		include("footer.php");
 ?>

subnetvlandel.php

@@ -1,78 +1,51 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$subnet_id = sanitize($_GET['subnet_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
+// subnet
-		// includes
+$query = "SELECT
-		include("includes.php");
+		subnet_address,
+		subnet_mask
+	FROM
+		subnet
+	WHERE
+		subnet_id=" . $subnet_id;
 
-		// get ip and id
+// run query
-		$subnet_id = sanitize($_GET['subnet_id']);
+$subnet = $db->db_select($query);
 
-		// start output
+$smarty->assign("subnet_id", $subnet_id);
-		include("header.php");
+$smarty->assign("subnet_address", $subnet[0]['subnet_address']);
+$smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
 	
-		// set language variables
+// vlan
-		$smarty->assign($lang);
+$query = "SELECT
+		v.vlan_id,
+		v.vlan_number,
+		v.vlan_name
+	FROM
+		subnetvlan AS s LEFT JOIN vlan AS v USING (vlan_id)
+	WHERE
+		s.subnet_id="  . $subnet_id . "
+	ORDER BY
+		v.vlan_number";
 
-	// setup subnet
+// run query
-		// build query
+$vlans = $db->db_select($query);
-		$query = "SELECT
+$smarty->assign("vlans", $vlans);
-				subnet.subnet_address AS subnet_address,
-				subnet.subnet_mask AS subnet_mask
-			FROM
-				subnet
-			WHERE
-				subnet.subnet_id=" . $subnet_id;
 	
-		// run query
+$smarty->display("subnetvlandel.tpl");
-		$subnet = $db->db_select($query);
 		
-		$smarty->assign("subnet_id", $subnet_id);
+include("footer.php");
-		$smarty->assign("subnet_address", $subnet[0]['subnet_address']);
-		$smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
-	
-	// setup vlan
-		// build query
-		$query = "SELECT
-				vlan.vlan_id AS vlan_id,
-				vlan.vlan_number AS vlan_number,
-				vlan.vlan_name AS vlan_name
-			FROM
-				subnetvlan,
-				vlan
-			WHERE
-				subnetvlan.subnet_id="  . $subnet_id . "
-				AND vlan.vlan_id=subnetvlan.vlan_id
-			ORDER BY
-				vlan.vlan_number";
-		
-		// run query
-		$vlans = $db->db_select($query);
-		$smarty->assign("vlans", $vlans);
-	
-	// end page
-		// output
-        $smarty->display("subnetvlandel.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

subnetvlanedit.php

@@ -1,59 +1,33 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$subnet_id = sanitize($_GET['subnet_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 		
-	// start page
+$query = "SELECT
-		// includes
+		subnet_address,
-		include("includes.php");
+		subnet_mask
+	FROM
+		subnet
+	WHERE
+		subnet_id=" . $subnet_id;
 
-		// get ip and id
+$subnet = $db->db_select($query);
-		$subnet_id = sanitize($_GET['subnet_id']);
 
-		// start output
+$smarty->assign("subnet_id", $subnet_id);
-		include("header.php");
+$smarty->assign("subnet_address", $subnet[0]['subnet_address']);
+$smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
 	
-		// set language variables
+$smarty->display("subnetvlanedit.tpl");
-		$smarty->assign($lang);
 		
-	// setup subnet
+include("footer.php");
-		// build query
-		$query = "SELECT
-				subnet.subnet_address AS subnet_address,
-				subnet.subnet_mask AS subnet_mask
-			FROM
-				subnet
-			WHERE
-				subnet.subnet_id=" . $subnet_id;
-		
-		// run query
-		$subnet = $db->db_select($query);
-		
-		$smarty->assign("subnet_id", $subnet_id);
-		$smarty->assign("subnet_address", $subnet[0]['subnet_address']);
-		$smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
-	
-	// end page
-		// output
-        $smarty->display("subnetvlanedit.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

tpl/about.tpl

@@ -15,6 +15,14 @@
          
     </td>
 </tr>
+<tr>
+    <td class="label">
+        {$lang_about_projectpage}
+    </td>
+    <td class="value">
+        <a href="https://git.piratenpartei-sh.de/thooge/ipreg">https://git.piratenpartei-sh.de/thooge/ipreg</a>
+    </td>
+</tr>
 <tr>
     <td class="label">
         {$lang_about_sfprojectpage}
@@ -75,6 +83,14 @@
         &nbsp;
     </td>
 </tr>
+<tr>
+    <td class="label">
+        {$lang_about_changelog_v08}
+    </td>
+    <td class="value">
+        {$lang_about_changelog_v08_ext}
+    </td>
+</tr>
 <tr>
     <td class="label">
         {$lang_about_changelog_v07}

tpl/asset.tpl

@@ -45,7 +45,7 @@
 </tr>
 {foreachelse}
 <tr>
-    <td colspan="2">
+    <td colspan="3">
         {$lang_asset_none}
     </td>
 </tr>

tpl/assetclass.tpl

@@ -24,8 +24,15 @@
         <a href="assetclassview.php?assetclass_id={$assetclass.assetclass_id}">{$assetclass.assetclass_name}</a>
     </td>
     <td class="value">
+        <img src="image.php?color={$assetclass.assetclassgroup_color}" alt="#{$assetclass.assetclassgroup_color}">
         <a href="assetclassgroupview.php?assetclassgroup_id={$assetclass.assetclassgroup_id}">{$assetclass.assetclassgroup_name}</a>
     </td>
 </tr>
+{foreachelse}
+<tr>
+    <td colspan="3">
+        {$lang_assetclass_none}
+    </td>
+</tr>
 {/foreach}
 </table>

tpl/assetclassgroup.tpl

@@ -22,5 +22,11 @@
         <a href="assetclassgroupview.php?assetclassgroup_id={$assetclassgroup.assetclassgroup_id}">{$assetclassgroup.assetclassgroup_name}</a>
     </td>
 </tr>
+{foreachelse}
+<tr>
+    <td>
+        {$lang_assetclassgroup_none}
+    </td>
+</tr>
 {/foreach}
 </table>

tpl/assetclassview.tpl

@@ -44,6 +44,7 @@
         {$lang_assetclassgroup_name}
     </td>
     <td class="value">
+        <img src="image.php?color={$assetclassgroup_color}" alt="#{$assetclassgroup_color}">
         <a href="assetclassgroupview.php?assetclassgroup_id={$assetclassgroup_id}">{$assetclassgroup_name}</a><br>
     </td>
 </tr>

tpl/location.tpl

@@ -18,8 +18,14 @@
     </td>
 </tr>
 <tr>
+{if $locations}
     <td class="value">
         {treelist tree=$locations}
     </td>
+{else}
+    <td class="value">
+        {$lang_location_none}
+    </td>
+{/if}
 </tr>
 </table>

tpl/natdel.tpl

@@ -5,11 +5,13 @@
 <table class="title">
     <tr>
         <td class="header">
-            {lang_nat}
+            {$lang_nat}
         </td>
         <td align="right">
             <a href="#" onClick="history.go(-1)"><img src="image.php?icon=back" alt="{$lang_cancel}"></a>
+{if $nat_options}
             <input type="image" src="image.php?icon=save" alt="{$lang_submit}">
+{/if}
         </td>
     </tr>
 </table>
@@ -43,11 +45,17 @@
         </td>
     </tr>
     <tr>
+{if $nat_options}
         <td class="label">
             {$lang_node}
         </td>
         <td class="value">
-            {html_options name=node_id_int options=$node_id_int_options}
+            {html_options name=nat_ext options=$nat_options}
         </td>
+{else}
+	<td colspan="2">
+		No NAT rule to delete
+	</td>
+{/if}
     </tr>
 </table>

tpl/node.tpl

@@ -34,5 +34,11 @@
             {$node.asset_info}
         </td>
     </tr>
+    {foreachelse}
+    <tr>
+        <td colspan="3">
+            {$lang_node_none}
+        </td>
+    </tr>
     {/foreach}
 </table>

tpl/nodeview.tpl

@@ -131,7 +131,13 @@
         </td>
         <td class="value">
             {foreach item=rule from=$natrules}
-            <a href="nodeview.php?node_id={$rule.nat_node_id}">{$rule.nat_node_ip}</a>/<a href="assetview.php?asset_id={$rule.nat_asset_id}">{$rule.nat_asset_name}</a> ({$rule.nat_type})<br />
+{if $rule.node_id_int eq $node.node_id}
+            <img src="images/arrow_left.png" alt="incoming" title="coming from">
+            <a href="nodeview.php?node_id={$rule.node_id_ext}">{$rule.node_ip_ext}</a>/<a href="assetview.php?asset_id={$rule.asset_id_ext}">{$rule.asset_name_ext}</a> ({$rule.nat_type})<br />
+{else}
+            <img src="images/arrow_right.png" alt="outgoing" title="forwarding to">
+            <a href="nodeview.php?node_id={$rule.node_id_int}">{$rule.node_ip_int}</a>/<a href="assetview.php?asset_id={$rule.asset_id_int}">{$rule.asset_name_int}</a> ({$rule.nat_type})<br />
+{/if}
             {/foreach}
         </td>
     </tr>

tpl/subnet.tpl

@@ -33,5 +33,11 @@
             {$subnet.subnet_info}
         </td>
     </tr>
+{foreachelse}
+    <tr>
+        <td colspan="3">
+            {$lang_subnet_none}
+        </td>
+    </tr>
 {/foreach}
 </table>

tpl/user.tpl

@@ -2,7 +2,7 @@
     <tr>
         <td class="header">
             <img class="icon" src="images/user.png" alt="" />
-            {$lang_users} ({$user|@count})
+            {$lang_users} ({$users|@count})
         </td>
         <td align="right">
             <a href="useradd.php"><img src="images/user_add.png" alt="{$lang_user_add}" /></a>

tpl/vlan.tpl

@@ -33,5 +33,11 @@
         {$vlan.vlan_info}
     </td>
 </tr>
+{foreachelse}
+<tr>
+    <td colspan="3">
+        {$lang_vlan_none}
+    </td>
+</tr>
 {/foreach}
 </table>

tpl/zone.tpl

@@ -34,5 +34,11 @@
 			{$zone.zone_serial}
 		</td>
 	</tr>
+        {foreachelse}
+        <tr>
+            <td colspan="3">
+                {$lang_zone_none}
+            </td>
+        </tr>
 	{/foreach}
 </table>

user.php

@@ -1,54 +1,28 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
+include("header.php");
-	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
+$query = "SELECT
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+		user_id,
+		user_name,
+		user_displayname
+	FROM
+		user
+	ORDER BY
+		user_name";
 	
-	For more information, visit http://sourceforge.net/projects/ipreg,
+$users = $db->db_select($query);
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
+$smarty->assign("users", $users);
-		// includes
+$smarty->display("user.tpl");
-		include("includes.php");
 		
-		// start output
+include("footer.php");
-		include("header.php");
-
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup user
-		// build query
-		$query = "SELECT
-				user.user_id AS user_id,
-				user.user_name AS user_name,
-				user.user_displayname AS user_displayname
-			FROM
-				user
-			ORDER BY
-				user.user_name";
-		
-		// run query
-		$users = $db->db_select($query);
-		$smarty->assign("users", $users);
-	
-	// end page
-		// output
-        $smarty->display("user.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

useradd.php

@@ -1,39 +1,16 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
+include("header.php");
-	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
+$smarty->display("useradd.tpl");
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("footer.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
-	
-	// start page
-		// includes
-		include("includes.php");
-		
-		// start output
-		include("header.php");
-		
-		// set language variables
-		$smarty->assign($lang);
-	
-	// end page
-		// output
-        $smarty->display("useradd.tpl");
-
-		// end output
-		include("footer.php");
 ?>

userdel.php

@@ -1,58 +1,31 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$user_id = sanitize($_GET['user_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 		
-	// start page
+$query = "SELECT
-		// includes
+	user_name
-		include("includes.php");
+FROM
+	user
+WHERE
+	user_id=" . $user_id;
 
-		// get id	
+$user = $db->db_select($query);
-		$user_id = sanitize($_GET['user_id']);
 		
-		// start output
+$smarty->assign("user_id", $user_id);
-		include("header.php");
+$smarty->assign("user_name", $user[0]['user_name']);
 	
-		// set language variables
+$smarty->display("userdel.tpl");
-		$smarty->assign($lang);
 
-	// setup user
+include("footer.php");
-		// build query
-		$query = "SELECT
-				user.user_name AS user_name
-			FROM
-				user
-			WHERE
-				user.user_id=" . $user_id;
-		
-		// run query
-		$user = $db->db_select($query);
-		
-		// send to tpl
-		$smarty->assign("user_id", $user_id);
-		$smarty->assign("user_name", $user[0]['user_name']);
-	
-	// end page
-		// output
-        $smarty->display("userdel.tpl");
-
-		// footer
-		include("footer.php");
 ?>

useredit.php

@@ -1,60 +1,33 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$user_id = sanitize($_GET['user_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
+$query = "SELECT
-		// includes
+	user_name,
-		include("includes.php");
+	user_displayname
+FROM
+	user
+WHERE
+	user_id=" . $user_id;
 		
-		// get id	
+$user = $db->db_select($query);
-		$user_id = sanitize($_GET['user_id']);
 		
-		// start output
+$smarty->assign("user_id", $user_id);
-		include("header.php");
+$smarty->assign("user_name", $user[0]['user_name']);
+$smarty->assign("user_displayname", $user[0]['user_displayname']);
 	
-		// set language variables
+$smarty->display("useredit.tpl");
-		$smarty->assign($lang);
 		
-	// setup user
+include("footer.php");
-		// build query
-		$query = "SELECT
-				user.user_name AS user_name,
-				user.user_displayname AS user_displayname
-			FROM
-				user
-			WHERE
-				user.user_id=" . $user_id;
-		
-		// run query
-		$user = $db->db_select($query);
-		
-		// send to tpl
-		$smarty->assign("user_id", $user_id);
-		$smarty->assign("user_name", $user[0]['user_name']);
-		$smarty->assign("user_displayname", $user[0]['user_displayname']);
-	
-	// end page
-		// output
-        $smarty->display("useredit.tpl");
-		
-		// footer
-		include("footer.php");
 ?>

userview.php

@@ -1,60 +1,35 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$user_id = sanitize($_GET['user_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
+$query = "SELECT
-		// includes
+		user_name,
-		include("includes.php");
+		user_displayname
+	FROM
+		user
+	WHERE
+		user_id=" . $user_id;
 
-		// get id
+// run query
-		$user_id = sanitize($_GET['user_id']);
+$user = $db->db_select($query);
 
-		// start output
+// send to tpl
-		include("header.php");
+$smarty->assign("user_id", $user_id);
+$smarty->assign("user_name", $user[0]['user_name']);
+$smarty->assign("user_displayname", $user[0]['user_displayname']);
 
-		// set language variables
+$smarty->display("userview.tpl");
-		$smarty->assign($lang);
 
-	// setup user
+include("footer.php");
-		// build query
-		$query = "SELECT
-				user.user_name AS user_name,
-				user.user_displayname AS user_displayname
-			FROM
-				user
-			WHERE
-				user.user_id=" . $user_id;
-		
-		// run query
-		$user = $db->db_select($query);
-
-		// send to tpl
-		$smarty->assign("user_id", $user_id);
-		$smarty->assign("user_name", $user[0]['user_name']);
-		$smarty->assign("user_displayname", $user[0]['user_displayname']);
-	
-	// end page
-		// output
-        $smarty->display("userview.tpl");
-
-		// footer
-		include("footer.php");
 ?>

vlan.php

@@ -1,55 +1,29 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
+include("header.php");
-	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
+$query = "SELECT
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+		vlan_id,
+		vlan_number,
+		vlan_name,
+		LEFT(vlan_info, 60) AS vlan_info
+	FROM
+		vlan
+	ORDER BY
+		vlan_number";
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+$vlans = $db->db_select($query);
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
+$smarty->assign("vlans", $vlans);
-		// includes
+$smarty->display("vlan.tpl");
-		include("includes.php");
 		
-		// start output
+include("footer.php");
-		include("header.php");
-			
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup vlan
-		// build query
-		$query = "SELECT
-				vlan.vlan_id AS vlan_id,
-				vlan.vlan_number AS vlan_number,
-				vlan.vlan_name AS vlan_name,
-				LEFT(vlan.vlan_info, 60) AS vlan_info
-			FROM
-				vlan
-			ORDER BY
-				vlan.vlan_number";
-		
-		// run query
-		$vlans = $db->db_select($query);
-        $smarty->assign("vlans", $vlans);
-
-	// end page
-		// output
-		$smarty->display("vlan.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

vlanadd.php

@@ -1,39 +1,16 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
+include("header.php");
-	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
+$smarty->display("vlanadd.tpl");
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("footer.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
-	
-	// start page
-		// includes
-		include("includes.php");
-		
-		// start output
-		include("header.php");
-	
-		// set language variables
-		$smarty->assign($lang);
-		
-	// end page
-		// output
-        $smarty->display("vlanadd.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

vlandel.php

@@ -1,60 +1,32 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$vlan_id = sanitize($_GET['vlan_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 		
-	// start page
+$query = "SELECT
-		// includes
+	vlan_name,
-		include("includes.php");
+	vlan_number
+FROM
+	vlan
+WHERE
+	vlan_id=" . $vlan_id;
 		
-		// get id	
+$vlan = $db->db_select($query);
-		$vlan_id = sanitize($_GET['vlan_id']);
 		
-		// start output
+$smarty->assign("vlan_id", $vlan_id);
-		include("header.php");
+$smarty->assign("vlan_name", $vlan[0]['vlan_name']);
+$smarty->assign("vlan_number", $vlan[0]['vlan_number']);
+$smarty->display("vlandel.tpl");
 		
-		// set language variables
+include("footer.php");
-		$smarty->assign($lang);
-	
-	// setup vlan
-		// build query
-		$query = "SELECT
-				vlan.vlan_name AS vlan_name,
-				vlan.vlan_number AS vlan_number
-			FROM
-				vlan
-			WHERE
-				vlan.vlan_id=" . $vlan_id;
-		
-		// run query
-		$vlan = $db->db_select($query);
-		
-		// send to tpl
-		$smarty->assign("vlan_id", $vlan_id);
-		$smarty->assign("vlan_name", $vlan[0]['vlan_name']);
-		$smarty->assign("vlan_number", $vlan[0]['vlan_number']);
-
-	// end page
-		// output
-        $smarty->display("vlandel.tpl");
-		
-		// footer
-		include("footer.php");
 ?>

vlanedit.php

@@ -1,62 +1,35 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$vlan_id = sanitize($_GET['vlan_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
-	
-	// start page
-		// includes
-		include("includes.php");
-		
-		// get id	
-		$vlan_id = sanitize($_GET['vlan_id']);
-		
-		// start output
-		include("header.php");
-		
-		// set language variables
-		$smarty->assign($lang);
 
 	// setup vlan
-		// build query
+$query = "SELECT
-		$query = "SELECT
+	vlan_name,
-				vlan.vlan_name AS vlan_name,
+	vlan_number,
-				vlan.vlan_number AS vlan_number,
+	vlan_info
-				vlan.vlan_info AS vlan_info
+FROM
-			FROM
+	vlan
-				vlan
+WHERE
-			WHERE
+	vlan_id=" . $vlan_id;
-				vlan.vlan_id=" . $vlan_id;
 		
-		// run query
+$vlan = $db->db_select($query);
-		$vlan = $db->db_select($query);
 		
-		// send to tpl
+$smarty->assign("vlan_id", $vlan_id);
-		$smarty->assign("vlan_id", $vlan_id);
+$smarty->assign("vlan_name", $vlan[0]['vlan_name']);
-		$smarty->assign("vlan_name", $vlan[0]['vlan_name']);
+$smarty->assign("vlan_number", $vlan[0]['vlan_number']);
-		$smarty->assign("vlan_number", $vlan[0]['vlan_number']);
+$smarty->assign("vlan_info", $vlan[0]['vlan_info']);
-		$smarty->assign("vlan_info", $vlan[0]['vlan_info']);
+$smarty->display("vlanedit.tpl");
 
-	// end page
+include("footer.php");
-		// output
-        $smarty->display("vlanedit.tpl");
-
-		// footer
-		include("footer.php");
 ?>

vlansubnetadd.php

@@ -1,86 +1,59 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$vlan_id = sanitize($_GET['vlan_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
+// vlan
-	*****************************************************************************/
+$query = "SELECT
+		vlan_name,
+		vlan_number
+	FROM
+		vlan
+	WHERE
+		vlan_id=" . $vlan_id;
 
-	// start page
+// run query
-		// includes
+$vlan = $db->db_select($query);
-		include("includes.php");
 
-		// get ip and id
+$smarty->assign("vlan_id", $vlan_id);
-		$vlan_id = sanitize($_GET['vlan_id']);
+$smarty->assign("vlan_name", $vlan[0]['vlan_name']);
+$smarty->assign("vlan_number", $vlan[0]['vlan_number']);
 	
-		// start output
+// subnet
-		include("header.php");
+$query = " SELECT
-			
+		subnet_id,
-		// set language variables
+		subnet_address,
-		$smarty->assign($lang);
+		subnet_mask
-	
+	FROM
-	// setup vlan
+		subnet
-		// build query
+	WHERE
-		$query = "SELECT
+		subnet_id NOT IN (
-				vlan.vlan_name AS vlan_name,
+			SELECT
-				vlan.vlan_number AS vlan_number
+				subnet_id
 			FROM
-				vlan
+				subnetvlan
 			WHERE
-				vlan.vlan_id=" . $vlan_id;
+				vlan_id=" . $vlan_id . "
+		)
+	ORDER BY
+		INET_ATON(subnet_address)";
 
-		// run query
+$subnets = $db->db_select($query);
-		$vlan = $db->db_select($query);
+foreach ($subnets as $subnet) {
+    $subnet_options[$subnet['subnet_id']] = $subnet['subnet_address'].'/'.$subnet['subnet_mask'];
+}
+$smarty->assign("subnet_options", $subnet_options);
 	
-		$smarty->assign("vlan_id", $vlan_id);
+$smarty->display("vlansubnetadd.tpl");
-		$smarty->assign("vlan_name", $vlan[0]['vlan_name']);
-		$smarty->assign("vlan_number", $vlan[0]['vlan_number']);
 		
-	// setup subnet
+include("footer.php");
-		// build query
-		$query = " SELECT
-				subnet.subnet_id AS subnet_id,
-				subnet.subnet_address AS subnet_address,
-				subnet.subnet_mask AS subnet_mask
-			FROM
-				subnet
-			WHERE
-				subnet.subnet_id NOT IN (
-					SELECT
-						subnet_id
-					FROM
-						subnetvlan
-					WHERE
-						vlan_id=" . $vlan_id . "
-				)
-			ORDER BY
-				INET_ATON(subnet.subnet_address)";
-		
-		// run query
-		$subnets = $db->db_select($query);
-        foreach ($subnets as $subnet) {
-            $subnet_options[$subnet['subnet_id']] = $subnet['subnet_address'].'/'.$subnet['subnet_mask'];
-        }
-		$smarty->assign("subnet_options", $subnet_options);
-	
-	// end page
-		// output
-        $smarty->display("vlansubnetadd.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

vlansubnetdel.php

@@ -1,81 +1,53 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$vlan_id = sanitize($_GET['vlan_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 		
-	// start page
+// vlan
-		// includes
+$query = "SELECT
-		include("includes.php");
+		vlan_name,
+		vlan_number
+	FROM
+		vlan
+	WHERE
+		vlan_id=" . $vlan_id;
 
-		// get ip and id
+// run query
-		$vlan_id = sanitize($_GET['vlan_id']);
+$vlan = $db->db_select($query);
 
-		// start output
+$smarty->assign("vlan_id", $vlan_id);
-		include("header.php");
+$smarty->assign("vlan_name", $vlan[0]['vlan_name']);
+$smarty->assign("vlan_number", $vlan[0]['vlan_number']);
 
-		// set language variables
+// setup subnet
-		$smarty->assign($lang);
+$query = "SELECT
+		s.subnet_id,
+		s.subnet_address,
+		s.subnet_mask
+	FROM
+		subnetvlan AS v LEFT JOIN subnet AS s USING(subnet_id)
+	WHERE
+		v.vlan_id="  . $vlan_id . "
+	ORDER BY
+		INET_ATON(s.subnet_address)";
 
-	// setup vlan
+$subnets = $db->db_select($query);
-		// build query
+foreach ($subnets as $subnet) {
-		$query = "SELECT
+    $subnet_options[$subnet['subnet_id']] = $subnet['subnet_address'].'/'.$subnet['subnet_mask'];
-				vlan.vlan_name AS vlan_name,
+}
-				vlan.vlan_number AS vlan_number
+$smarty->assign("subnet_options", $subnet_options);
-			FROM
-				vlan
-			WHERE
-				vlan.vlan_id=" . $vlan_id;
 	
-		// run query
+$smarty->display("vlansubnetdel.tpl");
-		$vlan = $db->db_select($query);
 
-		$smarty->assign("vlan_id", $vlan_id);
+include("footer.php");
-		$smarty->assign("vlan_name", $vlan[0]['vlan_name']);
-		$smarty->assign("vlan_number", $vlan[0]['vlan_number']);
-	
-	// 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
-				subnetvlan,
-				subnet
-			WHERE
-				subnetvlan.vlan_id="  . $vlan_id . "
-				AND subnet.subnet_id=subnetvlan.subnet_id
-			ORDER BY
-				INET_ATON(subnet.subnet_address)";
-		
-		// run query
-		$subnets = $db->db_select($query);
-        foreach ($subnets as $subnet) {
-            $subnet_options[$subnet['subnet_id']] = $subnet['subnet_address'].'/'.$subnet['subnet_mask'];
-        }
-		$smarty->assign("subnet_options", $subnet_options);
-	
-	// end page
-		// output
-        $smarty->display("vlansubnetdel.tpl");
-
-		// end output
-		include("footer.php");
 ?>

vlansubnetedit.php

@@ -1,60 +1,33 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$vlan_id = sanitize($_GET['vlan_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 		
-	// start page
+$query = "SELECT
-		// includes
+		vlan_name,
-		include("includes.php");
+		vlan_number
+	FROM
+		vlan
+	WHERE
+		vlan_id=" . $vlan_id;
 	
-		// get ip and id
+$vlan = $db->db_select($query);
-		$vlan_id = sanitize($_GET['vlan_id']);
 
-		// start output
+$smarty->assign("vlan_id", $vlan_id);
-		include("header.php");
+$smarty->assign("vlan_name", $vlan[0]['vlan_name']);
+$smarty->assign("vlan_number", $vlan[0]['vlan_number']);
 
-		// set language variables
+$smarty->display("vlansubnetedit.tpl");
-		$smarty->assign($lang);
 		
-	// setup vlan
+include("footer.php");
-		// build query
-		$query = "SELECT
-				vlan.vlan_name AS vlan_name,
-				vlan.vlan_number AS vlan_number
-			FROM
-				vlan
-			WHERE
-				vlan.vlan_id=" . $vlan_id;
-		
-		// run query
-		$vlan = $db->db_select($query);
-
-		// send to tpl
-		$smarty->assign("vlan_id", $vlan_id);
-		$smarty->assign("vlan_name", $vlan[0]['vlan_name']);
-		$smarty->assign("vlan_number", $vlan[0]['vlan_number']);
-	
-	// end page
-		// output
-        $smarty->display("vlansubnetedit.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

vlanview.php

@@ -1,82 +1,52 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$vlan_id = sanitize($_GET['vlan_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 
-	// start page
+// vlan
-		// includes
+$query = "SELECT
-		include("includes.php");
+	vlan_name,
+	vlan_number,
+	vlan_info
+FROM
+	vlan
+WHERE
+	vlan_id=" . $vlan_id;
 
-		// get id
+$vlan = $db->db_select($query);
-		$vlan_id = sanitize($_GET['vlan_id']);
         
-		// start output
+$smarty->assign("vlan_id", $vlan_id);
-		include("header.php");
+$smarty->assign("vlan_name", $vlan[0]['vlan_name']);
+$smarty->assign("vlan_number", $vlan[0]['vlan_number']);
+$smarty->assign("vlan_info", nl2br($vlan[0]['vlan_info']));
 
-		// set language variables
+// subnets
-		$smarty->assign($lang);
+$query = "SELECT
+	s.subnet_id,
+	s.subnet_address,
+	s.subnet_mask,
+	s.subnet_info
+FROM
+	subnet AS s LEFT JOIN subnetvlan AS v USING (subnet_id)
+WHERE
+	v.vlan_id=" . $vlan_id . "
+ORDER BY
+	INET_ATON(s.subnet_address)";
 		
-	// setup vlan
+$subnets = $db->db_select($query);
-		// build query
+$smarty->assign("subnets", $subnets);
-		$query = "SELECT
-				vlan.vlan_name AS vlan_name,
-				vlan.vlan_number AS vlan_number,
-				vlan.vlan_info AS vlan_info
-			FROM
-				vlan
-			WHERE
-				vlan.vlan_id=" . $vlan_id;
 
-		// run query
+$smarty->display("vlanview.tpl");
-		$vlan = $db->db_select($query);
 
-		// send to tpl
+include("footer.php");
-		$smarty->assign("vlan_id", $vlan_id);
-		$smarty->assign("vlan_name", $vlan[0]['vlan_name']);
-		$smarty->assign("vlan_number", $vlan[0]['vlan_number']);
-		$smarty->assign("vlan_info", nl2br($vlan[0]['vlan_info']));
-
-	// setup subnets
-		// build query
-		$query = "SELECT
-				subnet.subnet_id,
-				subnet.subnet_address,
-				subnet.subnet_mask,
-				subnet.subnet_info
-			FROM
-				subnet,
-				subnetvlan
-			WHERE
-				subnetvlan.vlan_id=" . $vlan_id . "
-				AND subnet.subnet_id=subnetvlan.subnet_id
-			ORDER BY
-				INET_ATON(subnet.subnet_address)";
-		
-		// run query
-		$subnets = $db->db_select($query);
-		$smarty->assign("subnets", $subnets);
-
-    // end page
-		// output
-        $smarty->display("vlanview.tpl");
-	
-        // end output
-		include("footer.php");
 ?>

zone.php

@@ -1,55 +1,31 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+include("header.php");
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+$query = "SELECT
-	or contact me at wietsew@users.sourceforge.net
+	zone_id,
-	*****************************************************************************/
+	zone_origin,
+	zone_soa,
+	zone_hostmaster,
+	zone_serial
+FROM
+	zone
+ORDER BY
+	zone_origin";
 		
-	// start page
+$zones = $db->db_select($query);
-		// includes
-		include("includes.php");
 
-		// start output
+$smarty->assign("zones", $zones);
-		include("header.php");
+$smarty->display("zone.tpl");
 		
-		// set language variables
+include("footer.php");
-		$smarty->assign($lang);
-
-		// build query
-		$query = "SELECT
-				zone_id,
-				zone_origin,
-				zone_soa,
-				zone_hostmaster,
-				zone_serial
-			FROM
-				zone
-			ORDER BY
-				zone_origin";
-		
-		// run query
-		$zones = $db->db_select($query);	
-		$smarty->assign("zones", $zones);
-
-	// end page
-		// output
-		$smarty->display("zone.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

zoneadd.php

@@ -1,39 +1,16 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
+include("header.php");
-	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
+$smarty->display("zoneadd.tpl");
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("footer.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
-	
-	// start page
-		// includes
-		include("includes.php");
-		
-		// start output
-		include("header.php");
-	
-		// set language variables
-		$smarty->assign($lang);
-		
-	// end page
-		// output
-        $smarty->display("zoneadd.tpl");
-		
-		// end output
-		include("footer.php");
 ?>

zonedel.php

@@ -1,52 +1,23 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$zone_id = sanitize($_GET['zone_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
-	*****************************************************************************/
 		
-	// start page
+$query = "SELECT zone_id, zone_origin, zone_serial FROM zone WHERE zone_id=" . $zone_id;
-		// includes
+$zone = $db->db_select($query);
-		include("includes.php");
 
-		// get id	
+$smarty->assign("zone", $zone[0]);
-		$zone_id = sanitize($_GET['zone_id']);
+$smarty->display("zonedel.tpl");
 		
-		// start output
+include("footer.php");
-		include("header.php");
-		
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup vlan
-		// build query
-		$query = "SELECT zone_id, zone_origin, zone_serial FROM zone WHERE zone_id=" . $zone_id;
-		
-		// run query
-		$zone = $db->db_select($query);
-		
-		// send to tpl
-		$smarty->assign("zone", $zone[0]);
-		
-	// end page
-		// output
-        $smarty->display("zonedel.tpl");
-		
-		// footer
-		include("footer.php");
 ?>

zoneedit.php

@@ -1,57 +1,30 @@
 <?php
-	/*****************************************************************************
+/*****************************************************************************
-	IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-	Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-	This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-	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,
+include("includes.php");
-	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
+$zone_id = sanitize($_GET['zone_id']);
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	For more information, visit http://sourceforge.net/projects/ipreg,
+include("header.php");
-	or contact me at wietsew@users.sourceforge.net
+$query = "SELECT
-	*****************************************************************************/
+	zone_id, zone_soa, zone_hostmaster, zone_origin, zone_ttl_default,
+	zone_refresh, zone_retry, zone_expire, zone_ttl, zone_serial,
+	zone_ns1, zone_ns2, zone_ns3, zone_mx1, zone_mx2, zone_info
+FROM
+	zone
+WHERE
+	zone_id=" . $zone_id;
 		
-	// start page
+$zone = $db->db_select($query);
-		// includes
-		include("includes.php");
 
-		// get id
+$smarty->assign("zone", $zone[0]);
-		$zone_id = sanitize($_GET['zone_id']);
+$smarty->display("zoneedit.tpl");
 
-		// start output
+include("footer.php");
-		include("header.php");
-	
-		// set language variables
-		$smarty->assign($lang);
-		
-	// setup assetclassgroup
-		// build query
-		$query = "SELECT
-				zone_id, zone_soa, zone_hostmaster, zone_origin, zone_ttl_default,
-				zone_refresh, zone_retry, zone_expire, zone_ttl, zone_serial,
-				zone_ns1, zone_ns2, zone_ns3, zone_mx1, zone_mx2, zone_info
-			FROM
-				zone
-			WHERE
-				zone_id=" . $zone_id;
-		
-		// run query
-		$zone = $db->db_select($query);
-		$smarty->assign("zone", $zone[0]);
-
-	// end page
-		// output
-        $smarty->display("zoneedit.tpl");
-
-        // end output
-		include("footer.php");
 ?>