Changes adopted from version 0.5

about.php

@@ -0,0 +1,47 @@
+<?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// start output
+		include("header.php");
+		
+		// set template
+		$tp = new Template("tpl/about.tpl", $config_yapter_error);
+		
+		// set language variables
+		$tp->setvars($lang);
+	
+	// setup page
+		// set vars
+		$tp->set("config_version", $config_version);
+	
+	// end page
+		// output
+		$tp->parse();
+		$tp->spit();
+		
+		// end output
+		include("footer.php");
+?>

asset.php

@@ -1,24 +1,129 @@
 <?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// start output
 		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/asset.tpl");
+		$tp = new Template("tpl/asset.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// get asset info
+	// create letter links
-	$result = mysql_query("SELECT asset_id, asset_name FROM asset ORDER BY asset_name") or die(mysql_error());
+		// build query
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
+		$query = "SELECT
-		$tp->set("asset_id", $row->asset_id);
+				SUBSTRING(UPPER(asset.asset_name),1,1) AS asset_letter
-		$tp->set("asset_name", $row->asset_name);
+			FROM
-		$tp->parse("assetrow");
+				asset
-	}
+			GROUP BY
-	if (($i>0) ? $tp->parse("asset") : $tp->hide("asset"));
+				asset_letter
+			ORDER BY
+				asset_letter";
 		
+		// run query
+		$alphabet = $db->db_select($query);
+		
+		// count results
+		$alphabet_counter = count($alphabet);
+		
+		// any letters?
+		if ($alphabet_counter>0) {
+			// get objects
+			foreach($alphabet AS $alphabet_letter) {
+				// to tpl
+				$tp->set("asset_letter", strtoupper($alphabet_letter['asset_letter']));
+				
+				// parse every row
+				$tp->parse("letter_row");
+			}
+		}
+		
+		// parse block
+		$tp->parse("letter_table");
+	
+	// setup asset
+		// setup current letter
+		if(isset($_GET['asset_letter'])) {
+			$asset_letter = sanitize($_GET['asset_letter']);
+		} else {
+			$asset_letter = $alphabet[0]['asset_letter'];
+		}
+		
+		// build query
+		$query = "SELECT
+				asset.asset_id AS asset_id,
+				asset.asset_name AS asset_name,
+				assetclass.assetclass_id AS assetclass_id,
+				assetclass.assetclass_name AS assetclass_name
+			FROM
+				asset,
+				assetclass
+			WHERE
+				SUBSTRING(asset.asset_name,1,1) = '" . $asset_letter . "'
+				AND assetclass.assetclass_id=asset.assetclass_id
+			ORDER BY
+				asset.asset_name";
+		
+		// run query
+		$assets = $db->db_select($query);
+		
+		// count results
+		$asset_counter = count($assets);
+		
+		// counter to tpl
+		$tp->set("asset_counter", $asset_counter);
+	
+		// any assets?
+		if ($asset_counter>0) {
+			// get objects
+			foreach($assets AS $asset) {
+				// send to tpl
+				$tp->set("asset_id", $asset['asset_id']);
+				$tp->set("asset_name", $asset['asset_name']);
+				
+				$tp->set("assetclass_id", $asset['assetclass_id']);
+				$tp->set("assetclass_name", $asset['assetclass_name']);
+				
+				// parse row
+				$tp->parse("asset_row");
+			}
+			
+			// parse block
+			$tp->parse("asset_table");
+		} else {
+			// hide block
+			$tp->hide("asset_table");
+		}
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// end output
 		include("footer.php");
 ?>

assetadd.php

@@ -1,24 +1,77 @@
 <?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// get id
+		if((isset($_GET['assetclass_id'])) ? $assetclass_id = sanitize($_GET['assetclass_id']) : $assetclass_id = "");
+		
+		// start output
 		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/assetadd.tpl");
+		$tp = new Template("tpl/assetadd.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// get assetclassgroup information
+	// setup assetclass
-	$result = mysql_query("SELECT assetclass_id, assetclass_name FROM assetclass ORDER BY assetclass_name") or die(mysql_error());
+		// build query
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
+		$query = "SELECT
-		$tp->set("assetclass_id", $row->assetclass_id);
+				assetclass.assetclass_id AS assetclass_id,
-		$tp->set("assetclass_name", $row->assetclass_name);
+				assetclass.assetclass_name AS assetclass_name
-		$tp->parse("assetclassrow");
+			FROM
-	}
+				assetclass
-	if (($i>0) ? $tp->parse("assetclass") : $tp->hide("assetclass"));
+			ORDER BY
+				assetclass.assetclass_name";
 		
+		// run query
+		$assetclasses = $db->db_select($query);
+		
+		foreach($assetclasses AS $assetclass) {
+			// send to tpl
+			$tp->set("assetclass_id", $assetclass['assetclass_id']);
+			$tp->set("assetclass_name", $assetclass['assetclass_name']);
+			
+			if($assetclass['assetclass_id']==$assetclass_id) {
+				$tp->set("assetclass_selected", "selected");
+			} else {
+				$tp->set("assetclass_selected", "");
+			}
+		
+			// parse block
+			$tp->parse("assetclass_row");
+		}
+		
+		// parse block
+		$tp->parse("assetclass_table");
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// end output
 		include("footer.php");
 ?>

assetclass.php

@@ -1,24 +1,89 @@
 <?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// start output
 		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/assetclass.tpl");
+		$tp = new Template("tpl/assetclass.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// get assetclass info
+	// setup assetclass
-	$result = mysql_query("SELECT assetclass_id, assetclass_name FROM assetclass ORDER BY assetclass_name") or die(mysql_error());
+		// build query
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
+		$query = "SELECT
-		$tp->set("assetclass_id", $row->assetclass_id);
+				assetclass.assetclass_id AS assetclass_id,
-		$tp->set("assetclass_name", $row->assetclass_name);
+				assetclass.assetclass_name AS assetclass_name,
-		$tp->parse("assetclassrow");
+				assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
-	}
+				assetclassgroup.assetclassgroup_name AS assetclassgroup_name
-	if (($i>0) ? $tp->parse("assetclass") : $tp->hide("assetclass"));
+			FROM
+				assetclass,
+				assetclassgroup
+			WHERE
+				assetclassgroup.assetclassgroup_id=assetclass.assetclassgroup_id
+			ORDER BY
+				assetclass.assetclass_name";
 		
+		// run query
+		$assetclasses = $db->db_select($query);
+		
+		// count results
+		$assetclass_counter = count($assetclasses);
+		
+		// counter to tpl
+		$tp->set("assetclass_counter", $assetclass_counter);
+		
+		// any assetclasses?
+		if ($assetclass_counter>0) {
+			// get objects
+			foreach($assetclasses AS $assetclass) {
+				// send to tpl
+				$tp->set("assetclass_id", $assetclass['assetclass_id']);
+				$tp->set("assetclass_name", $assetclass['assetclass_name']);
+				
+				$tp->set("assetclassgroup_id", $assetclass['assetclassgroup_id']);
+				$tp->set("assetclassgroup_name", $assetclass['assetclassgroup_name']);
+				
+				// parse row
+				$tp->parse("assetclass_row");
+			}
+			
+			// parse block
+			$tp->parse("assetclass_table");
+		} else {
+			// hide block
+			$tp->hide("assetclass_table");
+		}
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// end output
 		include("footer.php");
 ?>

assetclassadd.php

@@ -1,24 +1,78 @@
 <?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// get id
+		if((isset($_GET['assetclassgroup_id'])) ? $assetclassgroup_id = sanitize($_GET['assetclassgroup_id']) : $assetclassgroup_id = "");
+		
+		// start output
 		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/assetclassadd.tpl");
+		$tp = new Template("tpl/assetclassadd.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// get assetclassgroup information
+	// setup assetclassgroup
-	$result = mysql_query("SELECT assetclassgroup_id, assetclassgroup_name FROM assetclassgroup ORDER BY assetclassgroup_name") or die(mysql_error());
+		// build query
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
+		$query = "SELECT
-		$tp->set("assetclassgroup_id", $row->assetclassgroup_id);
+				assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
-		$tp->set("assetclassgroup_name", $row->assetclassgroup_name);
+				assetclassgroup.assetclassgroup_name AS assetclassgroup_name
-		$tp->parse("assetclassgrouprow");
+			FROM
-	}
+				assetclassgroup
-	if (($i>0) ? $tp->parse("assetclassgroup") : $tp->hide("assetclassgroup"));
+			ORDER BY
+				assetclassgroup.assetclassgroup_name";
 		
+		// run query
+		$assetclassgroup = $db->db_select($query);
+		
+		// get objects
+		foreach($assetclassgroup AS $assetclassgroup) {
+			// send to tpl
+			$tp->set("assetclassgroup_id", $assetclassgroup['assetclassgroup_id']);
+			$tp->set("assetclassgroup_name", $assetclassgroup['assetclassgroup_name']);
+			
+			if($assetclassgroup['assetclassgroup_id']==$assetclassgroup_id) {
+				$tp->set("assetclassgroup_selected", "selected");
+			} else {
+				$tp->set("assetclassgroup_selected", "");
+			}
+		
+			// parse block
+			$tp->parse("assetclassgroup_row");
+		}
+		
+		// parse block
+		$tp->parse("assetclassgroup_table");
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// end output
 		include("footer.php");
 ?>

assetclassdel.php

@@ -1,24 +1,63 @@
 <?php
-	include("header.php");
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
 		
 		// get id
-	$assetclass_id = $_GET['assetclass_id'];
+		$assetclass_id = sanitize($_GET['assetclass_id']);
+		
+		// start output
+		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/assetclassdel.tpl");
+		$tp = new Template("tpl/assetclassdel.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// get assetclass info
+	// setup assetclass
-	$result = mysql_query("SELECT assetclass_id, assetclass_name FROM assetclass WHERE assetclass_id='$assetclass_id'") or die(mysql_error());
+		// build query
-	$row=mysql_fetch_object($result);
+		$query = "SELECT
-	$tp->set("assetclass_id", $row->assetclass_id);
+				assetclass.assetclass_id AS assetclass_id,
-	$tp->set("assetclass_name", $row->assetclass_name);
+				assetclass.assetclass_name AS assetclass_name
+			FROM
+				assetclass
+			WHERE
+				assetclass.assetclass_id=" . $assetclass_id;
 		
+		// run query
+		$assetclass = $db->db_select($query);
+		
+		// send to tpl
+		$tp->set("assetclass_id", $assetclass[0]['assetclass_id']);
+		$tp->set("assetclass_name", $assetclass[0]['assetclass_name']);
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// end output
 		include("footer.php");
 ?>

assetclassedit.php

@@ -1,36 +1,96 @@
 <?php
-	include("header.php");
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
 		
 		// get id
-	$assetclass_id = $_GET['assetclass_id'];
+		$assetclass_id = sanitize($_GET['assetclass_id']);
+		
+		// start output
+		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/assetclassedit.tpl");
+		$tp = new Template("tpl/assetclassedit.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 		
-	// get assetclass information
+	// setup assetclass
-	$result = mysql_query("SELECT assetclass_name, assetclassgroup_id FROM assetclass WHERE assetclass_id='$assetclass_id'") or die(mysql_error());
+		// build query
-	$row=mysql_fetch_object($result);
+		$query = "SELECT
-	$assetclassgroup_id = $row->assetclassgroup_id;
+				assetclass.assetclass_id AS assetclass_id,
-	$tp->set("assetclass_id", $assetclass_id);
+				assetclass.assetclass_name AS assetclass_name,
-	$tp->set("assetclass_name", $row->assetclass_name);
+				assetclass.assetclassgroup_id AS assetclassgroup_id
-	$tp->set("assetclassgroup_id", $assetclassgroup_id);
+			FROM
+				assetclass
+			WHERE
+				assetclass.assetclass_id=" . $assetclass_id;
 		
-	// get assetclassgroup information
+		// run query
-	$result = mysql_query("SELECT assetclassgroup_id, assetclassgroup_name FROM assetclassgroup ORDER BY assetclassgroup_name") or die(mysql_error());
+		$assetclass = $db->db_select($query);
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
+		
-		if (($row->assetclassgroup_id==$assetclassgroup_id) ? $tp->set("selected", "selected") : $tp->set("selected", ""));
+		// send to tpl
-		$tp->set("assetclassgroup_id", $row->assetclassgroup_id);
+		$tp->set("assetclass_id", $assetclass[0]['assetclass_id']);
-		$tp->set("assetclassgroup_name", $row->assetclassgroup_name);
+		$tp->set("assetclass_name", $assetclass[0]['assetclass_name']);
-		$tp->parse("assetclassgrouprow");
+	
+	// setup assetclassgroup
+		// build query
+		$query = "SELECT
+				assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
+				assetclassgroup.assetclassgroup_name AS assetclassgroup_name
+			FROM
+				assetclassgroup
+			ORDER BY
+				assetclassgroup.assetclassgroup_name";
+		
+		// run query
+		$assetclassgroups = $db->db_select($query);
+		
+		// get objects
+		foreach($assetclassgroups AS $assetclassgroup) {
+			// send to tpl
+			$tp->set("assetclassgroup_id", $assetclassgroup['assetclassgroup_id']);
+			$tp->set("assetclassgroup_name", $assetclassgroup['assetclassgroup_name']);
+			
+			if($assetclassgroup['assetclassgroup_id']==$assetclass[0]['assetclassgroup_id']) {
+				$tp->set("assetclassgroup_selected", "selected");
+			} else {
+				$tp->set("assetclassgroup_selected", "");
 			}
-	if (($i>0) ? $tp->parse("assetclassgroup") : $tp->hide("assetclassgroup"));
 			
+			// parse block
+			$tp->parse("assetclassgroup_row");
+		}
+		
+		// parse block
+		$tp->parse("assetclassgroup_table");
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// end output
 		include("footer.php");
 ?>

assetclassgroup.php

@@ -0,0 +1,84 @@
+<?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// start output
+		include("header.php");
+			
+		// set template
+		$tp = new Template("tpl/assetclassgroup.tpl", $config_yapter_error);
+		
+		// set language variables
+		$tp->setvars($lang);
+	
+	// setup assetclassgroup
+		// build query
+		$query = "SELECT
+				assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
+				assetclassgroup.assetclassgroup_name AS assetclassgroup_name
+			FROM
+				assetclassgroup
+			ORDER BY
+				assetclassgroup.assetclassgroup_name";
+		
+		// run query
+		$assetclassgroups = $db->db_select($query);
+		
+		// count results
+		$assetclassgroup_counter = count($assetclassgroups);
+		
+		// counter to tpl
+		$tp->set("assetclassgroup_counter", $assetclassgroup_counter);
+		
+		// any assetclassgroups?
+		if ($assetclassgroup_counter>0) {
+			// get objects
+			foreach($assetclassgroups AS $assetclassgroup) {
+				// send to tpl
+				$tp->set("assetclassgroup_id", $assetclassgroup['assetclassgroup_id']);
+				$tp->set("assetclassgroup_name", $assetclassgroup['assetclassgroup_name']);
+				
+				$tp->set("assetclassgroup_id", $assetclassgroup['assetclassgroup_id']);
+				$tp->set("assetclassgroup_name", $assetclassgroup['assetclassgroup_name']);
+				
+				// parse row
+				$tp->parse("assetclassgroup_row");
+			}
+			
+			// parse block
+			$tp->parse("assetclassgroup_table");
+		} else {
+			// hide block
+			$tp->hide("assetclassgroup_table");
+		}
+	
+	// end page
+		// output
+		$tp->parse();
+		$tp->spit();
+		
+		// end output
+		include("footer.php");
+?>

assetclassgroupadd.php

@@ -0,0 +1,43 @@
+<?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// start output
+		include("header.php");
+			
+		// set template
+		$tp = new Template("tpl/assetclassgroupadd.tpl", $config_yapter_error);
+		
+		// set language variables
+		$tp->setvars($lang);
+	
+	// end page
+		// output
+		$tp->parse();
+		$tp->spit();
+		
+		// end output
+		include("footer.php");
+?>

assetclassgroupdel.php

@@ -0,0 +1,63 @@
+<?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// get id
+		$assetclassgroup_id = sanitize($_GET['assetclassgroup_id']);
+		
+		// start output
+		include("header.php");
+			
+		// set template
+		$tp = new Template("tpl/assetclassgroupdel.tpl", $config_yapter_error);
+		
+		// set language variables
+		$tp->setvars($lang);
+	
+	// setup assetclassgroup
+		// build query
+		$query = "SELECT
+				assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
+				assetclassgroup.assetclassgroup_name AS assetclassgroup_name
+			FROM
+				assetclassgroup
+			WHERE
+				assetclassgroup.assetclassgroup_id=" . $assetclassgroup_id;
+		
+		// run query
+		$assetclassgroup = $db->db_select($query);
+		
+		// send to tpl
+		$tp->set("assetclassgroup_id", $assetclassgroup[0]['assetclassgroup_id']);
+		$tp->set("assetclassgroup_name", $assetclassgroup[0]['assetclassgroup_name']);
+	
+	// end page
+		// output
+		$tp->parse();
+		$tp->spit();
+		
+		// end output
+		include("footer.php");
+?>

assetclassgroupedit.php

@@ -0,0 +1,65 @@
+<?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// get id
+		$assetclassgroup_id = sanitize($_GET['assetclassgroup_id']);
+		
+		// start output
+		include("header.php");
+		
+		// set template
+		$tp = new Template("tpl/assetclassgroupedit.tpl", $config_yapter_error);
+		
+		// set language variables
+		$tp->setvars($lang);
+		
+	// setup assetclassgroup
+		// build query
+		$query = "SELECT
+				assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
+				assetclassgroup.assetclassgroup_name AS assetclassgroup_name,
+				assetclassgroup.assetclassgroup_color AS assetclassgroup_color
+			FROM
+				assetclassgroup
+			WHERE
+				assetclassgroup.assetclassgroup_id=" . $assetclassgroup_id;
+		
+		// run query
+		$assetclassgroup = $db->db_select($query);
+		
+		// send to tpl
+		$tp->set("assetclassgroup_id", $assetclassgroup[0]['assetclassgroup_id']);
+		$tp->set("assetclassgroup_name", $assetclassgroup[0]['assetclassgroup_name']);
+		$tp->set("assetclassgroup_color", $assetclassgroup[0]['assetclassgroup_color']);
+	
+	// end page
+		// output
+		$tp->parse();
+		$tp->spit();
+		
+		// end output
+		include("footer.php");
+?>

assetclassgroupview.php

@@ -1,46 +1,105 @@
 <?php
-	include("header.php");
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
 		
 		// get id
-	$assetclassgroup_id = $_GET['assetclassgroup_id'];
+		$assetclassgroup_id = sanitize($_GET['assetclassgroup_id']);
+		
+		// start output
+		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/assetclassgroupview.tpl");
+		$tp = new Template("tpl/assetclassgroupview.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 		
-	// get assetclassgroup info
+	// setup assetclassgroup
-	$result = mysql_query("SELECT assetclassgroup_name, color FROM assetclassgroup WHERE assetclassgroup_id='$assetclassgroup_id'") or die(mysql_error());
+		// build query
-	$row=mysql_fetch_object($result);
+		$query = "SELECT
-	$tp->set("assetclassgroup_name", $row->assetclassgroup_name);
+				assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
-	$tp->set("color", $row->color);
+				assetclassgroup.assetclassgroup_name AS assetclassgroup_name,
+				assetclassgroup.assetclassgroup_color AS assetclassgroup_color
+			FROM
+				assetclassgroup
+			WHERE
+				assetclassgroup.assetclassgroup_id=" . $assetclassgroup_id;
 		
-	$result = mysql_query("SELECT assetclass_id, assetclass_name FROM assetclass WHERE assetclassgroup_id='$assetclassgroup_id' ORDER BY assetclass_name") or die(mysql_error());
+		// run query
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
+		$assetclassgroup = $db->db_select($query);
-		$tp->set("assetclass_name", $row->assetclass_name);
+		
-		$tp->set("assetclass_id", $row->assetclass_id);
+		// send to tpl
-		$tp->parse("assetclassrow");
+		$tp->set("assetclassgroup_id", $assetclassgroup[0]['assetclassgroup_id']);
+		$tp->set("assetclassgroup_name", $assetclassgroup[0]['assetclassgroup_name']);
+		$tp->set("assetclassgroup_color", $assetclassgroup[0]['assetclassgroup_color']);
+		
+	// setup assetclass
+		// build query
+		$query = "SELECT
+				assetclass.assetclass_id AS assetclass_id,
+				assetclass.assetclass_name AS assetclass_name
+			FROM
+				assetclass
+			WHERE
+				assetclass.assetclassgroup_id=" . $assetclassgroup_id . "
+			ORDER BY
+				assetclass.assetclass_name";
+		
+		// run query
+		$assetclasses = $db->db_select($query);
+		
+		// count results
+		$assetclass_counter = count($assetclasses);
+		
+		// counter to tpl
+		$tp->set("assetclass_counter", $assetclass_counter);
+		
+		// any assets?
+		if ($assetclass_counter>0) {
+			// get objects
+			foreach($assetclasses AS $assetclass) {
+				// send to tpl
+				$tp->set("assetclass_id", $assetclass['assetclass_id']);
+				$tp->set("assetclass_name", $assetclass['assetclass_name']);
+				
+				// parse row
+				$tp->parse("assetclass_row");
 			}
-	if (($i>0) ? $tp->parse("assetclass") : $tp->hide("assetclass"));
 			
-	// display options
+			// parse block
-	if($_SESSION['suser_level'] >= $config_userlevel_assetclassgroupedit) {
+			$tp->parse("assetclass_table");
-		$tp->set("assetclassgroup_id", $assetclassgroup_id);
-		$tp->parse("assetclassgroupedit");	
 		} else {
-		$tp->hide("assetclassgroupedit");
+			// hide block
-	}
+			$tp->hide("assetclass_table");
-	if($_SESSION['suser_level'] >= $config_userlevel_assetclassgroupdel) {
-		$tp->set("assetclassgroup_id", $assetclassgroup_id);
-		$tp->parse("assetclassgroupdel");
-	} else {
-		$tp->hide("assetclassgroupdel");
 		}
 		
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// end output
 		include("footer.php");
 ?>

assetclassview.php

@@ -1,48 +1,114 @@
 <?php
-	include("header.php");
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
 		
 		// get id
-	$assetclass_id = $_GET['assetclass_id'];
+		$assetclass_id = sanitize($_GET['assetclass_id']);
+		
+		// start output
+		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/assetclassview.tpl");
+		$tp = new Template("tpl/assetclassview.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// get assetclassgroup info
+	// setup assetclass
-	$result = mysql_query("SELECT ac.assetclassgroup_id, ac.assetclass_name, acg.assetclassgroup_name FROM assetclass ac, assetclassgroup acg WHERE ac.assetclass_id='$assetclass_id' AND acg.assetclassgroup_id=ac.assetclassgroup_id") or die(mysql_error());
+		// build query
-	$row = mysql_fetch_object($result);
+		$query = "SELECT
-	$tp->set("assetclass_name", $row->assetclass_name);
+				assetclass.assetclass_id AS assetclass_id,
-	$tp->set("assetclassgroup_id", $row->assetclassgroup_id);
+				assetclass.assetclass_name AS assetclass_name,
-	$tp->set("assetclassgroup_name", $row->assetclassgroup_name);
+				assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
+				assetclassgroup.assetclassgroup_name AS assetclassgroup_name
+			FROM
+				assetclass,
+				assetclassgroup
+			WHERE
+				assetclass.assetclass_id=" . $assetclass_id . "
+				AND assetclassgroup.assetclassgroup_id=assetclass.assetclassgroup_id";
 		
-	// get assets for this assetclassgroup
+		// run query
-	$result = mysql_query("SELECT asset_id, asset_name FROM asset WHERE assetclass_id='$assetclass_id' ORDER BY asset_name") or die(mysql_error());
+		$assetclass = $db->db_select($query);
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
+		
-		$tp->set("asset_id", $row->asset_id);
+		// send to tpl
-		$tp->set("asset_name", $row->asset_name);
+		$tp->set("assetclass_id", $assetclass[0]['assetclass_id']);
-		$tp->parse("assetrow");
+		$tp->set("assetclass_name", $assetclass[0]['assetclass_name']);
+		$tp->set("assetclass_selected", "");
+		
+		$tp->set("assetclassgroup_id", $assetclass[0]['assetclassgroup_id']);
+		$tp->set("assetclassgroup_name", $assetclass[0]['assetclassgroup_name']);
+	
+	// setup asset
+		// build query
+		$query = "SELECT
+				asset.asset_id AS asset_id,
+				asset.asset_name AS asset_name
+			FROM
+				asset
+			WHERE
+				asset.assetclass_id='" . $assetclass_id . "'
+			ORDER BY
+				asset.asset_name";
+		
+		// run query
+		$assets = $db->db_select($query);
+		
+		// count results
+		$asset_counter = count($assets);
+		
+		// counter to tpl
+		$tp->set("asset_counter", $asset_counter);
+		
+		// any assets?
+		if ($asset_counter>0) {
+			// sort using "natural order"
+			// ksort($assets);
+			
+			// get objects
+			foreach($assets AS $asset) {
+				// send to tpl
+				$tp->set("asset_id", $asset['asset_id']);
+				$tp->set("asset_name", $asset['asset_name']);
+				
+				// parse row
+				$tp->parse("asset_row");
 			}
-	if (($i>0) ? $tp->parse("asset") : $tp->hide("asset"));
 			
-	// display options
+			// parse block
-	if($_SESSION['suser_level'] >= $config_userlevel_assetclassedit) {
+			$tp->parse("asset_table");
-		$tp->set("assetclass_id", $assetclass_id);
-		$tp->parse("assetclassedit");	
 		} else {
-		$tp->hide("assetclassedit");
+			// hide block
-	}
+			$tp->hide("asset_table");
-	if($_SESSION['suser_level'] >= $config_userlevel_assetclassdel) {
-		$tp->set("assetclass_id", $assetclass_id);
-		$tp->parse("assetclassdel");
-	} else {
-		$tp->hide("assetclassdel");
 		}
 	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 	
+		// footer
 		include("footer.php");
 ?>

assetdel.php

@@ -1,33 +1,99 @@
 <?php
-	include("header.php");
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
 		
 		// get id	
-	$asset_id = $_GET['asset_id'];
+		$asset_id = sanitize($_GET['asset_id']);
+		
+		// start output
+		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/assetdel.tpl");
+		$tp = new Template("tpl/assetdel.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// get asset info
+	// setup asset
-	$result = mysql_query("SELECT asset_name FROM asset WHERE asset_id='$asset_id'") or die(mysql_error());
+		// build query
-	$row=mysql_fetch_object($result);
+		$query = "SELECT
+				asset.asset_name AS asset_name
+			FROM
+				asset
+			WHERE
+				asset.asset_id=" . $asset_id;
+		
+		// run query
+		$asset = $db->db_select($query);
+		
+		// send to tpl
 		$tp->set("asset_id", $asset_id);
-	$tp->set("asset_name", $row->asset_name);
+		$tp->set("asset_name", $asset[0]['asset_name']);
 	
-	// get node info
+	// setup node		
-	$result = mysql_query("SELECT n.node_id, n.ip, n.mac, n.dns1, n.dns2, n.node_info, s.subnet_id, s.subnet_address, s.subnet_mask FROM node n, subnet s WHERE asset_id='$asset_id' AND s.subnet_id=n.subnet_id ORDER BY INET_ATON(n.ip)") or die(mysql_error());
+		// build query
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
+		$query = "SELECT
-		$tp->set("node_id", $row->node_id);
+				node.node_id AS node_id,
-		$tp->set("ip", $row->ip);
+				node.node_ip AS node_ip
-		$tp->parse("noderow");
+			FROM
+				node
+			WHERE
+				node.asset_id=" . $asset_id . "
+			ORDER BY
+				INET_ATON(node.node_ip)";
+		
+		// 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) {
+				// set id
+				$tp->set("node_id", $node['node_id']);
+				$tp->set("node_ip", $node['node_ip']);
+				
+				// parse row
+				$tp->parse("node_row");
 			}
-	if (($i>0) ? $tp->parse("node") : $tp->hide("node"));
 			
+			// parse block
+			$tp->parse("node_table");
+		} else {
+			// hide block
+			$tp->hide("node_table");
+		}
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// footer
 		include("footer.php");
 ?>

assetedit.php

@@ -1,37 +1,108 @@
 <?php
-	include("header.php");
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
 		
 		// get id	
-	$asset_id = $_GET['asset_id'];
+		$asset_id = sanitize($_GET['asset_id']);
+		
+		// start output
+		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/assetedit.tpl");
+		$tp = new Template("tpl/assetedit.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// get asset information
+	// setup asset
-	$result = mysql_query("SELECT asset_name, hostname, assetclass_id, asset_info FROM asset WHERE asset_id='$asset_id'") or die(mysql_error());
+		// build query
-	$row = mysql_fetch_object($result);
+		$query = "SELECT
-	$assetclass_id = $row->assetclass_id;
+				asset.asset_name AS asset_name,
+				asset.asset_hostname AS asset_hostname,
+				asset.asset_info AS asset_info,
+				asset.assetclass_id AS assetclass_id
+			FROM
+				asset
+			WHERE
+				asset.asset_id=" . $asset_id;
+		
+		// run query
+		$asset = $db->db_select($query);
+		
+		// send to tpl
 		$tp->set("asset_id", $asset_id);
-	$tp->set("asset_name", $row->asset_name);
+		$tp->set("asset_name", $asset[0]['asset_name']);
-	$tp->set("hostname", $row->hostname);
+		$tp->set("asset_hostname", $asset[0]['asset_hostname']);
-	$tp->set("asset_info", $row->asset_info);
+		$tp->set("asset_info", $asset[0]['asset_info']);
 	
-	// get assetclass information
+	// setup assetclass
-	$result = mysql_query("SELECT assetclass_id, assetclass_name FROM assetclass ORDER BY assetclass_name") or die(mysql_error());
+		// build query
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
+		$query = "SELECT
-		if (($row->assetclass_id==$assetclass_id) ? $tp->set("selected", "selected") : $tp->set("selected", ""));
+				assetclass.assetclass_id AS assetclass_id,
-		$tp->set("assetclass_id", $row->assetclass_id);
+				assetclass.assetclass_name AS assetclass_name
-		$tp->set("assetclass_name", $row->assetclass_name);
+			FROM
-		$tp->parse("assetclassrow");
+				assetclass
+			ORDER BY
+				assetclass.assetclass_name";
+		
+		// run query
+		$assetclasses = $db->db_select($query);
+		
+		// count results
+		$assetclass_counter = count($assetclasses);
+		
+		// any nodes?
+		if ($assetclass_counter>0) {
+			// get objects
+			foreach($assetclasses AS $assetclass) {
+				// send to tpl
+				$tp->set("assetclass_id", $assetclass['assetclass_id']);
+				$tp->set("assetclass_name", $assetclass['assetclass_name']);
+				
+				// set select box
+				if($assetclass['assetclass_id']==$asset[0]['assetclass_id']) {
+					$tp->set("assetclass_selected", "selected");
+				} else {
+					$tp->set("assetclass_selected", "");
 				}
-	if (($i>0) ? $tp->parse("assetclass") : $tp->hide("assetclass"));
 				
+				// parse block
+				$tp->parse("assetclass_row");
+			}
+			// parse block
+			$tp->parse("assetclass_table");
+		} else {
+			// parse block
+			$tp->hide("assetclass_table");
+		}
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// footer
 		include("footer.php");
 ?>

assetview.php

@@ -1,58 +1,113 @@
 <?php
-	include("header.php");
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
 		
 		// get id
-	$asset_id = $_GET['asset_id'];
+		$asset_id = sanitize($_GET['asset_id']);
+		
+		// start output
+		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/assetview.tpl");
+		$tp = new Template("tpl/assetview.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 		
-	// get asset info
+	// setup asset
-	$result = mysql_query("SELECT a.asset_name, a.hostname, a.asset_info, ac.assetclass_id, ac.assetclass_name FROM asset a, assetclass ac WHERE a.asset_id='$asset_id' AND ac.assetclass_id=a.assetclass_id") or die(mysql_error());
+		// build query
-	$row=mysql_fetch_object($result);
+		$query = "SELECT
-	$tp->set("asset_name", $row->asset_name);
+				asset.asset_name AS asset_name,
-	$tp->set("hostname", $row->hostname);
+				asset.asset_hostname AS asset_hostname,
-	$tp->set("asset_info", nl2br($row->asset_info));
+				asset.asset_info AS asset_info,
-	$tp->set("assetclass_id", $row->assetclass_id);
+				assetclass.assetclass_id AS assetclass_id,
-	$tp->set("assetclass_name", $row->assetclass_name);
+				assetclass.assetclass_name AS assetclass_name
+			FROM
+				asset,
+				assetclass
+			WHERE
+				asset.asset_id=" . $asset_id . "
+				AND assetclass.assetclass_id=asset.assetclass_id";
 		
-	// get node info
+		// run query
-	$result = mysql_query("SELECT n.node_id, n.ip, n.mac, n.dns1, n.dns2, n.node_info, s.subnet_id, s.subnet_address, s.subnet_mask FROM node n, subnet s WHERE asset_id='$asset_id' AND s.subnet_id=n.subnet_id ORDER BY INET_ATON(n.ip)") or die(mysql_error());
+		$asset = $db->db_select($query);
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
-		$tp->set("node_id", $row->node_id);
-		$tp->set("ip", $row->ip);
-		$tp->set("mac", write_mac($row->mac));
-		$tp->set("dns1", $row->dns1);
-		$tp->set("dns2", $row->dns2);
-		$tp->set("node_info", nl2br($row->node_info));
-		$tp->set("subnet_id", $row->subnet_id);
-		$tp->set("subnet_address", $row->subnet_address);
-		$tp->set("subnet_mask", $row->subnet_mask);
-		$tp->set("nodecount", $i+1);
-		$tp->parse("noderow");
-	}
-	if (($i>0) ? $tp->parse("node") : $tp->hide("node"));
 		
-	// display options
+		// send to tpl
-	if($_SESSION['suser_level'] >= $config_userlevel_assetedit) {
 		$tp->set("asset_id", $asset_id);
-		$tp->parse("assetedit");	
+		$tp->set("asset_name", $asset[0]['asset_name']);
-	} else {
+		$tp->set("asset_hostname", $asset[0]['asset_hostname']);
-		$tp->hide("assetedit");
+		$tp->set("asset_info", nl2br($asset[0]['asset_info']));
-	}
+		
-	if($_SESSION['suser_level'] >= $config_userlevel_assetdel) {
+		$tp->set("assetclass_id", $asset[0]['assetclass_id']);
-		$tp->set("asset_id", $asset_id);
+		$tp->set("assetclass_name", $asset[0]['assetclass_name']);
-		$tp->parse("assetdel");
+	
-	} else {
+	// setup node		
-		$tp->hide("assetdel");
+		// build query
+		$query = "SELECT
+				node.node_id AS node_id,
+				node.node_ip AS node_ip
+			FROM
+				node
+			WHERE
+				node.asset_id=" . $asset_id . "
+			ORDER BY
+				INET_ATON(node.node_ip)";
+		
+		// run query
+		$nodes = $db->db_select($query);
+		
+		// count results
+		$node_counter = count($nodes);
+		
+		// counter to tpl
+		$tp->set("node_counter", $node_counter);
+		
+		// any nodes?
+		if ($node_counter>0) {
+			// get objects
+			foreach($nodes AS $node) {
+				// send to tpl
+				$tp->set("node_id", $node['node_id']);
+				$tp->set("node_ip", $node['node_ip']);
+				
+				// parse row
+				$tp->parse("node_row");
 			}
 			
+			// parse block
+			$tp->parse("node_table");
+		} else {
+			// hide block
+			$tp->hide("node_table");
+		}
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// footer
 		include("footer.php");
 ?>

assigniptoasset.php

@@ -1,45 +0,0 @@
-<?php
-	include("header.php");
-	
-	// get ip and id
-	if((isset($_GET['subnet_id'])) ? $subnet_id = $_GET['subnet_id'] : $subnet_id = "");
-	if((isset($_GET['ip'])) ? $ip = $_GET['ip'] : $ip = "");
-	
-	// set template
-	$tp = new Template("tpl/assigniptoasset.tpl");
-	
-	// set language variables
-	$tp->setvars($lang);
-	
-	// set variables
-	$tp->set("ip", $ip);
-	$tp->set("subnet_id", $subnet_id);
-	$tp->set("config_dns1suffix", $config_dns1suffix);
-	$tp->set("config_dns2suffix", $config_dns2suffix);
-	
-	// get subnet info
-	$result = mysql_query("SELECT subnet_id, subnet_address, subnet_mask FROM subnet ORDER BY INET_ATON(subnet_address)") or die(mysql_error());
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
-		if (($row->subnet_id==$subnet_id) ? $tp->set("selected", "selected") : $tp->set("selected", ""));
-		$tp->set("subnet_id", $row->subnet_id);
-		$tp->set("subnet_address", $row->subnet_address);
-		$tp->set("subnet_mask", $row->subnet_mask);
-		$tp->parse("subnetrow");
-	}
-	if (($i>0) ? $tp->parse("subnet") : $tp->hide("subnet"));
-	
-	// get asset info
-	$result = mysql_query("SELECT asset_id, asset_name FROM asset ORDER BY asset_name") or die(mysql_error());
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
-		$tp->set("asset_id", $row->asset_id);
-		$tp->set("asset_name", $row->asset_name);
-		$tp->parse("assetrow");
-	}
-	if (($i>0) ? $tp->parse("asset") : $tp->hide("asset"));
-	
-	// output
-	$tp->parse();
-	$tp->spit();
-	
-	include("footer.php");
-?>

assigniptonode.php

@@ -1,41 +1,65 @@
 <?php
-	include("header.php");
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
 		
 		// get ip and id
-	$ip = $_GET['ip'];
+		$node_ip = sanitize($_GET['node_ip']);
-	$subnet_id = $_GET['subnet_id'];
+		$subnet_id = sanitize($_GET['subnet_id']);
+		
+		// start output
+		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/assigniptonode.tpl");
+		$tp = new Template("tpl/assigniptonode.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// set variables
+	// build query
-	$tp->set("ip", $ip);
+		$query = "SELECT
+				subnet.subnet_address AS subnet_address,
+				subnet.subnet_mask AS subnet_mask
+			FROM
+				subnet
+			WHERE
+				subnet.subnet_id=" . $subnet_id;
+		
+		// run query
+		$subnet = $db->db_select($query);
+		
+		// send to tpl
 		$tp->set("subnet_id", $subnet_id);
+		$tp->set("subnet_address", $subnet[0]['subnet_address']);
+		$tp->set("subnet_mask", $subnet[0]['subnet_mask']);
+		$tp->set("node_ip", $node_ip);
 	
-	// get subnet info
+	// end page
-	$result = mysql_query("SELECT subnet_address, subnet_mask FROM subnet WHERE subnet_id='$subnet_id'") or die(mysql_error());
-	$row = mysql_fetch_object($result);
-	$tp->set("subnet_address", $row->subnet_address);
-	$tp->set("subnet_mask", $row->subnet_mask);
-	
-	// display options
-	if($_SESSION['suser_level'] >= $config_userlevel_assigniptonode) {
-		$tp->parse("assigniptonode");	
-	} else {
-		$tp->hide("assigniptonode");
-	}
-	if($_SESSION['suser_level'] >= $config_userlevel_nodeadd) {
-		$tp->parse("nodeadd");
-	} else {
-		$tp->hide("nodeadd");
-	}
-	
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// end output
 		include("footer.php");
 ?>

assignlocationtosubnet.php

@@ -1,40 +0,0 @@
-<?php
-	include("header.php");
-	
-	// get id
-	if((isset($_GET['location_id'])) ? $location_id = $_GET['location_id'] : $location_id = "");
-	if((isset($_GET['subnet_id'])) ? $subnet_id = $_GET['subnet_id'] : $subnet_id = "");
-	
-	// set template
-	$tp = new Template("tpl/assignlocationtosubnet.tpl");
-	
-	// set language variables
-	$tp->setvars($lang);
-		
-	// get location info
-	$result = mysql_query("SELECT location_id, location_name FROM location ORDER BY location_name");
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
-		if (($row->location_id==$location_id) ? $tp->set("selected", "selected") : $tp->set("selected", ""));
-		$tp->set("location_id", $row->location_id);
-		$tp->set("location_name", $row->location_name);
-		$tp->parse("locationrow");
-	}
-	if (($i>0) ? $tp->parse("location") : $tp->hide("location"));
-	
-	// get subnet info
-	$result = mysql_query("SELECT subnet_id, subnet_address, subnet_mask FROM subnet ORDER BY INET_ATON(subnet_address)") or die(mysql_error());
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
-		if (($row->subnet_id==$subnet_id) ? $tp->set("selected", "selected") : $tp->set("selected", ""));
-		$tp->set("subnet_id", $row->subnet_id);
-		$tp->set("subnet_address", $row->subnet_address);
-		$tp->set("subnet_mask", $row->subnet_mask);
-		$tp->parse("subnetrow");
-	}
-	if (($i>0) ? $tp->parse("subnet") : $tp->hide("subnet"));
-	
-	// output
-	$tp->parse();
-	$tp->spit();
-	
-	include("footer.php");
-?>

assignnodetoasset.php

@@ -0,0 +1,133 @@
+<?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// get 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 template
+		$tp = new Template("tpl/assignnodetoasset.tpl", $config_yapter_error);
+		
+		// set language variables
+		$tp->setvars($lang);
+	
+	// to tpl
+		$tp->set("node_ip", $node_ip);
+	
+	// setup asset
+		// build query
+		$query = "SELECT
+				asset.asset_id AS asset_id,
+				asset.asset_name AS asset_name
+			FROM
+				asset
+			ORDER BY
+				asset.asset_name";
+		
+		// run query
+		$assets = $db->db_select($query);
+		
+		// count results
+		$asset_counter = count($assets);
+		
+		// any assets?
+		if ($asset_counter>0) {
+			// get objects
+			foreach($assets AS $asset) {
+				// send to tpl
+				$tp->set("asset_id", $asset['asset_id']);
+				$tp->set("asset_name", $asset['asset_name']);
+				
+				if($asset['asset_id']==$asset_id) {
+					$tp->set("asset_selected", "selected");
+				} else {
+					$tp->set("asset_selected", "");
+				}
+				
+				// parse block
+				$tp->parse("asset_row");
+			}
+			// parse block
+			$tp->parse("asset_table");
+		} else {
+			// parse block
+			$tp->hide("asset_table");
+		}
+	
+	// setup subnet
+		// build query
+		$query = "SELECT
+				subnet.subnet_id AS subnet_id,
+				subnet.subnet_address AS subnet_address,
+				subnet.subnet_mask AS subnet_mask
+			FROM
+				subnet
+			ORDER BY
+				INET_ATON(subnet.subnet_address)";
+		
+		// run query
+		$subnets = $db->db_select($query);
+		
+		// count results
+		$subnet_counter = count($subnets);
+		
+		// any subnets?
+		if ($subnet_counter>0) {
+			// get objects
+			foreach($subnets AS $subnet) {
+				// send to tpl
+				$tp->set("subnet_id", $subnet['subnet_id']);
+				$tp->set("subnet_address", $subnet['subnet_address']);
+				$tp->set("subnet_mask", $subnet['subnet_mask']);
+				
+				if($subnet['subnet_id']==$subnet_id) {
+					$tp->set("subnet_selected", "selected");
+				} else {
+					$tp->set("subnet_selected", "");
+				}
+				
+				// parse block
+				$tp->parse("subnet_row");
+			}
+			// parse block
+			$tp->parse("subnet_table");
+		} else {
+			// parse block
+			$tp->hide("subnet_table");
+		}
+	
+	// end page
+		// output
+		$tp->parse();
+		$tp->spit();
+		
+		// end output
+		include("footer.php");
+?>

assignsubnettolocation.php

@@ -1,58 +0,0 @@
-<?php
-	include("header.php");
-	
-	// display only if admin
-	if($_SESSION['suser_level'] >= 2) {
-	
-	// check for submit
-	if ($_SERVER['REQUEST_METHOD']=="POST" ) {
-		$location_id = $_POST['location_id'];
-		$subnet_id = $_POST['subnet_id'];
-			
-		mysql_query("INSERT INTO subnetlocation (location_id, subnet_id) VALUE ('$location_id', '$subnet_id')") or die(mysql_error());
-		
-		header("Location: subnetview.php?subnet_id=" . $subnet_id);
-	}
-	
-	$subnet_id = $_GET['subnet_id'];
-?>
-	
-	<form method="POST" action="assignsubnettolocation.php">
-	<input type="hidden" name="subnet_id" value="<?php echo $subnet_id; ?>">
-	<table border="0">
-		<tr>
-			<td>
-				<b>Assign to:</b><br>
-			</td>
-			<td>
-				<select name="location_id">
-				
-<?php
-				function display_children($parent, $level) {
-					$result = mysql_query("SELECT location_id, location_name FROM location WHERE parent='$parent' ORDER BY location_name") or die(mysql_error());
-					while ($row = mysql_fetch_object($result)) {
-						echo '<option value="' . $row->location_id . '">' . str_repeat('&nbsp;&nbsp;&nbsp;',$level) . $row->location_name . '</option>';
-						display_children($row->location_id, $level+1);
-					}
-				}
-				
-				display_children('',0);
-?>
-
-				</select>		
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2" align="right">
-				<input type="submit" value="Submit"><input type="reset" value="Reset">
-			</td>
-		</tr>
-	</table>
-	</form>
-
-<?php
-	// end display only if admin
-	}
-	
-	include("footer.php");
-?>

assignvlantosubnet.php

@@ -1,41 +0,0 @@
-<?php
-	include("header.php");
-	
-	// set template
-	$tp = new Template("tpl/assignvlantosubnet.tpl");
-	
-	// set language variables
-	$tp->setvars($lang);
-	
-	// get id
-	if((isset($_GET['vlan_id'])) ? $vlan_id = $_GET['vlan_id'] : $vlan_id = "");
-	if((isset($_GET['subnet_id'])) ? $subnet_id = $_GET['subnet_id'] : $subnet_id = "");
-	
-	// get vlan info
-	$result = mysql_query("SELECT vlan_id, vlan_number, vlan_name FROM vlan ORDER BY vlan_number") or die(mysql_error());
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
-		if (($row->vlan_id==$vlan_id) ? $tp->set("selected", "selected") : $tp->set("selected", ""));
-		$tp->set("vlan_id", $row->vlan_id);
-		$tp->set("vlan_name", $row->vlan_name);
-		$tp->set("vlan_number", $row->vlan_number);
-		$tp->parse("vlanrow");
-	}
-	if (($i>0) ? $tp->parse("vlan") : $tp->hide("vlan"));
-	
-	// get subnet info
-	$result = mysql_query("SELECT subnet_id, subnet_address, subnet_mask FROM subnet ORDER BY INET_ATON(subnet_address)") or die(mysql_error());
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
-		if (($row->subnet_id==$subnet_id) ? $tp->set("selected", "selected") : $tp->set("selected", ""));
-		$tp->set("subnet_id", $row->subnet_id);
-		$tp->set("subnet_address", $row->subnet_address);
-		$tp->set("subnet_mask", $row->subnet_mask);
-		$tp->parse("subnetrow");
-	}
-	if (($i>0) ? $tp->parse("subnet") : $tp->hide("subnet"));
-	
-	// output
-	$tp->parse();
-	$tp->spit();
-	
-	include("footer.php");
-?>

comments.php

@@ -0,0 +1,46 @@
+<?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
+	*****************************************************************************/
+	
+	// includes
+	include("includes.php");
+	
+	// start output
+	include("header.php");
+	
+	// set template
+	$tp = new Template("tpl/comments.tpl", $config_yapter_error);
+	
+	// set language variables
+	$tp->setvars($lang);
+	
+	// get error
+	$comments = sanitize($_GET['comments']);
+	
+	// set veriables
+	$tp->set("comments", $lang['lang_comments_' . $comments]);
+	
+	// output
+	$tp->parse();
+	$tp->spit();
+		
+	include("footer.php");
+?>

config.php

@@ -1,52 +1,38 @@
 <?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.3';
+	$config_version = 'v0.5';
 	
 	// db connection
-	$mysql_host = "localhost";
+	$config_mysql_host = 'localhost';
-	$mysql_username = "db_user";
+	$config_mysql_username = 'db_user';
-	$mysql_password = "db_pass";
+	$config_mysql_password = 'db_pass';
-	$mysql_dbname = "db_name";
+	$config_mysql_dbname = 'db_name';
 	
-	// standard password for new users
+	// error reporting
-	$config_user_lang = "en";
+	$config_yapter_error = 15; // see yapter.php for more information
-	$config_user_pass = "welcome";
 	
-	// set userlevels
+	// default values for IP blocks
-	$config_userlevel_assetadd = 2;
+	$config_color_blocked = 'dcdcdc';
-	$config_userlevel_assetdel = 2;
+	$config_color_unused = 'ffffff';
-	$config_userlevel_assetedit = 2;
-	$config_userlevel_assetview = 1;
-	$config_userlevel_assetclassadd = 2;
-	$config_userlevel_assetclassdel = 2;
-	$config_userlevel_assetclassedit = 2;
-	$config_userlevel_assetclassview = 1;
-	$config_userlevel_assetclassgroupadd = 2;
-	$config_userlevel_assetclassgroupdel = 2;
-	$config_userlevel_assetclassgroupedit = 2;
-	$config_userlevel_assetclassgroupview = 1;
-	$config_userlevel_locationadd = 2;
-	$config_userlevel_locationdel = 2;
-	$config_userlevel_locationedit = 2;
-	$config_userlevel_locationview = 1;
-	$config_userlevel_nodeadd = 2;
-	$config_userlevel_nodedel = 2;
-	$config_userlevel_nodeedit = 2;
-	$config_userlevel_nodeview = 1;
-	$config_userlevel_subnetadd = 2;
-	$config_userlevel_subnetdel = 2;
-	$config_userlevel_subnetedit = 2;
-	$config_userlevel_subnetview = 1;
-	$config_userlevel_useradd = 2;
-	$config_userlevel_userdel = 2;
-	$config_userlevel_useredit = 2;
-	$config_userlevel_userview = 1;
-	$config_userlevel_vlanadd = 2;
-	$config_userlevel_vlandel = 2;
-	$config_userlevel_vlanedit = 2;
-	$config_userlevel_vlanview = 1;
-	
-	// domain suffix for dns input fields
-	$config_dns1suffix = '.yourdomain.com';
-	$config_dns2suffix = '.yourdomain.com';
 ?>

dbconnect.php

@@ -1,4 +1,28 @@
 <?php
-	mysql_connect($mysql_host,$mysql_username,$mysql_password);
+	/*****************************************************************************
-	mysql_select_db($mysql_dbname);
+	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
+	*****************************************************************************/
+	
+	// build connection
+	mysql_connect($config_mysql_host,$config_mysql_username,$config_mysql_password);
+	
+	// select db
+	mysql_select_db($config_mysql_dbname);
 ?>

error.php

@@ -1,21 +0,0 @@
-<?php
-	include("header.php");
-	
-	// set template
-	$tp = new Template("tpl/error.tpl");
-	
-	// set language variables
-	$tp->setvars($lang);
-	
-	// get error
-	$error = $_GET['error'];
-	
-	// set veriables
-	$tp->set("error", $lang['lang_error_' . $error]);
-	
-	// output
-	$tp->parse();
-	$tp->spit();
-		
-	include("footer.php");
-?>

footer.php

@@ -1,10 +1,33 @@
 <?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
 		// set template
-	$tp = new Template("tpl/footer.tpl");
+		$tp = new Template("tpl/footer.tpl", $config_yapter_error);
 				
 		// get version for the footer-stamp
 		$tp->set("config_version", $config_version);
 	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();

functions.php

@@ -1,46 +0,0 @@
-<?php
-	// strip mac address to 12 char string
-	function strip_mac($mac) {
-		$mac = str_replace('-', '', $mac);
-		$mac = str_replace(':', '', $mac);
-		$mac = str_replace('.', '', $mac);
-		$mac = str_replace(',', '', $mac);
-		$mac = str_replace(' ', '', $mac);
-		$mac = strtoupper($mac);
-		
-		return ($mac);
-	}
-	
-	// rebuild mac address
-	function write_mac($mac) {
-		if (strlen($mac)!=12) {
-			// if the MAC is empty, or for whatever reason incorrect, just return
-			return $mac;
-		} else {
-			// length is good, continue
-			$mac1 = substr($mac, 0, 2);
-			$mac2 = substr($mac, 2, 2);
-			$mac3 = substr($mac, 4, 2);
-			$mac4 = substr($mac, 6, 2);
-			$mac5 = substr($mac, 8, 2);
-			$mac6 = substr($mac, 10, 2);
-			
-			// check session for preference (if 0, do nothing), if changed: update useredit.php too!
-			if ($_SESSION['suser_mac']==1) {
-				$mac = $mac1 . '-' . $mac2 . '-' . $mac3 . '-' . $mac4 . '-' . $mac5 . '-' . $mac6;
-			} else if ($_SESSION['suser_mac']==2) {
-				$mac = $mac1 . ':' . $mac2 . ':' . $mac3 . ':' . $mac4 . ':' . $mac5 . ':' . $mac6;
-			} else if ($_SESSION['suser_mac']==3) {
-				$mac = $mac1 . $mac2 . $mac3 . '-' . $mac4 . $mac5 . $mac6;
-			}
-			
-			return $mac;
-		}
-	}
-	
-	// redirect page
-	function header_location($location) {
-		header("location: " . $location);
-		exit;
-	}
-?>

gpl-3.0.txt

@@ -0,0 +1,621 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS

header.php

@@ -1,43 +1,111 @@
 <?php
-	session_start();
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
 	
-	// check for user_id, if unnkown -> login
+	This program is free software: you can redistribute it and/or modify
-	if(empty($_SESSION['suser_id'])) {
+	it under the terms of the GNU General Public License as published by
-		header("Location: login.php");
+	the Free Software Foundation, either version 3 of the License, or
-		exit;
+	(at your option) any later version.
-	}
 	
-	// includes
+	This program is distributed in the hope that it will be useful,
-	include("config.php");
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	include("dbconnect.php");
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	include("functions.php");
+	GNU General Public License for more details.
-	include("yapter.php");
 	
+	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_lang'] . '.php');
+		include('lang/en.php');
 			
 		// set template
-	$tp = new Template("tpl/header.tpl");
+		$tp = new Template("tpl/header.tpl", $config_yapter_error);
 				
 		// set language variables
 		$tp->setvars($lang);
 	
-	// fill search box
+	// search box
+		// new search?
 		if (isset($_POST['search'])) {
-		$search = $_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 = '';
 			}
 		}
 	
-	// give these to the templates too
+		// to tpl
-	$tp->set("suser_displayname", $_SESSION['suser_displayname']);
+		// set global template vars
+		$tp->set("config_version", $config_version);
+		$tp->set("suser_name", $_SESSION['suser_displayname']);
 		$tp->set("search", $search);
 	
+	// menu
+		// assets
+		if($_SESSION['suser_menu_assets']=='on') {
+			$tp->parse("menu_assets");
+		} else {
+			$tp->hide("menu_assets");
+		}
+		// assetclasses
+		if($_SESSION['suser_menu_assetclasses']=='on') {
+			$tp->parse("menu_assetclasses");
+		} else {
+			$tp->hide("menu_assetclasses");
+		}
+		// assetclassgroups
+		if($_SESSION['suser_menu_assetclassgroups']=='on') {
+			$tp->parse("menu_assetclassgroups");
+		} else {
+			$tp->hide("menu_assetclassgroups");
+		}
+		// locations
+		if($_SESSION['suser_menu_locations']=='on') {
+			$tp->parse("menu_locations");
+		} else {
+			$tp->hide("menu_locations");
+		}
+		// nodes
+		if($_SESSION['suser_menu_nodes']=='on') {
+			$tp->parse("menu_nodes");
+		} else {
+			$tp->hide("menu_nodes");
+		}
+		// subnets
+		if($_SESSION['suser_menu_subnets']=='on') {
+			$tp->parse("menu_subnets");
+		} else {
+			$tp->hide("menu_subnets");
+		}
+		// users
+		if($_SESSION['suser_menu_users']=='on') {
+			$tp->parse("menu_users");
+		} else {
+			$tp->hide("menu_users");
+		}
+		// vlans
+		if($_SESSION['suser_menu_vlans']=='on') {
+			$tp->parse("menu_vlans");
+		} else {
+			$tp->hide("menu_vlans");
+		}
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();

image.php

@@ -0,0 +1,106 @@
+<?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+	
+	// icon image
+		if(isset($_GET['icon'])) {
+			// get desired image
+			$icon = sanitize($_GET['icon']);
+			
+			// switch selected
+			switch($icon) {
+				case ("add") :
+					$png = 'page_add';
+				break;
+				case ("back") :
+					$png = 'control_rewind_blue';
+				break;
+				case ("cancel") :
+					$png = 'control_rewind_blue';
+				break;
+				case ("comment") :
+					$png = 'comment';
+				break;
+				case ("delete") :
+					$png = 'page_delete';
+				break;
+				case ("edit") :
+					$png = 'page_edit';
+				break;
+				case ("error") :
+					$png = 'error';
+				break;
+				case ("help") :
+					$png = 'help';
+				break;
+				case ("logo") :
+					$png = 'logo';
+				break;
+				case ("next") :
+					$png = 'control_fastforward_blue';
+				break;
+				case ("save") :
+					$png = 'page_save';
+				break;
+				case ("search") :
+					$png = 'magnifier';
+				break;
+			}
+			
+			// get image
+			$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

@@ -0,0 +1,45 @@
+<?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
+	*****************************************************************************/
+	
+	// session
+		// start session
+		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");
+?>

index.php

@@ -1,40 +1,108 @@
 <?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// start output
 		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/index.tpl");
+		$tp = new Template("tpl/index.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// calculate assets
+	// setup asset
-	$query = mysql_query("SELECT asset_id FROM asset") or die(mysql_error());
+		// build query
-	$assetcount = mysql_num_rows($query);
+		$query = "SELECT
-	$tp->set('assetcount', $assetcount);
+				COUNT(asset.asset_id) AS asset_counter
+			FROM
+				asset";
 		
-	// calculate locations
+		// run query
-	$query = mysql_query("SELECT location_id FROM location") or die(mysql_error());
+		$assets = $db->db_select($query);
-	$locationcount = mysql_num_rows($query);
-	$tp->set('locationcount', $locationcount);
 		
-	// calculate nodes
+		// counter to tpl
-	$query = mysql_query("SELECT node_id FROM node") or die(mysql_error());
+		$tp->set("asset_counter", $assets[0]['asset_counter']);
-	$nodecount = mysql_num_rows($query);
-	$tp->set('nodecount', $nodecount);
 	
-	// calculate subnets
+	// setup location
-	$query = mysql_query("SELECT subnet_id FROM subnet") or die(mysql_error());
+		// build query
-	$subnetcount = mysql_num_rows($query);
+		$query = "SELECT
-	$tp->set('subnetcount', $subnetcount);
+				COUNT(location.location_id) AS location_counter
+			FROM
+				location";
 		
-	// calculate vlans
+		// run query
-	$query = mysql_query("SELECT vlan_id FROM vlan") or die(mysql_error());
+		$locations = $db->db_select($query);
-	$vlancount = mysql_num_rows($query);
-	$tp->set('vlancount', $vlancount);
 		
+		// counter to tpl
+		$tp->set("location_counter", $locations[0]['location_counter']);
+	
+	// setup node
+		// build query
+		$query = "SELECT
+				COUNT(node.node_id) AS node_counter
+			FROM
+				node";
+		
+		// run query
+		$nodes = $db->db_select($query);
+		
+		// counter to tpl
+		$tp->set("node_counter", $nodes[0]['node_counter']);
+	
+	// setup subnet
+		// build query
+		$query = "SELECT
+				COUNT(subnet.subnet_id) AS subnet_counter
+			FROM
+				subnet";
+		
+		// run query
+		$subnets = $db->db_select($query);
+		
+		// counter to tpl
+		$tp->set("subnet_counter", $subnets[0]['subnet_counter']);
+	
+	// setup vlan
+		// build query
+		$query = "SELECT
+				COUNT(vlan.vlan_id) AS vlan_counter
+			FROM
+				vlan";
+		
+		// run query
+		$vlans = $db->db_select($query);
+		
+		// counter to tpl
+		$tp->set("vlan_counter", $vlans[0]['vlan_counter']);
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// footer
 		include("footer.php");
 ?>

install/install.sql

@@ -1,213 +0,0 @@
--- 
--- Database: `ipreg`
--- 
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `asset`
--- 
-
-CREATE TABLE `asset` (
-  `asset_id` int(10) NOT NULL auto_increment,
-  `asset_name` varchar(100) NOT NULL default '',
-  `hostname` varchar(100) NOT NULL default '',
-  `assetclass_id` int(10) NOT NULL default '0',
-  `asset_info` text NOT NULL,
-  PRIMARY KEY  (`asset_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ;
-
--- 
--- Dumping data for table `asset`
--- 
-
-INSERT INTO `asset` VALUES (1, 'My Router', 'Router', 4, 'This is my router');
-INSERT INTO `asset` VALUES (2, 'My PC', 'PC', 10, 'This is my workstation');
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `assetclass`
--- 
-
-CREATE TABLE `assetclass` (
-  `assetclass_id` int(10) NOT NULL auto_increment,
-  `assetclassgroup_id` int(10) NOT NULL default '0',
-  `assetclass_name` varchar(100) NOT NULL default '',
-  PRIMARY KEY  (`assetclass_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=13 ;
-
--- 
--- Dumping data for table `assetclass`
--- 
-
-INSERT INTO `assetclass` VALUES (1, 1, 'Access device');
-INSERT INTO `assetclass` VALUES (2, 1, 'Firewall');
-INSERT INTO `assetclass` VALUES (3, 1, 'HUB');
-INSERT INTO `assetclass` VALUES (4, 1, 'Router');
-INSERT INTO `assetclass` VALUES (5, 1, 'Switch');
-INSERT INTO `assetclass` VALUES (6, 2, 'Server');
-INSERT INTO `assetclass` VALUES (7, 2, 'NAS');
-INSERT INTO `assetclass` VALUES (8, 3, 'IP Phone');
-INSERT INTO `assetclass` VALUES (9, 4, 'Laptop');
-INSERT INTO `assetclass` VALUES (10, 4, 'PC');
-INSERT INTO `assetclass` VALUES (11, 4, 'Printer');
-INSERT INTO `assetclass` VALUES (12, 4, 'Thin Client');
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `assetclassgroup`
--- 
-
-CREATE TABLE `assetclassgroup` (
-  `assetclassgroup_id` int(10) NOT NULL auto_increment,
-  `assetclassgroup_name` varchar(100) NOT NULL default '',
-  `color` varchar(10) NOT NULL default '',
-  PRIMARY KEY  (`assetclassgroup_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=6 ;
-
--- 
--- Dumping data for table `assetclassgroup`
--- 
-
-INSERT INTO `assetclassgroup` VALUES (1, 'Network', 'red');
-INSERT INTO `assetclassgroup` VALUES (2, 'Servers', 'green');
-INSERT INTO `assetclassgroup` VALUES (3, 'VOIP', 'orange');
-INSERT INTO `assetclassgroup` VALUES (4, 'Workstations', 'blue');
-INSERT INTO `assetclassgroup` VALUES (5, 'Other', 'black');
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `location`
--- 
-
-CREATE TABLE `location` (
-  `location_id` int(10) NOT NULL auto_increment,
-  `location_name` varchar(100) NOT NULL default '',
-  `parent` int(1) NOT NULL default '0',
-  `location_info` text NOT NULL,
-  PRIMARY KEY  (`location_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=9 ;
-
--- 
--- Dumping data for table `location`
--- 
-
-INSERT INTO `location` VALUES (1, 'Head Office', 0, '');
-INSERT INTO `location` VALUES (2, '1st floor', 1, '');
-INSERT INTO `location` VALUES (3, '2nd floor', 1, '');
-INSERT INTO `location` VALUES (4, 'Administration', 2, '');
-INSERT INTO `location` VALUES (5, 'Finance', 2, '');
-INSERT INTO `location` VALUES (6, 'Branch office', 0, '');
-INSERT INTO `location` VALUES (7, 'Planning', 3, '');
-INSERT INTO `location` VALUES (8, 'Logistics', 6, '');
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `node`
--- 
-
-CREATE TABLE `node` (
-  `node_id` int(10) NOT NULL auto_increment,
-  `ip` varchar(15) NOT NULL default '',
-  `mac` varchar(12) NOT NULL default '',
-  `dns1` varchar(100) NOT NULL default '',
-  `dns2` varchar(100) NOT NULL default '',
-  `subnet_id` int(10) NOT NULL default '0',
-  `asset_id` int(10) NOT NULL default '0',
-  `node_info` text NOT NULL,
-  PRIMARY KEY  (`node_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ;
-
--- 
--- Dumping data for table `node`
--- 
-
-INSERT INTO `node` VALUES (1, '192.168.0.1', 'aabbcc112233', 'router1', '', 1, 1, '');
-INSERT INTO `node` VALUES (2, '192.168.0.11', 'aa11bb22cc33', 'pc1', '', 1, 2, '');
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `subnet`
--- 
-
-CREATE TABLE `subnet` (
-  `subnet_id` int(10) NOT NULL auto_increment,
-  `subnet_address` varchar(15) NOT NULL default '',
-  `subnet_mask` int(2) NOT NULL default '0',
-  `vlan_id` int(10) NOT NULL default '0',
-  `subnet_info` text NOT NULL,
-  PRIMARY KEY  (`subnet_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
-
--- 
--- Dumping data for table `subnet`
--- 
-
-INSERT INTO `subnet` VALUES (1, '192.168.0.0', 24, 1, '');
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `subnetlocation`
--- 
-
-CREATE TABLE `subnetlocation` (
-  `subnetlocation_id` int(10) NOT NULL auto_increment,
-  `subnet_id` int(10) NOT NULL default '0',
-  `location_id` int(10) NOT NULL default '0',
-  PRIMARY KEY  (`subnetlocation_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
-
--- 
--- Dumping data for table `subnetlocation`
--- 
-
-INSERT INTO `subnetlocation` VALUES (1, 1, 1);
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `user`
--- 
-
-CREATE TABLE `user` (
-  `user_id` int(10) NOT NULL auto_increment,
-  `user_name` varchar(100) NOT NULL default '',
-  `user_pass` varchar(32) NOT NULL default '',
-  `user_level` int(1) NOT NULL default '0',
-  `user_displayname` varchar(100) NOT NULL default '',
-  `user_mac` int(1) NOT NULL default '0',
-  `user_lang` varchar(3) NOT NULL default '',
-  PRIMARY KEY  (`user_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
-
--- 
--- Dumping data for table `user`
--- 
-
-INSERT INTO `user` VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 2, 'Administrator', 0, 'en');
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `vlan`
--- 
-
-CREATE TABLE `vlan` (
-  `vlan_id` int(10) NOT NULL auto_increment,
-  `vlan_number` int(3) NOT NULL default '0',
-  `vlan_name` varchar(100) NOT NULL default '',
-  `vlan_info` text NOT NULL,
-  PRIMARY KEY  (`vlan_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
-
--- 
--- Dumping data for table `vlan`
--- 
-
-INSERT INTO `vlan` VALUES (1, 1, 'DEFAULT_VLAN', '');

install/install.txt

@@ -1,18 +1,16 @@
----
+IP Reg Installation
---- IP Reg
---- http://ipreg.sourceforge.net
----
 
-Installation instructions
+1. Create database
+Create a database for IP Reg on your web server, as well as a MySQL user who has all privileges for accessing and modifying it. 
 
-1) Copy all files to your webserver
+2. Run import
+Import the mysql.sql file into your database, which will create the tables and some sample data.
 
-2) Create your MYSQL-database
+3. Edit config file
+Open config.php in a text editor and fill in your database details.
 
-3) Use install.sql to create the tables and insert the first data
+4. Upload files
+Upload all files and directory's (except the install directory) to your webserver.
 
-4) Update config.php with your settings
+5. Start using IP Reg
-
+Start your browser and login to IP Reg with the default username/password: admin/admin
-5) Start your browser, log in with admin/admin
-
-6) Please report your comments at http://ipreg.sourceforge.net

install/mysql.sql

@@ -0,0 +1,143 @@
+CREATE TABLE asset (
+  asset_id int(10) NOT NULL auto_increment,
+  asset_name varchar(100) NOT NULL,
+  asset_hostname varchar(100) NOT NULL,
+  assetclass_id int(10) NOT NULL,
+  asset_info text NOT NULL,
+  PRIMARY KEY  (asset_id)
+) 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)
+) 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,
+  PRIMARY KEY  (assetclassgroup_id)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 ;
+
+INSERT INTO assetclassgroup (assetclassgroup_name, assetclassgroup_color) VALUES
+('Workstations', 000000);
+
+
+CREATE TABLE location (
+  location_id int(10) NOT NULL auto_increment,
+  location_name varchar(100) NOT NULL,
+  location_parent int(1) NOT NULL default 0,
+  location_info text NOT NULL,
+  PRIMARY KEY  (location_id)
+) 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,
+  nat_ext int(10) NOT NULL,
+  nat_int int(10) NOT NULL,
+  PRIMARY KEY  (nat_id)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 ;
+
+
+CREATE TABLE node (
+  node_id int(10) NOT NULL auto_increment,
+  node_ip varchar(15) NOT NULL,
+  node_mac varchar(12) NOT NULL,
+  node_dns1 varchar(100) NOT NULL,
+  node_dns2 varchar(100) NOT NULL,
+  subnet_id int(10) NOT NULL,
+  asset_id int(10) NOT NULL,
+  node_info text NOT NULL,
+  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(15) NOT NULL,
+  subnet_mask int(2) NOT NULL,
+  subnet_info text NOT NULL,
+  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,
+  location_id int(10) NOT NULL,
+  PRIMARY KEY  (subnetlocation_id)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 ;
+
+INSERT INTO subnetlocation (subnet_id, location_id) VALUES
+(1, 1);
+
+
+CREATE TABLE subnetvlan (
+  subnetvlan_id int(10) NOT NULL auto_increment,
+  subnet_id int(10) NOT NULL,
+  vlan_id int(10) NOT NULL,
+  PRIMARY KEY  (subnetvlan_id)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 ;
+
+
+CREATE TABLE user (
+  user_id int(10) NOT NULL auto_increment,
+  user_name varchar(100) NOT NULL,
+  user_pass varchar(32) NOT NULL,
+  user_displayname varchar(100) NOT NULL,
+  user_imagesize int(3) NOT NULL default 6,
+  user_imagecount int(3) NOT NULL default 64,
+  user_mac varchar(25) NOT NULL default 'xxxxxxxxxxxx',
+  user_dateformat varchar(10) NOT NULL default 'd M Y H:i',
+  user_dns1suffix varchar(100) NOT NULL,
+  user_dns2suffix varchar(100) NOT NULL,
+  user_menu_assets varchar(2) NOT NULL default 'on',
+  user_menu_assetclasses varchar(2) NOT NULL default 'on',
+  user_menu_assetclassgroups varchar(2) NOT NULL default 'on',
+  user_menu_locations varchar(2) NOT NULL default 'on',
+  user_menu_nodes varchar(2) NOT NULL default 'on',
+  user_menu_subnets varchar(2) NOT NULL default 'on',
+  user_menu_users varchar(2) NOT NULL default 'on',
+  user_menu_vlans varchar(2) NOT NULL default 'on',
+  PRIMARY KEY  (user_id)
+) 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
+('admin', '21232f297a57a5a743894a0e4a801fc3', 'administrator', 6, 64, 'xxxxxxxxxxxx', 'd M Y H:i', 'on', 'on', 'on', 'on', 'on', 'on', 'on', 'on');
+
+
+CREATE TABLE vlan (
+  vlan_id int(10) NOT NULL auto_increment,
+  vlan_number int(3) NOT NULL,
+  vlan_name varchar(100) NOT NULL,
+  vlan_info text NOT NULL,
+  PRIMARY KEY  (vlan_id)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 ;
+
+INSERT INTO vlan (vlan_number, vlan_name) VALUES
+(1, 'DEFAULT_VLAN');

lang/en.php

@@ -1,6 +1,8 @@
 <?php
 
 $lang = array(
+	'lang_ipreg' => 'IP Reg',
+	
 	'lang_asset' =>  'Asset',
 	'lang_assets' => 'Assets',
 	'lang_assetclass' => 'Assetclass',
@@ -9,8 +11,11 @@ $lang = array(
 	'lang_assetclassgroups' => 'Assetclassgroups',
 	'lang_location' => 'Location',
 	'lang_locations' => 'Locations',
+	'lang_menu' => 'Menu',
 	'lang_node' => 'Node',
 	'lang_nodes' => 'Nodes',
+	'lang_user' => 'User',
+	'lang_users' => 'Users',
 	'lang_sublocation' => 'Sub-location',
 	'lang_sublocations' => 'Sub-locations',
 	'lang_subnet' => 'Subnet',
@@ -18,25 +23,30 @@ $lang = array(
 	'lang_vlan' => 'VLAN',
 	'lang_vlans' => 'VLANs',
 	
+	'lang_about' => 'About',
+	'lang_all' => 'All',
+	'lang_cancel' => 'Cancel',
 	'lang_color' => 'Color',
 	'lang_error' => 'Error',
-	'lang_header_viewby' => 'View by',
+	'lang_item' => 'Item',
 	'lang_language' => 'Language',
 	'lang_login' => 'Login',
 	'lang_logout' => 'Logout',
 	'lang_options' => 'Options',
 	'lang_reset' => 'Reset',
-	'lang_search' => 'Search!',
+	'lang_search' => 'Search',
 	'lang_statistics' => 'Statistics',
+	'lang_subitem' => 'Sub-Item',
 	'lang_submit' => 'Submit',
 	'lang_unassigned' => 'Unassigned',
+	'lang_warning' => 'Warning',
 	
 	'lang_asset_add' => 'Add asset',
 	'lang_asset_del' => 'Delete asset',
 	'lang_asset_edit' => 'Modify asset',
 	'lang_asset_info' => 'Asset info',
 	'lang_asset_name' => 'Asset name',
-	'lang_hostname' => 'Hostname',
+	'lang_asset_hostname' => 'Hostname',
 	
 	'lang_assetclass_add' => 'Add assetclass',
 	'lang_assetclass_del' => 'Delete assetclass',
@@ -48,15 +58,21 @@ $lang = array(
 	'lang_assetclassgroup_edit' => 'Modify assetclassgroup',
 	'lang_assetclassgroup_name' => 'Assetclass Groupname',
 	
-	'lang_assigniptoasset' => 'Assign IP to asset',
+	'lang_assignnodetoasset' => 'Assign node to asset',
+	'lang_assignnodetoasset_existing' => 'Assign node to existing asset',
+	'lang_assignnodetoasset_new' => 'Assign node to new asset',
+	'lang_assigniptonode' => 'Assign IP to node',
+	'lang_assigniptonode_existing' => 'Assign IP to existing node',
+	'lang_assigniptonode_new' => 'Assign IP to new node',
 	'lang_assignlocationtosubnet' => 'Assign location to subnet',
+	'lang_assignlocationtosubnet_existing' => 'Assign location to existing subnet',
+	'lang_assignlocationtosubnet_new' => 'Assign location to new subnet',
+	'lang_assignsubnettovlan' => 'Assign subnet to VLAN',
+	'lang_assignsubnettovlan_existing' => 'Assign subnet to existing VLAN',
+	'lang_assignsubnettovlan_new' => 'Assign subnet to new VLAN',
 	'lang_assignvlantosubnet' => 'Assign VLAN to subnet',
-	
+	'lang_assignvlantosubnet_existing' => 'Assign VLAN to existing subnet',
-	'lang_error_ipinuse' => 'IP in use',
+	'lang_assignvlantosubnet_new' => 'Assign VLAN to new subnet',
-	'lang_error_locationisparent' => 'This location has sub-locations',
-	'lang_error_notallowed' => 'Not allowed',
-	'lang_error_usernameinuse' => 'Username in use',
-	'lang_goback' => 'Go back',
 	
 	'lang_location_add' => 'Add location',
 	'lang_location_del' => 'Delete location',
@@ -64,53 +80,117 @@ $lang = array(
 	'lang_location_info' => 'Location info',
 	'lang_location_name' => 'Location name',
 	'lang_location_parent' => 'Parent',
+	'lang_sublocation_add' => 'Add Sub-location',
+	
+	'lang_locationsubnet' => 'Location/Subnet',
+	'lang_locationsubnet_edit' => 'Edit Location/Subnet',
 	
 	'lang_node_add' => 'Add node',
 	'lang_node_del' => 'Delete node',
 	'lang_node_edit' => 'Modify node',
 	'lang_node_info' => 'Node info',
-	'lang_node_new' => 'Create new node',
 	'lang_dns1' => 'DNS name',
 	'lang_dns2' => 'DNS Alias',
 	'lang_ip' => 'IP Address',
 	'lang_mac' => 'MAC Address',
 	
-	'lang_search_found' => 'found',
+	'lang_nat' => 'NAT',
+	'lang_nat_add' => 'Add NAT',
+	'lang_nat_del' => 'Delete NAT',
+	'lang_nat_edit' => 'Modify NAT',
+	'lang_nat_rules' => 'NAT Rules',
+	'lang_nat_type' => 'Type',
+	'lang_nat_type_1' => 'Hide',
+	'lang_nat_type_2' => 'Static',
+	'lang_nat_type_3' => 'Dynamic',
+	
 	'lang_search_results_found' => 'Total results found',	
 	
 	'lang_subnet_add' => 'Add subnet',
 	'lang_subnet_subnetaddress' => 'Subnet address',
+	'lang_subnet_subnetaddress_mask' => 'Subnet address/Mask',
 	'lang_subnet_broadcastaddress' => 'Broadcast address',
+	'lang_subnet_nodesinsubnet' => 'Nodes in subnet',
+	'lang_subnet_subnetused' => 'Subnet used',
 	'lang_subnet_del' => 'Delete subnet',
 	'lang_subnet_edit' => 'Modify subnet',
 	'lang_subnet_info' => 'Subnet info',
 	'lang_subnet_mask' => 'Subnet mask',
 	
+	'lang_subnetlocation' => 'Subnet/Location',
+	'lang_subnetlocation_edit' => 'Edit Subnet/Location',
+	'lang_subnetvlan' => 'Subnet/VLAN',
+	'lang_subnetvlan_edit' => 'Edit Subnet/VLAN',
+	
 	'lang_user_add' => 'Add user',
 	'lang_user_del' => 'Delete user',
 	'lang_user_displayname' => 'Displayname',
 	'lang_user_edit' => 'Mofidy user',
-	'lang_user_level' => 'Userlevel',
 	'lang_user_name' => 'Username',
-	'lang_user_pass' => 'Password',
+	'lang_user_password' => 'Password',
-	'lang_user_passnew1' => 'New password',
-	'lang_user_passnew2' => 'Retype new password',
-	'lang_user_passold' => 'Current password',
 	
 	'lang_vlan_add' => 'Add VLAN',
 	'lang_vlan_del' => 'Delete VLAN',
 	'lang_vlan_edit' => 'Modify VLAN',
 	'lang_vlan_number' => 'VLAN ID',
 	'lang_vlan_info' => 'VLAN info',
+	'lang_vlan_new' => 'VLAN info',
 	'lang_vlan_name' => 'VLAN name',
 	
-	'lang_warning_asset_del_nodes' => 'These nodes will also be deleted!',
+	'lang_vlansubnet' => 'VLAN/Subnet',
-	'lang_warning_search_nosearch' => 'Nothing to search for!',
+	'lang_vlansubnet_edit' => 'Edit VLAN/Subnet',
+	
+	'lang_comments' => 'Comments',
+	'lang_comments_error' => 'Error',
+	'lang_comments_asset_del_nodes' => 'These nodes will also be deleted!',
+	'lang_comments_ipinuse' => 'IP in use',
+	'lang_comments_notallowed' => 'Not allowed',
+	'lang_comments_search_nosearch' => 'Nothing to search for!',
+	'lang_comments_usernameinuse' => 'Username in use',
 		
 	'lang_options_ipreg' => 'IP Reg options',
-	'lang_options_password_edit' => 'Modify password',
+	'lang_options_display' => 'Display options',
-	'lang_options_personal' => 'Personal options',
+	'lang_options_password' => 'Change password',
-	'lang_options_settings_edit' => 'Modify settings',
+	'lang_options_imagesize' => 'Imagesize',
+	'lang_options_imagesize_help' => 'Size (in pixels) of colored square on subnetview',
+	'lang_options_imagecount' => 'Imagecount',
+	'lang_options_imagecount_help' => 'Nr of colored squares per row on subnetview',
+	'lang_options_mac' => 'MAC Address',
+	'lang_options_mac_help' => 'Format in which a MAC address is displayed (e.g. xx-xx-xx-xx-xx-xx)',
+	'lang_options_menu_help' => 'Select items to be displayed in menu',
+	'lang_options_dateformat' => 'Date format',
+	'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 when creating a new node',
+	'lang_options_dns2suffix' => 'DNS Alias suffix',
+	'lang_options_dns2suffix_help' => 'Default DNS Alias suffix when creating a new node',
+	'lang_options_currentpassword' => 'Current password',
+	'lang_options_currentpassword_help' => 'Enter your current password',
+	'lang_options_newpassword1' => 'New password',
+	'lang_options_newpassword1_help' => 'Enter your new password',
+	'lang_options_newpassword2' => 'Retype new password',
+	'lang_options_newpassword2_help' => 'Re-type your new password',
+	
+	'lang_about_sfprojectpage' => 'Sourceforge Project Page',
+	'lang_about_license' => 'lang_about_license',
+	'lang_about_gpl' => 'GNU General Public License (GPL)',
+	'lang_about_yapter' => 'Yapter Template Engine',
+	'lang_about_iconset' => 'Silk icon set 1.3',
+	'lang_about_ipreg_ext' => 'IP Reg, a PHP/MySQL IPAM tool',
+	'lang_about_license_ext' => 'Copyright (C) 2007-2009 Wietse Warendorff<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_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_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_about_changelog_v03_ext' => '- Class A subnet support<br>- Multi-language support<br>- User defined options<br>- All configuration options in one file (config.php)',
+	'lang_about_changelog_v02' => 'v0.2 (dec 2007)',
+	'lang_about_changelog_v02_ext' => '- Fixed ordering of IP addresses<br>- Fixed info fields',
+	'lang_about_changelog_v01' => 'v0.1 (dec 2007)',
+	'lang_about_changelog_v01_ext' => '- First beta release',
+	
 );
 
 ?>

lib.php

@@ -0,0 +1,44 @@
+<?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
+	*****************************************************************************/
+	
+	// functions
+		include("lib/functions.php");
+	
+	// classes
+		// db
+			// load class
+			require("lib/db.class.php");
+			
+			// create instance
+			$db = new Db();
+		
+		// user
+			// load class
+			require("lib/user.class.php");
+			
+			// create instance
+			$user = new User();
+		
+		// tpl
+			// load class
+			include("lib/yapter.php");
+?>

lib/changelink.js

@@ -0,0 +1,5 @@
+	function changelink(optVal){
+		if(optVal=="")
+			return false;
+		window.location='subnetview.php?subnet_id='+optVal;
+	}

lib/changetext.js

@@ -0,0 +1,3 @@
+	function changetext(id,newtext) {
+		document.getElementById(id).innerHTML=newtext
+	}

lib/db.class.php

@@ -0,0 +1,55 @@
+<?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
+	*****************************************************************************/
+	
+	class Db {
+		function db_delete($query) {
+			// run query
+			$sql = mysql_query($query) or die(mysql_error());
+		}
+		
+		function db_insert($query) {
+			// run query
+			$sql = mysql_query($query) or die(mysql_error());
+			
+			// return result
+			return mysql_insert_id();
+		}
+		
+		function db_select($query) {
+			// run query
+			$sql = mysql_query($query) or die(mysql_error());
+			
+			// loop results
+			while($record = mysql_fetch_assoc($sql)) {
+				$result[] = $record;
+			}
+			
+			// return array
+			return $result;
+		}
+		
+		function db_update($query) {
+			// run query
+			$sql = mysql_query($query) or die(mysql_error());
+		}
+	}
+?>

lib/functions.php

@@ -0,0 +1,94 @@
+<?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
+	*****************************************************************************/
+	
+	// strip mac address to 12 char string
+	function strip_mac($mac) {
+		// strip chars we don't need
+		$mac = preg_replace("|[^a-fA-F0-9]|", "", $mac);
+		
+		// capitalize (just because it looks better eh)
+		$mac = strtoupper($mac);
+		
+		// and return
+		return ($mac);
+	}
+	
+	// rebuild mac address
+	function write_mac($mac) {
+		// check string length
+		if (strlen($mac)!=12) {
+			// if the MAC is empty, or for whatever reason incorrect, just return
+			return $mac;
+		} else {
+			// count to 12...
+			for($i=0;$i<12;$i++) {
+				// ... and strip mac to pieces
+				${"mac".$i} = $mac{$i};
+			}
+			
+			// get user preference
+			$user_mac = $_SESSION['suser_mac'];
+			
+			// count to 12 again...
+			for($i=0;$i<12;$i++) {
+				// ... and replace user preference with pieces
+				$user_mac = preg_replace("/x/", ${"mac".$i}, $user_mac, 1);
+			}
+			
+			// and return
+			return $user_mac;
+		}
+	}
+	
+	// redirect page
+	function header_location($location) {
+		// send header
+		header("location: " . $location);
+		
+		// exit to be sure
+		exit;
+	}
+	
+	// sanitize input
+	function sanitize($input) {
+		// trim whitespaces
+		$input = @trim($input);
+		
+		// magic quotes enabled?
+		if(get_magic_quotes_gpc()) {
+			// strip slashes
+			$input = stripslashes($input);
+		}
+		
+		// convert to utf-8
+		iconv("UTF-8", "UTF-8", $input);
+		
+		// convert special chars
+		$input = htmlentities($input,ENT_QUOTES,'UTF-8');
+		
+		// make sql ready
+		$input = mysql_real_escape_string($input);
+		
+		// and return
+		return $input;
+	}
+?>

lib/user.class.php

@@ -0,0 +1,115 @@
+<?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
+	*****************************************************************************/
+	
+	class User {
+		function check_strlen($string) {
+			// check length
+			if(strlen($string)<1) {
+				return FALSE;
+			} else {
+				return TRUE;
+			}
+		}
+		
+		function user_login($user_name, $user_pass) {
+			// check user_name length
+			if($this->check_strlen($user_name)==FALSE) {
+				return FALSE;
+			}
+			
+			// check user_pass length
+			if($this->check_strlen($user_pass)==FALSE) {
+				return FALSE;
+			}
+			
+			// get user data			
+				// initiate class
+				$db = new Db();
+				
+				// build query
+				$query = "SELECT
+					user.user_id,
+					user.user_pass,
+					user.user_displayname,
+					user.user_imagesize,
+					user.user_imagecount,
+					user.user_mac,
+					user.user_dateformat,
+					user.user_dns1suffix,
+					user.user_dns2suffix,
+					user.user_menu_assets,
+					user.user_menu_assetclasses,
+					user.user_menu_assetclassgroups,
+					user.user_menu_locations,
+					user.user_menu_nodes,
+					user.user_menu_subnets,
+					user.user_menu_users,
+					user.user_menu_vlans
+				FROM
+					user
+				WHERE
+					user.user_name='" . $user_name . "'";
+				
+				// run query
+				$users = $db->db_select($query);
+				
+				// count results
+				$user_counter = count($users);
+				
+				// any users?
+				if ($user_counter>0) {
+					// compare passwords
+					if(!strcmp(md5($user_pass), $users[0]['user_pass'])) {
+						// all ok: user is logged in, register session data
+						$_SESSION['suser_id'] = $users[0]['user_id'];
+						$_SESSION['suser_displayname'] = $users[0]['user_displayname'];
+						$_SESSION['suser_imagesize'] = $users[0]['user_imagesize'];
+						$_SESSION['suser_imagecount'] = $users[0]['user_imagecount'];
+						$_SESSION['suser_mac'] = $users[0]['user_mac'];
+						$_SESSION['suser_dateformat'] = $users[0]['user_dateformat'];
+						$_SESSION['suser_dns1suffix'] = $users[0]['user_dns1suffix'];
+						$_SESSION['suser_dns2suffix'] = $users[0]['user_dns2suffix'];
+						$_SESSION['suser_menu_assets'] = $users[0]['user_menu_assets'];
+						$_SESSION['suser_menu_assetclasses'] = $users[0]['user_menu_assetclasses'];
+						$_SESSION['suser_menu_assetclassgroups'] = $users[0]['user_menu_assetclassgroups'];
+						$_SESSION['suser_menu_locations'] = $users[0]['user_menu_locations'];
+						$_SESSION['suser_menu_nodes'] = $users[0]['user_menu_nodes'];
+						$_SESSION['suser_menu_subnets'] = $users[0]['user_menu_subnets'];
+						$_SESSION['suser_menu_users'] = $users[0]['user_menu_users'];
+						$_SESSION['suser_menu_vlans'] = $users[0]['user_menu_vlans'];
+					} else {
+						return FALSE;
+					}
+				} else {
+					return FALSE;
+				}
+			
+			// no errors found, return
+			return TRUE;
+		}
+		
+		function user_logout() {
+			// clear and destroy session
+			$_SESSION = array();
+		}
+	}
+?>

location.php

@@ -1,26 +1,73 @@
 <?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// start output
 		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/location.tpl");
+		$tp = new Template("tpl/location.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// create array with parent index and location names
+	// start location
-	$parents = array();
+		// look for locations
-	$location_names = array();
+			// build query
+			$query = "SELECT
+					location.location_id AS location_id,
+					location.location_name AS location_name,
+					location.location_parent AS location_parent
+				FROM
+					location
+				ORDER BY
+					location.location_name";
 			
-	// get location information and insert to the arrays
+			// run query
-	$result = mysql_query("SELECT location_id, location_name, parent FROM location") or die(mysql_error());
+			$locations = $db->db_select($query);
-	while ($row = mysql_fetch_object($result)) {
+			
-		$location_names[$row->location_id] = $row->location_name;
+			// count results
-		$parents[$row->parent][] = $row->location_id;
+			$location_counter = count($locations);
+			
+			// counter to tpl
+			$tp->set("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'];
+				}
 			}
 		
-	// look for parents and create a new array for every child
+		// look for parents
+			// function to look for parents and create a new array for every child
 			function location($parents, $parent = 0) {
-		$children = array();
+				// loop array to check
 				foreach($parents[$parent] as $child) {
 					if(isset($parents[$child])) {
 						// element has children
@@ -30,29 +77,38 @@
 						$children[$child] = NULL;
 					}
 				}
+				
+				// and again...
 				return $children;
 			}
 		
+		// to tpl
 			// recursive children check to template
-	function checkchildren ($array, $level) {
+			function checkchildren($locations, $level) {
+				// include template class
 				global $tp;
+				
+				// import location names
 				global $location_names;
-		foreach ($array as $location_id=>$val) {
+				
-			if($val != "") {
+				// action!
-	                	$tp->set("location_id", $location_id);
+				foreach ($locations as $parent=>$child) {
-	                	$tp->set("location_name", $location_names[$location_id]);
+					// send vars to template
-	                	$tp->set("nbsp", str_repeat("&nbsp;&nbsp;&nbsp;",$level));
+					$tp->set("location_id", $parent);
-	                	$tp->parse("locationrow");
+		                	$tp->set("location_name", $location_names[$parent]);
-	                	checkchildren($val, $level+1);
+		                	$tp->set("nbsp", str_repeat("-&nbsp;&nbsp;",$level));
-			} else {
+		                	$tp->parse("location_row");
-				$tp->set("location_id", $location_id);
+		                	
-	                	$tp->set("location_name", $location_names[$location_id]);
+		                	// any children?
-	                	$tp->set("nbsp", str_repeat("&nbsp;&nbsp;&nbsp;",$level));
+					if($child != "") {
-	                	$tp->parse("locationrow");
+						// yes, so do the loop again!
+			                	checkchildren($child, $level+1);
 					}
 				}
-		$tp->parse("location");
+				
-		$tp->clear("location");
+				// parse and clear for the next round
+				$tp->parse("location_table");
+				$tp->clear("location_table");
 			}
 			
 			// assemble the tree
@@ -61,9 +117,11 @@
 			// check for values and build template
 			checkchildren($tree, 0);
 	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// footer
 		include("footer.php");
 ?>

locationadd.php

@@ -1,24 +1,139 @@
 <?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// get id	
+		$location_parent = sanitize($_GET['location_parent']);
+		
+		// start output
 		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/locationadd.tpl");
+		$tp = new Template("tpl/locationadd.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// get location info
+	// start parent
-	$result = mysql_query("SELECT location_id, location_name FROM location ORDER BY location_name");
+		// look for locations
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
+			// build query
-		$tp->set("location_id", $row->location_id);
+			$query = "SELECT
-		$tp->set("location_name", $row->location_name);
+					location.location_id AS location_id,
-		$tp->parse("locationrow");
+					location.location_name AS location_name,
-	}
+					location.location_parent AS location_parent
-	if (($i>0) ? $tp->parse("location") : $tp->hide("location"));
+				FROM
+					location
+				ORDER BY
+					location.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) {
+					// create arrays
+					$location_names[$location['location_id']] = $location['location_name'];
+					$parents[$location['location_parent']][] = $location['location_id'];
+				}
+			}
+		
+		// look for parents
+			// function to look for parents and create a new array for every child
+			function location($parents, $parent = 0) {
+				// loop array to check
+				foreach($parents[$parent] as $child) {
+					if(isset($parents[$child])) {
+						// element has children
+						$children[$child] = location($parents, $child);
+					} else {
+						// no children, set NULL
+						$children[$child] = NULL;
+					}
+				}
+				
+				// and again...
+				return $children;
+			}
+		
+		// to tpl
+			// recursive children check to template
+			function checkchildren($locations, $level) {
+				// include template class
+				global $tp;
+				
+				// import location names
+				global $location_names;
+				
+				// import location names
+				global $location_parent;
+				
+				// action!
+				foreach ($locations as $parent=>$child) {
+					// send vars to template
+					$tp->set("location_id", $parent);
+		                	$tp->set("location_name", $location_names[$parent]);
+		                	$tp->set("nbsp", str_repeat("-&nbsp;&nbsp;",$level));
+		                	
+		                	// set parent selected
+		                	if($parent==$location_parent) {
+						$tp->set("location_selected", "selected");
+					} else {
+						$tp->set("location_selected", "");
+					}
+		                	
+		                	// parse block
+		                	$tp->parse("location_row");
+		                	
+		                	// any children?
+					if($child != "") {
+						// yes, so do the loop again!
+			                	checkchildren($child, $level+1);
+					}
+				}
+				
+				// parse and clear for the next round
+				$tp->parse("location_table");
+				$tp->clear("location_table");
+			}
+			
+			// assemble the tree
+			$tree = location($parents);
+			
+			// check for values and build template
+			checkchildren($tree, 0);
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// footer
 		include("footer.php");
 ?>

locationdel.php

@@ -1,24 +1,62 @@
 <?php
-	include("header.php");
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
 		
 		// get id	
-	$location_id = $_GET['location_id'];
+		$location_id = sanitize($_GET['location_id']);
+		
+		// start output
+		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/locationdel.tpl");
+		$tp = new Template("tpl/locationdel.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// get location info
+	// setup location
-	$result = mysql_query("SELECT location_name FROM location WHERE location_id='$location_id'") or die(mysql_error());
+		// build query
-	$row=mysql_fetch_object($result);
+		$query = "SELECT
-	$tp->set("location_id", $location_id);
+				location.location_name AS location_name
-	$tp->set("location_name", $row->location_name);
+			FROM
+				location
+			WHERE
+				location.location_id=" . $location_id;
 		
+		// run query
+		$location = $db->db_select($query);
+		
+		// send to tpl
+		$tp->set("location_id", $location_id);
+		$tp->set("location_name", $location[0]['location_name']);
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// footer
 		include("footer.php");
 ?>

locationedit.php

@@ -1,47 +1,167 @@
 <?php
-	include("header.php");
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
 		
 		// get id	
-	$location_id = $_GET['location_id'];
+		$location_id = sanitize($_GET['location_id']);
+		
+		// start output
+		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/locationedit.tpl");
+		$tp = new Template("tpl/locationedit.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// check for submit
+	// setup location
-	if ($_SERVER['REQUEST_METHOD']=="POST" ) {
+		// build query
-		$location_id = $_POST['location_id'];
+		$query = "SELECT
-		$location_name = $_POST['location_name'];		
+				location.location_name AS location_name,
-		$parent = $_POST['parent'];
+				location.location_parent AS location_parent,
-		$location_info = $_POST['location_info'];
+				location.location_info AS location_info
-		mysql_query("UPDATE location SET location_name='$location_name', parent='$parent', location_info='$location_info' WHERE location_id='$location_id'") or die(mysql_error());
+			FROM
+				location
+			WHERE
+				location.location_id=" . $location_id;
 		
-		header_location("locationview.php?location_id=" . $location_id);
+		// run query
-	}
+		$location = $db->db_select($query);
 		
-	// get current information
+		// get parent
-	$result = mysql_query("SELECT location_name, parent, location_info FROM location WHERE location_id='$location_id'") or die(mysql_error());
+		$location_parent = $location[0]['location_parent'];
-	$row = mysql_fetch_object($result);
+		
-	$parent = $row->parent;
+		// send to tpl
 		$tp->set("location_id", $location_id);
-	$tp->set("location_name", $row->location_name);
+		$tp->set("location_name", $location[0]['location_name']);
-	$tp->set("location_info", $row->location_info);
+		$tp->set("location_info", $location[0]['location_info']);
 	
-	// get parent info
+	// setup parent location
-	$result = mysql_query("SELECT location_id, location_name FROM location ORDER BY location_name");
+		// look for locations
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
+			// build query
-		if (($row->location_id==$parent) ? $tp->set("selected", "selected") : $tp->set("selected", ""));
+			$query = "SELECT
-		$tp->set("parent_id", $row->location_id);
+					location.location_id AS location_id,
-		$tp->set("parent_name", $row->location_name);
+					location.location_name AS location_name,
-		$tp->parse("parentrow");
+					location.location_parent AS location_parent
+				FROM
+					location
+				ORDER BY
+					location.location_name";
+			
+			// run query
+			$locations = $db->db_select($query);
+			
+			// count results
+			$location_counter = count($locations);
+			
+			// counter to tpl
+			$tp->set("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'];
+				}
 			}
-	if (($i>0) ? $tp->parse("parent") : $tp->hide("parent"));
 		
+		// look for parents
+			// function to look for parents and create a new array for every child
+			function location($parents, $parent = 0) {
+				// loop array to check
+				foreach($parents[$parent] as $child) {
+					if(isset($parents[$child])) {
+						// element has children
+						$children[$child] = location($parents, $child);
+					} else {
+						// no children, set NULL
+						$children[$child] = NULL;
+					}
+				}
+				
+				// and again...
+				return $children;
+			}
+		
+		// to tpl
+			// recursive children check to template
+			function checkchildren($locations, $level) {
+				// include template class
+				global $tp;
+				
+				// import location names
+				global $location_names;
+				
+				// import current id
+				global $location_id;
+				
+				// import parent
+				global $location_parent;
+				
+				// action!
+				foreach ($locations as $parent=>$child) {
+					// send vars to template
+					$tp->set("parentlocation_id", $parent);
+		                	$tp->set("parentlocation_name", $location_names[$parent]);
+		                	$tp->set("nbsp", str_repeat("-&nbsp;&nbsp;",$level));
+		                	
+		                	// set parent selected
+		                	if($parent==$location_parent) {
+						$tp->set("parentlocation_selected", "selected");
+					} else {
+						$tp->set("parentlocation_selected", "");
+					}
+		                	
+		                	// parse block
+		                	$tp->parse("parentlocation_row");
+		                	
+		                	// any children?
+					if($child != "") {
+						// yes, so do the loop again!
+			                	checkchildren($child, $level+1);
+					}
+				}
+				
+				// parse and clear for the next round
+				$tp->parse("parentlocation_table");
+				$tp->clear("parentlocation_table");
+			}
+			
+			// assemble the tree
+			$tree = location($parents);
+			
+			// check for values and build template
+			checkchildren($tree, 0);
+		
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// end output
 		include("footer.php");
 ?>

locationsubnetadd.php

@@ -0,0 +1,107 @@
+<?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// get ip and id
+		$location_id = sanitize($_GET['location_id']);
+		
+		// start output
+		include("header.php");
+		
+		// set template
+		$tp = new Template("tpl/locationsubnetadd.tpl", $config_yapter_error);
+		
+		// set language variables
+		$tp->setvars($lang);
+	
+	// setup location
+		// build query
+		$query = "SELECT
+				location.location_name AS location_name
+			FROM
+				location
+			WHERE
+				location.location_id=" . $location_id;
+		
+		// run query
+		$location = $db->db_select($query);
+		
+		$tp->set("location_id", $location_id);
+		$tp->set("location_name", $location[0]['location_name']);
+	
+	// setup subnet
+		// build query
+		$query = " SELECT
+				subnet.subnet_id AS subnet_id,
+				subnet.subnet_address AS subnet_address,
+				subnet.subnet_mask AS subnet_mask
+			FROM
+				subnet
+			WHERE
+				subnet.subnet_id NOT IN (
+					SELECT
+						subnet_id
+					FROM
+						subnetlocation
+					WHERE
+						location_id=" . $location_id . "
+				)
+			ORDER BY
+				INET_ATON(subnet.subnet_address)";
+		
+		// run query
+		$subnets = $db->db_select($query);
+		
+		// count results
+		$subnet_counter = count($subnets);
+		
+		// any locations?
+		if ($subnet_counter>0) {
+			// get objects
+			foreach($subnets AS $subnet) {
+				// send to tpl
+				$tp->set("subnet_id", $subnet['subnet_id']);
+				$tp->set("subnet_address", $subnet['subnet_address']);
+				$tp->set("subnet_mask", $subnet['subnet_mask']);
+				
+				// parse row
+				$tp->parse("subnet_row");
+			}
+			
+			// parse block
+			$tp->parse("subnet_table");
+		} else {
+			// hide block
+			$tp->hide("subnet_table");
+		}
+	
+	// end page
+		// output
+		$tp->parse();
+		$tp->spit();
+		
+		// end output
+		include("footer.php");
+?>

locationsubnetdel.php

@@ -0,0 +1,102 @@
+<?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// get ip and id
+		$location_id = sanitize($_GET['location_id']);
+		
+		// start output
+		include("header.php");
+		
+		// set template
+		$tp = new Template("tpl/locationsubnetdel.tpl", $config_yapter_error);
+		
+		// set language variables
+		$tp->setvars($lang);
+	
+	// setup location
+		// build query
+		$query = "SELECT
+				location.location_name AS location_name
+			FROM
+				location
+			WHERE
+				location.location_id=" . $location_id;
+		
+		// run query
+		$location = $db->db_select($query);
+		
+		$tp->set("location_id", $location_id);
+		$tp->set("location_name", $location[0]['location_name']);
+	
+	// setup subnet
+		// build query
+		$query = "SELECT
+				subnet.subnet_id AS subnet_id,
+				subnet.subnet_address AS subnet_address,
+				subnet.subnet_mask AS subnet_mask
+			FROM
+				subnetlocation,
+				subnet
+			WHERE
+				subnetlocation.location_id="  . $location_id . "
+				AND subnet.subnet_id=subnetlocation.subnet_id
+			ORDER BY
+				INET_ATON(subnet.subnet_address)";
+		
+		// run query
+		$subnets = $db->db_select($query);
+		
+		// count results
+		$subnet_counter = count($subnets);
+		
+		// any locations?
+		if ($subnet_counter>0) {
+			// get objects
+			foreach($subnets AS $subnet) {
+				// send to tpl
+				$tp->set("subnet_id", $subnet['subnet_id']);
+				$tp->set("subnet_address", $subnet['subnet_address']);
+				$tp->set("subnet_mask", $subnet['subnet_mask']);
+				
+				// parse row
+				$tp->parse("subnet_row");
+			}
+			
+			// parse block
+			$tp->parse("subnet_table");
+		} else {
+			// hide block
+			$tp->hide("subnet_table");
+		}
+	
+	// end page
+		// output
+		$tp->parse();
+		$tp->spit();
+		
+		// end output
+		include("footer.php");
+?>

locationsubnetedit.php

@@ -0,0 +1,62 @@
+<?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// get ip and id
+		$location_id = sanitize($_GET['location_id']);
+		
+		// start output
+		include("header.php");
+		
+		// set template
+		$tp = new Template("tpl/locationsubnetedit.tpl", $config_yapter_error);
+		
+		// set language variables
+		$tp->setvars($lang);
+	
+	// setup location
+		// build query
+		$query = "SELECT
+				location.location_name AS location_name
+			FROM
+				location
+			WHERE
+				location.location_id=" . $location_id;
+		
+		// run query
+		$location = $db->db_select($query);
+		
+		// send to tpl
+		$tp->set("location_id", $location_id);
+		$tp->set("location_name", $location[0]['location_name']);
+	
+	// end page
+		// output
+		$tp->parse();
+		$tp->spit();
+		
+		// end output
+		include("footer.php");
+?>

locationview.php

@@ -1,28 +1,72 @@
 <?php
-	include("header.php");
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
 		
 		// get id
-	$location_id = $_GET['location_id'];
+		$location_id = sanitize($_GET['location_id']);
+		
+		// start output
+		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/locationview.tpl");
+		$tp = new Template("tpl/locationview.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// create breadcrumb arrays
+	// start locationcrumb
-	$parents = array();
+		// get locations
-	$location_names = array();
+			// build query
-	$crumbs = array();
+			$query = "SELECT
+					location.location_id AS location_id,
+					location.location_name AS location_name,
+					location.location_parent AS location_parent
+				FROM
+					location";
 			
-	// get location information and insert to the arrays
+			// run query
-	$result = mysql_query("SELECT location_id, location_name, parent FROM location") or die(mysql_error());
+			$locations = $db->db_select($query);
-	while ($row = mysql_fetch_object($result)) {
+			
-		$location_names[$row->location_id] = $row->location_name;
+			// count results
-		$parents[$row->location_id] = $row->parent;
+			$location_counter = count($locations);
+			
+			// counter to tpl
+			$tp->set("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_id']] = $location['location_parent'];
+				}
 			}
 		
-	// function to build array with parents
+		// build parents array
+			// function to build array with parents for this location
 			function parent($location_id) {
 				// use names index
 				global $parents;
@@ -43,62 +87,128 @@
 			// build parents
 			parent($location_id);
 		
-	// loop array in reverse order and send to template
+		// to tpl
+			// loop in reverse order
 			foreach (array_reverse($crumbs) as $key=>$val) {
+				// send vars to template
 				$tp->set("location_id", $val);
 				$tp->set("location_name", $location_names[$val]);
+				
+				// include seperator?
 				if (($key>0) ? $tp->set("seperator", ".&nbsp;") : $tp->set("seperator", ""));
-		$tp->parse("locationcrumbrow");
+				
+				// parse block
+				$tp->parse("locationcrumb_row");
 			}
-	$tp->parse("locationcrumb");
 			
-	// get location info
+			// parse block
-	$result = mysql_query("SELECT location_name, location_info FROM location WHERE location_id='$location_id'");
+			$tp->parse("locationcrumb_table");
-	$row=mysql_fetch_object($result);
-	$tp->set("location_info", nl2br($row->location_info));
 	
-	// search subnets for this location
+	// setup location
-	$result = mysql_query("SELECT s.subnet_id, s.subnet_address, s.subnet_mask FROM subnet s INNER JOIN subnetlocation sl ON s.subnet_id=sl.subnet_id WHERE sl.location_id='$location_id'") or die(mysql_error());
+		// build query
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
+		$query = "SELECT
-		$tp->set("subnet_id", $row->subnet_id);
+				location.location_info AS location_info
-		$tp->set("subnet_address", $row->subnet_address);
+			FROM
-		$tp->set("subnet_mask", $row->subnet_mask);
+				location
-		$tp->parse("subnetrow");
+			WHERE
-	}
+				location.location_id=" . $location_id;
-	if (($i>0) ? $tp->parse("subnet") : $tp->hide("subnet"));
 		
-	// search sub-locations for this location
+		// run query
-	$result = mysql_query("SELECT location_id, location_name FROM location WHERE parent='$location_id' ORDER BY location_name") or die(mysql_error());
+		$location = $db->db_select($query);
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
-		$tp->set("sublocation_id", $row->location_id);
-		$tp->set("sublocation_name", $row->location_name);
-		$tp->parse("sublocationrow");
-	}	
-	if (($i>0) ? $tp->parse("sublocation") : $tp->hide("sublocation"));
 		
-	// display options
+		// send to tpl
-	if($_SESSION['suser_level'] >= $config_userlevel_assignlocationtosubnet) {
 		$tp->set("location_id", $location_id);
-		$tp->parse("assignlocationtosubnet");	
+		$tp->set("location_info", nl2br($location[0]['location_info']));
-	} else {
+	
-		$tp->hide("assignlocationtosubnet");
+	// setup sublocations		
-	}
+		// build query
-	if($_SESSION['suser_level'] >= $config_userlevel_locationedit) {
+		$query = "SELECT
-		$tp->set("location_id", $location_id);
+				location.location_id AS sublocation_id,
-		$tp->parse("locationedit");	
+				location.location_name AS sublocation_name
-	} else {
+			FROM
-		$tp->hide("locationedit");
+				location
-	}
+			WHERE
-	if($_SESSION['suser_level'] >= $config_userlevel_locationdel) {
+				location.location_parent=" . $location_id . "
-		$tp->set("location_id", $location_id);
+			ORDER BY
-		$tp->parse("locationdel");
+				location.location_name";
-	} else {
+		
-		$tp->hide("locationdel");
+		// run query
+		$sublocations = $db->db_select($query);
+		
+		// count results
+		$sublocation_counter = count($sublocations);
+		
+		// counter to tpl
+		$tp->set("sublocation_counter", $sublocation_counter);
+		
+		// any nodes?
+		if ($sublocation_counter>0) {
+			// get objects
+			foreach($sublocations AS $sublocation) {
+				// send to tpl
+				$tp->set("sublocation_id", $sublocation['sublocation_id']);
+				$tp->set("sublocation_name", $sublocation['sublocation_name']);
+				
+				// parse row
+				$tp->parse("sublocation_row");
 			}
 			
+			// parse block
+			$tp->parse("sublocation_table");
+		} else {
+			// hide block
+			$tp->hide("sublocation_table");
+		}
+	
+	// setup subnets
+		// build query
+		$query = "SELECT
+				subnet.subnet_id AS subnet_id,
+				subnet.subnet_address AS subnet_address,
+				subnet.subnet_mask AS subnet_mask
+			FROM
+				subnet,
+				subnetlocation
+			WHERE
+				subnetlocation.location_id=" . $location_id . "
+				AND subnetlocation.subnet_id=subnet.subnet_id
+			ORDER BY
+				INET_ATON(subnet.subnet_address)";
+		
+		// run query
+		$subnets = $db->db_select($query);
+		
+		// count results
+		$subnet_counter = count($subnets);
+		
+		// counter to tpl
+		$tp->set("subnet_counter", $subnet_counter);
+		
+		// any nodes?
+		if ($subnet_counter>0) {
+			// get objects
+			foreach($subnets AS $subnet) {
+				// send to tpl
+				$tp->set("subnet_id", $subnet['subnet_id']);
+				$tp->set("subnet_address", $subnet['subnet_address']);
+				$tp->set("subnet_mask", $subnet['subnet_mask']);
+				
+				// parse row
+				$tp->parse("subnet_row");
+			}
+			
+			// parse block
+			$tp->parse("subnet_table");
+		} else {
+			// hide block
+			$tp->hide("subnet_table");
+		}
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// footer
 		include("footer.php");
 ?>

login.php

@@ -1,91 +1,79 @@
 <?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
+	*****************************************************************************/
+	
+	// session
+		// start session
 		session_start();
 	
+	// headers
+		// raw http headers
+		header("Content-Type: text/html; charset=utf-8"); 
+	
+	// includes
 		// includes
 		include("config.php");
 		include("dbconnect.php");
-	include("functions.php");
 		
+		// load lib
+		include("lib.php");
+		
+		// include language file
+		include('lang/en.php');
+	
+	// try login?
 		// check for submit
 		if ($_SERVER['REQUEST_METHOD']=="POST" ) {
-		if(isset($_POST['user_name']) && isset($_POST['user_pass']) && trim($_POST['user_name']) <> "" && trim($_POST['user_pass']) <> "") {
+			/// get post info
-			$user_name = $_POST['user_name'];
+			$user_name = sanitize($_POST['user_name']);
-			$result = mysql_query("SELECT user_id, user_pass, user_level, user_displayname, user_mac, user_lang FROM user WHERE user_name='$user_name'") or die(mysql_error());
+			$user_pass = sanitize($_POST['user_pass']);
 			
-			if(mysql_num_rows($result) > 0) {
+			// login
-				if(!strcmp(md5($_POST['user_pass']), mysql_result($result, 0, "user_pass"))) {
+			$login = $user->user_login($user_name, $user_pass);
-				// all ok, user logged in
-					$_SESSION['suser_id'] = mysql_result($result, 0, "user_id");
-					$_SESSION['suser_level'] = mysql_result($result, 0, "user_level");
-					$_SESSION['suser_displayname'] = mysql_result($result, 0, "user_displayname");
-					$_SESSION['suser_mac'] = mysql_result($result, 0, "user_mac");
-					$_SESSION['suser_lang'] = mysql_result($result, 0, "user_lang");
 			
-					header("Location: index.php");
+			if($login==TRUE) {
+				// redirect
+				header_location("index.php");
 			} else {
 				// not ok, break session
 				$_SESSION = array();
 				session_destroy();
 			}
-				// clear mysql-result
-				mysql_free_result($result);
-			}
-		}
-		echo '<b>Error!</b>';
 		}
+		
+	// start output
+		// set template
+		$tp = new Template("tpl/login.tpl", $config_yapter_error);
+		
+		// get version for the footer-stamp
+		$tp->set("config_version", $config_version);
+		
+		// set language variables
+		$tp->setvars($lang);
+	
+	// end page
+		// output
+		$tp->parse();
+		$tp->spit();
+		
+		// end output
+		include("footer.php");
 ?>
-
-<html>
-<header>
-	<title>IP Reg</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-	<link rel="stylesheet" href="tpl/style.css" type="text/css">
-</header>
-<body>
-	<br>
-	
-	<hr>
-	
-	<form action="login.php" method="post">
-	<table border="0">
-		<tr>
-			<td colspan="2">
-				<b>IP Reg <?php echo $config_version; ?></b>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				Username:
-			</td>
-			<td>
-				<input type="text" name="user_name">
-			</td>
-		</tr>
-		<tr>
-			<td>
-				Password:
-			</td>
-			<td>
-				<input type="password" name="user_pass">
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2" align="right">
-				<input type="submit" value="Submit"><input type="reset" value="Reset">
-			</td>
-		</tr>
-	</table>
-	</form>
-
-	<hr>
-
-	<table border="0" width="100%">
-		<tr>
-			<td align="center">
-				<a href="index.php" class="label">IP Reg <?php echo $config_version; ?></a>
-			</td>
-		</tr>
-	</table>
-
-</body>
-</html>

logout.php

@@ -1,10 +1,33 @@
 <?php
-	session_start();
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
 	
-	// clear and destroy session
+	This program is free software: you can redistribute it and/or modify
-	$_SESSION = array();
+	it under the terms of the GNU General Public License as published by
-	session_destroy();
+	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
+		$user->user_logout();
+	
+		// redirect
 		header("Location: index.php");
-	
 ?> 

natadd.php

@@ -0,0 +1,111 @@
+<?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// get ip and id
+		$node_id = sanitize($_GET['node_id']);
+		
+		// start output
+		include("header.php");
+		
+		// set template
+		$tp = new Template("tpl/natadd.tpl", $config_yapter_error);
+		
+		// set language variables
+		$tp->setvars($lang);
+	
+	// setup node_ext
+		// build query
+		$query = "SELECT
+				node.node_ip AS node_ip_ext
+			FROM
+				node
+			WHERE
+				node.node_id=" . $node_id;
+		
+		// run query
+		$node = $db->db_select($query);
+		
+		$tp->set("node_id_ext", $node_id);
+		$tp->set("node_ip_ext", $node[0]['node_ip_ext']);
+	
+	// setup node_int
+		// build query
+		$query = "SELECT
+				asset.asset_name AS asset_name,
+				node.node_id AS node_id_int,
+				node.node_ip AS node_ip_int
+			FROM
+				asset,
+				node
+			WHERE
+				node.node_id NOT IN (
+					SELECT
+						nat_int
+					FROM
+						nat
+					WHERE
+						nat_ext=" . $node_id . "
+				)
+				AND node.node_id!=" . $node_id . "
+				AND asset.asset_id=node.asset_id
+			ORDER BY
+				INET_ATON(node.node_ip)";
+		
+		// run query
+		$nodes = $db->db_select($query);
+		
+		// count results
+		$node_counter = count($nodes);
+		
+		// any nodes?
+		if ($node_counter>0) {
+			// get objects
+			foreach($nodes AS $node) {
+				// send to tpl
+				$tp->set("asset_name", $node['asset_name']);
+				
+				$tp->set("node_id_int", $node['node_id_int']);
+				$tp->set("node_ip_int", $node['node_ip_int']);
+				
+				// parse row
+				$tp->parse("node_row");
+			}
+			
+			// parse block
+			$tp->parse("node_table");
+		} else {
+			// hide block
+			$tp->hide("node_table");
+		}
+	
+	// end page
+		// output
+		$tp->parse();
+		$tp->spit();
+		
+		// end output
+		include("footer.php");
+?>

natdel.php

@@ -0,0 +1,105 @@
+<?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// get ip and id
+		$node_id = sanitize($_GET['node_id']);
+		
+		// start output
+		include("header.php");
+		
+		// set template
+		$tp = new Template("tpl/natdel.tpl", $config_yapter_error);
+		
+		// set language variables
+		$tp->setvars($lang);
+	
+	// setup node_ext
+		// build query
+		$query = "SELECT
+				node.node_ip AS node_ip_ext
+			FROM
+				node
+			WHERE
+				node.node_id=" . $node_id;
+		
+		// run query
+		$node = $db->db_select($query);
+		
+		$tp->set("node_id_ext", $node_id);
+		$tp->set("node_ip_ext", $node[0]['node_ip_ext']);
+	
+	// setup node
+		// build query
+		$query = "SELECT
+				asset.asset_name AS asset_name,
+				node.node_id AS node_id_int,
+				node.node_ip AS node_ip_int
+			FROM
+				asset,
+				nat,
+				node
+			WHERE
+				nat.nat_ext="  . $node_id . "
+				AND node.node_id=nat.nat_int
+				AND asset.asset_id=node.asset_id
+			ORDER BY
+				INET_ATON(node.node_ip)";
+		
+		// run query
+		$nodes = $db->db_select($query);
+		
+		// count results
+		$node_counter = count($nodes);
+		
+		// any nodes?
+		if ($node_counter>0) {
+			// get objects
+			foreach($nodes AS $node) {
+				// send to tpl
+				$tp->set("asset_name", $node['asset_name']);
+				
+				$tp->set("node_id_int", $node['node_id_int']);
+				$tp->set("node_ip_int", $node['node_ip_int']);
+				
+				// parse row
+				$tp->parse("node_row");
+			}
+			
+			// parse block
+			$tp->parse("node_table");
+		} else {
+			// hide block
+			$tp->hide("node_table");
+		}
+	
+	// end page
+		// output
+		$tp->parse();
+		$tp->spit();
+		
+		// end output
+		include("footer.php");
+?>

natedit.php

@@ -0,0 +1,61 @@
+<?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// get id
+		$node_id = sanitize($_GET['node_id']);
+		
+		// start output
+		include("header.php");
+		
+		// set template
+		$tp = new Template("tpl/natedit.tpl", $config_yapter_error);
+		
+		// set language variables
+		$tp->setvars($lang);
+	
+	// setup node
+		// build query
+		$query = "SELECT
+				node.node_ip AS node_ip
+			FROM
+				node
+			WHERE
+				node.node_id=" . $node_id;
+		
+		// run query
+		$node = $db->db_select($query);
+		
+		$tp->set("node_id", $node_id);
+		$tp->set("node_ip", $node[0]['node_ip']);
+	
+	// end page
+		// output
+		$tp->parse();
+		$tp->spit();
+		
+		// end output
+		include("footer.php");
+?>

node.php

@@ -0,0 +1,108 @@
+<?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// start output
+		include("header.php");
+		
+		// set template
+		$tp = new Template("tpl/node.tpl", $config_yapter_error);
+		
+		// set language variables
+		$tp->setvars($lang);
+	
+	// start node
+		// setup view
+			// subnet
+			if(isset($_GET['subnet_id'])) {
+				// get id
+				$subnet_id = sanitize($_GET['subnet_id']);
+				
+				// build query part
+				$subnet_view = "AND node.subnet_id=" . $subnet_id;
+				
+				// to tpl
+				$tp->set("subnet_id", $subnet_id);
+			} else {
+				// to tpl
+				$tp->set("subnet_id", "");
+			}
+		
+		// build query
+		$query = "SELECT
+				asset.asset_id AS asset_id,
+				asset.asset_name AS asset_name,
+				node.node_id AS node_id,
+				node.node_ip AS node_ip
+			FROM
+				asset,
+				node
+			WHERE
+				asset.asset_id=node.asset_id
+				" . $subnet_view . "
+			GROUP BY
+				node.node_id
+			ORDER BY
+				INET_ATON(node.node_ip)";
+		
+		// run query
+		$nodes = $db->db_select($query);
+		
+		// count results
+		$node_counter = count($nodes);
+		
+		// counter to tpl
+		$tp->set("node_counter", $node_counter);
+	
+		// any nodes?
+		if ($node_counter>0) {
+			// get objects
+			foreach($nodes AS $node) {
+				// send to tpl
+				$tp->set("asset_id", $node['asset_id']);
+				$tp->set("asset_name", $node['asset_name']);
+				
+				$tp->set("node_id", $node['node_id']);
+				$tp->set("node_ip", $node['node_ip']);
+				
+				// parse row
+				$tp->parse("node_row");
+			}
+			
+			// parse block
+			$tp->parse("node_table");
+		} else {
+			// hide block
+			$tp->hide("node_table");
+		}
+	
+	// end page
+		// output
+		$tp->parse();
+		$tp->spit();
+		
+		// end output
+		include("footer.php");
+?>

nodeadd.php

@@ -1,43 +1,117 @@
 <?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// 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 template
-	$tp = new Template("tpl/nodeadd.tpl");
+		$tp = new Template("tpl/nodeadd.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// check for set ip and/or subnet_id
+	// set vars
-	if ((isset($_GET['ip'])) ? $ip = $tp->set("ip", $_GET['ip']) : $tp->set("ip", ""));
+		$tp->set("user_dns1suffix", $_SESSION['suser_dns1suffix']);
-	if ((isset($_GET['subnet_id'])) ?  $subnet_id = $_GET['subnet_id'] : $subnet_id = '');
+		$tp->set("user_dns2suffix", $_SESSION['suser_dns2suffix']);
+		$tp->set("node_ip", $node_ip);
 	
-	// set variables
+	// setup subnet
-	$tp->set("config_dns1suffix", $config_dns1suffix);
+		// build query
-	$tp->set("config_dns2suffix", $config_dns2suffix);
+		$query = "SELECT
+				subnet.subnet_id AS subnet_id,
+				subnet.subnet_address AS subnet_address,
+				subnet.subnet_mask AS subnet_mask
+			FROM
+				subnet
+			ORDER BY
+				INET_ATON(subnet.subnet_address)";
 		
-	// get subnet info
+		// run query
-	$result = mysql_query("SELECT subnet_id, subnet_address, subnet_mask FROM subnet ORDER BY INET_ATON(subnet_address)") or die(mysql_error());
+		$subnets = $db->db_select($query);
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
+		
-		if (($row->subnet_id==$subnet_id) ? $tp->set("selected", "selected") : $tp->set("selected", ""));
+		foreach($subnets AS $subnet) {
-		$tp->set("subnet_id", $row->subnet_id);
+			// send to tpl
-		$tp->set("subnet_address", $row->subnet_address);
+			$tp->set("subnet_id", $subnet['subnet_id']);
-		$tp->set("subnet_mask", $row->subnet_mask);
+			$tp->set("subnet_address", $subnet['subnet_address']);
-		$tp->parse("subnetrow");
+			$tp->set("subnet_mask", $subnet['subnet_mask']);
+			
+			// set subnet selected
+                	if($subnet['subnet_id']==$subnet_id) {
+				$tp->set("subnet_selected", "selected");
+			} else {
+				$tp->set("subnet_selected", "");
 			}
-	if (($i>0) ? $tp->parse("subnet") : $tp->hide("subnet"));
 			
-	// get assetclassgroup information
+			// parse block
-	$result = mysql_query("SELECT assetclass_id, assetclass_name FROM assetclass ORDER BY assetclass_name") or die(mysql_error());
+			$tp->parse("subnet_row");
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
-		$tp->set("assetclass_id", $row->assetclass_id);
-		$tp->set("assetclass_name", $row->assetclass_name);
-		$tp->parse("assetclassrow");
 		}
-	if (($i>0) ? $tp->parse("assetclass") : $tp->hide("assetclass"));
 		
+		// parse block
+		$tp->parse("subnet_table");
+	
+	// setup assetclass
+		// build query
+		$query = "SELECT
+				assetclass.assetclass_id AS assetclass_id,
+				assetclass.assetclass_name AS assetclass_name
+			FROM
+				assetclass
+			ORDER BY
+				assetclass.assetclass_name";
+		
+		// run query
+		$assetclasses = $db->db_select($query);
+		
+		foreach($assetclasses AS $assetclass) {
+			// send to tpl
+			$tp->set("assetclass_id", $assetclass['assetclass_id']);
+			$tp->set("assetclass_name", $assetclass['assetclass_name']);
+			
+			if($assetclass['assetclass_id']==$assetclass_id) {
+				$tp->set("assetclass_selected", "selected");
+			} else {
+				$tp->set("assetclass_selected", "");
+			}
+		
+			// parse block
+			$tp->parse("assetclass_row");
+		}
+		
+		// parse block
+		$tp->parse("assetclass_table");
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// end output
 		include("footer.php");
 ?>

nodedel.php

@@ -1,25 +1,64 @@
 <?php
-	include("header.php");
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
 		
 		// get id	
-	$node_id = $_GET['node_id'];
+		$node_id = sanitize($_GET['node_id']);
+		
+		// start output
+		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/nodedel.tpl");
+		$tp = new Template("tpl/nodedel.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// get asset info
+	// setup node
-	$result = mysql_query("SELECT ip, asset_id FROM node WHERE node_id='$node_id'") or die(mysql_error());
+		// build query
-	$row=mysql_fetch_object($result);
+		$query = "SELECT
-	$tp->set("node_id", $node_id);
+				node.asset_id AS asset_id,
-	$tp->set("asset_id", $row->asset_id);
+				node.node_ip AS node_ip
-	$tp->set("ip", $row->ip);
+			FROM
+				node
+			WHERE
+				node.node_id=" . $node_id;
 		
+		// run query
+		$node = $db->db_select($query);
+		
+		// send to tpl
+		$tp->set("node_id", $node_id);
+		$tp->set("asset_id", $node[0]['asset_id']);
+		$tp->set("node_ip", $node[0]['node_ip']);
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// end output
 		include("footer.php");
 ?>

nodeedit.php

@@ -1,41 +1,159 @@
 <?php
-	include("header.php");
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
 		
 		// get id	
-	$node_id = $_GET['node_id'];
+		$node_id = sanitize($_GET['node_id']);
+		
+		// start output
+		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/nodeedit.tpl");
+		$tp = new Template("tpl/nodeedit.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 		
-	// get node info
+	// setup node
-	$result = mysql_query("SELECT a.asset_name, n.ip, n.mac, n.dns1, n.dns2, n.subnet_id, n.node_info FROM asset a, node n WHERE node_id='$node_id' AND a.asset_id=n.asset_id") or die(mysql_error());
+		// build query
-	$row = mysql_fetch_object($result);
+		$query = "SELECT
-	$subnet_id = $row->subnet_id;
+				asset.asset_id AS asset_id,
-	$tp->set("node_id", $node_id);
+				node.node_id AS node_id,
-	$tp->set("asset_name", $row->asset_name);
+				node.node_ip AS node_ip,
-	$tp->set("ip", $row->ip);
+				node.node_mac AS node_mac,
-	$tp->set("mac", write_mac($row->mac));
+				node.node_dns1 AS node_dns1,
-	$tp->set("dns1", $row->dns1);
+				node.node_dns2 AS node_dns2,
-	$tp->set("dns2", $row->dns2);
+				node.node_info AS node_info,
-	$tp->set("node_info", nl2br($row->node_info));
+				subnet.subnet_id AS subnet_id
+			FROM
+				asset,
+				node,
+				subnet
+			WHERE
+				asset.asset_id=node.asset_id
+				AND node.node_id=" . $node_id . "
+				AND subnet.subnet_id=node.subnet_id";
 		
-	// get subnet info
+		// run query
-	$result = mysql_query("SELECT subnet_id, subnet_address, subnet_mask FROM subnet ORDER BY INET_ATON(subnet_address)") or die(mysql_error());
+		$node = $db->db_select($query);
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
+		
-		if (($row->subnet_id==$subnet_id) ? $tp->set("selected", "selected") : $tp->set("selected", ""));
+		// send to tpl
-		$tp->set("subnet_id", $row->subnet_id);
+		$tp->set("node_id", $node[0]['node_id']);
-		$tp->set("subnet_address", $row->subnet_address);
+		$tp->set("node_ip", $node[0]['node_ip']);
-		$tp->set("subnet_mask", $row->subnet_mask);
+		$tp->set("node_mac", write_mac($node[0]['node_mac']));
-		$tp->parse("subnetrow");
+		$tp->set("node_dns1", $node[0]['node_dns1']);
+		$tp->set("node_dns2", $node[0]['node_dns2']);
+		$tp->set("node_info", $node[0]['node_info']);
+	
+	// setup asset
+		// build query
+		$query = "SELECT
+				asset.asset_id AS asset_id,
+				asset.asset_name AS asset_name
+			FROM
+				asset
+			ORDER BY
+				asset.asset_name";
+		
+		// run query
+		$assets = $db->db_select($query);
+		
+		// count results
+		$asset_counter = count($assets);
+		
+		// any assets?
+		if ($asset_counter>0) {
+			// get objects
+			foreach($assets AS $asset) {
+				// send to tpl
+				$tp->set("asset_id", $asset['asset_id']);
+				$tp->set("asset_name", $asset['asset_name']);
+				
+				if($asset['asset_id']==$node[0]['asset_id']) {
+					$tp->set("asset_selected", "selected");
+				} else {
+					$tp->set("asset_selected", "");
 				}
-	if (($i>0) ? $tp->parse("subnet") : $tp->hide("subnet"));
 				
+				// parse block
+				$tp->parse("asset_row");
+			}
+			// parse block
+			$tp->parse("asset_table");
+		} else {
+			// parse block
+			$tp->hide("asset_table");
+		}
+	
+	// setup subnet
+		// build query
+		$query = "SELECT
+				subnet.subnet_id AS subnet_id,
+				subnet.subnet_address AS subnet_address,
+				subnet.subnet_mask AS subnet_mask
+			FROM
+				subnet
+			ORDER BY
+				INET_ATON(subnet.subnet_address)";
+		
+		// run query
+		$subnets = $db->db_select($query);
+		
+		// count results
+		$subnet_counter = count($subnets);
+		
+		// any subnets?
+		if ($subnet_counter>0) {
+			// get objects
+			foreach($subnets AS $subnet) {
+				// send to tpl
+				$tp->set("subnet_id", $subnet['subnet_id']);
+				$tp->set("subnet_address", $subnet['subnet_address']);
+				$tp->set("subnet_mask", $subnet['subnet_mask']);
+				
+				if($subnet['subnet_id']==$node[0]['subnet_id']) {
+					$tp->set("subnet_selected", "selected");
+				} else {
+					$tp->set("subnet_selected", "");
+				}
+				
+				// parse block
+				$tp->parse("subnet_row");
+			}
+			// parse block
+			$tp->parse("subnet_table");
+		} else {
+			// parse block
+			$tp->hide("subnet_table");
+		}
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// end output
 		include("footer.php");
 ?>

nodelist.php

@@ -1,50 +0,0 @@
-<?php
-	include("header.php");
-		
-	// get id
-	$subnet_id = $_GET['subnet_id'];
-	
-	// set template
-	$tp = new Template("tpl/nodelist.tpl");
-	
-	// set language variables
-	$tp->setvars($lang);
-	
-	// set variables
-	$tp->set("subnet_id", $subnet_id);
-	
-	// set ordering
-	if (isset($_GET['order'])) {
-		switch($_GET['order']) {
-			case ("asset_name") : $order = "a.asset_name"; break;
-			case ("hostname") : $order = "a.hostname"; break;
-			case ("mac") : $order = "n.mac"; break;
-			case ("dns1") : $order = "n.dns1"; break;
-			case ("dns2") : $order = "n.dns2"; break;
-			default : $order = "INET_ATON(n.ip)";
-		}
-	} else {
-		$order = "INET_ATON(n.ip)";
-	}
-	
-	// get node info
-	$result = mysql_query("SELECT a.asset_id, a.asset_name, a.hostname, n.node_id, n.ip, n.mac, n.dns1, n.dns2 FROM asset a, node n WHERE n.subnet_id='$subnet_id' AND a.asset_id=n.asset_id ORDER BY $order") or die(mysql_error());
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
-		$tp->set("asset_id", $row->asset_id);
-		$tp->set("asset_name", $row->asset_name);
-		$tp->set("hostname", $row->hostname);
-		$tp->set("node_id", $row->node_id);
-		$tp->set("ip", $row->ip);
-		$tp->set("mac", write_mac($row->mac));
-		$tp->set("dns1", $row->dns1);
-		$tp->set("dns2", $row->dns2);
-		$tp->parse("noderow");
-	}
-	if (($i>0) ? $tp->parse("node") : $tp->hide("node"));
-	
-	// output
-	$tp->parse();
-	$tp->spit();
-	
-	include("footer.php");
-?>

nodeview.php

@@ -1,43 +1,178 @@
 <?php
-	include("header.php");
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
 		
 		// get id
-	$node_id = $_GET['node_id'];
+		$node_id = sanitize($_GET['node_id']);
+		
+		// start output
+		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/nodeview.tpl");
+		$tp = new Template("tpl/nodeview.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// get node info
+	// setup node
-	$result = mysql_query("SELECT a.asset_name, a.asset_id, n.ip, n.mac, n.dns1, n.dns2, n.node_info, s.subnet_id, s.subnet_address, s.subnet_mask FROM asset a, node n, subnet s WHERE n.node_id='$node_id' AND a.asset_id=n.asset_id AND s.subnet_id=n.subnet_id") or die(mysql_error());
+		// build query
-	$row = mysql_fetch_object($result);
+		$query = "SELECT
-	$tp->set("asset_id", $row->asset_id);
+				asset.asset_id AS asset_id,
-	$tp->set("asset_name", $row->asset_name);
+				asset.asset_name AS asset_name,
-	$tp->set("ip", $row->ip);
+				node.node_id AS node_id,
-	$tp->set("mac", write_mac($row->mac));
+				node.node_ip AS node_ip,
-	$tp->set("dns1", $row->dns1);
+				node.node_mac AS node_mac,
-	$tp->set("dns2", $row->dns2);
+				node.node_dns1 AS node_dns1,
-	$tp->set("node_info", nl2br($row->node_info));
+				node.node_dns2 AS node_dns2,
-	$tp->set("subnet_id", $row->subnet_id);
+				node.node_info AS node_info,
-	$tp->set("subnet_address", $row->subnet_address);
+				subnet.subnet_id AS subnet_id,
-	$tp->set("subnet_mask", $row->subnet_mask);
+				subnet.subnet_address AS subnet_address,
+				subnet.subnet_mask AS subnet_mask
+			FROM
+				asset,
+				node,
+				subnet
+			WHERE
+				asset.asset_id=node.asset_id
+				AND node.node_id=" . $node_id . "
+				AND subnet.subnet_id=node.subnet_id";
 		
-	// display options
+		// run query
-	if($_SESSION['suser_level'] >= $config_userlevel_nodeedit) {
+		$nodes = $db->db_select($query);
-		$tp->set("node_id", $node_id);
+		
-		$tp->parse("nodeedit");	
+		// count results
-	} else {
+		$node_counter = count($nodes);
-		$tp->hide("nodeedit");
+		
-	}
+		// counter to tpl
-	if($_SESSION['suser_level'] >= $config_userlevel_nodedel) {
+		$tp->set("node_counter", $node_counter);
-		$tp->set("node_id", $node_id);
+		
-		$tp->parse("nodedel");
+		// any nodes?
-	} else {
+		if ($node_counter>0) {
-		$tp->hide("nodedel");
+			// get objects
+			foreach($nodes AS $node) {
+				// send to tpl
+				$tp->set("asset_id", $node['asset_id']);
+				$tp->set("asset_name", $node['asset_name']);
+				
+				$tp->set("node_id", $node['node_id']);
+				$tp->set("node_ip", $node['node_ip']);
+				$tp->set("node_mac", write_mac($node['node_mac']));
+				$tp->set("node_dns1", $node['node_dns1']);
+				$tp->set("node_dns2", $node['node_dns2']);
+				$tp->set("node_info", nl2br($node['node_info']));
+				
+				$tp->set("subnet_id", $node['subnet_id']);
+				$tp->set("subnet_address", $node['subnet_address']);
+				$tp->set("subnet_mask", $node['subnet_mask']);
+				
+				// parse row
+				$tp->parse("node_row");
 			}
 			
+			// parse block
+			$tp->parse("node_table");
+		} else {
+			// hide block
+			$tp->hide("node_table");
+		}
+	
+	// setup nat
+		// build query
+		$query = "SELECT
+				asset_ext.asset_id AS asset_id_ext,
+				asset_int.asset_id AS asset_id_int,
+				asset_ext.asset_name AS asset_name_ext,
+				asset_int.asset_name AS asset_name_int,
+				nat.nat_id AS nat_id,
+				nat.nat_type AS nat_type,
+				nat.nat_ext AS nat_ext,
+				nat.nat_int AS nat_int,
+				node_ext.node_ip AS node_ip_ext,
+				node_int.node_ip AS node_ip_int
+			FROM
+				asset asset_ext,
+				asset asset_int,
+				nat,
+				node node_ext,
+				node node_int
+			WHERE
+				(nat.nat_ext=" . $node_id . "
+				OR nat.nat_int=" . $node_id . ")
+				AND node_ext.node_id=nat.nat_ext
+				AND node_int.node_id=nat.nat_int
+				AND asset_ext.asset_id=node_ext.asset_id
+				AND asset_int.asset_id=node_int.asset_id
+			ORDER BY
+				INET_ATON(node_ext.node_ip),
+				INET_ATON(node_int.node_ip)";
+		
+		// run query
+		$nats = $db->db_select($query);
+		
+		// count results
+		$nat_counter = count($nats);
+		
+		// counter to tpl
+		$tp->set("nat_counter", $nat_counter);
+		
+		// any nodes?
+		if ($nat_counter>0) {
+			// get objects
+			foreach($nats AS $nat) {
+				if($node_id==$nat['nat_ext']) {
+					// send to tpl
+					$tp->set("nat_asset_id", $nat['asset_id_int']);
+					$tp->set("nat_asset_name", $nat['asset_name_int']);
+					
+					$tp->set("nat_type", $lang['lang_nat_type_' . $nat['nat_type']]);
+					
+					$tp->set("nat_node_id", $nat['nat_int']);
+					$tp->set("nat_node_ip", $nat['node_ip_int']);
+				} else if($node_id==$nat['nat_int']) {
+					// send to tpl
+					$tp->set("nat_asset_id", $nat['asset_id_ext']);
+					$tp->set("nat_asset_name", $nat['asset_name_ext']);
+					
+					$tp->set("nat_type", $lang['lang_nat_type_' . $nat['nat_type']]);
+					
+					$tp->set("nat_node_id", $nat['nat_ext']);
+					$tp->set("nat_node_ip", $nat['node_ip_ext']);
+				}
+				
+				// parse row
+				$tp->parse("nat_row");
+			}
+			
+			// parse block
+			$tp->parse("nat_table");
+		} else {
+			// hide block
+			$tp->hide("nat_table");
+		}
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();

options.php

@@ -1,28 +1,43 @@
 <?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// start output
 		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/options.tpl");
+		$tp = new Template("tpl/options.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// display options
+	// end page
-	if(($_SESSION['suser_level'] >= $config_userlevel_assetadd) ? $tp->parse("assetadd") : $tp->hide("assetadd"));
-	if(($_SESSION['suser_level'] >= $config_userlevel_assetclassadd) ? $tp->parse("assetclassadd") : $tp->hide("assetclassadd"));
-	if(($_SESSION['suser_level'] >= $config_userlevel_locationadd) ? $tp->parse("locationadd") : $tp->hide("locationadd"));
-	if(($_SESSION['suser_level'] >= $config_userlevel_nodeadd) ? $tp->parse("nodeadd") : $tp->hide("nodeadd"));
-	if(($_SESSION['suser_level'] >= $config_userlevel_useradd) ? $tp->parse("useradd") : $tp->hide("useradd"));
-	if(($_SESSION['suser_level'] >= $config_userlevel_subnetadd) ? $tp->parse("subnetadd") : $tp->hide("subnetadd"));
-	if(($_SESSION['suser_level'] >= $config_userlevel_vlanadd) ? $tp->parse("vlanadd") : $tp->hide("vlanadd"));
-	
-	if(($_SESSION['suser_level'] >= $config_userlevel_assigniptoasset) ? $tp->parse("assigniptoasset") : $tp->hide("assigniptoasset"));
-	if(($_SESSION['suser_level'] >= $config_userlevel_assignlocationtosubnet) ? $tp->parse("assignlocationtosubnet") : $tp->hide("assignlocationtosubnet"));
-	if(($_SESSION['suser_level'] >= $config_userlevel_assignvlantosubnet) ? $tp->parse("assignvlantosubnet") : $tp->hide("assignvlantosubnet"));
-	
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// end output
 		include("footer.php");
 ?>

optionseditdisplay.php

@@ -0,0 +1,111 @@
+<?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// start output
+		include("header.php");
+		
+		// set template
+		$tp = new Template("tpl/optionseditdisplay.tpl", $config_yapter_error);
+		
+		// set language variables
+		$tp->setvars($lang);
+	
+	// setup options
+		// set menu checkboxes
+			// assets
+			if($_SESSION['suser_menu_assets']=='on') {
+				$user_menu_assets_checked = 'checked';
+			} else {
+				$user_menu_assets_checked = '';
+			}
+			// assetclasses
+			if($_SESSION['suser_menu_assetclasses']=='on') {
+				$user_menu_assetclasses_checked = 'checked';
+			} else {
+				$user_menu_assetclasses_checked = '';
+			}
+			// assetclassgroups
+			if($_SESSION['suser_menu_assetclassgroups']=='on') {
+				$user_menu_assetclassgroups_checked = 'checked';
+			} else {
+				$user_menu_assetclassgroups_checked = '';
+			}
+			// locations
+			if($_SESSION['suser_menu_locations']=='on') {
+				$user_menu_locations_checked = 'checked';
+			} else {
+				$user_menu_locations_checked = '';
+			}
+			// nodes
+			if($_SESSION['suser_menu_nodes']=='on') {
+				$user_menu_nodes_checked = 'checked';
+			} else {
+				$user_menu_nodes_checked = '';
+			}
+			// subnets
+			if($_SESSION['suser_menu_subnets']=='on') {
+				$user_menu_subnets_checked = 'checked';
+			} else {
+				$user_menu_subnets_checked = '';
+			}
+			// users
+			if($_SESSION['suser_menu_users']=='on') {
+				$user_menu_users_checked = 'checked';
+			} else {
+				$user_menu_users_checked = '';
+			}
+			// vlans
+			if($_SESSION['suser_menu_vlans']=='on') {
+				$user_menu_vlans_checked = 'checked';
+			} else {
+				$user_menu_vlans_checked = '';
+			}
+		
+		// send to tpl
+		$tp->set("user_id", $_SESSION['suser_id']);
+		$tp->set("user_imagesize", $_SESSION['suser_imagesize']);
+		$tp->set("user_imagecount", $_SESSION['suser_imagecount']);
+		$tp->set("user_mac", $_SESSION['suser_mac']);
+		$tp->set("user_dateformat", $_SESSION['suser_dateformat']);
+		$tp->set("user_dns1suffix", $_SESSION['suser_dns1suffix']);
+		$tp->set("user_dns2suffix", $_SESSION['suser_dns2suffix']);
+		$tp->set("user_menu_assets_checked", $user_menu_assets_checked);
+		$tp->set("user_menu_assetclasses_checked", $user_menu_assetclasses_checked);
+		$tp->set("user_menu_assetclassgroups_checked", $user_menu_assetclassgroups_checked);
+		$tp->set("user_menu_locations_checked", $user_menu_locations_checked);
+		$tp->set("user_menu_nodes_checked", $user_menu_nodes_checked);
+		$tp->set("user_menu_subnets_checked", $user_menu_subnets_checked);
+		$tp->set("user_menu_users_checked", $user_menu_users_checked);
+		$tp->set("user_menu_vlans_checked", $user_menu_vlans_checked);
+	
+	// end page
+		// output
+		$tp->parse();
+		$tp->spit();
+		
+		// end output
+		include("footer.php");
+?>

optionseditpassword.php

@@ -0,0 +1,43 @@
+<?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// start output
+		include("header.php");
+		
+		// set template
+		$tp = new Template("tpl/optionseditpassword.tpl", $config_yapter_error);
+		
+		// set language variables
+		$tp->setvars($lang);
+	
+	// end page
+		// output
+		$tp->parse();
+		$tp->spit();
+		
+		// end output
+		include("footer.php");
+?>

search.php

@@ -1,15 +1,44 @@
 <?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// start output
 		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/search.tpl");
+		$tp = new Template("tpl/search.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// get string that was searched for
+	// get string that was searched for ($search is allready set in header.php)
 	if (empty($search)) {
+		// parse nosearch box
 		$tp->parse("nosearch");
+		
+		// hide others
 		$tp->hide("asset");
 		$tp->hide("location");
 		$tp->hide("node");
@@ -17,89 +46,276 @@
 		$tp->hide("vlan");
 		$tp->hide("resultcount");
 	} else {
+		// hide nosearch box
 		$tp->hide("nosearch");
 		
-		// set needle and counter
+		// set needle
 		$needle = '%' . $search . '%';
+		
+		// set counter
 		$resultcounter = 0;
 		
-		// search assets
+		// setup asset
-		$result = mysql_query("SELECT asset_id, asset_name FROM asset WHERE asset_name LIKE '$needle' OR asset_info LIKE '%$needle%' ORDER BY asset_name") or die(mysql_error());
+			// build query
-		for ($i=0;$row=mysql_fetch_object($result);$i++) {
+			$query = "SELECT
-			$tp->set("counter", $i+1);
+					asset.asset_id AS asset_id,
+					asset.asset_name AS asset_name
+				FROM
+					asset
+				WHERE
+					asset.asset_name LIKE '" . $needle . "'
+					OR asset.asset_hostname LIKE '" . $needle . "'
+					OR asset.asset_info LIKE '" . $needle . "'
+				ORDER BY
+					asset.asset_name";
+			
+			// run query
+			$assets = $db->db_select($query);
+			
+			// count results
+			$counter = count($assets);
+			
+			// counter to tpl
+			$tp->set("counter", $counter);
+		
+			// any assets?
+			if ($counter>0) {
+				// get objects
+				foreach($assets AS $asset) {
+					// send to tpl
 					$tp->set("item_name", $lang['lang_assets']);
 					$tp->set("item", "asset");
-			$tp->set("id", $row->asset_id);
+					$tp->set("id", $asset['asset_id']);
-			$tp->set("name", $row->asset_name);
+					$tp->set("name", $asset['asset_name']);
-			$resultcounter++;
+					
+					// parse block
 					$tp->parse("row");
+					
+					// update counter
+					$resultcounter++;
 				}
-		if (($i>0) ? $tp->parse("asset") : $tp->hide("asset"));
+				
+				// parse block
+				$tp->parse("asset");
+			} else {
+				// parse block
+				$tp->hide("asset");
+			}
+			
+			// clear row
 			$tp->clear("row");
 		
-		// search locations
+		// setup location
-		$result = mysql_query("SELECT location_id, location_name FROM location WHERE location_name LIKE '$needle' OR location_info LIKE '%$needle%' ORDER BY location_name") or die(mysql_error());
+			// build query
-		for ($i=0;$row=mysql_fetch_object($result);$i++) {
+			$query = "SELECT
-			$tp->set("counter", $i+1);
+					location.location_id AS location_id,
+					location.location_name AS location_name
+				FROM
+					location
+				WHERE
+					location.location_name LIKE '" . $needle . "'
+					OR location.location_info LIKE '" . $needle . "'
+				ORDER BY
+					location.location_name";
+			
+			// run query
+			$locations = $db->db_select($query);
+			
+			// count results
+			$counter = count($locations);
+			
+			// counter to tpl
+			$tp->set("counter", $counter);
+		
+			// any locations?
+			if ($counter>0) {
+				// get objects
+				foreach($locations AS $location) {
+					// send to tpl
 					$tp->set("item_name", $lang['lang_locations']);
 					$tp->set("item", "location");
-			$tp->set("id", $row->location_id);
+					$tp->set("id", $location['location_id']);
-			$tp->set("name", $row->location_name);
+					$tp->set("name", $location['location_name']);
-			$resultcounter++;
+					
+					// parse block
 					$tp->parse("row");
+					
+					// update counter
+					$resultcounter++;
 				}
-		if (($i>0) ? $tp->parse("location") : $tp->hide("location"));
+				
+				// parse block
+				$tp->parse("location");
+			} else {
+				// parse block
+				$tp->hide("location");
+			}
+			
+			// clear row
 			$tp->clear("row");
 		
-		// search node
+		// setup node
-		$result = mysql_query("SELECT node_id, ip FROM node WHERE ip LIKE '$needle' OR mac LIKE '$needle' OR dns1 LIKE '$needle' OR dns2 LIKE '$needle' OR node_info LIKE '$needle' ORDER BY ip") or die(mysql_error());
+			// build query
-		for ($i=0;$row=mysql_fetch_object($result);$i++) {
+			$query = "SELECT
-			$tp->set("counter", $i+1);
+					node.node_id AS node_id,
+					node.node_ip AS node_ip
+				FROM
+					node
+				WHERE
+					node.node_ip LIKE '" . $needle . "'
+					OR node.node_mac LIKE '" . $needle . "'
+					OR node.node_dns1 LIKE '" . $needle . "'
+					OR node.node_dns2 LIKE '" . $needle . "'
+					OR node.node_info LIKE '" . $needle . "'
+				ORDER BY
+					node.node_ip";
+			
+			// run query
+			$nodes = $db->db_select($query);
+			
+			// count results
+			$counter = count($nodes);
+			
+			// counter to tpl
+			$tp->set("counter", $counter);
+		
+			// any nodes?
+			if ($counter>0) {
+				// get objects
+				foreach($nodes AS $node) {
+					// send to tpl
 					$tp->set("item_name", $lang['lang_nodes']);
 					$tp->set("item", "node");
-			$tp->set("id", $row->node_id);
+					$tp->set("id", $node['node_id']);
-			$tp->set("name", $row->ip);
+					$tp->set("name", $node['node_ip']);
-			$resultcounter++;
+					
+					// parse block
 					$tp->parse("row");
+					
+					// update counter
+					$resultcounter++;
 				}
-		if (($i>0) ? $tp->parse("node") : $tp->hide("node"));
+				
+				// parse block
+				$tp->parse("node");
+			} else {
+				// parse block
+				$tp->hide("node");
+			}
+			
+			// clear row
 			$tp->clear("row");
 		
-		// search subnet
+		// setup subnet
-		$result = mysql_query("SELECT subnet_id, subnet_address FROM subnet WHERE subnet_address LIKE '$needle' OR subnet_info LIKE '%$needle%' ORDER BY INET_ATON(subnet_address)") or die(mysql_error());
+			// build query
-		for ($i=0;$row=mysql_fetch_object($result);$i++) {
+			$query = "SELECT
-			$tp->set("counter", $i+1);
+					subnet.subnet_id AS subnet_id,
+					subnet.subnet_address AS subnet_address
+				FROM
+					subnet
+				WHERE
+					subnet.subnet_address LIKE '" . $needle . "'
+					OR subnet.subnet_info LIKE '" . $needle . "'
+				ORDER BY
+					subnet.subnet_address";
+			
+			// run query
+			$subnets = $db->db_select($query);
+			
+			// count results
+			$counter = count($subnets);
+			
+			// counter to tpl
+			$tp->set("counter", $counter);
+		
+			// any subnets?
+			if ($counter>0) {
+				// get objects
+				foreach($subnets AS $subnet) {
+					// send to tpl
 					$tp->set("item_name", $lang['lang_subnets']);
 					$tp->set("item", "subnet");
-			$tp->set("id", $row->subnet_id);
+					$tp->set("id", $subnet['subnet_id']);
-			$tp->set("name", $row->subnet_address);
+					$tp->set("name", $subnet['subnet_address']);
-			$resultcounter++;
+					
+					// parse block
 					$tp->parse("row");
+					
+					// update counter
+					$resultcounter++;
 				}
-		if (($i>0) ? $tp->parse("subnet") : $tp->hide("subnet"));
+				
+				// parse block
+				$tp->parse("subnet");
+			} else {
+				// parse block
+				$tp->hide("subnet");
+			}
+			
+			// clear row
 			$tp->clear("row");
 		
-		// search vlan
+		// setup vlan
-		$result = mysql_query("SELECT vlan_id, vlan_name FROM vlan WHERE vlan_name LIKE '$needle' OR vlan_info LIKE '%$needle%' ORDER BY vlan_name") or die(mysql_error());
+			// build query
-		for ($i=0;$row=mysql_fetch_object($result);$i++) {
+			$query = "SELECT
-			$tp->set("counter", $i+1);
+					vlan.vlan_id AS vlan_id,
+					vlan.vlan_name AS vlan_name
+				FROM
+					vlan
+				WHERE
+					vlan.vlan_name LIKE '" . $needle . "'
+					OR vlan.vlan_info LIKE '" . $needle . "'
+				ORDER BY
+					vlan.vlan_name";
+			
+			// run query
+			$vlans = $db->db_select($query);
+			
+			// count results
+			$counter = count($vlans);
+			
+			// counter to tpl
+			$tp->set("counter", $counter);
+		
+			// any vlans?
+			if ($counter>0) {
+				// get objects
+				foreach($vlans AS $vlan) {
+					// send to tpl
 					$tp->set("item_name", $lang['lang_vlans']);
 					$tp->set("item", "vlan");
-			$tp->set("id", $row->vlan_id);
+					$tp->set("id", $vlan['vlan_id']);
-			$tp->set("name", $row->vlan_name);
+					$tp->set("name", $vlan['vlan_name']);
-			$resultcounter++;
+					
+					// parse block
 					$tp->parse("row");
+					
+					// update counter
+					$resultcounter++;
 				}
-		if (($i>0) ? $tp->parse("vlan") : $tp->hide("vlan"));
+				
+				// parse block
+				$tp->parse("vlan");
+			} else {
+				// parse block
+				$tp->hide("vlan");
+			}
+			
+			// clear row
 			$tp->clear("row");
 		
+		// to tpl
 		$tp->set("resultcounter", $resultcounter);
+		
+		// parse block
 		$tp->parse("resultcount");
 	}
 	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// end output
 		include("footer.php");
 ?>

style.css

@@ -1,39 +0,0 @@
-body {
-	background-color: #FFFFFF;
-	color: #000000;
-	font-family: Verdana, Arial, Helvetica, Sans-serif;
-	margin: 12px;
-	margin-top: 12px;
-	font-size: 70%;
-}
-
-a {
-	color: #466A8D;
-}
-
-a:hover {
-	color: #E1B100;
-}
-
-input {
-	font-size: 100%;
-	position: relative;
-	top: -2px;
-	font-family: Verdana, Arial, Helvetica, Sans-serif;
-}
-
-select {
-	font-size: 100%;
-	font-family: Verdana, Sans-serif;
-	position: relative;
-	top: -2px;
-}
-
-table {
-	font-size: 100%;
-}
-
-td {
-	vertical-align: top;
-	height: 18px;
-}

subnet.php

@@ -1,25 +1,91 @@
 <?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// start output
 		include("header.php");
 			
 		// set template
-	$tp = new Template("tpl/subnet.tpl");
+		$tp = new Template("tpl/subnet.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// get subnet info
+	// setup subnet
-	$result = mysql_query("SELECT subnet_id, subnet_address, subnet_mask FROM subnet ORDER BY INET_ATON(subnet_address)") or die(mysql_error());
+		// build query
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
+		$query = "SELECT
-		$tp->set("subnet_id", $row->subnet_id);
+				subnet.subnet_id AS subnet_id,
-		$tp->set("subnet_address", $row->subnet_address);
+				subnet.subnet_address AS subnet_address,
-		$tp->set("subnet_mask", $row->subnet_mask);
+				subnet.subnet_mask AS subnet_mask,
-		$tp->parse("subnetrow");
+				COUNT(node.subnet_id) AS node_counter
-	}
+			FROM
-	if (($i>0) ? $tp->parse("subnet") : $tp->hide("subnet"));
+				subnet
+			LEFT JOIN
+				node
+			ON
+				node.subnet_id=subnet.subnet_id
+			GROUP BY
+				subnet.subnet_id
+			ORDER BY
+				INET_ATON(subnet.subnet_address)";
 		
+		// run query
+		$subnets = $db->db_select($query);
+		
+		// count results
+		$subnet_counter = count($subnets);
+		
+		// counter to tpl
+		$tp->set("subnet_counter", $subnet_counter);
+	
+		// any subnets?
+		if ($subnet_counter>0) {
+			// get objects
+			foreach($subnets AS $subnet) {
+				// send to tpl
+				$tp->set("subnet_id", $subnet['subnet_id']);
+				$tp->set("subnet_address", $subnet['subnet_address']);
+				$tp->set("subnet_mask", $subnet['subnet_mask']);
+				$tp->set("node_counter", $subnet['node_counter']);
+				
+				// parse row
+				$tp->parse("subnet_row");
+			}
+			
+			// parse block
+			$tp->parse("subnet_table");
+		} else {
+			// hide block
+			$tp->hide("subnet_table");
+		}
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// end output
 		include("footer.php");
 ?>

subnetadd.php

@@ -1,15 +1,46 @@
 <?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// get id
+		if((isset($_GET['vlan_id'])) ? $vlan_id = sanitize($_GET['vlan_id']) : $vlan_id = "");
+		
+		// start output
 		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/subnetadd.tpl");
+		$tp = new Template("tpl/subnetadd.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// end output
 		include("footer.php");
 ?>

subnetdel.php

@@ -1,34 +1,101 @@
 <?php
-	include("header.php");
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
 		
 		// get id	
-	$subnet_id = $_GET['subnet_id'];
+		$subnet_id = sanitize($_GET['subnet_id']);
+		
+		// start output
+		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/subnetdel.tpl");
+		$tp = new Template("tpl/subnetdel.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// get subnet info
+	// setup subnet
-	$result = mysql_query("SELECT subnet_address, subnet_mask FROM subnet WHERE subnet_id='$subnet_id'") or die(mysql_error());
+		// build query
-	$row=mysql_fetch_object($result);
+		$query = "SELECT
+				subnet.subnet_address AS subnet_address,
+				subnet.subnet_mask AS subnet_mask
+			FROM
+				subnet
+			WHERE
+				subnet.subnet_id=" . $subnet_id;
+		
+		// run query
+		$subnet = $db->db_select($query);
+		
+		// send to tpl
 		$tp->set("subnet_id", $subnet_id);
-	$tp->set("subnet_address", $row->subnet_address);
+		$tp->set("subnet_address", $subnet[0]['subnet_address']);
-	$tp->set("subnet_mask", $row->subnet_mask);
+		$tp->set("subnet_mask", $subnet[0]['subnet_mask']);
 	
-	// get node info
+	// setup node		
-	$result = mysql_query("SELECT node_id, ip, mac, dns1, dns2, node_info FROM node WHERE subnet_id='$subnet_id' ORDER BY INET_ATON(ip)") or die(mysql_error());
+		// build query
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
+		$query = "SELECT
-		$tp->set("node_id", $row->node_id);
+				node.node_id AS node_id,
-		$tp->set("ip", $row->ip);
+				node.node_ip AS node_ip
-		$tp->parse("noderow");
+			FROM
+				node
+			WHERE
+				node.subnet_id=" . $subnet_id . "
+			ORDER BY
+				INET_ATON(node.node_ip)";
+		
+		// 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) {
+				// set id
+				$tp->set("node_id", $node['node_id']);
+				$tp->set("node_ip", $node['node_ip']);
+				
+				// parse row
+				$tp->parse("node_row");
 			}
-	if (($i>0) ? $tp->parse("node") : $tp->hide("node"));
 			
+			// parse block
+			$tp->parse("node_table");
+		} else {
+			// hide block
+			$tp->hide("node_table");
+		}
+	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// footer
 		include("footer.php");
 ?>

subnetedit.php

@@ -1,39 +1,66 @@
 <?php
-	include("header.php");
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
 		
 		// get id	
-	$subnet_id = $_GET['subnet_id'];
+		$subnet_id = sanitize($_GET['subnet_id']);
+		
+		// start output
+		include("header.php");
 		
 		// set template
-	$tp = new Template("tpl/subnetedit.tpl");
+		$tp = new Template("tpl/subnetedit.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// get subnet information
+	// setup subnet
-	$result = mysql_query("SELECT subnet_address, subnet_mask, vlan_id, subnet_info FROM subnet WHERE subnet_id='$subnet_id'") or die(mysql_error());
+		// build query
-	$row = mysql_fetch_object($result);
+		$query = "SELECT
-	$vlan_id = $row->vlan_id;
+				subnet.subnet_address AS subnet_address,
+				subnet.subnet_mask AS subnet_mask,
+				subnet.subnet_info AS subnet_info
+			FROM
+				subnet
+			WHERE
+				subnet.subnet_id=" . $subnet_id;
+		
+		// run query
+		$subnet = $db->db_select($query);
+		
+		// send to tpl
 		$tp->set("subnet_id", $subnet_id);
-	$tp->set("subnet_address", $row->subnet_address);
+		$tp->set("subnet_address", $subnet[0]['subnet_address']);
-	$tp->set("subnet_mask", $row->subnet_mask);
+		$tp->set("subnet_mask", $subnet[0]['subnet_mask']);
-	$tp->set("vlan_id", $vlan_id);
+		$tp->set("subnet_info", $subnet[0]['subnet_info']);
-	$tp->set("subnet_info", $row->subnet_info);
-	
-	// get vlan info
-	$result = mysql_query("SELECT vlan_id, vlan_number, vlan_name FROM vlan ORDER BY vlan_number") or die(mysql_error());
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
-		if (($row->vlan_id==$vlan_id) ? $tp->set("selected", "selected") : $tp->set("selected", ""));
-		$tp->set("vlan_id", $row->vlan_id);
-		$tp->set("vlan_name", $row->vlan_name);
-		$tp->set("vlan_number", $row->vlan_number);
-		$tp->parse("vlanrow");
-	}
-	if (($i>0) ? $tp->parse("vlan") : $tp->hide("vlan"));
 	
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// end output
 		include("footer.php");
 ?>

subnetlocationadd.php

@@ -0,0 +1,108 @@
+<?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// get ip and id
+		$subnet_id = sanitize($_GET['subnet_id']);
+		
+		// start output
+		include("header.php");
+		
+		// set template
+		$tp = new Template("tpl/subnetlocationadd.tpl", $config_yapter_error);
+		
+		// set language variables
+		$tp->setvars($lang);
+	
+	// setup subnet
+		// build query
+		$query = "SELECT
+				subnet.subnet_address AS subnet_address,
+				subnet.subnet_mask AS subnet_mask
+			FROM
+				subnet
+			WHERE
+				subnet.subnet_id=" . $subnet_id;
+		
+		// run query
+		$subnet = $db->db_select($query);
+		
+		$tp->set("subnet_id", $subnet_id);
+		$tp->set("subnet_address", $subnet[0]['subnet_address']);
+		$tp->set("subnet_mask", $subnet[0]['subnet_mask']);
+	
+	// start parent
+		// build query
+		$query = "SELECT
+				location.location_id AS location_id,
+				location.location_name AS location_name,
+				location.location_parent AS location_parent
+			FROM
+				location
+			WHERE
+				location.location_id NOT IN (
+					SELECT
+						location_id
+					FROM
+						subnetlocation
+					WHERE
+						subnet_id=" . $subnet_id . "
+				)
+			ORDER BY
+				location.location_name";
+		
+		// run query
+		$locations = $db->db_select($query);
+		
+		// count results
+		$location_counter = count($locations);
+		
+		// any locations?
+		if ($location_counter>0) {
+			// get objects
+			foreach($locations AS $location) {
+				// send to tpl
+				$tp->set("location_id", $location['location_id']);
+				$tp->set("location_name", $location['location_name']);
+				
+				// parse row
+				$tp->parse("location_row");
+			}
+			
+			// parse block
+			$tp->parse("location_table");
+		} else {
+			// hide block
+			$tp->hide("location_table");
+		}
+	
+	// end page
+		// output
+		$tp->parse();
+		$tp->spit();
+		
+		// end output
+		include("footer.php");
+?>

subnetlocationdel.php

@@ -0,0 +1,102 @@
+<?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// get ip and id
+		$subnet_id = sanitize($_GET['subnet_id']);
+		
+		// start output
+		include("header.php");
+		
+		// set template
+		$tp = new Template("tpl/subnetlocationdel.tpl", $config_yapter_error);
+		
+		// set language variables
+		$tp->setvars($lang);
+	
+	// setup subnet
+		// build query
+		$query = "SELECT
+				subnet.subnet_address AS subnet_address,
+				subnet.subnet_mask AS subnet_mask
+			FROM
+				subnet
+			WHERE
+				subnet.subnet_id=" . $subnet_id;
+		
+		// run query
+		$subnet = $db->db_select($query);
+		
+		$tp->set("subnet_id", $subnet_id);
+		$tp->set("subnet_address", $subnet[0]['subnet_address']);
+		$tp->set("subnet_mask", $subnet[0]['subnet_mask']);
+	
+	// setup location
+		// build query
+		$query = "SELECT
+				location.location_id AS location_id,
+				location.location_name AS location_name
+			FROM
+				subnetlocation,
+				location
+			WHERE
+				subnetlocation.subnet_id="  . $subnet_id . "
+				AND location.location_id=subnetlocation.location_id
+			ORDER BY
+				location.location_name";
+		
+		// run query
+		$locations = $db->db_select($query);
+		
+		// count results
+		$location_counter = count($locations);
+		
+		// any locations?
+		if ($location_counter>0) {
+			// get objects
+			foreach($locations AS $location) {
+				// send to tpl
+				$tp->set("location_id", $location['location_id']);
+				$tp->set("location_name", $location['location_name']);
+				
+				// parse row
+				$tp->parse("location_row");
+			}
+			
+			// parse block
+			$tp->parse("location_table");
+		} else {
+			// hide block
+			$tp->hide("location_table");
+		}
+	
+	// end page
+		// output
+		$tp->parse();
+		$tp->spit();
+		
+		// end output
+		include("footer.php");
+?>

subnetlocationedit.php

@@ -0,0 +1,63 @@
+<?php
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
+		
+		// get ip and id
+		$subnet_id = sanitize($_GET['subnet_id']);
+		
+		// start output
+		include("header.php");
+		
+		// set template
+		$tp = new Template("tpl/subnetlocationedit.tpl", $config_yapter_error);
+		
+		// set language variables
+		$tp->setvars($lang);
+	
+	// setup subnet
+		// build query
+		$query = "SELECT
+				subnet.subnet_address AS subnet_address,
+				subnet.subnet_mask AS subnet_mask
+			FROM
+				subnet
+			WHERE
+				subnet.subnet_id=" . $subnet_id;
+		
+		// run query
+		$subnet = $db->db_select($query);
+		
+		$tp->set("subnet_id", $subnet_id);
+		$tp->set("subnet_address", $subnet[0]['subnet_address']);
+		$tp->set("subnet_mask", $subnet[0]['subnet_mask']);
+	
+	// end page
+		// output
+		$tp->parse();
+		$tp->spit();
+		
+		// end output
+		include("footer.php");
+?>

subnetview.php

@@ -1,33 +1,88 @@
 <?php
-	include("header.php");
+	/*****************************************************************************
+	IP Reg, a PHP/MySQL IPAM tool
+	Copyright (C) 2007-2009 Wietse Warendorff
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	
+	For more information, visit http://sourceforge.net/projects/ipreg,
+	or contact me at wietsew@users.sourceforge.net
+	*****************************************************************************/
+	
+	// start page
+		// includes
+		include("includes.php");
 		
 		// get id	
-	$subnet_id = $_GET['subnet_id'];
+		$subnet_id = sanitize($_GET['subnet_id']);
 		
 		// get page
 		if(isset($_GET['page'])) {
-		$page = $_GET['page'];
+			$page = sanitize($_GET['page']);
 		}
 		
+		// start output
+		include("header.php");
+		
 		// set template
-	$tp = new Template("tpl/subnetview.tpl");
+		$tp = new Template("tpl/subnetview.tpl", $config_yapter_error);
 		
 		// set language variables
 		$tp->setvars($lang);
 	
-	// get subnet info
+	// setup subnet
-	$result = mysql_query("SELECT subnet_address, subnet_mask, vlan_id, subnet_info FROM subnet WHERE subnet_id='$subnet_id'") or die(mysql_error());
+		// build query
-	$row = mysql_fetch_object($result);
+		$query = "SELECT
-	$tp->set("subnet_id", $subnet_id);
+				subnet.subnet_address AS subnet_address,
-	$tp->set("subnet_address", $row->subnet_address);
+				subnet.subnet_mask AS subnet_mask,
-	$tp->set("subnet_mask", $row->subnet_mask);
+				subnet.subnet_info AS subnet_info,
-	$tp->set("subnet_info", nl2br($row->subnet_info));
+				COUNT(node.subnet_id) AS node_counter
+			FROM
+				subnet
+			LEFT JOIN
+				node
+			ON
+				node.subnet_id=subnet.subnet_id
+			WHERE
+				subnet.subnet_id=" . $subnet_id . "
+			GROUP BY
+				subnet.subnet_id";
+		
+		// run query
+		$subnet = $db->db_select($query);
 		
 		// set needed variables
-	$subnet_address = $row->subnet_address;
+		$subnet_address = $subnet[0]['subnet_address'];
-	$subnet_mask = $row->subnet_mask;
+		$subnet_mask = $subnet[0]['subnet_mask'];
-	$vlan_id = $row->vlan_id;
 		
+		// set counters
+		$host_counter = pow(2,(32-$subnet_mask));
+		$node_counter = $subnet[0]['node_counter'];
+		$subnet_usedpercentage = round((($node_counter/($host_counter-2))*100),1);
+		
+		// send to tpl
+		$tp->set("subnet_id", $subnet_id);
+		$tp->set("subnet_address", $subnet_address);
+		$tp->set("subnet_mask", $subnet_mask);
+		$tp->set("subnet_info", nl2br($subnet[0]['subnet_info']));
+		$tp->set("node_counter", $node_counter);
+		$tp->set("subnet_usedpercentage", $subnet_usedpercentage);
+		$tp->set("config_color_unused", $config_color_unused);
+		$tp->set("host_counter", $host_counter-2);
+		$tp->set("free_counter", (($host_counter-2)-$node_counter));
+	
+	// setup subnet
 		// split up the range
 		$iprange = explode('.', $subnet_address);
 		$iprange1 = $iprange[0];
@@ -35,24 +90,41 @@
 		$iprange3 = $iprange[2];
 		$iprange4 = $iprange[3];
 		
-	// create array for these addresses
+		// create empty subnet-array
 		$subnet = array();
+		
+		// determine range (Class A/B/C)
 			if ($subnet_mask>=24) {
 				// Class C
-		// calculate hosts
+				// fill subnet-array with addresses we want to see
-		$hostcount = pow(2,(32-$subnet_mask));
+				for($i=0;$i<$host_counter;$i++) {
-		
+					// build ip
-		// fill array with addresses we want to see
-		for($i=0;$i<$hostcount;$i++) {
 					$ip = $iprange1 . '.' . $iprange2 . '.' . $iprange3 . '.' . ($iprange4+$i);
+					
+					// fill subnet-array
 					$subnet[$ip] = array();
 				}
 				
 				// calculate broadcast address
 				$broadcast_address = $iprange1 . '.' . $iprange2 . '.' . $iprange3 .  '.' . ($iprange4+$i-1);
 				
+				// to tpl
+				$tp->set("iprange1", $iprange1);
+				$tp->set("iprange2", $iprange2);
+				$tp->set("iprange3", $iprange3);
+				$tp->set("iprange4", $iprange4);
+				$tp->set("subnetmask1", 255);
+				$tp->set("subnetmask2", 255);
+				$tp->set("subnetmask3", 255);
+				$tp->set("subnetmask4", 256-$host_counter);
+				
 				// no pagination needed
-		$tp->set("pagination", '&nbsp;');
+				$tp->parse("noselect");
+				$tp->hide("one_select");
+				$tp->hide("two_select");
+				
+				// set displayed nodes
+				$nodes_displayed = $host_counter;
 			} else if ($subnet_mask>=16) {
 				// Class B
 				// which part do we want to see?
@@ -60,24 +132,52 @@
 				$page = explode('.', $page);
 				$page2 = $page[2];
 				
-		// fill array with addresses we want to see
+				// fill subnet-array with addresses we want to see
 				for($i=0;$i<256;$i++) {
+					// build ip
 					$ip = $iprange1 . '.' . $iprange2 . '.' . $page2 .  '.' . $i;
+					
+					// fill subnet-array
 					$subnet[$ip] = array();
 				}
 				
 				// calculate broadcast address
 				$broadcast_address = $iprange1 . '.' . $iprange2 . '.' . ($iprange3+$i-1) .  '.255';
 				
-		// create pagination
+				// to tpl
-		$pagination = 'Page:&nbsp;' . $iprange1 . '.' . $iprange2 . '.&nbsp;';
+				$tp->set("iprange1", $iprange1);
-		$pagination .= '<select name="pagination" onchange="linkTo(this.options[this.selectedIndex].value);">';
+				$tp->set("iprange2", $iprange2);
+				
+				// loop addresses in range3
 				for($i=$iprange3;$i<(pow(2,(32-$subnet_mask))/256);$i++) {
-			if(($i==$page2) ? $selected='selected' : $selected='');
+					// send to tpl
-			$pagination .= '<option value="' . $subnet_id . '&page=' . $iprange1 . '.' . $iprange2 . '.' . $i . '.0"' . $selected . '>' . $i . '.0</option>';
+					$tp->set("iprange3", $i);
+					$tp->set("iprange4", 0);
+					
+					// set select box
+					if($i==$page2) {
+						$tp->set("row_selected", "selected");
+						
+					} else {
+						$tp->set("row_selected", "");
 					}
-		$pagination .= '</select>';
+					
-		$tp->set("pagination", $pagination);
+					// parse block
+					$tp->parse("one_select_row");
+				}
+				
+				$tp->set("subnetmask1", 255);
+				$tp->set("subnetmask2", 255);
+				$tp->set("subnetmask3", 256-($host_counter/256));
+				$tp->set("subnetmask4", 0);
+				
+				// one select box
+				$tp->hide("noselect");
+				$tp->parse("one_select");
+				$tp->hide("two_select");
+				
+				// set displayed nodes
+				$nodes_displayed = 256;
 			} else {
 				// Class A
 				// which part do we want to see?
@@ -86,131 +186,314 @@
 				$page2 = $page[1];
 				$page3 = $page[2];
 				
-		// fill array with addresses we want to see
+				// fill subnet-array with addresses we want to see
 				for($i=0;$i<256;$i++) {
+					// build ip
 					$ip = $iprange1 . '.' . $page2 . '.' . $page3 .  '.' . $i;
+					
+					// fill subnet-array
 					$subnet[$ip] = array();
 				}
 				
 				// calculate broadcast address
-		$broadcast_address = $iprange1 . '.' . ($iprange+$i-1) . '.255.255';
+				$broadcast_address = $iprange1 . '.' . ($iprange2+$i-1) . '.255.255';
 				
-		// create pagination
+				// to tpl
-		$pagination = 'Page:&nbsp;';
+				$tp->set("iprange1", $iprange1);
-		// selectbox 1
+				$tp->set("iprange2", $iprange2);
-		$pagination .= '<select name="pagination" onchange="linkTo(this.options[this.selectedIndex].value);">';
+				
+				// loop addresses in range 2
 				for($i=$iprange2;$i<(pow(2,(24-$subnet_mask))/256);$i++) {
-			if(($i==$page2) ? $selected='selected' : $selected='');
+					// send to tpl
-			$pagination .= '<option value="' . $subnet_id . '&page=' . $iprange1 . '.' . $i . '.' . $page3 . '.0"' . $selected . '>' . $iprange1 . '.' . $i . '</option>';
+					$tp->set("iprange1", $iprange1);
+					$tp->set("iprange2", $i);
+					$tp->set("iprange3", $page3);
+					$tp->set("iprange4", $iprange4);
+					
+					// set select box
+					if($i==$page2) {
+						$tp->set("row1_selected", "selected");
+						
+					} else {
+						$tp->set("row1_selected", "");
 					}
-		$pagination .= '</select><select name="pagination" onchange="linkTo(this.options[this.selectedIndex].value);">';
+					
-		// selectbox 2
+					// parse block
+					$tp->parse("two_select_row1");
+				}
+				
+				// loop addresses in range 3
 				for($i=0;$i<256;$i++) {
-			if(($i==$page3) ? $selected='selected' : $selected='');
+					// send to tpl
-			$pagination .= '<option value="' . $subnet_id . '&page=' . $iprange1 . '.' . $page2 . '.' . $i . '.0"' . $selected . '>' . $i . '.0</option>';
+					$tp->set("iprange1", $iprange1);
-		}
+					$tp->set("iprange2", $page2);
-		$pagination .= '</select>';
+					$tp->set("iprange3", $i);
-		$tp->set("pagination", $pagination);
+					$tp->set("iprange4", $iprange4);
+					
+					// set select box
+					if($i==$page3) {
+						$tp->set("row2_selected", "selected");
+						
+					} else {
+						$tp->set("row2_selected", "");
 					}
 					
-	// get nodes for this subnet and implement the values into the array
+					// parse block
-	$result = mysql_query("SELECT a.asset_name, acg.color, n.node_id, n.ip FROM asset a, assetclass ac, assetclassgroup acg, node n WHERE n.ip IN ('".implode("','",array_keys($subnet))."') AND n.subnet_id='$subnet_id' AND a.asset_id=n.asset_id AND ac.assetclass_id=a.assetclass_id AND acg.assetclassgroup_id=ac.assetclassgroup_id") or die(mysql_error());
+					$tp->parse("two_select_row2");
-	while ($row = mysql_fetch_array($result)) {
-		$subnet[$row['ip']] = $row;
 				}
 				
-	// replace subnet address (if in array)
+				$tp->set("subnetmask1", 255);
+				$tp->set("subnetmask2", 256-($host_counter/65536));
+				$tp->set("subnetmask3", 0);
+				$tp->set("subnetmask4", 0);
+				
+				// one select box
+				$tp->hide("noselect");
+				$tp->hide("one_select");
+				$tp->parse("two_select");
+				
+				// set displayed nodes
+				$nodes_displayed = 256;
+			}
+	
+		// get nodes for this subnetview and implement the values into the array
+			// build query
+			$query = "SELECT
+					asset.asset_name AS asset_name,
+					assetclassgroup.assetclassgroup_color AS assetclassgroup_color,
+					node.node_id AS node_id,
+					node.node_ip AS node_ip
+				FROM
+					asset,
+					assetclass,
+					assetclassgroup,
+					node
+				WHERE
+					node.node_ip IN ('".implode("','",array_keys($subnet))."')
+					AND node.subnet_id='$subnet_id'
+					AND asset.asset_id=node.asset_id
+					AND assetclass.assetclass_id=asset.assetclass_id
+					AND assetclassgroup.assetclassgroup_id=assetclass.assetclassgroup_id";
+			
+			// run query
+			$nodes = $db->db_select($query);
+			
+			// count results
+			$node_counter = count($nodes);
+			
+			// any nodes?
+			if ($node_counter>0) {
+				// get objects
+				foreach($nodes AS $node) {
+					// add node-values to ip in subnet-array
+					$subnet[$node['node_ip']] = $node;
+					
+				}
+			}
+	
+		// replace ip's in subnet-array (if necessary)
+			// check for subnet address
 			if(array_key_exists($subnet_address, $subnet)) {
+				// replace
 				$subnet[$subnet_address] = array("subnet_address");
 			}
 			
-	// replace broadcast address (if in array)
+			// check for broadcast address
 			if(array_key_exists($broadcast_address, $subnet)) {
+				// replace
 				$subnet[$broadcast_address] = array("broadcast_address");
 			}
 	
-	// loop array and send to template
+		// loop subnet-array and send to template
+			// start counter
 			$i=1;
-	foreach($subnet as $ip => $node) {
+			
-		if(($i%64==0) ? $tr="</tr><tr>" : $tr="");
+			// loop subnet-array
+			foreach($subnet AS $node_ip => $node) {
+				// make new line?
+				if(($i%$_SESSION['suser_imagecount']==0 && $i!=$nodes_displayed) ? $tr="</tr><tr>" : $tr="");
+				
+				// check node
 				if(empty($node)) {
-			$tp->set("url", 'assigniptonode.php?subnet_id=' . $subnet_id . '&ip='. $ip);
+					// empty node to tpl
-			$tp->set("remotetext", $ip);
+					$tp->set("url", 'assigniptonode.php?subnet_id=' . $subnet_id . '&amp;node_ip='. $node_ip);
-			$tp->set("color", 'grey');
+					$tp->set("remotetext", $node_ip);
+					$tp->set("assetclassgroup_color", $config_color_unused);
 				} else if ($node[0]=="subnet_address") {
+					// subnet address to tpl
 					$tp->set("url", "");
-			$tp->set("remotetext", $ip . '&nbsp;' . $lang['lang_subnet_subnetaddress']);
+					$tp->set("remotetext", $node_ip . '&nbsp;' . $lang['lang_subnet_subnetaddress']);
-			$tp->set("color", 'cross');
+					$tp->set("assetclassgroup_color", $config_color_blocked);
 				} else if ($node[0]=="broadcast_address") {
+					// broadcast address to tpl
 					$tp->set("url", "");
-			$tp->set("remotetext", $ip . '&nbsp;' . $lang['lang_subnet_broadcastaddress']);
+					$tp->set("remotetext", $node_ip . '&nbsp;' . $lang['lang_subnet_broadcastaddress']);
-			$tp->set("color", 'cross');
+					$tp->set("assetclassgroup_color", $config_color_blocked);
 				} else {
+					// node to tpl
 					$tp->set("url", 'nodeview.php?node_id=' . $node['node_id']);
-			$tp->set("remotetext", $ip . '&nbsp;' . $node['asset_name']);
+					$tp->set("remotetext", $node_ip . '&nbsp;' . $node['asset_name']);
-			$tp->set("color", $node['color']);
+					$tp->set("assetclassgroup_color", $node['assetclassgroup_color']);
 				}
+				
+				// set other vars
 				$tp->set("tr", $tr);
-		$tp->parse("iprow");
+				
+				// parse block
+				$tp->parse("node_row");
+				
+				// update counter
 				$i++;
 			}
-	$tp->parse("subnet");
 			
+			// parse block
+			$tp->parse("node_table");
 	
-	// get vlan info
+	// setup vlan
-	$result = mysql_query("SELECT vlan_id, vlan_number, vlan_name FROM vlan WHERE vlan_id='$vlan_id'") or die(mysql_error());
+		// build query
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
+		$query = "SELECT
-		$tp->set("vlan_id", $row->vlan_id);
+				vlan.vlan_id AS vlan_id,
-		$tp->set("vlan_name", $row->vlan_name);
+				vlan.vlan_name AS vlan_name,
-		$tp->parse("vlanrow");
+				vlan.vlan_number AS vlan_number
+			FROM
+				subnetvlan,
+				vlan
+			WHERE
+				subnetvlan.subnet_id=" . $subnet_id . "
+				AND vlan.vlan_id=subnetvlan.vlan_id
+			ORDER BY
+				vlan.vlan_name";
+		
+		// run query
+		$vlans = $db->db_select($query);
+		
+		// count results
+		$vlan_counter = count($vlans);
+		
+		// counter to tpl
+		$tp->set("vlan_counter", $vlan_counter);
+		
+		// any nodes?
+		if ($vlan_counter>0) {
+			// get objects
+			foreach($vlans AS $vlan) {
+				// send to tpl
+				$tp->set("vlan_id", $vlan['vlan_id']);
+				$tp->set("vlan_name", $vlan['vlan_name']);
+				$tp->set("vlan_number", $vlan['vlan_number']);
+								
+				// parse block
+				$tp->parse("vlan_row");
 			}
-	if (($i>0) ? $tp->parse("vlan") : $tp->hide("vlan"));
+			// parse block
-	
+			$tp->parse("vlan_table");
-	// get location info
-	$result = mysql_query("SELECT l.location_id, l.location_name FROM location l INNER JOIN subnetlocation sl ON l.location_id=sl.location_id WHERE sl.subnet_id='$subnet_id'") or die(mysql_error());
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
-		$tp->set("location_id", $row->location_id);
-		$tp->set("location_name", $row->location_name);
-		$tp->parse("locationrow");
-	}	
-	if (($i>0) ? $tp->parse("location") : $tp->hide("location"));
-	
-	// get assetclass info
-	$result = mysql_query("SELECT assetclassgroup_id, assetclassgroup_name, color FROM assetclassgroup ORDER BY assetclassgroup_id") or die(mysql_error());
-	for ($i=0;$row=mysql_fetch_object($result);$i++) {
-		$tp->set("assetclassgroup_id", $row->assetclassgroup_id);
-		$tp->set("assetclassgroup_name", $row->assetclassgroup_name);
-		$tp->set("color", $row->color);
-		$tp->parse("assetclassgrouprow");
-	}
-	if (($i>0) ? $tp->parse("assetclassgroup") : $tp->hide("assetclassgroup"));
-	
-	// display options
-	if($_SESSION['suser_level'] >= $config_userlevel_assignlocationtosubnet) {
-		$tp->parse("assignlocationtosubnet");
 		} else {
-		$tp->hide("assignlocationtosubnet");
+			// parse block
-	}
+			$tp->hide("vlan_table");
-	if($_SESSION['suser_level'] >= $config_userlevel_assignvlantosubnet) {
-		$tp->set("vlan_id", $vlan_id);
-		$tp->parse("assignvlantosubnet");	
-	} else {
-		$tp->hide("assignvlantosubnet");
-	}
-	if($_SESSION['suser_level'] >= $config_userlevel_subnetedit) {
-		$tp->parse("subnetedit");
-	} else {
-		$tp->hide("subnetedit");
-	}
-	if($_SESSION['suser_level'] >= $config_userlevel_subnetdel) {
-		$tp->parse("subnetdel");
-	} else {
-		$tp->hide("subnetdel");
 		}
 	
+	// setup location
+		// build query
+		$query = "SELECT
+				location.location_id,
+				location.location_name
+			FROM
+				location
+			LEFT JOIN
+				subnetlocation
+			ON
+				subnetlocation.location_id=location.location_id
+			WHERE
+				subnetlocation.subnet_id=". $subnet_id . "
+			ORDER BY
+				location.location_name";
+		
+		// run query
+		$locations = $db->db_select($query);
+		
+		// count results
+		$location_counter = count($locations);
+		
+		// counter to tpl
+		$tp->set("location_counter", $location_counter);
+		
+		// any nodes?
+		if ($location_counter>0) {
+			// get objects
+			foreach($locations AS $location) {
+				// send to tpl
+				$tp->set("location_id", $location['location_id']);
+				$tp->set("location_name", $location['location_name']);
+								
+				// parse block
+				$tp->parse("location_row");
+			}
+			// parse block
+			$tp->parse("location_table");
+		} else {
+			// parse block
+			$tp->hide("location_table");
+		}
+	
+	// setup assetclassgroup
+		// build query
+		$query = "SELECT
+				assetclassgroup.assetclassgroup_id,
+				assetclassgroup.assetclassgroup_name,
+				assetclassgroup.assetclassgroup_color,
+				(SELECT
+					COUNT(node.node_id)
+				FROM
+					asset,
+					assetclass,				
+					node
+				WHERE
+					asset.assetclass_id=assetclass.assetclass_id
+					AND assetclass.assetclassgroup_id=assetclassgroup.assetclassgroup_id
+					AND node.asset_id=asset.asset_id
+					AND node.subnet_id=" . $subnet_id . ") AS node_counter
+			FROM
+				assetclassgroup
+			GROUP BY
+				assetclassgroup.assetclassgroup_id
+			ORDER BY
+				assetclassgroup.assetclassgroup_name";
+	
+		// run query
+		$assetclassgroups = $db->db_select($query);
+		
+		// count results
+		$assetclassgroup_counter = count($assetclassgroups);
+		
+		// counter to tpl
+		$tp->set("assetclassgroup_counter", $assetclassgroup_counter);
+		
+		// any nodes?
+		if ($assetclassgroup_counter>0) {
+			// get objects
+			foreach($assetclassgroups AS $assetclassgroup) {
+				// send to tpl
+				$tp->set("assetclassgroup_id", $assetclassgroup['assetclassgroup_id']);
+				$tp->set("assetclassgroup_name", $assetclassgroup['assetclassgroup_name']);
+				$tp->set("assetclassgroup_color", $assetclassgroup['assetclassgroup_color']);
+				
+				$tp->set("assetclassgroup_node_counter", $assetclassgroup['node_counter']);
+								
+				// parse block
+				$tp->parse("assetclassgroup_row");
+			}
+			// parse block
+			$tp->parse("assetclassgroup_table");
+		} else {
+			// parse block
+			$tp->hide("assetclassgroup_table");
+		}
+		
+	// end page
 		// output
 		$tp->parse();
 		$tp->spit();
 		
+		// end output
 		include("footer.php");
 ?>