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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
-		
-		// 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,37 +1,18 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 	
-		// start output
 include("header.php");
 	
-		// set language variables
-		$smarty->assign($lang);
 
 // create letter links
-		// build query
 $query = "SELECT
 		SUBSTRING(UPPER(asset.asset_name),1,1) AS asset_letter
 	FROM
@@ -41,11 +22,9 @@
 	ORDER BY
 		asset_letter";
 
-		// run query
 $alphabet = $db->db_select($query);
 $smarty->assign("alphabet", $alphabet);
 
-	// setup asset
 // setup current letter
 if(isset($_GET['asset_letter'])) {
 	$asset_letter = sanitize($_GET['asset_letter']);
@@ -53,32 +32,24 @@
 	$asset_letter = $alphabet[0]['asset_letter'];
 }
 		
-		// build query
 $query = "SELECT
-				asset.asset_id AS asset_id,
+		a.asset_id,
-				IF(LENGTH(asset.asset_name)>0, asset.asset_name, '...') AS asset_name,
+		IF(LENGTH(a.asset_name)>0, a.asset_name, '...') AS asset_name,
-				asset.asset_info AS asset_info,
+		a.asset_info,
-				assetclass.assetclass_id AS assetclass_id,
+		c.assetclass_id,
-				assetclass.assetclass_name AS assetclass_name
+		c.assetclass_name
 	FROM
-				asset,
+		asset AS a LEFT OUTER JOIN assetclass AS c USING (assetclass_id)
-				assetclass
 	WHERE
-				SUBSTRING(asset.asset_name,1,1) = '" . $asset_letter . "'
+		SUBSTRING(a.asset_name,1,1) = '" . $asset_letter . "'
-				AND assetclass.assetclass_id=asset.assetclass_id
 	ORDER BY
-				asset.asset_name";
+		a.asset_name";
 
-		// run query
 $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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 
-		// get id
 if((isset($_GET['assetclass_id'])) ? $assetclass_id = sanitize($_GET['assetclass_id']) : $assetclass_id = "");
 
-		// start output
 include("header.php");
 		
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup assetclass
-		// build query
 $query = "SELECT
-				assetclass.assetclass_id AS assetclass_id,
+	assetclass_id,
-				assetclass.assetclass_name AS assetclass_name
+	assetclass_name
 FROM
 	assetclass
 ORDER BY
-				assetclass.assetclass_name";
+	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
+$smarty->assign("assetclass_options", $assetclass_options);
-		// output
 $smarty->display("assetadd.tpl");
 
-		// end output
 include("footer.php");
 ?>

assetclass.php

@@ -1,61 +1,30 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
-		
-		// start output
 include("header.php");
 			
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup assetclass
-		// build query
 $query = "SELECT
-				assetclass.assetclass_id AS assetclass_id,
+		a.assetclass_id,
-				assetclass.assetclass_name AS assetclass_name,
+		a.assetclass_name,
-				assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
+		g.assetclassgroup_id,
-				assetclassgroup.assetclassgroup_name AS assetclassgroup_name
+		g.assetclassgroup_name,
+		g.assetclassgroup_color
 	FROM
-				assetclass,
+		assetclass AS a LEFT OUTER JOIN assetclassgroup AS g USING (assetclassgroup_id)
-				assetclassgroup
-			WHERE
-				assetclassgroup.assetclassgroup_id=assetclass.assetclassgroup_id
 	ORDER BY
-				assetclass.assetclass_name";
+		a.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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 
-		// get id
 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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 
-		// get id
 $assetclass_id = sanitize($_GET['assetclass_id']);
 
-		// start output
 include("header.php");
 
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup assetclass
-		// build query
 $query = "SELECT
-				assetclass.assetclass_id AS assetclass_id,
+		assetclass_id,
-				assetclass.assetclass_name AS assetclass_name
+		assetclass_name
 	FROM
 		assetclass
 	WHERE
-				assetclass.assetclass_id=" . $assetclass_id;
+		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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 
-		// get id
 $assetclass_id = sanitize($_GET['assetclass_id']);
-		
-		// start output
 include("header.php");
 		
-		// set language variables
-		$smarty->assign($lang);
-
-	// setup assetclass
-		// build query
 $query = "SELECT
-				assetclass.assetclass_id AS assetclass_id,
+		assetclass_id,
-				assetclass.assetclass_name AS assetclass_name,
+		assetclass_name,
-				assetclass.assetclassgroup_id AS assetclassgroup_id
+		assetclassgroup_id
 	FROM
 		assetclass
 	WHERE
-				assetclass.assetclass_id=" . $assetclass_id;
+		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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 
-		// start output
 include("header.php");
 	
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup assetclassgroup
-		// build query
 $query = "SELECT
-				assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
+	assetclassgroup_id,
-				assetclassgroup.assetclassgroup_name AS assetclassgroup_name,
+	assetclassgroup_name,
-				assetclassgroup.assetclassgroup_color AS assetclassgroup_color
+	assetclassgroup_color
 FROM
 	assetclassgroup
 ORDER BY
-				assetclassgroup.assetclassgroup_name";
+	assetclassgroup_name";
 		
-		// run query
 $assetclassgroups = $db->db_select($query);
-        $smarty->assign("assetclassgroups", $assetclassgroups);
 
-	// end page
+$smarty->assign("assetclassgroups", $assetclassgroups);
-		// output
 $smarty->display("assetclassgroup.tpl");
 		
-		// end output
 include("footer.php");
 ?>

assetclassgroupadd.php

@@ -1,39 +1,16 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
-		
-		// 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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 
-		// get id
 $assetclassgroup_id = sanitize($_GET['assetclassgroup_id']);
 
-		// start output
 include("header.php");
 
-		// set language variables
 $smarty->assign($lang);
 
-	// setup assetclassgroup
-		// build query
 $query = "SELECT
-				assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
+		assetclassgroup_id,
-				assetclassgroup.assetclassgroup_name AS assetclassgroup_name
+		assetclassgroup_name
 	FROM
 		assetclassgroup
 	WHERE
-				assetclassgroup.assetclassgroup_id=" . $assetclassgroup_id;
+		assetclassgroup_id=" . $assetclassgroup_id;
 
-		// run query
 $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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 
-		// get id
 $assetclassgroup_id = sanitize($_GET['assetclassgroup_id']);
 
-		// start output
 $smarty->assign("scripts", 'jscolor.js');
 include("header.php");
 
-		// set language variables
 $smarty->assign($lang);
 
-	// setup assetclassgroup
-		// build query
 $query = "SELECT
-				assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
+		assetclassgroup_id,
-				assetclassgroup.assetclassgroup_name AS assetclassgroup_name,
+		assetclassgroup_name,
-				assetclassgroup.assetclassgroup_color AS assetclassgroup_color
+		assetclassgroup_color
 	FROM
 		assetclassgroup
 	WHERE
-				assetclassgroup.assetclassgroup_id=" . $assetclassgroup_id;
+		assetclassgroup_id=" . $assetclassgroup_id;
 
-		// run query
 $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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 
-		// get id
 $assetclassgroup_id = sanitize($_GET['assetclassgroup_id']);
 
-		// start output
 include("header.php");
 
-		// set language variables
-		$smarty->assign($lang);
-		
-	// setup assetclassgroup
-		// build query
 $query = "SELECT
-				assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
+		assetclassgroup_id,
-				assetclassgroup.assetclassgroup_name AS assetclassgroup_name,
+		assetclassgroup_name,
-				assetclassgroup.assetclassgroup_color AS assetclassgroup_color
+		assetclassgroup_color
 	FROM
 		assetclassgroup
 	WHERE
-				assetclassgroup.assetclassgroup_id=" . $assetclassgroup_id;
+		assetclassgroup_id=" . $assetclassgroup_id;
 
-		// run query
 $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']);
 
-	// setup assetclass
-		// build query
 $query = "SELECT
-				assetclass.assetclass_id AS assetclass_id,
+		assetclass_id,
-				assetclass.assetclass_name AS assetclass_name
+		assetclass_name
 	FROM
 		assetclass
 	WHERE
-				assetclass.assetclassgroup_id=" . $assetclassgroup_id . "
+		assetclassgroup_id=" . $assetclassgroup_id . "
 	ORDER BY
-				assetclass.assetclass_name";
+		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,66 +1,36 @@
 <?php
 /*****************************************************************************
 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,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    For more information, visit http://sourceforge.net/projects/ipreg,
-    or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-    // start page
-        // includes
 include("includes.php");
 
-        // get id
 $assetclass_id = sanitize($_GET['assetclass_id']);
 
-        // start output
 include("header.php");
 
-        // set language variables
-        $smarty->assign($lang);
-
-    // setup assetclass
-        // build query
   $query = "SELECT
-                assetclass.assetclass_id,
+		a.assetclass_id, a.assetclass_name,
-                assetclass.assetclass_name,
+		g.assetclassgroup_id, g.assetclassgroup_name, g.assetclassgroup_color
-                assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
-                assetclassgroup.assetclassgroup_name AS assetclassgroup_name
 	FROM
-                assetclass,
+		assetclass AS a LEFT OUTER JOIN assetclassgroup AS g USING (assetclassgroup_id)
-                assetclassgroup
 	WHERE
-                assetclass.assetclass_id=" . $assetclass_id . "
+		a.assetclass_id=" . $assetclass_id;
-                AND assetclassgroup.assetclassgroup_id=assetclass.assetclassgroup_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("assetclass_selected", "");
 
 $smarty->assign("assetclassgroup_id", $assetclass[0]['assetclassgroup_id']);
 $smarty->assign("assetclassgroup_name", $assetclass[0]['assetclassgroup_name']);
+$smarty->assign("assetclassgroup_color", $assetclass[0]['assetclassgroup_color']);
 
-        // send to tpl
-    // setup asset
-        // build query
 $query = "SELECT
 		asset_id,
 		asset_name,
@@ -72,14 +42,10 @@
 	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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 
-		// get id	
 $asset_id = sanitize($_GET['asset_id']);
 
-		// start output
 include("header.php");
 	
-		// set language variables
-		$smarty->assign($lang);
-
-	// setup asset
-		// build query
 $query = "SELECT
-				asset.asset_name AS asset_name
+		asset_name
 	FROM
 		asset
 	WHERE
-				asset.asset_id=" . $asset_id;
+		asset_id=" . $asset_id;
 
-		// run query
 $asset = $db->db_select($query);
 
-		// send to tpl
 $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_id,
-				node.node_ip AS node_ip
+		node_ip
 	FROM
 		node
 	WHERE
-				node.asset_id=" . $asset_id . "
+		asset_id=" . $asset_id . "
 	ORDER BY
-				INET_ATON(node.node_ip)";
+		INET_ATON(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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 
-		// get id	
 $asset_id = sanitize($_GET['asset_id']);
 
-		// start output
 include("header.php");
 	
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup asset
-		// build query
 $query = "SELECT
 		asset_id,
-				asset.asset_name AS asset_name,
+		asset_name,
-				asset.asset_hostname AS asset_hostname,
+		asset_hostname,
-				asset.asset_info AS asset_info,
+		asset_info,
-				asset.assetclass_id AS assetclass_id
+		assetclass_id
 	FROM
 		asset
 	WHERE
-				asset.asset_id=" . $asset_id;
+		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,57 +1,31 @@
 <?php
 /*****************************************************************************
 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,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    For more information, visit http://sourceforge.net/projects/ipreg,
-    or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-    // start page
-        // includes
 include("includes.php");
 
-        // get id
 $asset_id = sanitize($_GET['asset_id']);
 
-        // start output
 include("header.php");
 
-        // set language variables
-        $smarty->assign($lang);
-
-    // setup asset
-        // build query
 $query = "SELECT
-                asset.asset_name,
+		a.asset_name,
-                asset.asset_hostname,
+		a.asset_hostname,
-                asset.asset_info,
+		a.asset_info,
-                assetclass.assetclass_id AS assetclass_id,
+		c.assetclass_id,
-                assetclass.assetclass_name AS assetclass_name
+		c.assetclass_name
 	FROM
-                asset,
+		asset AS a LEFT OUTER JOIN assetclass AS c USING (assetclass_id)
-                assetclass
 	WHERE
-                asset.asset_id=" . $asset_id . "
+		a.asset_id=" . $asset_id;
-                AND assetclass.assetclass_id=asset.assetclass_id";
 
-        // run query
 $asset = $db->db_select($query);
 
-        // send to tpl
 $smarty->assign("asset_id", $asset_id);
 $smarty->assign("asset_name", $asset[0]['asset_name']);
 $smarty->assign("asset_hostname", $asset[0]['asset_hostname']);
@@ -60,8 +34,6 @@
 $smarty->assign("assetclass_id", $asset[0]['assetclass_id']);
 $smarty->assign("assetclass_name", $asset[0]['assetclass_name']);
 
-    // setup node
-        // build query
 $query = "SELECT
 		node_id,
 		node_ip,
@@ -69,18 +41,14 @@
 	FROM
 		node
 	WHERE
-                node.asset_id=" . $asset_id . "
+		asset_id=" . $asset_id . "
 	ORDER BY
-                INET_ATON(node.node_ip)";
+		INET_ATON(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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 
-		// get ip and id
 $node_ip = sanitize($_GET['node_ip']);
 $subnet_id = sanitize($_GET['subnet_id']);
 
-		// start output
 include("header.php");
 
-		// set language variables
-		$smarty->assign($lang);
-	
-	// build query
 $query = "SELECT
-				subnet.subnet_address AS subnet_address,
+		subnet_address,
-				subnet.subnet_mask AS subnet_mask
+		subnet_mask
 	FROM
 		subnet
 	WHERE
-				subnet.subnet_id=" . $subnet_id;
+		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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 
-		// get id	
 $asset_id = sanitize($_GET['asset_id']);
 $node_ip = sanitize($_GET['node_ip']);
 $subnet_id = sanitize($_GET['subnet_id']);
 
-		// start output
 include("header.php");
 
-		// set language variables
-		$smarty->assign($lang);
-	
-	// to tpl
 $smarty->assign("node_ip", $node_ip);
-
-	// setup asset
 $smarty->assign("asset_id", $asset_id);
-		// build query
+
 $query = "SELECT
-				asset.asset_id AS asset_id,
+		asset_id,
-				asset.asset_name AS asset_name
+		asset_name
 	FROM
 		asset
 	ORDER BY
-				asset.asset_name";
+		asset_name";
 
-		// run query
 $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,41 +1,21 @@
 <?php
 /*****************************************************************************
 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,
-	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
 *****************************************************************************/
 
-	// includes
 include("includes.php");
 
-	// start output
 include("header.php");
 
-	// set language variables
-	$smarty->assign($lang);
 
-	// get error
 $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
-    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,
-    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
 *****************************************************************************/
 
-    // 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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-				
-		// get version for the footer-stamp
 $smarty->assign("config_version", $config_version);
 	
-	// end page
-		// output
 $smarty->display("footer.tpl");
 ?>

header.php

@@ -1,53 +1,27 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// include language file
 include('lang/' . $_SESSION['suser_language'] . '.php');
-			
-		// set language variables
 $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);
@@ -63,7 +37,5 @@
 $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,35 +1,17 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 
-	// icon image
 if(isset($_GET['icon'])) {
-			// get desired image
 	$icon = sanitize($_GET['icon']);
 	
-			// switch selected
 	switch($icon) {
 		case ("add") :
 			$png = 'page_add';
@@ -72,36 +54,26 @@
 		break;
 	}
 	
-			// get image
 	$image = imagecreatefrompng("images/" . $png . ".png");
 	
-			// alpha blending
 	imagealphablending($image, true);
 	
-			// save alphablending setting
 	imagesavealpha($image, true);
 	
-			// display image
 	header('Content-type: image/png');
 	imagepng($image);
 	imagedestroy($image);
 }
 
-	// colored block
 if(isset($_GET['color'])) {
-			// get desired color
 	$color = sanitize($_GET['color']);
 	
-			// create base image
 	$image = imagecreatetruecolor($_SESSION['suser_imagesize'], $_SESSION['suser_imagesize']);
 	
-			// 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
-	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,
-	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
 *****************************************************************************/
 	
-	// session
-		// start session
 session_name('ipreg');
 session_start();
 
 // check for user_id, if unnkown, redirect to login
 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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 
-		// start output
 include("header.php");
 
-		// set language variables
+// asset
-		$smarty->assign($lang);
-
-	// setup asset
-		// build query
 $query = "SELECT
-				COUNT(asset.asset_id) AS asset_counter
+		COUNT(asset_id) AS asset_counter
 	FROM
 		asset";
 
-		// run query
 $assets = $db->db_select($query);
-		
-		// counter to tpl
 $smarty->assign("asset_counter", $assets[0]['asset_counter']);
 
-	// setup location
+// location
-		// build query
 $query = "SELECT
-				COUNT(location.location_id) AS location_counter
+		COUNT(location_id) AS location_counter
 	FROM
 		location";
 
-		// run query
 $locations = $db->db_select($query);
-		
-		// counter to tpl
 $smarty->assign("location_counter", $locations[0]['location_counter']);
 
-	// setup node
+// node
-		// build query
 $query = "SELECT
-				COUNT(node.node_id) AS node_counter
+		COUNT(node_id) AS node_counter
 	FROM
 		node";
 
-		// run query
 $nodes = $db->db_select($query);
-		
-		// counter to tpl
 $smarty->assign("node_counter", $nodes[0]['node_counter']);
 
-	// setup subnet
+// subnet
-		// build query
 $query = "SELECT
-				COUNT(subnet.subnet_id) AS subnet_counter
+		COUNT(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
+//  vlan
-		// build query
 $query = "SELECT
-				COUNT(vlan.vlan_id) AS vlan_counter
+		COUNT(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
+// 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
-    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,
-    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
 *****************************************************************************/
 
-    // functions
+// global version string
+$config_version = 'v0.8';
+
+// available languages
+$config_lang = array('de', 'en');
+
 include("lib/functions.php");
 
-    // classes
-        // db
-            // load class
 require("lib/db.class.php");
-
-            // create instance
 $db = new Db($dblink);
 
-        // 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,38 +1,16 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 		
-		// start output
 include("header.php");
 		
-		// set language variables
-		$smarty->assign($lang);
-
-	// start location
-		// look for locations
-			// build query
 $query = "SELECT
 	location_id AS id,
 	location_name AS value,
@@ -41,9 +19,9 @@
 	location
 ORDER BY location_parent, location_sort, location_name";
 
-			// run query
 $locations = $db->db_select($query);
 
+// function for recursion
 function build_tree($parent_id, $level) {
     global $locations;
     $children = array();
@@ -58,13 +36,11 @@
     }
     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,56 +1,29 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get 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>
 
-
-	// start parent
-		// 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
 $locations = $db->db_select($query);
 			
-			// count results
 $location_counter = count($locations);
 
-			// any loactions?
 if ($location_counter>0) {
 	// get objects
 	foreach ($locations AS $location) {
@@ -91,7 +64,6 @@
 			checkchildren($child, $level+1);
 		}
 	}
-				
 }
 
 $tree = location($parents);
@@ -100,10 +72,7 @@
 $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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get id	
 $location_id = sanitize($_GET['location_id']);
 		
-		// start output
 include("header.php");
 		
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup location
-		// build query
 $query = "SELECT
-				location.location_name AS location_name
+	location_name
 FROM
 	location
 WHERE
-				location.location_id=" . $location_id;
+	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,40 +1,19 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get id	
 $location_id = sanitize($_GET['location_id']);
 		
-		// start output
 include("header.php");
 
-		// set language variables
+// location			
-		$smarty->assign($lang);
-	
-	// setup location
-		// build query
 $query = "SELECT
 	location_name,
 	location_parent,
@@ -43,46 +22,38 @@
 FROM
 	location
 WHERE
-				location.location_id=" . $location_id;
+	location_id=" . $location_id;
 		
-		// run query
 $location = $db->db_select($query);
 		
-		// get parent
 $location_parent = $location[0]['location_parent'];
 		
-		// send to tpl
 $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
+// parent location
-		// look for locations
-			// build query
 $query = "SELECT
-					location.location_id AS location_id,
+	location_id,
-					location.location_name AS location_name,
+	location_name,
-					location.location_parent AS location_parent
+	location_parent
 FROM
 	location
+WHERE
+	location_id != " . $location_id . "
 ORDER BY
-					location.location_name";
+	location_name";
 			
-			// run query
 $locations = $db->db_select($query);
 			
-			// count results
 $location_counter = count($locations);
 			
-			// counter to tpl
 $smarty->assign("location_counter", $location_counter);
 			
 // any loactions?
 if ($location_counter>0) {
-				// get objects
 	foreach($locations AS $location) {
-					// create arrays
 		$location_names[$location['location_id']] = $location['location_name'];
 		$parents[$location['location_parent']][] = $location['location_id'];
 	}
@@ -127,11 +98,7 @@
 $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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get ip and id
 $location_id = sanitize($_GET['location_id']);
 		
-		// start output
 include("header.php");
 		
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup location
-		// build query
 $query = "SELECT
-				location.location_name AS location_name
+		location_name
 	FROM
 		location
 	WHERE
-				location.location_id=" . $location_id;
+		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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get ip and id
 $location_id = sanitize($_GET['location_id']);
 		
-		// start output
 include("header.php");
 
-		// set language variables
+// location		
-		$smarty->assign($lang);
-	
-	// setup location
-		// build query
 $query = "SELECT
-				location.location_name AS location_name
+	location_name
 FROM
 	location
 WHERE
-				location.location_id=" . $location_id;
+	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
+// subnet
-		// build query
 $query = "SELECT
-				subnet.subnet_id AS subnet_id,
+		s.subnet_id,
-				subnet.subnet_address AS subnet_address,
+		s.subnet_address,
-				subnet.subnet_mask AS subnet_mask
+		s.subnet_mask
 	FROM
-				subnetlocation,
+		subnetlocation AS l LEFT JOIN subnet AS s USING (subnet_id)
-				subnet
 	WHERE
-				subnetlocation.location_id="  . $location_id . "
+		l.location_id="  . $location_id . "
-				AND subnet.subnet_id=subnetlocation.subnet_id
 	ORDER BY
-				INET_ATON(subnet.subnet_address)";
+		INET_ATON(s.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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 		
-		// get ip and id
 $location_id = sanitize($_GET['location_id']);
 		
-		// start output
 include("header.php");
-		
+// location
-		// set language variables
-		$smarty->assign($lang);
-
-	// setup location
-		// build query
 $query = "SELECT
-				location.location_name AS location_name
+		location_name
 	FROM
 		location
 	WHERE
-				location.location_id=" . $location_id;
+		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,40 +1,20 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get id
 $location_id = sanitize($_GET['location_id']);
 		
-		// start output
 include("header.php");
 
-		// set language variables
-		$smarty->assign($lang);
 	
-	// start locationcrumb
+// locationcrumb
-		// get location crumbs
 
 $query = "SELECT location_id AS id,
 	    location_name AS name,
@@ -58,14 +38,12 @@
 	$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		
+// sublocations		
-		// build query
 $query = "SELECT
 		location_id AS sublocation_id,
 		location_name AS sublocation_name,
@@ -78,33 +56,25 @@
 	ORDER BY
 		location_name";
 
-		// run query
 $sublocations = $db->db_select($query);
 $smarty->assign("sublocations", $sublocations);
 	
-	// setup subnets
+// subnets
-		// build query
 $query = "SELECT
-				subnet.subnet_id AS subnet_id,
+		s.subnet_id,
-				subnet.subnet_address AS subnet_address,
+		s.subnet_address,
-				subnet.subnet_mask AS subnet_mask
+		s.subnet_mask
 	FROM
-				subnet,
+		subnet AS s LEFT JOIN subnetlocation USING (subnet_id)
-				subnetlocation
 	WHERE
 		subnetlocation.location_id=" . $location_id . "
-				AND subnetlocation.subnet_id=subnet.subnet_id
 	ORDER BY
-				INET_ATON(subnet.subnet_address)";
+		INET_ATON(s.subnet_address)";
 
-		// run query
 $subnets = $db->db_select($query);
 $smarty->assign("subnets", $subnets);
 	
-	// end page
-		// output
 $smarty->display("locationview.tpl");
 		
-		// footer
 include("footer.php");
 ?>

login.php

@@ -1,47 +1,24 @@
 <?php
 /*****************************************************************************
 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,
-	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
 *****************************************************************************/
 
-	// session
-		// start session
 session_name('ipreg');
 session_start();
 
-	// 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");
 		
 // include language file
 $language = lang_getfrombrowser($config_lang, $config_lang_default, null, false);
 include('lang/' . $language . '.php');
 
-	// try login?
 // check for submit
 if ($_SERVER['REQUEST_METHOD']=="POST" ) {
 	/// get post info
@@ -61,17 +38,10 @@
 	}
 }
 		
-	// 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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 
-	// logout
+// user logout: clear session
-		// user logout
+$_SESSION = array();
-		$user->user_logout();
 
-		// redirect
+// redirect to start page
 header("Location: index.php");
 ?> 

natadd.php

@@ -1,64 +1,40 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 	
-		// get ip and id
 $node_id = sanitize($_GET['node_id']);
 
-		// start output
 include("header.php");
 	
-		// set language variables
+// node_ext
-		$smarty->assign($lang);
-
-	// setup node_ext
-		// build query
 $query = "SELECT
-				node.node_ip AS node_ip_ext
+		node_ip AS node_ip_ext
 	FROM
 		node
 	WHERE
-				node.node_id=" . $node_id;
+		node_id=" . $node_id;
 
-		// run query
 $node = $db->db_select($query);
 
 $smarty->assign("node_id_ext", $node_id);
 $smarty->assign("node_ip_ext", $node[0]['node_ip_ext']);
 
-	// setup node_int
+// node_int
-		// build query
 $query = "SELECT
-				asset.asset_name AS asset_name,
+		a.asset_name,
-				node.node_id AS node_id_int,
+		n.node_id AS node_id_int,
-				node.node_ip AS node_ip_int
+		n.node_ip AS node_ip_int
 	FROM
-				asset,
+		asset AS a LEFT JOIN node AS n USING (asset_id)
-				node
 	WHERE
-				node.node_id NOT IN (
+		n.node_id NOT IN (
 			SELECT
 				nat_int
 			FROM
@@ -66,12 +42,10 @@
 			WHERE
 				nat_ext=" . $node_id . "
 		)
-				AND node.node_id!=" . $node_id . "
+		AND n.node_id!=" . $node_id . "
-				AND asset.asset_id=node.asset_id
 	ORDER BY
-				INET_ATON(node.node_ip)";
+		INET_ATON(n.node_ip)";
 
-		// run query
 $nodes = $db->db_select($query);
 foreach ($nodes as $rec) {
      $node_options[$rec['node_id_int']] = $rec['node_ip_int'] . '/' . $rec['asset_name'];
@@ -83,10 +57,7 @@
 $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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 
-		// get ip and id
 $node_id = sanitize($_GET['node_id']);
 
-		// start output
 include("header.php");
 
-		// set language variables
+// node_ext
-		$smarty->assign($lang);
-	
-	// setup node_ext
-		// build query
 $query = "SELECT
-				node.node_ip AS node_ip_ext
+		node_ip AS node_ip_ext
 	FROM
 		node
 	WHERE
-				node.node_id=" . $node_id;
+		node_id=" . $node_id;
 
-		// run query
 $node = $db->db_select($query);
 
 $smarty->assign("node_id_ext", $node_id);
 $smarty->assign("node_ip_ext", $node[0]['node_ip_ext']);
 
-	// setup node
+// options
-		// build query
 $query = "SELECT
-				asset.asset_name AS asset_name,
+		a.asset_name,
-				node.node_id AS node_id_int,
+		n.node_ip,
-				node.node_ip AS node_ip_int
+		x.nat_ext
 	FROM
-				asset,
+		asset AS a,
-				nat,
+		nat AS x,
-				node
+		node AS n
 	WHERE
-				nat.nat_ext="  . $node_id . "
+		x.nat_ext="  . $node_id . "
-				AND node.node_id=nat.nat_int
+		AND n.node_id=x.nat_int
-				AND asset.asset_id=node.asset_id
+		AND a.asset_id=n.asset_id
 	ORDER BY
-				INET_ATON(node.node_ip)";
+		INET_ATON(n.node_ip)";
 
-		// run query
 $nodes = $db->db_select($query);
-        $smarty->assign("nodes", $nodes);
 
-// *** <option value="{node_id_int}">{node_ip_int}/{asset_name}</option>
+$options = array();
-
+foreach ($nodes as $rec) {
-	// end page
+    $options[$rec['nat_ext']] = $rec['node_ip'] . '/' . $rec['asset_name'];
-		// output
+}
+$smarty->assign("nat_options", $options);
 $smarty->display("natdel.tpl");
 
-		// end output
 include("footer.php");
 ?>

natedit.php

@@ -1,57 +1,31 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get id
 $node_id = sanitize($_GET['node_id']);
 		
-		// start output
 include("header.php");
 
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup node
-		// build query
 $query = "SELECT
-				node.node_ip AS node_ip
+	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,53 +1,23 @@
 <?php
 /*****************************************************************************
 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,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    For more information, visit http://sourceforge.net/projects/ipreg,
-    or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-    // start page
-        // includes
 include("includes.php");
-
-        // start output
 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']);
-
+    $subnet_view = "WHERE node.subnet_id=" . $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,
@@ -55,24 +25,16 @@
         node.node_id,
         node.node_ip
     FROM
-                asset,
+        asset LEFT JOIN node USING (asset_id)
-                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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// check for set ip and/or subnet_id
 if ((isset($_GET['node_ip'])) ? $node_ip = sanitize($_GET['node_ip']) : $node_ip = '');
 if ((isset($_GET['subnet_id'])) ?  $subnet_id = sanitize($_GET['subnet_id']) : $subnet_id = '');
 		
-		// start output
 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,47 +1,25 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get id	
 $node_id = sanitize($_GET['node_id']);
 		
-		// start output
 include("header.php");
 
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup node
-		// build query
 $query = "SELECT
-				node.asset_id AS asset_id,
+		asset_id,
-				node.node_ip AS node_ip
+		node_ip
 	FROM
 		node
 	WHERE
-				node.node_id=" . $node_id;
+		node_id=" . $node_id;
 
 // run query
 $node = $db->db_select($query);
@@ -51,10 +29,7 @@
 $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,63 +1,39 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get id	
 $node_id = sanitize($_GET['node_id']);
 		
-		// start output
 include("header.php");
 		
-		// set language variables
-		$smarty->assign($lang);
-		
-	// setup node
-		// build query
 $query = "SELECT
-				asset.asset_id AS asset_id,
+		a.asset_id,
-				node.node_id AS node_id,
+		n.node_id,
-				node.node_ip AS node_ip,
+		n.node_ip,
-				node.node_mac AS node_mac,
+		n.node_mac,
-				node.node_dns1 AS node_dns1,
+		n.node_dns1,
-				node.node_dns2 AS node_dns2,
+		n.node_dns2,
-				node.node_info AS node_info,
+		n.node_info,
-				subnet.subnet_id AS subnet_id,
+		s.subnet_id,
-                node.zone_id AS zone_id
+		n.zone_id
 	FROM
-				asset,
+		asset AS a,
-				node,
+		node AS n,
-				subnet
+		subnet AS s
 	WHERE
-				asset.asset_id=node.asset_id
+		a.asset_id=n.asset_id
-				AND node.node_id=" . $node_id . "
+		AND n.node_id=" . $node_id . "
-				AND subnet.subnet_id=node.subnet_id";
+		AND s.subnet_id=n.subnet_id";
 
-		// run query
 $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']));
@@ -68,19 +44,11 @@
 $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,40 +1,24 @@
 <?php
 /*****************************************************************************
 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,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    For more information, visit http://sourceforge.net/projects/ipreg,
-    or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-    // start page
-        // includes
 include("includes.php");
 
-        // get id
+if (isset($_GET['node_id']) && (!empty($_GET['node_id']))) {
     $node_id = sanitize($_GET['node_id']);
+} else {
+    // redirect to error page
+    header_location("comments.php?comments=error");
+    exit;
+}
 
-        // start output
 include("header.php");
-
+// node
-        // set language variables
-        $smarty->assign($lang);
-
-    // setup node
-        // build query
 $query = "SELECT
         asset.asset_id,
         asset.asset_name,
@@ -57,13 +41,11 @@
     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
+// nat
-        // build query
 $query = "SELECT
         asset_ext.asset_id AS asset_id_ext,
         asset_int.asset_id AS asset_id_int,
@@ -74,13 +56,15 @@
         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_ip AS node_ip_int,
+        node_int.node_id AS node_id_int,
+        node_ext.node_id AS node_id_ext
     FROM
-                asset asset_ext,
+        asset AS asset_ext,
-                asset asset_int,
+        asset AS asset_int,
         nat,
-                node node_ext,
+        node AS node_ext,
-                node node_int
+        node AS node_int
     WHERE
         (nat.nat_ext=" . $node_id . "
         OR nat.nat_int=" . $node_id . ")
@@ -92,13 +76,9 @@
         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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
-
-		// 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,39 +1,19 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 		
-		// start output
 include("header.php");
 		
-		// set language variables
-		$smarty->assign($lang);
 $smarty->assign("language", $language);
 
-	// setup options
+	
-		// set menu checkboxes
-			// assets
 if($_SESSION['suser_menu_assets']=='on') {
 	$user_menu_assets_checked = 'checked';
 } else {
@@ -94,7 +74,6 @@
 	$user_tooltips_checked = '';
 }
 
-		// send to tpl
 $smarty->assign("user_id", $_SESSION['suser_id']);
 $smarty->assign("user_imagesize", $_SESSION['suser_imagesize']);
 $smarty->assign("user_imagecount", $_SESSION['suser_imagecount']);
@@ -114,10 +93,7 @@
 $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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
-		
-		// 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,34 +1,15 @@
 <?php
 /*****************************************************************************
 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,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    For more information, visit http://sourceforge.net/projects/ipreg,
-    or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-    // start page
-        // includes
 include("includes.php");
-
-        // start output
 include("header.php");
 
-        // set language variables
-        $smarty->assign($lang);
 
 // get string that was searched for ($search is already set in header.php)
 if (empty($search)) {
@@ -45,103 +26,93 @@
     // set counter
     $resultcounter = 0;
 
-        // setup asset
+    // asset
-            // build query
     $query = "SELECT
-                    asset.asset_id AS id,
+            asset_id AS id,
-                    asset.asset_name AS name,
+            asset_name AS name,
-                    asset.asset_info AS description
+            asset_info AS description
         FROM
             asset
         WHERE
-                    asset.asset_name LIKE '" . $needle . "'
+            asset_name LIKE '" . $needle . "'
-                    OR asset.asset_hostname LIKE '" . $needle . "'
+            OR asset_hostname LIKE '" . $needle . "'
-                    OR asset.asset_info LIKE '" . $needle . "'
+            OR asset_info LIKE '" . $needle . "'
         ORDER BY
-                    asset.asset_name";
+            asset_name";
 
-            // run query
     $assets = $db->db_select($query);
     $resultcounter += count($assets);
     $smarty->assign("assets", $assets);
 
-        // setup location
+    // location
-            // build query
     $query = "SELECT
-                    location.location_id AS id,
+            location_id AS id,
-                    location.location_name AS name
+            location_name AS name
         FROM
             location
         WHERE
-                    location.location_name LIKE '" . $needle . "'
+            location_name LIKE '" . $needle . "'
-                    OR location.location_info LIKE '" . $needle . "'
+            OR location_info LIKE '" . $needle . "'
         ORDER BY
-                    location.location_name";
+            location_name";
 
-            // run query
     $locations = $db->db_select($query);
     $resultcounter += count($locations);
     $smarty->assign("locations", $locations);
 
-        // setup node
+    // node
-            // build query
     $query = "SELECT
-                    node.node_id AS id,
+            node_id AS id,
-                    node.node_ip AS ip
+            node_ip AS ip
         FROM
             node
         WHERE
-                    node.node_ip LIKE '" . $needle . "'
+            node_ip LIKE '" . $needle . "'
-                    OR node.node_mac LIKE '" . $needle . "'
+            OR node_mac LIKE '" . $needle . "'
-                    OR node.node_dns1 LIKE '" . $needle . "'
+            OR node_dns1 LIKE '" . $needle . "'
-                    OR node.node_dns2 LIKE '" . $needle . "'
+            OR node_dns2 LIKE '" . $needle . "'
-                    OR node.node_info LIKE '" . $needle . "'
+            OR node_info LIKE '" . $needle . "'
         ORDER BY
-                    node.node_ip";
+            node_ip";
 
-            // run query
     $nodes = $db->db_select($query);
     $resultcounter += count($nodes);
     $smarty->assign("nodes", $nodes);
 
-        // setup subnet
+    // subnet
-            // build query
     $query = "SELECT
-                    subnet.subnet_id AS id,
+            subnet_id AS id,
-                    subnet.subnet_address AS address
+            subnet_address AS address
         FROM
             subnet
         WHERE
-                    subnet.subnet_address LIKE '" . $needle . "'
+            subnet_address LIKE '" . $needle . "'
-                    OR subnet.subnet_info LIKE '" . $needle . "'
+            OR subnet_info LIKE '" . $needle . "'
         ORDER BY
-                    subnet.subnet_address";
+            subnet_address";
 
     // run query
     $subnets = $db->db_select($query);
     $resultcounter += count($subnets);
     $smarty->assign("subnets", $subnets);
 
-        // setup vlan
+    // vlan
-            // build query
     $query = "SELECT
-                    vlan.vlan_id AS id,
+            vlan_id AS id,
-                    vlan.vlan_name AS name
+            vlan_name AS name
         FROM
             vlan
         WHERE
-                    vlan.vlan_name LIKE '" . $needle . "'
+            vlan_name LIKE '" . $needle . "'
-                    OR vlan.vlan_info LIKE '" . $needle . "'
+            OR vlan_info LIKE '" . $needle . "'
         ORDER BY
-                    vlan.vlan_name";
+            vlan_name";
 
-            // run query
     $vlans = $db->db_select($query);
     $resultcounter += count($vlans);
     $smarty->assign("vlans", $vlans);
 
     // setup zone
-            // build query
     $query = "SELECT
             zone_id AS id,
             zone_origin AS origin
@@ -160,7 +131,6 @@
         ORDER BY
             zone_origin";
 
-            // run query
     $zones = $db->db_select($query);
     $resultcounter += count($zones);
     $smarty->assign("zones", $zones);
@@ -169,10 +139,7 @@
     $smarty->assign("resultcounter", $resultcounter);
 }
 
-    // end page
-        // output
 $smarty->display("search.tpl");
 
-        // end output
 include("footer.php");
 ?>

subnet.php

@@ -1,37 +1,15 @@
 <?php
 /*****************************************************************************
 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,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    For more information, visit http://sourceforge.net/projects/ipreg,
-    or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-    // start page
-        // includes
 include("includes.php");
-
-        // start output
 include("header.php");
 
-        // set language variables
-        $smarty->assign($lang);
-
-    // setup subnet
-        // build query
 $query = "SELECT
         s.subnet_id,
         s.subnet_address,
@@ -41,24 +19,16 @@
         CHAR_LENGTH(s.subnet_info) AS subnet_length,
         COUNT(node.subnet_id) AS node_counter
     FROM
-                subnet AS s
+        subnet AS s LEFT JOIN node USING (subnet_id)
-            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
+$smarty->assign("subnets", $subnets);
-        // output
 $smarty->display("subnet.tpl");
 
-        // end output
 include("footer.php");
 ?>

subnetadd.php

@@ -1,50 +1,27 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 		
-		// get id
 if((isset($_GET['vlan_id'])) ? $vlan_id = sanitize($_GET['vlan_id']) : $vlan_id = "");
 		
-		// start output
 include("header.php");
 
-		// set language variables
-		$smarty->assign($lang);
-
-	// setup vlan
-		// build query
 $query = "SELECT
-				vlan.vlan_id AS vlan_id,
+		vlan_id,
-				vlan.vlan_number AS vlan_number,
+		vlan_number,
-				vlan.vlan_name AS vlan_name
+		vlan_name
 	FROM
 		vlan
 	ORDER BY
-				vlan.vlan_name";
+		vlan_name";
 
-		// run query
 $vlans = $db->db_select($query);
 $vlan_options[0] = $lang['lang_option_none'];
 foreach ($vlans as $vlan) {
@@ -52,10 +29,7 @@
 }
 $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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get id	
 $subnet_id = sanitize($_GET['subnet_id']);
 		
-		// start output
 include("header.php");
 	
-		// set language variables
+// subnet
-		$smarty->assign($lang);
-	
-	// setup subnet
-		// build query
 $query = "SELECT
-				subnet.subnet_address AS subnet_address,
+		subnet_address,
-				subnet.subnet_mask AS subnet_mask
+		subnet_mask
 	FROM
 		subnet
 	WHERE
-				subnet.subnet_id=" . $subnet_id;
+		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']);
 	
-	// setup node		
+// node		
-		// build query
 $query = "SELECT
-				node.node_id AS node_id,
+		node_id,
-				node.node_ip AS node_ip
+		node_ip
 	FROM
 		node
 	WHERE
-				node.subnet_id=" . $subnet_id . "
+		subnet_id=" . $subnet_id . "
 	ORDER BY
-				INET_ATON(node.node_ip)";
+		INET_ATON(node_ip)";
 
-		// run query
 $nodes = $db->db_select($query);
-        $smarty->assign("nodes", $nodes);
 
-	// end page
+$smarty->assign("nodes", $nodes);
-		// output
 $smarty->display("subnetdel.tpl");
 		
-		// footer
 include("footer.php");
 ?>

subnetedit.php

@@ -1,40 +1,18 @@
 <?php
 /*****************************************************************************
 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,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    For more information, visit http://sourceforge.net/projects/ipreg,
-    or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-    // start page
-        // includes
 include("includes.php");
 
-        // get id
 $subnet_id = sanitize($_GET['subnet_id']);
 
-        // start output
 include("header.php");
 
-        // set language variables
-        $smarty->assign($lang);
-
-    // setup subnet
-        // build query
 $query = "SELECT
         subnet_address,
         subnet_mask,
@@ -48,10 +26,8 @@
     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']);
@@ -61,10 +37,7 @@
 $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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get ip and id
 $subnet_id = sanitize($_GET['subnet_id']);
 		
-		// start output
 include("header.php");
 		
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup subnet
-		// build query
 $query = "SELECT
-				subnet.subnet_address AS subnet_address,
+		subnet_address,
-				subnet.subnet_mask AS subnet_mask
+		subnet_mask
 	FROM
 		subnet
 	WHERE
-				subnet.subnet_id=" . $subnet_id;
+		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,47 +1,26 @@
 <?php
 /*****************************************************************************
 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,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    For more information, visit http://sourceforge.net/projects/ipreg,
-    or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-    // start page
-        // includes
 include("includes.php");
 
-        // get ip and id
 $subnet_id = sanitize($_GET['subnet_id']);
 
-        // start output
 include("header.php");
 
-        // set language variables
+// subnet
-        $smarty->assign($lang);
-
-    // setup subnet
-        // build query
 $query = "SELECT
-                subnet.subnet_address AS subnet_address,
+        subnet_address,
-                subnet.subnet_mask AS subnet_mask
+        subnet_mask
     FROM
         subnet
     WHERE
-                subnet.subnet_id=" . $subnet_id;
+        subnet_id=" . $subnet_id;
 
 // run query
 $subnet = $db->db_select($query);
@@ -50,19 +29,16 @@
 $smarty->assign("subnet_address", $subnet[0]['subnet_address']);
 $smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
 
-    // setup location
+// location
-        // build query
 $query = "SELECT
-                location.location_id AS location_id,
+        l.location_id,
-                location.location_name AS location_name
+        l.location_name
     FROM
-                subnetlocation,
+        subnetlocation AS s LEFT JOIN location USING (location_id)
-                location
     WHERE
-                subnetlocation.subnet_id="  . $subnet_id . "
+        s.subnet_id="  . $subnet_id . "
-                AND location.location_id=subnetlocation.location_id
     ORDER BY
-                location.location_name";
+        l.location_name";
 
 // run query
 $records = $db->db_select($query);
@@ -72,11 +48,7 @@
 }
 $smarty->assign("location_options", $locations);
 
-
-    // end page
-        // output
 $smarty->display("subnetlocationdel.tpl");
 
-        // end output
 include("footer.php");
 ?>

subnetlocationedit.php

@@ -1,47 +1,25 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get ip and id
 $subnet_id = sanitize($_GET['subnet_id']);
 		
-		// start output
 include("header.php");
 	
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup subnet
-		// build query
 $query = "SELECT
-				subnet.subnet_address AS subnet_address,
+		subnet_address,
-				subnet.subnet_mask AS subnet_mask
+		subnet_mask
 	FROM
 		subnet
 	WHERE
-				subnet.subnet_id=" . $subnet_id;
+		subnet_id=" . $subnet_id;
 
 // run query
 $subnet = $db->db_select($query);
@@ -50,10 +28,7 @@
 $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,67 +1,40 @@
 <?php
 /*****************************************************************************
 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,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    For more information, visit http://sourceforge.net/projects/ipreg,
-    or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-    // start page
-        // includes
 include("includes.php");
 
-        // get id
 $subnet_id = sanitize($_GET['subnet_id']);
 
-        // get page
 if(isset($_GET['page'])) {
     $page = sanitize($_GET['page']);
 }
 
-        // start output
 $smarty->assign("scripts",'changetext.js');
 include("header.php");
 
-        // set language variables
+// subnet
-        $smarty->assign($lang);
-
-    // setup subnet
-        // build query
 $query = "SELECT
-                subnet.subnet_address,
+        s.subnet_address,
-                subnet.subnet_mask,
+        s.subnet_mask,
-                subnet.subnet_dhcp_start,
+        s.subnet_dhcp_start,
-                subnet.subnet_dhcp_end,
+        s.subnet_dhcp_end,
-                subnet.subnet_info,
+        s.subnet_info,
-                subnet.protocol_version,
+        s.protocol_version,
-                subnet.ntp_server,
+        s.ntp_server,
         COUNT(node.subnet_id) AS node_counter
     FROM
-                subnet
+        subnet AS s LEFT JOIN node USING (subnet_id)
-            LEFT JOIN
-                node
-            ON
-                node.subnet_id=subnet.subnet_id
     WHERE
-                subnet.subnet_id=" . $subnet_id . "
+        s.subnet_id=" . $subnet_id . "
     GROUP BY
-                subnet.subnet_id";
+        s.subnet_id";
 
-        // run query
 $subnet = $db->db_select($query);
 
 // set needed variables
@@ -77,7 +50,6 @@
 $node_counter = $subnet[0]['node_counter'];
 $subnet_usedpercentage = round((($node_counter/($host_counter-2))*100), 1);
 
-        // send to tpl
 $smarty->assign("subnet_id", $subnet_id);
 $smarty->assign("subnet_address", $subnet_address);
 $smarty->assign("subnet_mask", $subnet_mask);
@@ -92,7 +64,8 @@
 $smarty->assign("host_counter", $host_counter-2);
 $smarty->assign("free_counter", (($host_counter-2)-$node_counter));
 
-    // setup subnet
+// subnet
+
 // split up the range
 $iprange = explode('.', $subnet_address);
 $iprange1 = $iprange[0];
@@ -265,7 +238,6 @@
 }
 
 // get nodes for this subnetview and implement the values into the array
-            // build query
 $query = "SELECT
         asset.asset_name,
         assetclassgroup.assetclassgroup_color,
@@ -283,19 +255,14 @@
         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;
-
     }
 }
 
@@ -328,11 +295,11 @@
 //   if(($i%$_SESSION['suser_imagecount']==0 && $i!=$nodes_displayed) ? $tr="</tr><tr>" : $tr="");
 
 // check if node-ip in DHCP-area
-                                $subnet[$node_ip]["dynamic"] = False;
+    $subnet[$node_ip]["dynamic"] = false;
     if ($dhcpstart > 0) {
         $ipval = ip2long($node_ip);
         if (($ipval >= $dhcpstart) and ($ipval <= $dhcpend)) {
-                                        $subnet[$node_ip]["dynamic"] = True;
+            $subnet[$node_ip]["dynamic"] = true;
         }
     }
 
@@ -346,7 +313,6 @@
         } else {
             $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"] = "";
@@ -364,16 +330,15 @@
         $subnet[$node_ip]["assetclassgroup_color"] = $node['assetclassgroup_color'];
     }
 
-
     // update counter
     //   $i++;
-            }
+
+} // foreach
 
 $smarty->assign("subnet", $subnet);
 $smarty->assign("imagewrap", $_SESSION['suser_imagecount']);
 
-    // setup vlan
+// vlan
-        // build query
 $query = "SELECT
         vlan.vlan_id AS vlan_id,
         vlan.vlan_name AS vlan_name,
@@ -391,28 +356,21 @@
 $vlans = $db->db_select($query);
 $smarty->assign("vlans", $vlans);
 
-    // setup location
+// location
-        // build query
 $query = "SELECT
-                location.location_id,
+        l.location_id,
-                location.location_name
+        l.location_name
     FROM
-                location
+        location AS l LEFT JOIN subnetlocation AS s USING (location_id)
-            LEFT JOIN
-                subnetlocation
-            ON
-                subnetlocation.location_id=location.location_id
     WHERE
-                subnetlocation.subnet_id=". $subnet_id . "
+        s.subnet_id=". $subnet_id . "
     ORDER BY
-                location.location_name";
+        l.location_name";
 
-        // run query
 $locations = $db->db_select($query);
 $smarty->assign("locations", $locations);
 
-    // setup assetclassgroup
+// assetclassgroup
-        // build query
 $query = "SELECT
         assetclassgroup_id AS id,
         assetclassgroup_name AS name,
@@ -431,10 +389,7 @@
 $assetclassgroups = $db->db_select($query);
 $smarty->assign("assetclassgroups", $assetclassgroups);
 
-    // end page
-        // output
 $smarty->display("subnetview.tpl");
 
-        // end output
 include("footer.php");
 ?>

subnetvlanadd.php

@@ -1,47 +1,28 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get ip and id
 $subnet_id = sanitize($_GET['subnet_id']);
 		
-		// start output
 include("header.php");
 		
-		// set language variables
-		$smarty->assign($lang);
 	
-	// setup subnet
+// subnet
 // build query
 $query = "SELECT
-				subnet.subnet_address AS subnet_address,
+		subnet_address,
-				subnet.subnet_mask AS subnet_mask
+		subnet_mask
 	FROM
 		subnet
 	WHERE
-				subnet.subnet_id=" . $subnet_id;
+		subnet_id=" . $subnet_id;
 
 // run query
 $subnet = $db->db_select($query);
@@ -50,16 +31,15 @@
 $smarty->assign("subnet_address", $subnet[0]['subnet_address']);
 $smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
 
-    // setup vlan
+// vlan
-		// build query
 $query = " SELECT
-				vlan.vlan_id AS vlan_id,
+		vlan_id,
-				vlan.vlan_number AS vlan_number,
+		vlan_number,
-				vlan.vlan_name AS vlan_name
+		vlan_name
 	FROM
 		vlan
 	WHERE
-				vlan.vlan_id NOT IN (
+		vlan_id NOT IN (
 			SELECT
 				vlan_id
 			FROM
@@ -68,22 +48,15 @@
 				subnet_id=" . $subnet_id . "
 		)
 	ORDER BY
-				vlan.vlan_number";
+		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,47 +1,26 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get ip and id
 $subnet_id = sanitize($_GET['subnet_id']);
 		
-		// start output
 include("header.php");
 
-		// set language variables
+// subnet
-		$smarty->assign($lang);
-	
-	// setup subnet
-		// build query
 $query = "SELECT
-				subnet.subnet_address AS subnet_address,
+		subnet_address,
-				subnet.subnet_mask AS subnet_mask
+		subnet_mask
 	FROM
 		subnet
 	WHERE
-				subnet.subnet_id=" . $subnet_id;
+		subnet_id=" . $subnet_id;
 
 // run query
 $subnet = $db->db_select($query);
@@ -50,29 +29,23 @@
 $smarty->assign("subnet_address", $subnet[0]['subnet_address']);
 $smarty->assign("subnet_mask", $subnet[0]['subnet_mask']);
 	
-	// setup vlan
+// vlan
-		// build query
 $query = "SELECT
-				vlan.vlan_id AS vlan_id,
+		v.vlan_id,
-				vlan.vlan_number AS vlan_number,
+		v.vlan_number,
-				vlan.vlan_name AS vlan_name
+		v.vlan_name
 	FROM
-				subnetvlan,
+		subnetvlan AS s LEFT JOIN vlan AS v USING (vlan_id)
-				vlan
 	WHERE
-				subnetvlan.subnet_id="  . $subnet_id . "
+		s.subnet_id="  . $subnet_id . "
-				AND vlan.vlan_id=subnetvlan.vlan_id
 	ORDER BY
-				vlan.vlan_number";
+		v.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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 		
-		// get ip and id
 $subnet_id = sanitize($_GET['subnet_id']);
 		
-		// start output
 include("header.php");
 		
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup subnet
-		// build query
 $query = "SELECT
-				subnet.subnet_address AS subnet_address,
+		subnet_address,
-				subnet.subnet_mask AS subnet_mask
+		subnet_mask
 	FROM
 		subnet
 	WHERE
-				subnet.subnet_id=" . $subnet_id;
+		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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
-		
-		// start output
 include("header.php");
 
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup user
-		// build query
 $query = "SELECT
-				user.user_id AS user_id,
+		user_id,
-				user.user_name AS user_name,
+		user_name,
-				user.user_displayname AS user_displayname
+		user_displayname
 	FROM
 		user
 	ORDER BY
-				user.user_name";
+		user_name";
 	
-		// run query
 $users = $db->db_select($query);
-		$smarty->assign("users", $users);
 
-	// end page
+$smarty->assign("users", $users);
-		// output
 $smarty->display("user.tpl");
 		
-		// end output
 include("footer.php");
 ?>

useradd.php

@@ -1,39 +1,16 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
-		
-		// 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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get id	
 $user_id = sanitize($_GET['user_id']);
 		
-		// start output
 include("header.php");
 		
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup user
-		// build query
 $query = "SELECT
-				user.user_name AS user_name
+	user_name
 FROM
 	user
 WHERE
-				user.user_id=" . $user_id;
+	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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get id	
 $user_id = sanitize($_GET['user_id']);
 		
-		// start output
 include("header.php");
 
-		// set language variables
-		$smarty->assign($lang);
-		
-	// setup user
-		// build query
 $query = "SELECT
-				user.user_name AS user_name,
+	user_name,
-				user.user_displayname AS user_displayname
+	user_displayname
 FROM
 	user
 WHERE
-				user.user_id=" . $user_id;
+	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,47 +1,25 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get id
 $user_id = sanitize($_GET['user_id']);
 		
-		// start output
 include("header.php");
 
-		// set language variables
-		$smarty->assign($lang);
-
-	// setup user
-		// build query
 $query = "SELECT
-				user.user_name AS user_name,
+		user_name,
-				user.user_displayname AS user_displayname
+		user_displayname
 	FROM
 		user
 	WHERE
-				user.user_id=" . $user_id;
+		user_id=" . $user_id;
 
 // run query
 $user = $db->db_select($query);
@@ -51,10 +29,7 @@
 $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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
-		
-		// start output
 include("header.php");
 			
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup vlan
-		// build query
 $query = "SELECT
-				vlan.vlan_id AS vlan_id,
+		vlan_id,
-				vlan.vlan_number AS vlan_number,
+		vlan_number,
-				vlan.vlan_name AS vlan_name,
+		vlan_name,
-				LEFT(vlan.vlan_info, 60) AS vlan_info
+		LEFT(vlan_info, 60) AS vlan_info
 	FROM
 		vlan
 	ORDER BY
-				vlan.vlan_number";
+		vlan_number";
 		
-		// run query
 $vlans = $db->db_select($query);
-        $smarty->assign("vlans", $vlans);
 
-	// end page
+$smarty->assign("vlans", $vlans);
-		// output
 $smarty->display("vlan.tpl");
 		
-		// end output
 include("footer.php");
 ?>

vlanadd.php

@@ -1,39 +1,16 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
-		
-		// 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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get id	
 $vlan_id = sanitize($_GET['vlan_id']);
 		
-		// start output
 include("header.php");
 		
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup vlan
-		// build query
 $query = "SELECT
-				vlan.vlan_name AS vlan_name,
+	vlan_name,
-				vlan.vlan_number AS vlan_number
+	vlan_number
 FROM
 	vlan
 WHERE
-				vlan.vlan_id=" . $vlan_id;
+	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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 		
-		// get id	
 $vlan_id = sanitize($_GET['vlan_id']);
 		
-		// start output
 include("header.php");
 
-		// set language variables
-		$smarty->assign($lang);
-	
 	// setup vlan
-		// build query
 $query = "SELECT
-				vlan.vlan_name AS vlan_name,
+	vlan_name,
-				vlan.vlan_number AS vlan_number,
+	vlan_number,
-				vlan.vlan_info AS vlan_info
+	vlan_info
 FROM
 	vlan
 WHERE
-				vlan.vlan_id=" . $vlan_id;
+	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']);
 $smarty->assign("vlan_info", $vlan[0]['vlan_info']);
-	
-	// end page
-		// output
 $smarty->display("vlanedit.tpl");
 
-		// footer
 include("footer.php");
 ?>

vlansubnetadd.php

@@ -1,47 +1,25 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get ip and id
 $vlan_id = sanitize($_GET['vlan_id']);
 		
-		// start output
 include("header.php");
-			
+// vlan
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup vlan
-		// build query
 $query = "SELECT
-				vlan.vlan_name AS vlan_name,
+		vlan_name,
-				vlan.vlan_number AS vlan_number
+		vlan_number
 	FROM
 		vlan
 	WHERE
-				vlan.vlan_id=" . $vlan_id;
+		vlan_id=" . $vlan_id;
 
 // run query
 $vlan = $db->db_select($query);
@@ -50,16 +28,15 @@
 $smarty->assign("vlan_name", $vlan[0]['vlan_name']);
 $smarty->assign("vlan_number", $vlan[0]['vlan_number']);
 	
-	// setup subnet
+// subnet
-		// build query
 $query = " SELECT
-				subnet.subnet_id AS subnet_id,
+		subnet_id,
-				subnet.subnet_address AS subnet_address,
+		subnet_address,
-				subnet.subnet_mask AS subnet_mask
+		subnet_mask
 	FROM
 		subnet
 	WHERE
-				subnet.subnet_id NOT IN (
+		subnet_id NOT IN (
 			SELECT
 				subnet_id
 			FROM
@@ -68,19 +45,15 @@
 				vlan_id=" . $vlan_id . "
 		)
 	ORDER BY
-				INET_ATON(subnet.subnet_address)";
+		INET_ATON(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,47 +1,26 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 		
-		// get ip and id
 $vlan_id = sanitize($_GET['vlan_id']);
 		
-		// start output
 include("header.php");
 		
-		// set language variables
+// vlan
-		$smarty->assign($lang);
-	
-	// setup vlan
-		// build query
 $query = "SELECT
-				vlan.vlan_name AS vlan_name,
+		vlan_name,
-				vlan.vlan_number AS vlan_number
+		vlan_number
 	FROM
 		vlan
 	WHERE
-				vlan.vlan_id=" . $vlan_id;
+		vlan_id=" . $vlan_id;
 
 // run query
 $vlan = $db->db_select($query);
@@ -51,31 +30,24 @@
 $smarty->assign("vlan_number", $vlan[0]['vlan_number']);
 
 // setup subnet
-		// build query
 $query = "SELECT
-				subnet.subnet_id AS subnet_id,
+		s.subnet_id,
-				subnet.subnet_address AS subnet_address,
+		s.subnet_address,
-				subnet.subnet_mask AS subnet_mask
+		s.subnet_mask
 	FROM
-				subnetvlan,
+		subnetvlan AS v LEFT JOIN subnet AS s USING(subnet_id)
-				subnet
 	WHERE
-				subnetvlan.vlan_id="  . $vlan_id . "
+		v.vlan_id="  . $vlan_id . "
-				AND subnet.subnet_id=subnetvlan.subnet_id
 	ORDER BY
-				INET_ATON(subnet.subnet_address)";
+		INET_ATON(s.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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get ip and id
 $vlan_id = sanitize($_GET['vlan_id']);
 		
-		// start output
 include("header.php");
 		
-		// set language variables
-		$smarty->assign($lang);
-	
-	// setup vlan
-		// build query
 $query = "SELECT
-				vlan.vlan_name AS vlan_name,
+		vlan_name,
-				vlan.vlan_number AS vlan_number
+		vlan_number
 	FROM
 		vlan
 	WHERE
-				vlan.vlan_id=" . $vlan_id;
+		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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 
-	// start page
-		// includes
 include("includes.php");
 		
-		// get id
 $vlan_id = sanitize($_GET['vlan_id']);
 		
-		// start output
 include("header.php");
 
-		// set language variables
+// vlan
-		$smarty->assign($lang);
-	
-	// setup vlan
-		// build query
 $query = "SELECT
-				vlan.vlan_name AS vlan_name,
+	vlan_name,
-				vlan.vlan_number AS vlan_number,
+	vlan_number,
-				vlan.vlan_info AS vlan_info
+	vlan_info
 FROM
 	vlan
 WHERE
-				vlan.vlan_id=" . $vlan_id;
+	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']);
 $smarty->assign("vlan_info", nl2br($vlan[0]['vlan_info']));
 
-	// setup subnets
+// subnets
-		// build query
 $query = "SELECT
-				subnet.subnet_id,
+	s.subnet_id,
-				subnet.subnet_address,
+	s.subnet_address,
-				subnet.subnet_mask,
+	s.subnet_mask,
-				subnet.subnet_info
+	s.subnet_info
 FROM
-				subnet,
+	subnet AS s LEFT JOIN subnetvlan AS v USING (subnet_id)
-				subnetvlan
 WHERE
-				subnetvlan.vlan_id=" . $vlan_id . "
+	v.vlan_id=" . $vlan_id . "
-				AND subnet.subnet_id=subnetvlan.subnet_id
 ORDER BY
-				INET_ATON(subnet.subnet_address)";
+	INET_ATON(s.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,36 +1,16 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// start output
 include("header.php");
 		
-		// set language variables
-		$smarty->assign($lang);
-
-		// build query
 $query = "SELECT
 	zone_id,
 	zone_origin,
@@ -42,14 +22,10 @@
 ORDER BY
 	zone_origin";
 		
-		// run query
 $zones = $db->db_select($query);
-		$smarty->assign("zones", $zones);
 
-	// end page
+$smarty->assign("zones", $zones);
-		// output
 $smarty->display("zone.tpl");
 		
-		// end output
 include("footer.php");
 ?>

zoneadd.php

@@ -1,39 +1,16 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
-		
-		// 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
-	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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get id	
 $zone_id = sanitize($_GET['zone_id']);
 		
-		// start output
 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,40 +1,17 @@
 <?php
 /*****************************************************************************
 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,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	For more information, visit http://sourceforge.net/projects/ipreg,
-	or contact me at wietsew@users.sourceforge.net
 *****************************************************************************/
 	
-	// start page
-		// includes
 include("includes.php");
 		
-		// get id
 $zone_id = sanitize($_GET['zone_id']);
 
-		// start output
 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,
@@ -44,14 +21,10 @@
 WHERE
 	zone_id=" . $zone_id;
 		
-		// run query
 $zone = $db->db_select($query);
-		$smarty->assign("zone", $zone[0]);
 
-	// end page
+$smarty->assign("zone", $zone[0]);
-		// output
 $smarty->display("zoneedit.tpl");
 
-        // end output
 include("footer.php");
 ?>