Back out changes, something went wrong.

1 files changed, 2528 insertions, 2553 deletions

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 030aaf8..076fa99 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -1,396 +1,449 @@
 <?php
-	/****h* pfSense/pfsense-utils
-	 * NAME
-	 *   pfsense-utils.inc - Utilities specific to pfSense
-	 * DESCRIPTION
-	 *   This include contains various pfSense specific functions.
-	 * HISTORY
-	 *   $Id$
-	 ******
-	 *
-	 * Copyright (C) 2004-2006 Scott Ullrich (sullrich@gmail.com)
-	 * All rights reserved.
-	 * Redistribution and use in source and binary forms, with or without
-	 * modification, are permitted provided that the following conditions are met:
-	 *
-	 * 1. Redistributions of source code must retain the above copyright notice,
-	 * this list of conditions and the following disclaimer.
-	 *
-	 * 2. Redistributions in binary form must reproduce the above copyright
-	 * notice, this list of conditions and the following disclaimer in the
-	 * documentation and/or other materials provided with the distribution.
-	 *
-	 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	 * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	 * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	 * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	 * RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	 * POSSIBILITY OF SUCH DAMAGE.
-	 *
-	 */
-	
-	function get_tmp_file() {
-		return "/tmp/tmp-" . time();
-	}
-	
-	/****f* pfsense-utils/find_number_of_needed_carp_interfaces
-	 * NAME
-	 *   find_number_of_needed_carp_interfaces
-	 * INPUTS
-	 *   null
-	 * RESULT
-	 *   the number of needed carp interfacs
-	 ******/
-	function find_number_of_needed_carp_interfaces() {
-		global $config, $g;
-		$carp_counter=0;
-		if(!$config['virtualip'])
-			return 0;
-		if(!$config['virtualip']['vip'])
-			return 0;
-		foreach($config['virtualip']['vip'] as $vip) {
-			if($vip['mode'] == "carp")
-				$carp_counter++;
-		}
-		return $carp_counter;
-	}
-	
-	/****f* pfsense-utils/reset_carp
-	 * NAME
-	 *   reset_carp - resets carp after primary interface changes
-	 * INPUTS
-	 *   null
-	 * RESULT
-	 *   null
-	 ******/
-	function reset_carp() {
-		$carp_counter=find_number_of_created_carp_interfaces();
-		$needed_carp_interfaces = find_number_of_needed_carp_interfaces();
-		mwexec("/sbin/sysctl net.inet.carp.allow=0");
-		for($x=0; $x<$carp_counter; $x++) {
-			mwexec("/sbin/ifconfig carp{$x} down");
-			mwexec("/sbin/ifconfig carp{$x} delete");
-			log_error("CARP: $needed_carp_interfaces < $carp_counter");
-			if($needed_carp_interfaces < $carp_counter) {
-				$needed_carp_interfaces--;
-				log_error("Destroying carp interface.");
-				mwexec("/sbin/ifconfig carp{$x} destroy");
+/****h* pfSense/pfsense-utils
+ * NAME
+ *   pfsense-utils.inc - Utilities specific to pfSense
+ * DESCRIPTION
+ *   This include contains various pfSense specific functions.
+ * HISTORY
+ *   $Id$
+ ******
+ *
+ * Copyright (C) 2004-2006 Scott Ullrich (sullrich@gmail.com)
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+function get_tmp_file() {
+	return "/tmp/tmp-" . time();
+}
+
+/****f* pfsense-utils/find_number_of_needed_carp_interfaces
+ * NAME
+ *   find_number_of_needed_carp_interfaces
+ * INPUTS
+ *   null
+ * RESULT
+ *   the number of needed carp interfacs
+ ******/
+function find_number_of_needed_carp_interfaces() {
+	global $config, $g;
+	$carp_counter=0;
+	if(!$config['virtualip'])
+		return 0;
+	if(!$config['virtualip']['vip'])
+		return 0;
+	foreach($config['virtualip']['vip'] as $vip) {
+		if($vip['mode'] == "carp")
+			$carp_counter++;
+	}
+	return $carp_counter;
+}
+
+/****f* pfsense-utils/reset_carp
+ * NAME
+ *   reset_carp - resets carp after primary interface changes
+ * INPUTS
+ *   null
+ * RESULT
+ *   null
+ ******/
+function reset_carp() {
+	$carp_counter=find_number_of_created_carp_interfaces();
+	$needed_carp_interfaces = find_number_of_needed_carp_interfaces();
+	mwexec("/sbin/sysctl net.inet.carp.allow=0");
+	for($x=0; $x<$carp_counter; $x++) {
+		mwexec("/sbin/ifconfig carp{$x} down");
+		mwexec("/sbin/ifconfig carp{$x} delete");
+		log_error("CARP: $needed_carp_interfaces < $carp_counter");
+		if($needed_carp_interfaces < $carp_counter) {
+			$needed_carp_interfaces--;
+			log_error("Destroying carp interface.");
+			mwexec("/sbin/ifconfig carp{$x} destroy");
+		}
+	}
+	find_number_of_created_carp_interfaces(true);
+	sleep(1);
+	mwexec("/sbin/sysctl net.inet.carp.allow=1");
+	interfaces_carp_configure();
+	usleep(1000);
+	interfaces_carp_bring_up_final();
+}
+
+/****f* pfsense-utils/get_dns_servers
+ * NAME
+ *   get_dns_servres - get system dns servers
+ * INPUTS
+ *   $dns_servers - an array of the dns servers
+ * RESULT
+ *   null
+ ******/
+function get_dns_servers() {
+	$dns_servers = array();
+	$dns = `cat /etc/resolv.conf`;
+	$dns_s = split("\n", $dns);
+	foreach($dns_s as $dns) {
+		$matches = "";
+		if (preg_match("/nameserver (.*)/", $dns, $matches))
+			$dns_servers[] = $matches[1];
+	}
+	$dns_server_master = array();
+	sort($dns_servers);
+	$lastseen = "";
+	foreach($dns_servers as $t) {
+		if($t <> $lastseen)
+			if($t <> "")
+				$dns_server_master[] = $t;
+		$lastseen = $t;
+	}
+	return $dns_server_master;
+}
+
+/****f* pfsense-utils/log_error
+* NAME
+*   log_error  - Sends a string to syslog.
+* INPUTS
+*   $error     - string containing the syslog message.
+* RESULT
+*   null
+******/
+function log_error($error) {
+	$page = $_SERVER['SCRIPT_NAME'];
+	syslog(LOG_WARNING, "$page: $error");
+	return;
+}
+
+/****f* pfsense-utils/get_interface_mac_address
+ * NAME
+ *   get_interface_mac_address - Return a interfaces mac address
+ * INPUTS
+ *   $interface	- interface to obtain mac address from
+ * RESULT
+ *   $mac - the mac address of the interface
+ ******/
+function get_interface_mac_address($interface) {
+	$mac = exec("ifconfig {$interface} | awk '/ether/ {print $2}'");
+	if(is_macaddr($mac)) {
+		return trim($mac);
+	} else {
+		return "";
+	}
+}
+
+/****f* pfsense-utils/return_dir_as_array
+ * NAME
+ *   return_dir_as_array - Return a directory's contents as an array.
+ * INPUTS
+ *   $dir	- string containing the path to the desired directory.
+ * RESULT
+ *   $dir_array - array containing the directory's contents. This array will be empty if the path specified is invalid.
+ ******/
+function return_dir_as_array($dir) {
+	$dir_array = array();
+	if (is_dir($dir)) {
+		if ($dh = opendir($dir)) {
+			while (($file = readdir($dh)) !== false) {
+				$canadd = 0;
+				if($file == ".") $canadd = 1;
+				if($file == "..") $canadd = 1;
+				if($canadd == 0)
+					array_push($dir_array, $file);
 			}
-		}
-		find_number_of_created_carp_interfaces(true);
-		sleep(1);
-		mwexec("/sbin/sysctl net.inet.carp.allow=1");
-		interfaces_carp_configure();
-		usleep(1000);
-		interfaces_carp_bring_up_final();
-	}
-	
-	/****f* pfsense-utils/get_dns_servers
-	 * NAME
-	 *   get_dns_servres - get system dns servers
-	 * INPUTS
-	 *   $dns_servers - an array of the dns servers
-	 * RESULT
-	 *   null
-	 ******/
-	function get_dns_servers() {
-		$dns_servers = array();
-		$dns = `cat /etc/resolv.conf`;
-		$dns_s = split("\n", $dns);
-		foreach($dns_s as $dns) {
-			$matches = "";
-			if (preg_match("/nameserver (.*)/", $dns, $matches))
-				$dns_servers[] = $matches[1];
-		}
-		$dns_server_master = array();
-		sort($dns_servers);
-		$lastseen = "";
-		foreach($dns_servers as $t) {
-			if($t <> $lastseen)
-				if($t <> "")
-					$dns_server_master[] = $t;
-			$lastseen = $t;
-		}
-		return $dns_server_master;
-	}
-	
-	/****f* pfsense-utils/log_error
-	* NAME
-	*   log_error  - Sends a string to syslog.
-	* INPUTS
-	*   $error     - string containing the syslog message.
-	* RESULT
-	*   null
-	******/
-	function log_error($error) {
-		$page = $_SERVER['SCRIPT_NAME'];
-		syslog(LOG_WARNING, "$page: $error");
+			closedir($dh);
+		}
+	}
+	return $dir_array;
+}
+
+/****f* pfsense-utils/enable_hardware_offloading
+ * NAME
+ *   enable_hardware_offloading - Enable a NIC's supported hardware features.
+ * INPUTS
+ *   $interface	- string containing the physical interface to work on.
+ * RESULT
+ *   null
+ * NOTES
+ *   This function only supports the fxp driver's loadable microcode.
+ ******/
+function enable_hardware_offloading($interface) {
+	global $g, $config;
+
+	if(stristr($interface,"lnc"))
 		return;
-	}
-	
-	/****f* pfsense-utils/get_interface_mac_address
-	 * NAME
-	 *   get_interface_mac_address - Return a interfaces mac address
-	 * INPUTS
-	 *   $interface	- interface to obtain mac address from
-	 * RESULT
-	 *   $mac - the mac address of the interface
-	 ******/
-	function get_interface_mac_address($interface) {
-		$mac = exec("ifconfig {$interface} | awk '/ether/ {print $2}'");
-		if(is_macaddr($mac)) {
-			return trim($mac);
-		} else {
-			return "";
-		}
-	}
-	
-	/****f* pfsense-utils/return_dir_as_array
-	 * NAME
-	 *   return_dir_as_array - Return a directory's contents as an array.
-	 * INPUTS
-	 *   $dir	- string containing the path to the desired directory.
-	 * RESULT
-	 *   $dir_array - array containing the directory's contents. This array will be empty if the path specified is invalid.
-	 ******/
-	function return_dir_as_array($dir) {
-		$dir_array = array();
-		if (is_dir($dir)) {
-			if ($dh = opendir($dir)) {
-				while (($file = readdir($dh)) !== false) {
-					$canadd = 0;
-					if($file == ".") $canadd = 1;
-					if($file == "..") $canadd = 1;
-					if($canadd == 0)
-						array_push($dir_array, $file);
-				}
-				closedir($dh);
-			}
-		}
-		return $dir_array;
-	}
-	
-	/****f* pfsense-utils/enable_hardware_offloading
-	 * NAME
-	 *   enable_hardware_offloading - Enable a NIC's supported hardware features.
-	 * INPUTS
-	 *   $interface	- string containing the physical interface to work on.
-	 * RESULT
-	 *   null
-	 * NOTES
-	 *   This function only supports the fxp driver's loadable microcode.
-	 ******/
-	function enable_hardware_offloading($interface) {
-		global $g, $config;
-	
-		if(stristr($interface,"lnc"))
-			return;
-		if(isset($config['system']['do_not_use_nic_microcode']))
-			return;
-	
-		if($g['booting']) {
-		/* translate wan, lan, opt -> real interface if needed */
-		$int = filter_translate_type_to_real_interface($interface);
-		if($int <> "") $interface = $int;
-		$int_family = preg_split("/[0-9]+/", $int);
-		$options = strtolower(`/sbin/ifconfig {$interface} | grep options`);
-		$supported_ints = array('fxp');
-		if (in_array($int_family, $supported_ints))
-			mwexec("/sbin/ifconfig {$interface} link0");
-	
-		if($config['system']['disablechecksumoffloading'])
-			return;
-	
-		if(stristr($options, "txcsum") == true)
-		    mwexec("/sbin/ifconfig {$interface} txcsum 2>/dev/null");
-		if(stristr($options, "rxcsum") == true)
-		    mwexec("/sbin/ifconfig {$interface} rxcsum 2>/dev/null");
-		if(stristr($options, "polling") == true)
-		    mwexec("/sbin/ifconfig {$interface} polling 2>/dev/null");
-		} else {
-			mwexec("sysctl kern.polling.enable=0");
-		}
+	if(isset($config['system']['do_not_use_nic_microcode']))
 		return;
-	}
-	
-	/****f* pfsense-utils/is_alias_inuse
-	 * NAME
-	 *   checks to see if an alias is currently in use by a rule
-	 * INPUTS
-	 *
-	 * RESULT
-	 *   true or false
-	 * NOTES
-	 *
-	 ******/
-	function is_alias_inuse($alias) {
-		global $g, $config;
-	
-		if($alias == "") return false;
-		/* loop through firewall rules looking for alias in use */
-		if(is_array($config['nat']['rule']))
-			foreach($config['filter']['rule'] as $rule) {
-				if(is_array($rule['source']['address']))
-					if($rule['source']['address'] == $alias)
-						return true;
-				if(is_array($rule['destination']['address']))
-					if($rule['destination']['address'] == $alias)
-						return true;
-			}
-		/* loop through nat rules looking for alias in use */
-		if(is_array($config['nat']['rule']))
-			foreach($config['nat']['rule'] as $rule) {
-				if($rule['target'] == $alias)
+
+	if($g['booting']) {
+	/* translate wan, lan, opt -> real interface if needed */
+	$int = filter_translate_type_to_real_interface($interface);
+	if($int <> "") $interface = $int;
+	$int_family = preg_split("/[0-9]+/", $int);
+	$options = strtolower(`/sbin/ifconfig {$interface} | grep options`);
+	$supported_ints = array('fxp');
+	if (in_array($int_family, $supported_ints))
+		mwexec("/sbin/ifconfig {$interface} link0");
+
+	if($config['system']['disablechecksumoffloading'])
+		return;
+
+	if(stristr($options, "txcsum") == true)
+	    mwexec("/sbin/ifconfig {$interface} txcsum 2>/dev/null");
+	if(stristr($options, "rxcsum") == true)
+	    mwexec("/sbin/ifconfig {$interface} rxcsum 2>/dev/null");
+	if(stristr($options, "polling") == true)
+	    mwexec("/sbin/ifconfig {$interface} polling 2>/dev/null");
+	} else {
+		mwexec("sysctl kern.polling.enable=0");
+	}
+	return;
+}
+
+/****f* pfsense-utils/is_alias_inuse
+ * NAME
+ *   checks to see if an alias is currently in use by a rule
+ * INPUTS
+ *
+ * RESULT
+ *   true or false
+ * NOTES
+ *
+ ******/
+function is_alias_inuse($alias) {
+	global $g, $config;
+
+	if($alias == "") return false;
+	/* loop through firewall rules looking for alias in use */
+	if(is_array($config['nat']['rule']))
+		foreach($config['filter']['rule'] as $rule) {
+			if(is_array($rule['source']['address']))
+				if($rule['source']['address'] == $alias)
 					return true;
-				if($rule['external-address'] == $alias)
+			if(is_array($rule['destination']['address']))
+				if($rule['destination']['address'] == $alias)
 					return true;
-			}
-		return false;
-	}
-	
-	/****f* pfsense-utils/setup_polling_defaults
-	 * NAME
-	 *   sets up sysctls for pollingS
-	 * INPUTS
-	 *
-	 * RESULT
-	 *   null
-	 * NOTES
-	 *
-	 ******/
-	function setup_polling_defaults() {
-		global $g, $config;
-		if($config['system']['polling_each_burst'])
-			mwexec("sysctl kern.polling.each_burst={$config['system']['polling_each_burst']}");
-		if($config['system']['polling_burst_max'])
-			mwexec("sysctl kern.polling.burst_max={$config['system']['polling_burst_max']}");
-		if($config['system']['polling_user_frac'])
-			mwexec("sysctl kern.polling.user_frac={$config['system']['polling_user_frac']}");
-	}
-	
-	/****f* pfsense-utils/setup_polling
-	 * NAME
-	 *   sets up polling
-	 * INPUTS
-	 *
-	 * RESULT
-	 *   null
-	 * NOTES
-	 *
-	 ******/
-	function setup_polling() {
-		global $g, $config;
-	
-		setup_polling_defaults();
-	
-		if(isset($config['system']['polling']))
-			$supported_ints = array('dc', 'em', 'fwe', 'fwip', 'fxp', 'ixgb', 'ste', 'nge', 're', 'rl', 'sf', 'sis', 'ste', 'vge', 'vr', 'xl');
-		else
-			$supported_ints = array();
-	
-		/* build an array of interfaces to work with */
-		$iflist = array("lan" => "LAN", "wan" => "WAN");
-		for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++)
-			$iflist['opt' . $i] = $config['interfaces']['opt' . $i]['descr'];
-	
-		foreach ($iflist as $ifent => $ifname) {
-			$real_interface = convert_friendly_interface_to_real_interface_name($ifname);
-			$supported = false;
-			foreach($supported_ints as $supported) {
-				if(stristr($real_interface, $supported)) {
-					$supported = true;
-				}
-			}
-			if ($supported == true) {
-				mwexec("/sbin/ifconfig {$real_interface} polling");
-			} else {
-				mwexec("/sbin/ifconfig {$real_interface} -polling");
-			}
-		}
-	}
-	
-	/****f* pfsense-utils/setup_microcode
-	 * NAME
-	 *   enumerates all interfaces and calls enable_hardware_offloading which
-	 *   enables a NIC's supported hardware features.
-	 * INPUTS
-	 *
-	 * RESULT
-	 *   null
-	 * NOTES
-	 *   This function only supports the fxp driver's loadable microcode.
-	 ******/
-	function setup_microcode() {
-		global $config;
-	
-		$ifdescrs = array('wan', 'lan');
-		for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) {
-			$ifdescrs['opt' . $j] = "opt" . $j;
-		}
-		foreach($ifdescrs as $if)
-			enable_hardware_offloading($if);
-	}
-	
-	/****f* pfsense-utils/return_filename_as_array
-	 * NAME
-	 *   return_filename_as_array - Return a file's contents as an array.
-	 * INPUTS
-	 *   $filename	- string containing the path to the desired file.
-	 *   $strip	- array of characters to strip - default is '#'.
-	 * RESULT
-	 *   $file	- array containing the file's contents.
-	 * NOTES
-	 *   This function strips lines starting with '#' and leading/trailing whitespace by default.
-	 ******/
-	function return_filename_as_array($filename, $strip = array('#')) {
-		if(file_exists($filename)) $file = file($filename);
-		if(is_array($file)) {
-			foreach($file as $line) $line = trim($line);
-			foreach($strip as $tostrip) $file = preg_grep("/^{$tostrip}/", $file, PREG_GREP_INVERT);
 		}
-		return $file;
-	}
-	
-	/****f* pfsense-utils/file_put_contents
-	 * NAME
-	 *   file_put_contents - Wrapper for file_put_contents if it doesn't exist
-	 * RESULT
-	 *   none
-	 ******/
-	if(!function_exists("file_put_contents")) {
-		function file_put_contents($filename, $data) {
-			$fd = fopen($filename,"w");
-			fwrite($fd, $data);
-			fclose($fd);
+	/* loop through nat rules looking for alias in use */
+	if(is_array($config['nat']['rule']))
+		foreach($config['nat']['rule'] as $rule) {
+			if($rule['target'] == $alias)
+				return true;
+			if($rule['external-address'] == $alias)
+				return true;
+		}
+	return false;
+}
+
+/****f* pfsense-utils/setup_polling_defaults
+ * NAME
+ *   sets up sysctls for pollingS
+ * INPUTS
+ *
+ * RESULT
+ *   null
+ * NOTES
+ *
+ ******/
+function setup_polling_defaults() {
+	global $g, $config;
+	if($config['system']['polling_each_burst'])
+		mwexec("sysctl kern.polling.each_burst={$config['system']['polling_each_burst']}");
+	if($config['system']['polling_burst_max'])
+		mwexec("sysctl kern.polling.burst_max={$config['system']['polling_burst_max']}");
+	if($config['system']['polling_user_frac'])
+		mwexec("sysctl kern.polling.user_frac={$config['system']['polling_user_frac']}");
+}
+
+/****f* pfsense-utils/setup_polling
+ * NAME
+ *   sets up polling
+ * INPUTS
+ *
+ * RESULT
+ *   null
+ * NOTES
+ *
+ ******/
+function setup_polling() {
+	global $g, $config;
+
+	setup_polling_defaults();
+
+	if(isset($config['system']['polling']))
+		$supported_ints = array('dc', 'em', 'fwe', 'fwip', 'fxp', 'ixgb', 'ste', 'nge', 're', 'rl', 'sf', 'sis', 'ste', 'vge', 'vr', 'xl');
+	else
+		$supported_ints = array();
+
+	/* build an array of interfaces to work with */
+	$iflist = array("lan" => "LAN", "wan" => "WAN");
+	for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++)
+		$iflist['opt' . $i] = $config['interfaces']['opt' . $i]['descr'];
+
+	foreach ($iflist as $ifent => $ifname) {
+		$real_interface = convert_friendly_interface_to_real_interface_name($ifname);
+		$supported = false;
+		foreach($supported_ints as $supported) {
+			if(stristr($real_interface, $supported)) {
+				$supported = true;
+			}
 		}
+		if ($supported == true) {
+			mwexec("/sbin/ifconfig {$real_interface} polling");
+		} else {
+			mwexec("/sbin/ifconfig {$real_interface} -polling");
+		}
+	}
+}
+
+/****f* pfsense-utils/setup_microcode
+ * NAME
+ *   enumerates all interfaces and calls enable_hardware_offloading which
+ *   enables a NIC's supported hardware features.
+ * INPUTS
+ *
+ * RESULT
+ *   null
+ * NOTES
+ *   This function only supports the fxp driver's loadable microcode.
+ ******/
+function setup_microcode() {
+	global $config;
+
+	$ifdescrs = array('wan', 'lan');
+	for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) {
+		$ifdescrs['opt' . $j] = "opt" . $j;
+	}
+	foreach($ifdescrs as $if)
+		enable_hardware_offloading($if);
+}
+
+/****f* pfsense-utils/return_filename_as_array
+ * NAME
+ *   return_filename_as_array - Return a file's contents as an array.
+ * INPUTS
+ *   $filename	- string containing the path to the desired file.
+ *   $strip	- array of characters to strip - default is '#'.
+ * RESULT
+ *   $file	- array containing the file's contents.
+ * NOTES
+ *   This function strips lines starting with '#' and leading/trailing whitespace by default.
+ ******/
+function return_filename_as_array($filename, $strip = array('#')) {
+	if(file_exists($filename)) $file = file($filename);
+	if(is_array($file)) {
+		foreach($file as $line) $line = trim($line);
+		foreach($strip as $tostrip) $file = preg_grep("/^{$tostrip}/", $file, PREG_GREP_INVERT);
+	}
+	return $file;
+}
+
+/****f* pfsense-utils/file_put_contents
+ * NAME
+ *   file_put_contents - Wrapper for file_put_contents if it doesn't exist
+ * RESULT
+ *   none
+ ******/
+if(!function_exists("file_put_contents")) {
+	function file_put_contents($filename, $data) {
+		$fd = fopen($filename,"w");
+		fwrite($fd, $data);
+		fclose($fd);
 	}
-	
-	/****f* pfsense-utils/get_carp_status
-	 * NAME
-	 *   get_carp_status - Return whether CARP is enabled or disabled.
-	 * RESULT
-	 *   boolean	- true if CARP is enabled, false if otherwise.
-	 ******/
-	function get_carp_status() {
-	    /* grab the current status of carp */
-	    $status = `/sbin/sysctl net.inet.carp.allow | cut -d" " -f2`;
-	    if(intval($status) == "0") return false;
-	    return true;
-	}
-	
-	/****f* pfsense-utils/is_carp_defined
-	 * NAME
-	 *   is_carp_defined - Return whether CARP is detected in the kernel.
-	 * RESULT
-	 *   boolean	- true if CARP is detected, false otherwise.
-	 ******/
-	function is_carp_defined() {
-		/* is carp compiled into the kernel and userland? */
-		$command = "/sbin/sysctl -a | grep carp";
+}
+
+/****f* pfsense-utils/get_carp_status
+ * NAME
+ *   get_carp_status - Return whether CARP is enabled or disabled.
+ * RESULT
+ *   boolean	- true if CARP is enabled, false if otherwise.
+ ******/
+function get_carp_status() {
+    /* grab the current status of carp */
+    $status = `/sbin/sysctl net.inet.carp.allow | cut -d" " -f2`;
+    if(intval($status) == "0") return false;
+    return true;
+}
+
+/****f* pfsense-utils/is_carp_defined
+ * NAME
+ *   is_carp_defined - Return whether CARP is detected in the kernel.
+ * RESULT
+ *   boolean	- true if CARP is detected, false otherwise.
+ ******/
+function is_carp_defined() {
+	/* is carp compiled into the kernel and userland? */
+	$command = "/sbin/sysctl -a | grep carp";
+	$fd = popen($command . " 2>&1 ", "r");
+	if(!$fd) {
+		log_error("Warning, could not execute command {$command}");
+		return 0;
+	}
+	while(!feof($fd)) {
+		$tmp .= fread($fd,49);
+	}
+	fclose($fd);
+
+	if($tmp == "")
+		return false;
+	else
+		return true;
+}
+
+/****f* pfsense-utils/get_interface_mtu
+ * NAME
+ *   get_interface_mtu - Return the mtu of an interface
+ * RESULT
+ *   $tmp	- Returns the mtu of an interface
+ ******/
+function get_interface_mtu($interface) {
+	$mtu = `/sbin/ifconfig {$interface} | /usr/bin/grep mtu | /usr/bin/cut -d" " -f4`;
+	return $mtu;
+}
+
+/****f* pfsense-utils/is_interface_wireless
+ * NAME
+ *   is_interface_wireless - Returns if an interface is wireless
+ * RESULT
+ *   $tmp	- Returns if an interface is wireless
+ ******/
+function is_interface_wireless($interface) {
+	global $config, $g;
+	$interface = convert_real_interface_to_friendly_interface_name($interface);
+	if(isset($config['interfaces'][$interface]['wireless']))
+		return true;
+	else
+		return false;
+}
+
+/****f* pfsense-utils/find_number_of_created_carp_interfaces
+ * NAME
+ *   find_number_of_created_carp_interfaces - Return the number of CARP interfaces.
+ * RESULT
+ *   $tmp	- Number of currently created CARP interfaces.
+ ******/
+function find_number_of_created_carp_interfaces($flush = false) {
+	global $carp_interface_count_cache;
+
+	if (!isset($carp_interface_count_cache) or $flush) {
+		$command = "/sbin/ifconfig | /usr/bin/grep \"carp*:\" | /usr/bin/wc -l";
 		$fd = popen($command . " 2>&1 ", "r");
 		if(!$fd) {
 			log_error("Warning, could not execute command {$command}");
@@ -400,2265 +453,2187 @@
 			$tmp .= fread($fd,49);
 		}
 		fclose($fd);
-	
-		if($tmp == "")
-			return false;
-		else
-			return true;
-	}
-	
-	/****f* pfsense-utils/get_interface_mtu
-	 * NAME
-	 *   get_interface_mtu - Return the mtu of an interface
-	 * RESULT
-	 *   $tmp	- Returns the mtu of an interface
-	 ******/
-	function get_interface_mtu($interface) {
-		$mtu = `/sbin/ifconfig {$interface} | /usr/bin/grep mtu | /usr/bin/cut -d" " -f4`;
-		return $mtu;
-	}
-	
-	/****f* pfsense-utils/is_interface_wireless
-	 * NAME
-	 *   is_interface_wireless - Returns if an interface is wireless
-	 * RESULT
-	 *   $tmp	- Returns if an interface is wireless
-	 ******/
-	function is_interface_wireless($interface) {
-		global $config, $g;
-		$interface = convert_real_interface_to_friendly_interface_name($interface);
-		if(isset($config['interfaces'][$interface]['wireless']))
-			return true;
-		else
-			return false;
-	}
-	
-	/****f* pfsense-utils/find_number_of_created_carp_interfaces
-	 * NAME
-	 *   find_number_of_created_carp_interfaces - Return the number of CARP interfaces.
-	 * RESULT
-	 *   $tmp	- Number of currently created CARP interfaces.
-	 ******/
-	function find_number_of_created_carp_interfaces($flush = false) {
-		global $carp_interface_count_cache;
-	
-		if (!isset($carp_interface_count_cache) or $flush) {
-			$command = "/sbin/ifconfig | /usr/bin/grep \"carp*:\" | /usr/bin/wc -l";
-			$fd = popen($command . " 2>&1 ", "r");
-			if(!$fd) {
-				log_error("Warning, could not execute command {$command}");
-				return 0;
-			}
-			while(!feof($fd)) {
-				$tmp .= fread($fd,49);
-			}
-			fclose($fd);
-			$carp_interface_count_cache = intval($tmp);
-		}
-		return $carp_interface_count_cache;
-	}
-	
-	/****f* pfsense-utils/link_int_to_bridge_interface
-	 * NAME
-	 *   link_int_to_bridge_interface - Finds out a bridge group for an interface
-	 * INPUTS
-	 *   $ip
-	 * RESULT
-	 *   bridge[0-99]
-	 ******/
-	function link_int_to_bridge_interface($int) {
-		global $config, $g;
-		$real_int = convert_friendly_interface_to_real_interface_name($int);
-		$num_bridges = find_number_of_created_bridges();
-		for($x=0; $x<$num_bridges; $x++) {
-			$matches = "";
-			$bridge_info = `/sbin/ifconfig bridge{$x}`;
-			if(stristr($bridge_info, "member: {$real_int}")) {
-				return "bridge{$x}";
-			}
-		}
-	}
-	
-	function link_carp_interface_to_parent($interface) {
-		global $config;
-		if($interface == "") return;
-	
-		$ifdescrs = array('wan', 'lan');
-		for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++)
-			$ifdescrs['opt' . $j] = "opt" . $j;
-	
-		$carp_ints = "";
-		$num_carp_ints = find_number_of_created_carp_interfaces();
-		foreach ($ifdescrs as $ifdescr => $ifname) {
-			$carp_int = $interface;
-			$carp_ip = find_interface_ip($interface);
+		$carp_interface_count_cache = intval($tmp);
+	}
+	return $carp_interface_count_cache;
+}
+
+/****f* pfsense-utils/link_int_to_bridge_interface
+ * NAME
+ *   link_int_to_bridge_interface - Finds out a bridge group for an interface
+ * INPUTS
+ *   $ip
+ * RESULT
+ *   bridge[0-99]
+ ******/
+function link_int_to_bridge_interface($int) {
+	global $config, $g;
+	$real_int = convert_friendly_interface_to_real_interface_name($int);
+	$num_bridges = find_number_of_created_bridges();
+	for($x=0; $x<$num_bridges; $x++) {
+		$matches = "";
+		$bridge_info = `/sbin/ifconfig bridge{$x}`;
+		if(stristr($bridge_info, "member: {$real_int}")) {
+			return "bridge{$x}";
+		}
+	}
+}
+
+/****f* pfsense-utils/link_ip_to_carp_interface
+ * NAME
+ *   link_ip_to_carp_interface - Find where a CARP interface links to.
+ * INPUTS
+ *   $ip
+ * RESULT
+ *   $carp_ints
+ ******/
+function link_ip_to_carp_interface($ip) {
+	global $config;
+	if($ip == "") return;
+
+	$ifdescrs = array('wan', 'lan');
+	for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++)
+		$ifdescrs['opt' . $j] = "opt" . $j;
+
+	$ft = split("\.", $ip);
+	$ft_ip = $ft[0] . "." . $ft[1] . "." . $ft[2] . ".";
+
+	$carp_ints = "";
+	$num_carp_ints = find_number_of_created_carp_interfaces();
+	foreach ($ifdescrs as $ifdescr => $ifname) {
+		for($x=0; $x<$num_carp_ints; $x++) {
+			$carp_int = "carp{$x}";
+			$carp_ip = find_interface_ip($carp_int);
 			$carp_subnet = find_virtual_ip_netmask($carp_ip);
 			$starting_ip = gen_subnet("{$carp_ip}", "{$carp_subnet}");
-			if(ip_in_subnet($starting_ip, "{$carp_ip}/{$carp_subnet}"))
+			if(ip_in_subnet($ip, "{$starting_ip}/{$carp_subnet}"))
 				if(!stristr($carp_ints, $carp_int))
-					return $ifname;
-		}
-		return $carp_ints;
-	}
-	
-	/****f* pfsense-utils/link_ip_to_carp_interface
-	 * NAME
-	 *   link_ip_to_carp_interface - Find where a CARP interface links to.
-	 * INPUTS
-	 *   $ip
-	 * RESULT
-	 *   $carp_ints
-	 ******/
-	function link_ip_to_carp_interface($ip) {
-		global $config;
-		if($ip == "") return;
-	
-		$ifdescrs = array('wan', 'lan');
-		for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++)
-			$ifdescrs['opt' . $j] = "opt" . $j;
-	
-		$ft = split("\.", $ip);
-		$ft_ip = $ft[0] . "." . $ft[1] . "." . $ft[2] . ".";
-	
-		$carp_ints = "";
-		$num_carp_ints = find_number_of_created_carp_interfaces();
-		foreach ($ifdescrs as $ifdescr => $ifname) {
-			for($x=0; $x<$num_carp_ints; $x++) {
-				$carp_int = "carp{$x}";
-				$carp_ip = find_interface_ip($carp_int);
-				$carp_subnet = find_virtual_ip_netmask($carp_ip);
-				$starting_ip = gen_subnet("{$carp_ip}", "{$carp_subnet}");
-				if(ip_in_subnet($ip, "{$starting_ip}/{$carp_subnet}"))
-					if(!stristr($carp_ints, $carp_int))
-						$carp_ints .= " " . $carp_int;
-			}
-		}
-		return $carp_ints;
-	}
-	
-	/****f* pfsense-utils/find_virtual_ip_netmask
-	 * NAME
-	 *   find_virtual_ip_netmask - Finds a virtual ip's subnet mask'
-	 * INPUTS
-	 *   $ip - ip address to locate subnet mask of
-	 * RESULT
-	 *   String containing the command's result.
-	 * NOTES
-	 *   This function returns the command's stdout and stderr.
-	 ******/
-	function find_virtual_ip_netmask($ip) {
-	        global $config;
-	        foreach($config['virtualip']['vip'] as $vip) {
-	                if($ip == $vip['subnet'])
-	                        return $vip['subnet_bits'];
-	        }
-	}
-	
-	/****f* pfsense-utils/exec_command
-	 * NAME
-	 *   exec_command - Execute a command and return a string of the result.
-	 * INPUTS
-	 *   $command	- String of the command to be executed.
-	 * RESULT
-	 *   String containing the command's result.
-	 * NOTES
-	 *   This function returns the command's stdout and stderr.
-	 ******/
-	function exec_command($command) {
-		$output = array();
-		exec($command . ' 2>&1 ', $output);
-		return(implode("\n", $output));
-	}
-	
-	/****f* interfaces/is_jumbo_capable
-	 * NAME
-	 *   is_jumbo_capable - Test if interface is jumbo frame capable.  Useful for determining VLAN capability.
-	 * INPUTS
-	 *   $int             - string containing interface name
-	 * RESULT
-	 *   boolean          - true or false
-	 ******/
-	function is_jumbo_capable($int) {
-		/* Per:
-		 * http://www.freebsd.org/cgi/man.cgi?query=vlan&manpath=FreeBSD+6.0-RELEASE&format=html
-		 * Only the following drivers support large frames
-	         *
-		 * 'de' chipset purposely left out of this list
-		 * requires defining BIG_PACKET in the
-		 * /usr/src/sys/pci/if_de.c source file and rebuilding the
-		 * kernel or module.  The hack works only for the 21041,
-		 * 21140, and 21140A chips.
-		 */
-		global $g;
-	
-		$capable = $g['vlan_long_frame'];
-	
-		$int_family = preg_split("/[0-9]+/", $int);
-	
-		if (in_array($int_family[0], $capable))
-			return true;
-		else
-			return false;
-	}
-	
-	/*
-	 * Return the interface array
-	 */
-	function get_interface_arr($flush = false) {
-		global $interface_arr_cache;
-	
-		/* If the cache doesn't exist, build it */
-		if (!isset($interface_arr_cache) or $flush)
-			$interface_arr_cache = exec_command("/sbin/ifconfig -l");
-	
-		return $interface_arr_cache;
-	}
-	
-	/*
-	 * does_interface_exist($interface): return true or false if a interface is
-	 * detected.
-	 */
-	function does_interface_exist($interface) {
-	    if(!$interface)
-	    		return false;
-	    $ints = get_interface_arr();
-		$carpips = find_number_of_needed_carp_interfaces();
-		for($i=0; $i<$carpips; $i++)
-			$ints = " carp{$i}";
-		if(stristr($ints, $interface) !== false)
-			return true;
-		else
-			return false;
-	}
-	
-	/*
-	 * convert_ip_to_network_format($ip, $subnet): converts an ip address to network form
-	 */
-	function convert_ip_to_network_format($ip, $subnet) {
-		$ipsplit = split('[.]', $ip);
-		$string = $ipsplit[0] . "." . $ipsplit[1] . "." . $ipsplit[2] . ".0/" . $subnet;
-		return $string;
-	}
-	
-	/*
-	 * find_interface_ip($interface): return the interface ip (first found)
-	 */
-	function find_interface_ip($interface, $flush = false) {
-		global $interface_ip_arr_cache;
-		$interface = str_replace("\n", "", $interface);
-		if(does_interface_exist($interface) == false) return;
-		/* Setup IP cache */
-		if (!isset($interface_ip_arr_cache[$interface]) or $flush) {
-			$interface_ip_arr_cache[$interface] = exec_command("/sbin/ifconfig {$interface} | /usr/bin/grep -w \"inet\" | /usr/bin/cut -d\" \" -f 2| /usr/bin/head -1");
-			$interface_ip_arr_cache[$interface] = str_replace("\n", "", $interface_ip_arr_cache[$interface]);
-		}
-	
-		return $interface_ip_arr_cache[$interface];
-	}
-	
-	function guess_interface_from_ip($ipaddress) {
-		$ret = exec_command("/sbin/route -n get {$ipaddress} | /usr/bin/grep interface | /usr/bin/awk '{ print \$2; };'");
-		return $ret;
-	}
-	
-	function filter_opt_interface_to_real($opt) {
-		global $config;
-		return $config['interfaces'][$opt]['if'];
-	}
-	
-	function filter_get_opt_interface_descr($opt) {
-		global $config;
-		return $config['interfaces'][$opt]['descr'];
-	}
-	
-	function get_friendly_interface_list_as_array() {
-		global $config;
-		$ints = array();
-		$ifdescrs = get_interface_list();
-		foreach ($ifdescrs as $ifdescr => $ifname) {
-			array_push($ints,$ifdescr);
-		}
-		return $ints;
-	}
-	
-	/*
-	 * find_ip_interface($ip): return the interface where an ip is defined
+					$carp_ints .= " " . $carp_int;
+		}
+	}
+	return $carp_ints;
+}
+
+/****f* pfsense-utils/find_virtual_ip_netmask
+ * NAME
+ *   find_virtual_ip_netmask - Finds a virtual ip's subnet mask'
+ * INPUTS
+ *   $ip - ip address to locate subnet mask of
+ * RESULT
+ *   String containing the command's result.
+ * NOTES
+ *   This function returns the command's stdout and stderr.
+ ******/
+function find_virtual_ip_netmask($ip) {
+        global $config;
+        foreach($config['virtualip']['vip'] as $vip) {
+                if($ip == $vip['subnet'])
+                        return $vip['subnet_bits'];
+        }
+}
+
+/****f* pfsense-utils/exec_command
+ * NAME
+ *   exec_command - Execute a command and return a string of the result.
+ * INPUTS
+ *   $command	- String of the command to be executed.
+ * RESULT
+ *   String containing the command's result.
+ * NOTES
+ *   This function returns the command's stdout and stderr.
+ ******/
+function exec_command($command) {
+	$output = array();
+	exec($command . ' 2>&1 ', $output);
+	return(implode("\n", $output));
+}
+
+/****f* interfaces/is_jumbo_capable
+ * NAME
+ *   is_jumbo_capable - Test if interface is jumbo frame capable.  Useful for determining VLAN capability.
+ * INPUTS
+ *   $int             - string containing interface name
+ * RESULT
+ *   boolean          - true or false
+ ******/
+function is_jumbo_capable($int) {
+	/* Per:
+	 * http://www.freebsd.org/cgi/man.cgi?query=vlan&manpath=FreeBSD+6.0-RELEASE&format=html
+	 * Only the following drivers support large frames
+         *
+	 * 'de' chipset purposely left out of this list
+	 * requires defining BIG_PACKET in the
+	 * /usr/src/sys/pci/if_de.c source file and rebuilding the
+	 * kernel or module.  The hack works only for the 21041,
+	 * 21140, and 21140A chips.
 	 */
-	function find_ip_interface($ip) {
-		global $config;
-		$ifdescrs = array('wan', 'lan');
-		for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) {
-			$ifdescrs['opt' . $j] = "opt" . $j;
-		}
-		foreach ($ifdescrs as $ifdescr => $ifname) {
-			$int = filter_translate_type_to_real_interface($ifname);
-			$ifconfig = exec_command("/sbin/ifconfig {$int}");
-		if(stristr($ifconfig,$ip) <> false)
-			return $int;
-		}
+	global $g;
+
+	$capable = $g['vlan_long_frame'];
+
+	$int_family = preg_split("/[0-9]+/", $int);
+
+	if (in_array($int_family[0], $capable))
+		return true;
+	else
 		return false;
+}
+
+/*
+ * Return the interface array
+ */
+function get_interface_arr($flush = false) {
+	global $interface_arr_cache;
+
+	/* If the cache doesn't exist, build it */
+	if (!isset($interface_arr_cache) or $flush)
+		$interface_arr_cache = exec_command("/sbin/ifconfig -l");
+
+	return $interface_arr_cache;
+}
+
+/*
+ * does_interface_exist($interface): return true or false if a interface is
+ * detected.
+ */
+function does_interface_exist($interface) {
+        $ints = get_interface_arr();
+
+	if(stristr($ints, $interface) !== false)
+		return true;
+	else
+		return false;
+}
+
+/*
+ * convert_ip_to_network_format($ip, $subnet): converts an ip address to network form
+ */
+function convert_ip_to_network_format($ip, $subnet) {
+	$ipsplit = split('[.]', $ip);
+	$string = $ipsplit[0] . "." . $ipsplit[1] . "." . $ipsplit[2] . ".0/" . $subnet;
+	return $string;
+}
+
+/*
+ * find_interface_ip($interface): return the interface ip (first found)
+ */
+function find_interface_ip($interface, $flush = false) {
+	global $interface_ip_arr_cache;
+	$interface = str_replace("\n", "", $interface);
+	if(does_interface_exist($interface) == false) return;
+	/* Setup IP cache */
+	if (!isset($interface_ip_arr_cache[$interface]) or $flush) {
+		$interface_ip_arr_cache[$interface] = exec_command("/sbin/ifconfig {$interface} | /usr/bin/grep -w \"inet\" | /usr/bin/cut -d\" \" -f 2| /usr/bin/head -1");
+		$interface_ip_arr_cache[$interface] = str_replace("\n", "", $interface_ip_arr_cache[$interface]);
+	}
+
+	return $interface_ip_arr_cache[$interface];
+}
+
+function guess_interface_from_ip($ipaddress) {
+	$ret = exec_command("/sbin/route -n get {$ipaddress} | /usr/bin/grep interface | /usr/bin/awk '{ print \$2
+; };'");
+	return $ret;
+}
+
+function filter_opt_interface_to_real($opt) {
+	global $config;
+	return $config['interfaces'][$opt]['if'];
+}
+
+function filter_get_opt_interface_descr($opt) {
+	global $config;
+	return $config['interfaces'][$opt]['descr'];
+}
+
+function get_friendly_interface_list_as_array() {
+	global $config;
+	$ints = array();
+	$ifdescrs = get_interface_list();
+	foreach ($ifdescrs as $ifdescr => $ifname) {
+		array_push($ints,$ifdescr);
+	}
+	return $ints;
+}
+
+/*
+ * find_ip_interface($ip): return the interface where an ip is defined
+ */
+function find_ip_interface($ip) {
+	global $config;
+	$ifdescrs = array('wan', 'lan');
+	for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) {
+		$ifdescrs['opt' . $j] = "opt" . $j;
+	}
+	foreach ($ifdescrs as $ifdescr => $ifname) {
+		$int = filter_translate_type_to_real_interface($ifname);
+		$ifconfig = exec_command("/sbin/ifconfig {$int}");
+	if(stristr($ifconfig,$ip) <> false)
+		return $int;
+	}
+	return false;
+}
+
+/*
+ *  filter_translate_type_to_real_interface($interface): returns the real interface name
+ *                                                       for a friendly interface.  ie: wan
+ */
+function filter_translate_type_to_real_interface($interface) {
+	global $config;
+	if($config['interfaces'][$interface]['if'] <> "") {
+		return $config['interfaces'][$interface]['if'];
+	} else {
+		return $interface;
 	}
-	
-	/*
-	 *  filter_translate_type_to_real_interface($interface): returns the real interface name
-	 *                                                       for a friendly interface.  ie: wan
-	 */
-	function filter_translate_type_to_real_interface($interface) {
-		global $config;
-		if($config['interfaces'][$interface]['if'] <> "") {
-			return $config['interfaces'][$interface]['if'];
-		} else {
-			return $interface;
-		}
-	}
-	
-	/*
-	 * get_carp_interface_status($carpinterface): returns the status of a carp ip
-	 */
-	function get_carp_interface_status($carpinterface) {
-		/* basically cache the contents of ifconfig statement
-		to speed up this routine */
-		global $carp_query;
-		if($carp_query == "")
-		$carp_query = split("\n", `/sbin/ifconfig | /usr/bin/grep carp`);
-		$found_interface = 0;
-		foreach($carp_query as $int) {
-			if($found_interface == 1) {
-				if(stristr($int, "MASTER")) return "MASTER";
-				if(stristr($int, "BACKUP")) return "BACKUP";
-				if(stristr($int, "INIT")) return "INIT";
-				return false;
-			}
-			if(stristr($int, $carpinterface) == true)
-			$found_interface=1;
-		}
-		return;
-	}
-	
-	/*
-	 * get_pfsync_interface_status($pfsyncinterface): returns the status of a pfsync
-	 */
-	function get_pfsync_interface_status($pfsyncinterface) {
-	    $result = does_interface_exist($pfsyncinterface);
-	    if($result <> true) return;
-	    $status = exec_command("/sbin/ifconfig {$pfsyncinterface} | /usr/bin/grep \"pfsync:\" | /usr/bin/cut -d\" \" -f5");
-	    return $status;
-	}
-	
-	/*
-	 * find_carp_interface($ip): return the carp interface where an ip is defined
-	 */
-	function find_carp_interface($ip) {
-		global $find_carp_ifconfig;
-		if($find_carp_ifconfig == "") {
-			$find_carp_ifconfig = array();
-			$num_carp_ints = find_number_of_created_carp_interfaces();
-			for($x=0; $x<$num_carp_ints; $x++) {
-				$find_carp_ifconfig[$x] = exec_command("/sbin/ifconfig carp{$x}");
-			}
-		}
-		$carps = 0;
-		foreach($find_carp_ifconfig as $fci) {
-			if(stristr($fci, $ip) == true)
-				return "carp{$carps}";
-			$carps++;
-		}
-	}
-	
-	/*
-	 * setup_filter_bridge(): toggle filtering bridge
-	 */
-	function setup_filter_bridge() {
-		global $config, $g;
-		if(isset($config['bridge']['filteringbridge'])) {
-			mwexec("/sbin/sysctl net.link.bridge.pfil_member=1");
-			mwexec("/sbin/sysctl net.link.bridge.pfil_bridge=1");
-		} else {
-			mwexec("/sbin/sysctl net.link.bridge.pfil_member=0");
-			mwexec("/sbin/sysctl net.link.bridge.pfil_bridge=0");
-		}
-	}
-	
-	/*
-	 * find_number_of_created_bridges(): returns the number of currently created bridges
-	 */
-	function find_number_of_created_bridges($flush = false) {
-		global $bridge_interface_count_cache;
-		if(!isset($bridge_interface_count_cache) or $flush)
-			$bridge_interface_count_cache = exec_command('/sbin/ifconfig | /usr/bin/grep "bridge[0-999]" | /usr/bin/wc -l');
-	
-		return $bridge_interface_count_cache;
-	}
-	
-	/*
-	 * add_rule_to_anchor($anchor, $rule): adds the specified rule to an anchor
-	 */
-	function add_rule_to_anchor($anchor, $rule, $label) {
-		mwexec("echo " . $rule . " | /sbin/pfctl -a " . $anchor . ":" . $label . " -f -");
-	}
-	
-	/*
-	 * remove_text_from_file
-	 * remove $text from file $file
-	 */
-	function remove_text_from_file($file, $text) {
-		global $fd_log;
-		if($fd_log)
-			fwrite($fd_log, "Adding needed text items:\n");
-		$filecontents = file_get_contents($file);
-		$textTMP = str_replace($text, "", $filecontents);
-		$text = $textTMP;
-		if($fd_log)
-			fwrite($fd_log, $text);
-		$fd = fopen($file, "w");
-		fwrite($fd, $text);
-		fclose($fd);
-	}
-	
-	/*
-	 * add_text_to_file($file, $text): adds $text to $file.
-	 * replaces the text if it already exists.
-	 */
-	function add_text_to_file($file, $text) {
-		if(file_exists($file) and is_writable($file)) {
-			$filecontents = split("\n", file_get_contents($file));
-			$fout = fopen($file, "w");
-			$new_file_text = "";
-			foreach($filecontents as $line) {
-				if($line)
-					$new_file_text .= rtrim($line) . "\n";
-			}
-			$new_file_text .= $text . "\n";
-			$file_text = str_replace("\n\n", "\n", $new_file_text);
-			fwrite($fout, $file_text);
-			fclose($fout);
-			return true;
-		} else {
+}
+
+/*
+ * get_carp_interface_status($carpinterface): returns the status of a carp ip
+ */
+function get_carp_interface_status($carpinterface) {
+	/* basically cache the contents of ifconfig statement
+	to speed up this routine */
+	global $carp_query;
+	if($carp_query == "")
+	$carp_query = split("\n", `/sbin/ifconfig | /usr/bin/grep carp`);
+	$found_interface = 0;
+	foreach($carp_query as $int) {
+		if($found_interface == 1) {
+			if(stristr($int, "MASTER")) return "MASTER";
+			if(stristr($int, "BACKUP")) return "BACKUP";
+			if(stristr($int, "INIT")) return "INIT";
 			return false;
 		}
+		if(stristr($int, $carpinterface) == true)
+		$found_interface=1;
+	}
+	return;
+}
+
+/*
+ * get_pfsync_interface_status($pfsyncinterface): returns the status of a pfsync
+ */
+function get_pfsync_interface_status($pfsyncinterface) {
+    $result = does_interface_exist($pfsyncinterface);
+    if($result <> true) return;
+    $status = exec_command("/sbin/ifconfig {$pfsyncinterface} | /usr/bin/grep \"pfsync:\" | /usr/bin/cut -d\" \" -f5");
+    return $status;
+}
+
+/*
+ * find_carp_interface($ip): return the carp interface where an ip is defined
+ */
+function find_carp_interface($ip) {
+	global $find_carp_ifconfig;
+	if($find_carp_ifconfig == "") {
+		$find_carp_ifconfig = array();
+		$num_carp_ints = find_number_of_created_carp_interfaces();
+		for($x=0; $x<$num_carp_ints; $x++) {
+			$find_carp_ifconfig[$x] = exec_command("/sbin/ifconfig carp{$x}");
+		}
+	}
+	$carps = 0;
+	foreach($find_carp_ifconfig as $fci) {
+		if(stristr($fci, $ip) == true)
+			return "carp{$carps}";
+		$carps++;
+	}
+}
+
+/*
+ * setup_filter_bridge(): toggle filtering bridge
+ */
+function setup_filter_bridge() {
+	global $config, $g;
+	if(isset($config['bridge']['filteringbridge'])) {
+		mwexec("/sbin/sysctl net.link.bridge.pfil_member=1");
+		mwexec("/sbin/sysctl net.link.bridge.pfil_bridge=1");
+	} else {
+		mwexec("/sbin/sysctl net.link.bridge.pfil_member=0");
+		mwexec("/sbin/sysctl net.link.bridge.pfil_bridge=0");
+	}
+}
+
+/*
+ * find_number_of_created_bridges(): returns the number of currently created bridges
+ */
+function find_number_of_created_bridges($flush = false) {
+	global $bridge_interface_count_cache;
+	if(!isset($bridge_interface_count_cache) or $flush)
+		$bridge_interface_count_cache = exec_command('/sbin/ifconfig | /usr/bin/grep "bridge[0-999]" | /usr/bin/wc -l');
+
+	return $bridge_interface_count_cache;
+}
+
+/*
+ * add_rule_to_anchor($anchor, $rule): adds the specified rule to an anchor
+ */
+function add_rule_to_anchor($anchor, $rule, $label) {
+	mwexec("echo " . $rule . " | /sbin/pfctl -a " . $anchor . ":" . $label . " -f -");
+}
+
+/*
+ * remove_text_from_file
+ * remove $text from file $file
+ */
+function remove_text_from_file($file, $text) {
+	global $fd_log;
+	if($fd_log)
+		fwrite($fd_log, "Adding needed text items:\n");
+	$filecontents = file_get_contents($file);
+	$textTMP = str_replace($text, "", $filecontents);
+	$text = $textTMP;
+	if($fd_log)
+		fwrite($fd_log, $text);
+	$fd = fopen($file, "w");
+	fwrite($fd, $text);
+	fclose($fd);
+}
+
+/*
+ * add_text_to_file($file, $text): adds $text to $file.
+ * replaces the text if it already exists.
+ */
+function add_text_to_file($file, $text) {
+	if(file_exists($file) and is_writable($file)) {
+		$filecontents = split("\n", file_get_contents($file));
+		$fout = fopen($file, "w");
+		$new_file_text = "";
+		foreach($filecontents as $line) {
+			if($line)
+				$new_file_text .= rtrim($line) . "\n";
+		}
+		$new_file_text .= $text . "\n";
+		$file_text = str_replace("\n\n", "\n", $new_file_text);
+		fwrite($fout, $file_text);
+		fclose($fout);
+		return true;
+	} else {
+		return false;
 	}
-	
-	/*
-	 *   after_sync_bump_adv_skew(): create skew values by 1S
-	 */
-	function after_sync_bump_adv_skew() {
-		global $config, $g;
-		$processed_skew = 1;
-		$a_vip = &$config['virtualip']['vip'];
-		foreach ($a_vip as $vipent) {
-			if($vipent['advskew'] <> "") {
-				$processed_skew = 1;
-				$vipent['advskew'] = $vipent['advskew']+1;
-			}
-		}
-		if($processed_skew == 1)
-			write_config("After synch increase advertising skew");
-	}
-	
-	/*
-	 * get_filename_from_url($url): converts a url to its filename.
-	 */
-	function get_filename_from_url($url) {
-		return basename($url);
-	}
-	
-	/*
-	 *   update_output_window: update bottom textarea dynamically.
-	 */
-	function update_output_window($text) {
-		global $pkg_interface;
-		$log = ereg_replace("\n", "\\n", $text);
-		if($pkg_interface == "console") {
-			/* too chatty */
+}
+
+/*
+ *   after_sync_bump_adv_skew(): create skew values by 1S
+ */
+function after_sync_bump_adv_skew() {
+	global $config, $g;
+	$processed_skew = 1;
+	$a_vip = &$config['virtualip']['vip'];
+	foreach ($a_vip as $vipent) {
+		if($vipent['advskew'] <> "") {
+			$processed_skew = 1;
+			$vipent['advskew'] = $vipent['advskew']+1;
+		}
+	}
+	if($processed_skew == 1)
+		write_config("After synch increase advertising skew");
+}
+
+/*
+ * get_filename_from_url($url): converts a url to its filename.
+ */
+function get_filename_from_url($url) {
+	return basename($url);
+}
+
+/*
+ *   update_output_window: update bottom textarea dynamically.
+ */
+function update_output_window($text) {
+	global $pkg_interface;
+	$log = ereg_replace("\n", "\\n", $text);
+	if($pkg_interface == "console") {
+		/* too chatty */
+	} else {
+		echo "\n<script language=\"JavaScript\">this.document.forms[0].output.value = \"" . $log . "\";</script>";
+	}
+	/* ensure that contents are written out */
+	ob_flush();
+}
+
+/*
+ *   get_dir: return an array of $dir
+ */
+function get_dir($dir) {
+	$dir_array = array();
+	$d = dir($dir);
+	while (false !== ($entry = $d->read())) {
+		array_push($dir_array, $entry);
+	}
+	$d->close();
+	return $dir_array;
+}
+
+/*
+ *   update_output_window: update top textarea dynamically.
+ */
+function update_status($status) {
+	global $pkg_interface;
+	if($pkg_interface == "console") {
+		echo $status . "\n";
+	} else {
+		echo "\n<script type=\"text/javascript\">document.forms[0].status.value=\"" . $status . "\";</script>";
+	}
+	/* ensure that contents are written out */
+	ob_flush();
+}
+
+/*
+ *   exec_command_and_return_text_array: execute command and return output
+ */
+function exec_command_and_return_text_array($command) {
+	$fd = popen($command . " 2>&1 ", "r");
+	while(!feof($fd)) {
+		$tmp .= fread($fd,49);
+	}
+	fclose($fd);
+	$temp_array = split("\n", $tmp);
+	return $temp_array;
+}
+
+/*
+ *   exec_command_and_return_text: execute command and return output
+ */
+function exec_command_and_return_text($command) {
+	return exec_command($command);
+}
+
+/*
+ *   exec_command_and_return_text: execute command and update output window dynamically
+ */
+function execute_command_return_output($command) {
+	global $fd_log, $pkg_interface;
+	$fd = popen($command . " 2>&1 ", "r");
+	if($pkg_interface <> "console") {
+		echo "\n<script language=\"JavaScript\">this.document.forms[0].output.value = \"\";</script>";
+	}
+	$counter = 0;
+	$counter2 = 0;
+	while(!feof($fd)) {
+		$tmp = fread($fd, 50);
+		$tmp1 = ereg_replace("\n","\\n", $tmp);
+		$text = ereg_replace("\"","'", $tmp1);
+		$lasttext = "";
+		if($lasttext == "..") {
+			$text = "";
+			$lasttext = "";
+			$counter=$counter-2;
 		} else {
-			echo "\n<script language=\"JavaScript\">this.document.forms[0].output.value = \"" . $log . "\";</script>";
-		}
-		/* ensure that contents are written out */
-		ob_flush();
-	}
-	
-	/*
-	 *   get_dir: return an array of $dir
-	 */
-	function get_dir($dir) {
-		$dir_array = array();
-		$d = dir($dir);
-		while (false !== ($entry = $d->read())) {
-			array_push($dir_array, $entry);
+			$lasttext .= $text;
 		}
-		$d->close();
-		return $dir_array;
-	}
-	
-	/*
-	 *   update_output_window: update top textarea dynamically.
-	 */
-	function update_status($status) {
-		global $pkg_interface;
-		if($pkg_interface == "console") {
-			echo $status . "\n";
+		if($counter > 51) {
+			$counter = 0;
+			$extrabreak = "\\n";
 		} else {
-			echo "\n<script type=\"text/javascript\">document.forms[0].status.value=\"" . $status . "\";</script>";
-		}
-		/* ensure that contents are written out */
-		ob_flush();
-	}
-	
-	/*
-	 *   exec_command_and_return_text_array: execute command and return output
-	 */
-	function exec_command_and_return_text_array($command) {
-		$fd = popen($command . " 2>&1 ", "r");
-		while(!feof($fd)) {
-			$tmp .= fread($fd,49);
+	    $extrabreak = "";
+	    $counter++;
 		}
-		fclose($fd);
-		$temp_array = split("\n", $tmp);
-		return $temp_array;
-	}
-	
-	/*
-	 *   exec_command_and_return_text: execute command and return output
-	 */
-	function exec_command_and_return_text($command) {
-		return exec_command($command);
-	}
-	
-	/*
-	 *   exec_command_and_return_text: execute command and update output window dynamically
-	 */
-	function execute_command_return_output($command) {
-		global $fd_log, $pkg_interface;
-		$fd = popen($command . " 2>&1 ", "r");
-		if($pkg_interface <> "console") {
-			echo "\n<script language=\"JavaScript\">this.document.forms[0].output.value = \"\";</script>";
-		}
-		$counter = 0;
-		$counter2 = 0;
-		while(!feof($fd)) {
-			$tmp = fread($fd, 50);
-			$tmp1 = ereg_replace("\n","\\n", $tmp);
-			$text = ereg_replace("\"","'", $tmp1);
-			$lasttext = "";
-			if($lasttext == "..") {
-				$text = "";
-				$lasttext = "";
-				$counter=$counter-2;
-			} else {
-				$lasttext .= $text;
-			}
-			if($counter > 51) {
-				$counter = 0;
-				$extrabreak = "\\n";
-			} else {
-		    $extrabreak = "";
-		    $counter++;
-			}
-			if($counter2 > 600) {
-				if($pkg_interface <> "console") {
-					echo "\n<script language=\"JavaScript\">this.document.forms[0].output.value = \"\";</script>";
-				}
-				$counter2 = 0;
-			} else
-				$counter2++;
+		if($counter2 > 600) {
 			if($pkg_interface <> "console") {
-				echo "\n<script language=\"JavaScript\">this.document.forms[0].output.value = this.document.forms[0].output.value + \"" . $text . $extrabreak .  "\"; f('output'); </script>";
+				echo "\n<script language=\"JavaScript\">this.document.forms[0].output.value = \"\";</script>";
 			}
-		}
-		fclose($fd);
-	}
-	
-	/*
-	 * convert_friendly_interface_to_real_interface_name($interface): convert WAN to FXP0
-	 */
-	function convert_friendly_interface_to_real_interface_name($interface) {
-		global $config;
-		$lc_interface = strtolower($interface);
-		if($lc_interface == "lan") return $config['interfaces']['lan']['if'];
-		if($lc_interface == "wan") return $config['interfaces']['wan']['if'];
-		$ifdescrs = array();
-		for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++)
-			$ifdescrs['opt' . $j] = "opt" . $j;
-		foreach ($ifdescrs as $ifdescr => $ifname) {
-			if(strtolower($ifname) == $lc_interface)
-		    return $config['interfaces'][$ifname]['if'];
-			if(strtolower($config['interfaces'][$ifname]['descr']) == $lc_interface)
-				return $config['interfaces'][$ifname]['if'];
-	   }
-	   return $interface;
-	}
-	
-	/*
-	 * convert_real_interface_to_friendly_interface_name($interface): convert fxp0 -> wan, etc.
-	 */
-	function convert_real_interface_to_friendly_interface_name($interface) {
-		global $config;
-		$ifdescrs = array('wan', 'lan');
-		for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++)
-			$ifdescrs['opt' . $j] = "opt" . $j;
-		foreach ($ifdescrs as $ifdescr => $ifname) {
-			if($config['interfaces']['$ifname']['if'] == $interface)
-				return $ifname;
-			$int = filter_translate_type_to_real_interface($ifname);
-			if($ifname == $interface) return $ifname;
-			if($int == $interface) return $ifname;
-		}
-		return $interface;
-	}
-	
-	/*
-	 * update_progress_bar($percent): updates the javascript driven progress bar.
-	 */
-	function update_progress_bar($percent) {
-		global $pkg_interface;
-		if($percent > 100) $percent = 1;
+			$counter2 = 0;
+		} else
+			$counter2++;
 		if($pkg_interface <> "console") {
-			echo "\n<script type=\"text/javascript\" language=\"javascript\">";
-			echo "\ndocument.progressbar.style.width='" . $percent . "%';";
-			echo "\n</script>";
-		} else {
-			echo " {$percent}%";
-		}
+			echo "\n<script language=\"JavaScript\">this.document.forms[0].output.value = this.document.forms[0].output.value + \"" . $text . $extrabreak .  "\"; f('output'); </script>";
+		}
+	}
+	fclose($fd);
+}
+
+/*
+ * convert_friendly_interface_to_real_interface_name($interface): convert WAN to FXP0
+ */
+function convert_friendly_interface_to_real_interface_name($interface) {
+	global $config;
+	$lc_interface = strtolower($interface);
+	if($lc_interface == "lan") return $config['interfaces']['lan']['if'];
+	if($lc_interface == "wan") return $config['interfaces']['wan']['if'];
+	$ifdescrs = array();
+	for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++)
+		$ifdescrs['opt' . $j] = "opt" . $j;
+	foreach ($ifdescrs as $ifdescr => $ifname) {
+		if(strtolower($ifname) == $lc_interface)
+	    return $config['interfaces'][$ifname]['if'];
+		if(strtolower($config['interfaces'][$ifname]['descr']) == $lc_interface)
+			return $config['interfaces'][$ifname]['if'];
+   }
+   return $interface;
+}
+
+/*
+ * convert_real_interface_to_friendly_interface_name($interface): convert fxp0 -> wan, etc.
+ */
+function convert_real_interface_to_friendly_interface_name($interface) {
+	global $config;
+	$ifdescrs = array('wan', 'lan');
+	for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++)
+		$ifdescrs['opt' . $j] = "opt" . $j;
+	foreach ($ifdescrs as $ifdescr => $ifname) {
+		if($config['interfaces']['$ifname']['if'] == $interface)
+			return $ifname;
+		$int = filter_translate_type_to_real_interface($ifname);
+		if($ifname == $interface) return $ifname;
+		if($int == $interface) return $ifname;
+	}
+	return $interface;
+}
+
+/*
+ * update_progress_bar($percent): updates the javascript driven progress bar.
+ */
+function update_progress_bar($percent) {
+	global $pkg_interface;
+	if($percent > 100) $percent = 1;
+	if($pkg_interface <> "console") {
+		echo "\n<script type=\"text/javascript\" language=\"javascript\">";
+		echo "\ndocument.progressbar.style.width='" . $percent . "%';";
+		echo "\n</script>";
+	} else {
+		echo " {$percent}%";
+	}
+}
+
+/****f* pfsense-utils/WakeOnLan
+ * NAME
+ *   WakeOnLan - Wake a machine up using the wake on lan format/protocol
+ * RESULT
+ *   true/false - true if the operation was successful
+ ******/
+function WakeOnLan($addr, $mac)
+{
+	$addr_byte = explode(':', $mac);
+	$hw_addr = '';
+
+	for ($a=0; $a < 6; $a++)
+		$hw_addr .= chr(hexdec($addr_byte[$a]));
+
+	$msg = chr(255).chr(255).chr(255).chr(255).chr(255).chr(255);
+
+	for ($a = 1; $a <= 16; $a++)
+		$msg .= $hw_addr;
+
+	// send it to the broadcast address using UDP
+	$s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
+	if ($s == false) {
+		log_error("Error creating socket!");
+		log_error("Error code is '".socket_last_error($s)."' - " . socket_strerror(socket_last_error($s)));
+	} else {
+		// setting a broadcast option to socket:
+		$opt_ret =  socket_set_option($s, 1, 6, TRUE);
+		if($opt_ret < 0)
+			log_error("setsockopt() failed, error: " . strerror($opt_ret));
+		$e = socket_sendto($s, $msg, strlen($msg), 0, $addr, 2050);
+		socket_close($s);
+		log_error("Magic Packet sent ({$e}) to {$addr} MAC={$mac}");
+		return true;
 	}
-	
-	/****f* pfsense-utils/WakeOnLan
-	 * NAME
-	 *   WakeOnLan - Wake a machine up using the wake on lan format/protocol
-	 * RESULT
-	 *   true/false - true if the operation was successful
-	 ******/
-	function WakeOnLan($addr, $mac)
-	{
-		$addr_byte = explode(':', $mac);
-		$hw_addr = '';
-	
-		for ($a=0; $a < 6; $a++)
-			$hw_addr .= chr(hexdec($addr_byte[$a]));
-	
-		$msg = chr(255).chr(255).chr(255).chr(255).chr(255).chr(255);
-	
-		for ($a = 1; $a <= 16; $a++)
-			$msg .= $hw_addr;
-	
-		// send it to the broadcast address using UDP
-		$s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-		if ($s == false) {
-			log_error("Error creating socket!");
-			log_error("Error code is '".socket_last_error($s)."' - " . socket_strerror(socket_last_error($s)));
-		} else {
-			// setting a broadcast option to socket:
-			$opt_ret =  socket_set_option($s, 1, 6, TRUE);
-			if($opt_ret < 0)
-				log_error("setsockopt() failed, error: " . strerror($opt_ret));
-			$e = socket_sendto($s, $msg, strlen($msg), 0, $addr, 2050);
-			socket_close($s);
-			log_error("Magic Packet sent ({$e}) to {$addr} MAC={$mac}");
-			return true;
-		}
-	
+
+	return false;
+}
+
+/*
+ * gather_altq_queue_stats():  gather altq queue stats and return an array that
+ *                             is queuename|qlength|measured_packets
+ *                             NOTE: this command takes 5 seconds to run
+ */
+function gather_altq_queue_stats($dont_return_root_queues) {
+	mwexec("/usr/bin/killall -9 pfctl");
+	$stats = `/sbin/pfctl -vvsq & /bin/sleep 5;/usr/bin/killall pfctl 2>/dev/null`;
+	$stats_array = split("\n", $stats);
+	$queue_stats = array();
+	foreach ($stats_array as $stats_line) {
+		$match_array = "";
+		if (preg_match_all("/queue\s+(\w+)\s+/",$stats_line,$match_array))
+			$queue_name = $match_array[1][0];
+		if (preg_match_all("/measured:\s+.*packets\/s\,\s(.*)\s+\]/",$stats_line,$match_array))
+			$speed = $match_array[1][0];
+		if (preg_match_all("/borrows:\s+(.*)/",$stats_line,$match_array))
+			$borrows = $match_array[1][0];
+		if (preg_match_all("/suspends:\s+(.*)/",$stats_line,$match_array))
+			$suspends = $match_array[1][0];
+		if (preg_match_all("/dropped pkts:\s+(.*)/",$stats_line,$match_array))
+			$drops = $match_array[1][0];
+		if (preg_match_all("/measured:\s+(.*)packets/",$stats_line,$match_array)) {
+			$measured = $match_array[1][0];
+			if($dont_return_root_queues == true)
+				if(stristr($queue_name,"root_") == false)
+					array_push($queue_stats, "{$queue_name}|{$speed}|{$measured}|{$borrows}|{$suspends}|{$drops}");
+		}
+	}
+	return $queue_stats;
+}
+
+/*
+ * reverse_strrchr($haystack, $needle):  Return everything in $haystack up to the *last* instance of $needle.
+ *					 Useful for finding paths and stripping file extensions.
+ */
+function reverse_strrchr($haystack, $needle) {
+	return strrpos($haystack, $needle) ? substr($haystack, 0, strrpos($haystack, $needle) +1 ) : false;
+}
+
+/*
+ *  backup_config_section($section): returns as an xml file string of
+ *                                   the configuration section
+ */
+function backup_config_section($section) {
+	global $config;
+	$new_section = &$config[$section];
+	/* generate configuration XML */
+	$xmlconfig = dump_xml_config($new_section, $section);
+	$xmlconfig = str_replace("<?xml version=\"1.0\"?>", "", $xmlconfig);
+	return $xmlconfig;
+}
+
+/*
+ *  backup_vip_config_section($section): returns as an xml file string of
+ *                                   the configuration section
+ */
+function backup_vip_config_section() {
+	global $config;
+	$new_section = &$config['virtualip'];
+	foreach($new_section['vip'] as $section) {
+		if($section['mode'] == "proxyarp") {
+			unset($section);
+		}
+		if($section['advskew'] <> "") {
+			$section_val = intval($section['advskew']);
+			$section_val=$section_val+100;
+			if($section_val > 255)
+				$section_val = 255;
+			$section['advskew'] = $section_val;
+		}
+		$temp['vip'][] = $section;
+   }
+   return $temp;
+}
+
+/*
+ *  restore_config_section($section, new_contents): restore a configuration section,
+ *                                                  and write the configuration out
+ *                                                  to disk/cf.
+ */
+function restore_config_section($section, $new_contents) {
+	global $config, $g;
+	conf_mount_rw();
+	$fout = fopen("{$g['tmp_path']}/tmpxml","w");
+	fwrite($fout, $new_contents);
+	fclose($fout);
+	$section_xml = parse_xml_config($g['tmp_path'] . "/tmpxml", $section);
+	$config[$section] = &$section_xml;
+	unlink($g['tmp_path'] . "/tmpxml");
+	write_config("Restored {$section} of config file (maybe from CARP partner)");
+	conf_mount_ro();
+	return;
+}
+
+/*
+ *  merge_config_section($section, new_contents):   restore a configuration section,
+ *                                                  and write the configuration out
+ *                                                  to disk/cf.  But preserve the prior
+ * 													structure if needed
+ */
+function merge_config_section($section, $new_contents) {
+	global $config;
+	conf_mount_rw();
+	$fname = get_tmp_filename();
+	$fout = fopen($fname, "w");
+	fwrite($fout, $new_contents);
+	fclose($fout);
+	$section_xml = parse_xml_config($fname, $section);
+	$config[$section] = $section_xml;
+	unlink($fname);
+	write_config("Restored {$section} of config file (maybe from CARP partner)");
+	conf_mount_ro();
+	return;
+}
+
+/*
+ * http_post($server, $port, $url, $vars): does an http post to a web server
+ *                                         posting the vars array.
+ * written by nf@bigpond.net.au
+ */
+function http_post($server, $port, $url, $vars) {
+	$user_agent = "Mozilla/4.0 (compatible; MSIE 5.5; Windows 98)";
+	$urlencoded = "";
+	while (list($key,$value) = each($vars))
+		$urlencoded.= urlencode($key) . "=" . urlencode($value) . "&";
+	$urlencoded = substr($urlencoded,0,-1);
+	$content_length = strlen($urlencoded);
+	$headers = "POST $url HTTP/1.1
+Accept: */*
+Accept-Language: en-au
+Content-Type: application/x-www-form-urlencoded
+User-Agent: $user_agent
+Host: $server
+Connection: Keep-Alive
+Cache-Control: no-cache
+Content-Length: $content_length
+
+";
+
+	$errno = "";
+	$errstr = "";
+	$fp = fsockopen($server, $port, $errno, $errstr);
+	if (!$fp) {
 		return false;
 	}
-	
-	/*
-	 * gather_altq_queue_stats():  gather altq queue stats and return an array that
-	 *                             is queuename|qlength|measured_packets
-	 *                             NOTE: this command takes 5 seconds to run
-	 */
-	function gather_altq_queue_stats($dont_return_root_queues) {
-		mwexec("/usr/bin/killall -9 pfctl");
-		$stats = `/sbin/pfctl -vvsq & /bin/sleep 5;/usr/bin/killall pfctl 2>/dev/null`;
-		$stats_array = split("\n", $stats);
-		$queue_stats = array();
-		foreach ($stats_array as $stats_line) {
-			$match_array = "";
-			if (preg_match_all("/queue\s+(\w+)\s+/",$stats_line,$match_array))
-				$queue_name = $match_array[1][0];
-			if (preg_match_all("/measured:\s+.*packets\/s\,\s(.*)\s+\]/",$stats_line,$match_array))
-				$speed = $match_array[1][0];
-			if (preg_match_all("/borrows:\s+(.*)/",$stats_line,$match_array))
-				$borrows = $match_array[1][0];
-			if (preg_match_all("/suspends:\s+(.*)/",$stats_line,$match_array))
-				$suspends = $match_array[1][0];
-			if (preg_match_all("/dropped pkts:\s+(.*)/",$stats_line,$match_array))
-				$drops = $match_array[1][0];
-			if (preg_match_all("/measured:\s+(.*)packets/",$stats_line,$match_array)) {
-				$measured = $match_array[1][0];
-				if($dont_return_root_queues == true)
-					if(stristr($queue_name,"root_") == false)
-						array_push($queue_stats, "{$queue_name}|{$speed}|{$measured}|{$borrows}|{$suspends}|{$drops}");
-			}
-		}
-		return $queue_stats;
-	}
-	
-	/*
-	 * reverse_strrchr($haystack, $needle):  Return everything in $haystack up to the *last* instance of $needle.
-	 *					 Useful for finding paths and stripping file extensions.
-	 */
-	function reverse_strrchr($haystack, $needle) {
-		return strrpos($haystack, $needle) ? substr($haystack, 0, strrpos($haystack, $needle) +1 ) : false;
-	}
-	
-	/*
-	 *  backup_config_section($section): returns as an xml file string of
-	 *                                   the configuration section
-	 */
-	function backup_config_section($section) {
-		global $config;
-		$new_section = &$config[$section];
-		/* generate configuration XML */
-		$xmlconfig = dump_xml_config($new_section, $section);
-		$xmlconfig = str_replace("<?xml version=\"1.0\"?>", "", $xmlconfig);
-		return $xmlconfig;
-	}
-	
-	/*
-	 *  backup_vip_config_section($section): returns as an xml file string of
-	 *                                   the configuration section
-	 */
-	function backup_vip_config_section() {
-		global $config;
-		$new_section = &$config['virtualip'];
-		foreach($new_section['vip'] as $section) {
-			if($section['mode'] == "proxyarp") {
-				unset($section);
-			}
-			if($section['advskew'] <> "") {
-				$section_val = intval($section['advskew']);
-				$section_val=$section_val+100;
-				if($section_val > 255)
-					$section_val = 255;
-				$section['advskew'] = $section_val;
-			}
-			$temp['vip'][] = $section;
-	   }
-	   return $temp;
-	}
-	
-	/*
-	 *  restore_config_section($section, new_contents): restore a configuration section,
-	 *                                                  and write the configuration out
-	 *                                                  to disk/cf.
-	 */
-	function restore_config_section($section, $new_contents) {
-		global $config, $g;
-		conf_mount_rw();
-		$fout = fopen("{$g['tmp_path']}/tmpxml","w");
-		fwrite($fout, $new_contents);
-		fclose($fout);
-		$section_xml = parse_xml_config($g['tmp_path'] . "/tmpxml", $section);
-		$config[$section] = &$section_xml;
-		unlink($g['tmp_path'] . "/tmpxml");
-		write_config("Restored {$section} of config file (maybe from CARP partner)");
-		conf_mount_ro();
-		return;
-	}
-	
-	/*
-	 *  merge_config_section($section, new_contents):   restore a configuration section,
-	 *                                                  and write the configuration out
-	 *                                                  to disk/cf.  But preserve the prior
-	 * 													structure if needed
-	 */
-	function merge_config_section($section, $new_contents) {
-		global $config;
-		conf_mount_rw();
-		$fname = get_tmp_filename();
-		$fout = fopen($fname, "w");
-		fwrite($fout, $new_contents);
+
+	fputs($fp, $headers);
+	fputs($fp, $urlencoded);
+
+	$ret = "";
+	while (!feof($fp))
+		$ret.= fgets($fp, 1024);
+	fclose($fp);
+
+	return $ret;
+}
+
+/*
+ *  php_check_syntax($code_tocheck, $errormessage): checks $code_to_check for errors
+ */
+if (!function_exists('php_check_syntax')){
+	function php_check_syntax($code_to_check, &$errormessage){
+		return false;
+		$fout = fopen("/tmp/codetocheck.php","w");
+		$code = $_POST['content'];
+		$code = str_replace("<?php", "", $code);
+		$code = str_replace("?>", "", $code);
+		fwrite($fout, "<?php\n\n");
+		fwrite($fout, $code_to_check);
+		fwrite($fout, "\n\n?>\n");
 		fclose($fout);
-		$section_xml = parse_xml_config($fname, $section);
-		$config[$section] = $section_xml;
-		unlink($fname);
-		write_config("Restored {$section} of config file (maybe from CARP partner)");
-		conf_mount_ro();
-		return;
-	}
-	
-	/*
-	 * http_post($server, $port, $url, $vars): does an http post to a web server
-	 *                                         posting the vars array.
-	 * written by nf@bigpond.net.au
-	 */
-	function http_post($server, $port, $url, $vars) {
-		$user_agent = "Mozilla/4.0 (compatible; MSIE 5.5; Windows 98)";
-		$urlencoded = "";
-		while (list($key,$value) = each($vars))
-			$urlencoded.= urlencode($key) . "=" . urlencode($value) . "&";
-		$urlencoded = substr($urlencoded,0,-1);
-		$content_length = strlen($urlencoded);
-		$headers = "POST $url HTTP/1.1
-	Accept: */*
-	Accept-Language: en-au
-	Content-Type: application/x-www-form-urlencoded
-	User-Agent: $user_agent
-	Host: $server
-	Connection: Keep-Alive
-	Cache-Control: no-cache
-	Content-Length: $content_length
-	
-	";
-	
-		$errno = "";
-		$errstr = "";
-		$fp = fsockopen($server, $port, $errno, $errstr);
-		if (!$fp) {
-			return false;
-		}
-	
-		fputs($fp, $headers);
-		fputs($fp, $urlencoded);
-	
-		$ret = "";
-		while (!feof($fp))
-			$ret.= fgets($fp, 1024);
-		fclose($fp);
-	
-		return $ret;
-	}
-	
-	/*
-	 *  php_check_syntax($code_tocheck, $errormessage): checks $code_to_check for errors
-	 */
-	if (!function_exists('php_check_syntax')){
-		function php_check_syntax($code_to_check, &$errormessage){
-			return false;
-			$fout = fopen("/tmp/codetocheck.php","w");
-			$code = $_POST['content'];
-			$code = str_replace("<?php", "", $code);
-			$code = str_replace("?>", "", $code);
-			fwrite($fout, "<?php\n\n");
-			fwrite($fout, $code_to_check);
-			fwrite($fout, "\n\n?>\n");
-			fclose($fout);
-			$command = "/usr/local/bin/php -l /tmp/codetocheck.php";
-			$output = exec_command($command);
-			if (stristr($output, "Errors parsing") == false) {
-				echo "false\n";
-				$errormessage = '';
-				return(false);
-			} else {
-				$errormessage = $output;
-				return(true);
-			}
-		}
-	}
-	
-	/*
-	 *  php_check_filename_syntax($filename, $errormessage): checks the file $filename for errors
-	 */
-	if (!function_exists('php_check_syntax')){
-		function php_check_syntax($code_to_check, &$errormessage){
-			return false;
-			$command = "/usr/local/bin/php -l " . $code_to_check;
-			$output = exec_command($command);
-			if (stristr($output, "Errors parsing") == false) {
-				echo "false\n";
-				$errormessage = '';
-				return(false);
-			} else {
-				$errormessage = $output;
-				return(true);
-			}
+		$command = "/usr/local/bin/php -l /tmp/codetocheck.php";
+		$output = exec_command($command);
+		if (stristr($output, "Errors parsing") == false) {
+			echo "false\n";
+			$errormessage = '';
+			return(false);
+		} else {
+			$errormessage = $output;
+			return(true);
 		}
 	}
-	
-	/*
-	 * rmdir_recursive($path,$follow_links=false)
-	 * Recursively remove a directory tree (rm -rf path)
-	 * This is for directories _only_
-	 */
-	function rmdir_recursive($path,$follow_links=false) {
-		$to_do = glob($path);
-		if(!is_array($to_do)) $to_do = array($to_do);
-		foreach($to_do as $workingdir) { // Handle wildcards by foreaching.
-			if(file_exists($workingdir)) {
-				if(is_dir($workingdir)) {
-					$dir = opendir($workingdir);
-					while ($entry = readdir($dir)) {
-						if (is_file("$workingdir/$entry") || ((!$follow_links) && is_link("$workingdir/$entry")))
-							unlink("$workingdir/$entry");
-						elseif (is_dir("$workingdir/$entry") && $entry!='.' && $entry!='..')
-							rmdir_recursive("$workingdir/$entry");
-					}
-					closedir($dir);
-					rmdir($workingdir);
-				} elseif (is_file($workingdir)) {
-					unlink($workingdir);
+}
+
+/*
+ *  php_check_filename_syntax($filename, $errormessage): checks the file $filename for errors
+ */
+if (!function_exists('php_check_syntax')){
+	function php_check_syntax($code_to_check, &$errormessage){
+		return false;
+		$command = "/usr/local/bin/php -l " . $code_to_check;
+		$output = exec_command($command);
+		if (stristr($output, "Errors parsing") == false) {
+			echo "false\n";
+			$errormessage = '';
+			return(false);
+		} else {
+			$errormessage = $output;
+			return(true);
+		}
+	}
+}
+
+/*
+ * rmdir_recursive($path,$follow_links=false)
+ * Recursively remove a directory tree (rm -rf path)
+ * This is for directories _only_
+ */
+function rmdir_recursive($path,$follow_links=false) {
+	$to_do = glob($path);
+	if(!is_array($to_do)) $to_do = array($to_do);
+	foreach($to_do as $workingdir) { // Handle wildcards by foreaching.
+		if(file_exists($workingdir)) {
+			if(is_dir($workingdir)) {
+				$dir = opendir($workingdir);
+				while ($entry = readdir($dir)) {
+					if (is_file("$workingdir/$entry") || ((!$follow_links) && is_link("$workingdir/$entry")))
+						unlink("$workingdir/$entry");
+					elseif (is_dir("$workingdir/$entry") && $entry!='.' && $entry!='..')
+						rmdir_recursive("$workingdir/$entry");
 				}
-	               	}
+				closedir($dir);
+				rmdir($workingdir);
+			} elseif (is_file($workingdir)) {
+				unlink($workingdir);
+			}
+               	}
+	}
+	return;
+}
+
+/*
+ *     get_memory()
+ *     returns an array listing the amount of
+ *     memory installed in the hardware
+ *     [0]real and [1]available
+ */
+function get_memory() {
+	if(file_exists("/var/log/dmesg.boot")) {
+		$mem = `cat /var/log/dmesg.boot | grep memory`;
+		$matches = "";
+		if (preg_match_all("/real memory  = .* \((.*) MB/", $mem, $matches))
+			$real = $matches[1];
+		if (preg_match_all("/avail memory = .* \((.*) MB/", $mem, $matches))
+			$avail = $matches[1];
+		return array($real[0],$avail[0]);
+	} else {
+		$mem = `dmesg -a`;
+		$matches = "";
+		if (preg_match_all("/real memory  = .* \((.*) MB/", $mem, $matches))
+			$real = $matches[1];
+		if (preg_match_all("/avail memory = .* \((.*) MB/", $mem, $matches))
+			$avail = $matches[1];
+		return array($real[0],$avail[0]);
+	}
+}
+
+/*
+ *    safe_mkdir($path, $mode = 0755)
+ *    create directory if it doesn't already exist and isn't a file!
+ */
+function safe_mkdir($path, $mode=0755) {
+	global $g;
+
+	/* cdrom is ro. */
+	if($g['platform'] == "cdrom")
+		return false;
+
+	if (!is_file($path) && !is_dir($path))
+		return mkdir($path, $mode);
+	else
+		return false;
+}
+
+/*
+ * make_dirs($path, $mode = 0755)
+ * create directory tree recursively (mkdir -p)
+ */
+function make_dirs($path, $mode = 0755) {
+	$base = '';
+	foreach (explode('/', $path) as $dir) {
+		$base .= "/$dir";
+		if (!is_dir($base)) {
+			if (!@mkdir($base, $mode))
+				return false;
 		}
-		return;
 	}
-	
-	/*
-	 *     get_memory()
-	 *     returns an array listing the amount of
-	 *     memory installed in the hardware
-	 *     [0]real and [1]available
-	 */
-	function get_memory() {
-		if(file_exists("/var/log/dmesg.boot")) {
-			$mem = `cat /var/log/dmesg.boot | grep memory`;
-			$matches = "";
-			if (preg_match_all("/real memory  = .* \((.*) MB/", $mem, $matches))
-				$real = $matches[1];
-			if (preg_match_all("/avail memory = .* \((.*) MB/", $mem, $matches))
-				$avail = $matches[1];
-			return array($real[0],$avail[0]);
+	return true;
+}
+
+/*
+ * call_pfsense_method(): Call a method exposed by the pfsense.com XMLRPC server.
+ */
+function call_pfsense_method($method, $params, $timeout = 0) {
+	$ip = gethostbyname('www.pfsense.com');
+	if($ip == "www.pfsense.com")
+		return false;
+	global $g, $config;
+	$xmlrpc_base_url = $g['xmlrpcbaseurl'];
+	$xmlrpc_path = $g['xmlrpcpath'];
+	$msg = new XML_RPC_Message($method, array(XML_RPC_Encode($params)));
+	$cli = new XML_RPC_Client($xmlrpc_path, $xmlrpc_base_url);
+	$resp = $cli->send($msg, $timeout);
+	if(!$resp) {
+		log_error("XMLRPC communication error: " . $cli->errstr);
+		return false;
+	} elseif($resp->faultCode()) {
+		log_error("XMLRPC request failed with error " . $resp->faultCode() . ": " . $resp->faultString());
+		return false;
+	} else {
+		return XML_RPC_Decode($resp->value());
+	}
+}
+
+/*
+ * check_firmware_version(): Check whether the current firmware installed is the most recently released.
+ */
+function check_firmware_version($tocheck = "all", $return_php = true) {
+	global $g, $config;
+	$ip = gethostbyname('www.pfsense.com');
+	if($ip == "www.pfsense.com")
+		return false;
+	$rawparams = array("firmware" => array("version" => trim(file_get_contents('/etc/version'))),
+		"kernel"   => array("version" => trim(file_get_contents('/etc/version_kernel'))),
+		"base"     => array("version" => trim(file_get_contents('/etc/version_base'))),
+		"platform" => trim(file_get_contents('/etc/platform'))
+		);
+	if($tocheck == "all") {
+		$params = $rawparams;
+	} else {
+		foreach($tocheck as $check) {
+			$params['check'] = $rawparams['check'];
+			$params['platform'] = $rawparams['platform'];
+		}
+	}
+	if($config['system']['firmware']['branch']) {
+		$params['branch'] = $config['system']['firmware']['branch'];
+	}
+	if(!$versions = call_pfsense_method('pfsense.get_firmware_version', $params)) {
+		return false;
+	} else {
+		$versions["current"] = $params;
+	}
+	return $versions;
+}
+
+function get_disk_info() {
+	$diskout = "";
+	exec("/bin/df -h | /usr/bin/grep -w '/' | /usr/bin/awk '{ print $2, $3, $4, $5 }'", $diskout);
+	return explode(' ', $diskout[0]);
+	// $size, $used, $avail, $cap
+}
+
+/****f* pfsense-utils/display_top_tabs
+ * NAME
+ *   display_top_tabs - display tabs with rounded edges
+ * INPUTS
+ *   $text	- array of tabs
+ * RESULT
+ *   null
+ ******/
+function display_top_tabs($tab_array) {
+	echo "<table cellpadding='0' cellspacing='0'>\n";
+	echo " <tr height='1'>\n";
+	$tabscounter = 0;
+	foreach ($tab_array as $ta) {
+		if($ta[1] == true) {
+			echo "  <td bgcolor='#EEEEEE' onClick=\"document.location='{$ta[2]}'\" style=\"cursor: pointer;\"><div id='tabactive'></div></td>\n";
 		} else {
-			$mem = `dmesg -a`;
-			$matches = "";
-			if (preg_match_all("/real memory  = .* \((.*) MB/", $mem, $matches))
-				$real = $matches[1];
-			if (preg_match_all("/avail memory = .* \((.*) MB/", $mem, $matches))
-				$avail = $matches[1];
-			return array($real[0],$avail[0]);
+			echo "  <td bgcolor='#777777' onClick=\"document.location='{$ta[2]}'\" style=\"cursor: pointer;\"><div id='tabdeactive{$tabscounter}'></div></td>\n";
 		}
+		$tabscounter++;
 	}
-	
-	/*
-	 *    safe_mkdir($path, $mode = 0755)
-	 *    create directory if it doesn't already exist and isn't a file!
-	 */
-	function safe_mkdir($path, $mode=0755) {
-		global $g;
-	
-		/* cdrom is ro. */
-		if($g['platform'] == "cdrom")
-			return false;
-	
-		if (!is_file($path) && !is_dir($path))
-			return mkdir($path, $mode);
-		else
-			return false;
-	}
-	
-	/*
-	 * make_dirs($path, $mode = 0755)
-	 * create directory tree recursively (mkdir -p)
-	 */
-	function make_dirs($path, $mode = 0755) {
-		$base = '';
-		foreach (explode('/', $path) as $dir) {
-			$base .= "/$dir";
-			if (!is_dir($base)) {
-				if (!@mkdir($base, $mode))
-					return false;
-			}
-		}
-		return true;
-	}
-	
-	/*
-	 * call_pfsense_method(): Call a method exposed by the pfsense.com XMLRPC server.
-	 */
-	function call_pfsense_method($method, $params, $timeout = 0) {
-		$ip = gethostbyname('www.pfsense.com');
-		if($ip == "www.pfsense.com")
-			return false;
-		global $g, $config;
-		$xmlrpc_base_url = $g['xmlrpcbaseurl'];
-		$xmlrpc_path = $g['xmlrpcpath'];
-		$msg = new XML_RPC_Message($method, array(XML_RPC_Encode($params)));
-		$cli = new XML_RPC_Client($xmlrpc_path, $xmlrpc_base_url);
-		$resp = $cli->send($msg, $timeout);
-		if(!$resp) {
-			log_error("XMLRPC communication error: " . $cli->errstr);
-			return false;
-		} elseif($resp->faultCode()) {
-			log_error("XMLRPC request failed with error " . $resp->faultCode() . ": " . $resp->faultString());
-			return false;
+	echo "</tr>\n<tr>\n";
+	foreach ($tab_array as $ta) {
+		if($ta[1] == true) {
+			echo "  <td bgcolor='#EEEEEE' onClick=\"document.location='{$ta[2]}'\" style=\"cursor: pointer;\"><B>&nbsp;&nbsp;&nbsp;{$ta[0]}";
+			echo "&nbsp;&nbsp;&nbsp;";
+			echo "<font size='-12'>&nbsp;</td>\n";
 		} else {
-			return XML_RPC_Decode($resp->value());
+			echo "  <td bgcolor='#777777' onClick=\"document.location='{$ta[2]}'\" style=\"cursor: pointer;\"><B>&nbsp;&nbsp;&nbsp;<a href='{$ta[2]}'>";
+			echo "<font color='white'>{$ta[0]}</a>&nbsp;&nbsp;&nbsp;";
+			echo "<font size='-12'>&nbsp;</td>\n";
 		}
 	}
-	
-	/*
-	 * check_firmware_version(): Check whether the current firmware installed is the most recently released.
-	 */
-	function check_firmware_version($tocheck = "all", $return_php = true) {
-		global $g, $config;
-		$ip = gethostbyname('www.pfsense.com');
-		if($ip == "www.pfsense.com")
-			return false;
-		$rawparams = array("firmware" => array("version" => trim(file_get_contents('/etc/version'))),
-			"kernel"   => array("version" => trim(file_get_contents('/etc/version_kernel'))),
-			"base"     => array("version" => trim(file_get_contents('/etc/version_base'))),
-			"platform" => trim(file_get_contents('/etc/platform'))
-			);
-		if($tocheck == "all") {
-			$params = $rawparams;
+	echo "</tr>\n<tr height='5px'>\n";
+	foreach ($tab_array as $ta) {
+		if($ta[1] == true) {
+			echo "  <td bgcolor='#EEEEEE' onClick=\"document.location='{$ta[2]}'\" style=\"cursor: pointer;\"></td>\n";
 		} else {
-			foreach($tocheck as $check) {
-				$params['check'] = $rawparams['check'];
-				$params['platform'] = $rawparams['platform'];
+			echo "  <td bgcolor='#777777' onClick=\"document.location='{$ta[2]}'\" style=\"cursor: pointer;\"></td>\n";
+		}
+		$tabscounter++;
+	}
+	echo " </tr>\n";
+	echo "</table>\n";
+
+	echo "<script type=\"text/javascript\">";
+	echo "NiftyCheck();\n";
+	echo "Rounded(\"div#tabactive\",\"top\",\"#FFF\",\"#EEEEEE\",\"smooth\");\n";
+	for($x=0; $x<$tabscounter; $x++)
+		echo "Rounded(\"div#tabdeactive{$x}\",\"top\",\"#FFF\",\"#777777\",\"smooth\");\n";
+	echo "</script>";
+}
+
+
+/****f* pfsense-utils/display_topbar
+ * NAME
+ *   display_topbar - top a table off with rounded edges
+ * INPUTS
+ *   $text	- (optional) Text to include in bar
+ * RESULT
+ *   null
+ ******/
+function display_topbar($text = "", $bg_color="#990000", $replace_color="#FFFFFF", $rounding_style="smooth") {
+	echo "     <table width='100%' cellpadding='0' cellspacing='0'>\n";
+	echo "       <tr height='1'>\n";
+	echo "         <td width='100%' valign='top' color='{$bg_color}' bgcolor='{$bg_color}'>";
+	echo "		<div id='topbar'></div></td>\n";
+	echo "       </tr>\n";
+	echo "       <tr height='1'>\n";
+	if ($text != "")
+		echo "         <td height='1' class='listtopic'>{$text}</td>\n";
+	else
+		echo "         <td height='1' class='listtopic'></td>\n";
+	echo "       </tr>\n";
+	echo "     </table>";
+	echo "<script type=\"text/javascript\">";
+	echo "NiftyCheck();\n";
+	echo "Rounded(\"div#topbar\",\"top\",\"{$replace_color}\",\"{$bg_color}\",\"{$rounding_style}\");\n";
+	echo "</script>";
+}
+
+/****f* pfsense-utils/generate_random_mac_address
+ * NAME
+ *   generate_random_mac - generates a random mac address
+ * INPUTS
+ *   none
+ * RESULT
+ *   $mac - a random mac address
+ ******/
+function generate_random_mac_address() {
+	$mac = "02";
+	for($x=0; $x<5; $x++)
+		$mac .= ":" . dechex(rand(16, 255));
+	return $mac;
+}
+
+/****f* pfsense-utils/strncpy
+ * NAME
+ *   strncpy - copy strings
+ * INPUTS
+ *   &$dst, $src, $length
+ * RESULT
+ *   none
+ ******/
+function strncpy(&$dst, $src, $length) {
+	if (strlen($src) > $length) {
+		$dst = substr($src, 0, $length);
+	} else {
+		$dst = $src;
+	}
+}
+
+/****f* pfsense-utils/reload_interfaces_sync
+ * NAME
+ *   reload_interfaces - reload all interfaces
+ * INPUTS
+ *   none
+ * RESULT
+ *   none
+ ******/
+function reload_interfaces_sync() {
+	global $config, $g, $debug;
+
+	$shutdown_webgui_needed = false;
+
+	touch("{$g['tmp_path']}/reloading_all");
+
+	if($debug)
+		log_error("reload_interfaces_sync() is starting.");
+
+	if(file_exists("{$g['tmp_path']}/config.cache"))
+		unlink("{$g['tmp_path']}/config.cache");
+
+	/* parse config.xml again */
+	$config = parse_config(true);
+
+	$wan_if = $config['interfaces']['wan']['if'];
+	$lan_if = $config['interfaces']['lan']['if'];
+
+	if($debug)
+		log_error("Cleaning up Interfaces");
+
+	/* build an array of interfaces to work with */
+	$iflist = array("lan" => "LAN", "wan" => "WAN");
+	for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++)
+		$iflist['opt' . $i] = "opt{$i}";
+
+	foreach ($iflist as $ifent => $ifname) {
+		$ifname_real = convert_friendly_interface_to_real_interface_name($ifname);
+		if(stristr($ifname, "lo0") == true)
+			continue;
+		/* do not process wan interface, its mandatory */
+		if(stristr($ifname, "$wan_if") == true)
+			continue;
+		/* do not process lan interface, its mandatory */
+		if(stristr($ifname, "$lan_if") == true)
+			continue;
+		if($debug)
+			log_error("Downing and deleting $ifname_real - $ifname");
+		mwexec("/sbin/ifconfig {$ifname_real} down");
+		mwexec("/sbin/ifconfig {$ifname_real} delete");
+	}
+
+	/* set up VLAN virtual interfaces */
+	if($debug)
+		log_error("Configuring VLANS");
+	interfaces_vlan_configure();
+
+	/* set up LAN interface */
+	if($debug)
+		log_error("Configuring LAN");
+	interfaces_lan_configure();
+
+	/* set up WAN interface */
+	if($debug)
+		log_error("Configuring WAN");
+	interfaces_wan_configure();
+
+	/* set up Optional interfaces */
+	if($debug)
+		log_error("Configuring optional interfaces");
+	interfaces_optional_configure();
+
+	/* set up static routes */
+	if($debug)
+		log_error("Configuring system Routing");
+	system_routing_configure();
+
+	/* enable routing */
+	if($debug)
+		log_error("Enabling system routing");
+	system_routing_enable();
+
+	/* setup captive portal if needed */
+	if($debug)
+		log_error("Configuring Captive portal");
+	captiveportal_configure();
+
+	/* bring up carp interfaces */
+	if($debug)
+		log_error("Configuring CARP");
+	interfaces_carp_configure();
+
+	/* bring up carp interfaces*/
+	if($debug)
+		log_error("Bringing up CARP interfaces");
+	interfaces_carp_bring_up_final();
+
+	/* restart webConfigurator if needed */
+	if($shutdown_webgui_needed == true)
+		touch("/tmp/restart_webgui");
+
+	/* start devd back up */
+	mwexec("/bin/rm /tmp/reload*");
+
+	/* remove reloading_all trigger */
+	if($debug)
+		log_error("Removing {$g['tmp_path']}/reloading_all");
+	unlink_if_exists("{$g['tmp_path']}/reloading_all");
+}
+
+/****f* pfsense-utils/reload_all
+ * NAME
+ *   reload_all - triggers a reload of all settings
+ *   * INPUTS
+ *   none
+ * RESULT
+ *   none
+ ******/
+function reload_all() {
+	touch("/tmp/reload_all");
+}
+
+/****f* pfsense-utils/reload_interfaces
+ * NAME
+ *   reload_interfaces - triggers a reload of all interfaces
+ * INPUTS
+ *   none
+ * RESULT
+ *   none
+ ******/
+function reload_interfaces() {
+	touch("/tmp/reload_interfaces");
+}
+
+/****f* pfsense-utils/sync_webgui_passwords
+ * NAME
+ *   sync_webgui_passwords - syncs webgui and ssh passwords
+ * INPUTS
+ *   none
+ * RESULT
+ *   none
+ ******/
+function sync_webgui_passwords() {
+	global $config, $g;
+	conf_mount_rw();
+	$fd = fopen("{$g['varrun_path']}/htpasswd", "w");
+	if (!$fd) {
+		printf("Error: cannot open htpasswd in system_password_configure().\n");
+		return 1;
+	}
+	/* set admin account */
+	$username = $config['system']['username'];
+
+	/* set defined user account */
+	if($username <> "admin") {
+		$username = $config['system']['username'];
+		fwrite($fd, $username . ":" . $config['system']['password'] . "\n");
+	} else {
+		fwrite($fd, $username . ":" . $config['system']['password'] . "\n");
+	}
+	fclose($fd);
+	chmod("{$g['varrun_path']}/htpasswd", 0600);
+	$crypted_pw = $config['system']['password'];
+	mwexec("/usr/sbin/pwd_mkdb -d /etc -p /etc/master.passwd");
+	mwexec("/usr/sbin/pwd_mkdb -p /etc/master.passwd");
+	/* sync root */
+	$fd = popen("/usr/sbin/pw usermod -n root -H 0", "w");
+	fwrite($fd, $crypted_pw);
+	pclose($fd);
+	mwexec("/usr/sbin/pw usermod -n root -s /bin/sh");
+	/* sync admin */
+	$fd = popen("/usr/sbin/pw usermod -n admin -H 0", "w");
+	fwrite($fd, $crypted_pw);
+	pclose($fd);
+	mwexec("/usr/sbin/pw usermod -n admin -s /etc/rc.initial");
+	mwexec("/usr/sbin/pwd_mkdb -d /etc -p /etc/master.passwd");
+	mwexec("/usr/sbin/pwd_mkdb -p /etc/master.passwd");
+	conf_mount_ro();
+}
+
+/****f* pfsense-utils/cleanup_opt_interfaces_after_removal
+ * NAME
+ *   cleanup_opt_interfaces_after_removal - renumber interfaces after removing
+ *   * INPUTS
+ *   optional interface number
+ * RESULT
+ *   none
+ ******/
+function cleanup_opt_interfaces_after_removal($opt_interface_num) {
+	/*	move all the interfaces up.  for example:
+	*		opt1 --> opt1
+	*		opt2 --> delete
+	*		opt3 --> opt2
+	*		opt4 --> opt3
+	*/
+	global $g, $config;
+	config_lock();
+	conf_mount_rw();
+	unlink_if_exists("{$g['tmp_path']}/config.cache");
+	$config_file = file_get_contents("/cf/conf/config.xml");
+	/* loop through and reassign deleted items */
+	for ($i = 500; isset ($config['interfaces']['opt' . $i]); $i--) {
+		if ($i < $opt_interface_num)
+			break;
+		if ($i == $opt_interface_num) {
+			/* item should be deleted */
+			str_replace("opt" . $i, "optXXXX", $config_file);
+		}
+	}
+	/* loop through and reassign optional items */
+	for ($i = 500; isset ($config['interfaces']['opt' . $i]); $i--) {
+		if ($i < $opt_interface_num)
+			break;
+		/* replace opt$i with $i -1 */
+		str_replace("opt" . $i, "opt" . ($i -1), $config_file);
+	}
+	$fd = fopen("/cf/conf/config.xml", "w");
+	fwrite($fd, $config_file);
+	fclose($fd);
+	$config = parse_config(true);
+	/* loop through and delete old rules */
+	$num_rules = count($config['filter']['rule']);
+	for($x = $num_rules; $x > 0; $x--) {
+		if($config['filter']['rule'][$x])
+			if($config['filter']['rule'][$x]['interface'] == "optXXXX")
+		 		unset($config['filter']['rule'][$x]['interface']);
+	}
+	$num_rules = count($config['nat']['advancedoutbound']['rule']);
+	for($x = $num_rules; $x > 0; $x--) {
+		if($config['nat']['advancedoutbound']['rule'][$x])
+			if($config['nat']['advancedoutbound']['rule'][$x]['interface'] == "optXXXX")
+		 		unset($config['nat']['advancedoutbound']['rule'][$x]['interface']);
+	}
+	$num_rules = count($config['nat']['rule']);
+	for($x = $num_rules; $x > 0; $x--) {
+		if($config['nat']['rule'][$x])
+			if($config['nat']['rule'][$x]['interface'] == "optXXXX")
+		 		unset($config['nat']['rule'][$x]['interface']);
+	}
+	conf_mount_ro();
+	config_unlock();
+	return true;
+}
+
+/****f* pfsense-utils/get_number_of_wan_netgraph_interfaces_needed
+ * NAME
+ *   get_number_of_wan_netgraph_interfaces_needed - returns the
+ *   		amount of netgraph interfaces needed for system wans
+ *   * INPUTS
+ *   none
+ * RESULT
+ *   number of needed netgraph (ng) interfaces
+ ******/
+function get_number_of_wan_netgraph_interfaces_needed() {
+	global $config, $g;
+	/* build an array of interfaces to work with */
+	$iflist = array("wan" => "WAN");
+	for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++)
+		$iflist['opt' . $i] = $config['interfaces']['opt' . $i]['descr'];
+	$ng_interfaces_needed = 0;
+	foreach ($iflist as $ifent => $ifname) {
+		if($config['interfaces'][$ifname]['ipaddr'] == "pppoe") {
+			$ng_interfaces_needed++;
+		}
+	}
+	return $ng_interfaces_needed;
+}
+
+function get_netgaph_interface_assignment($friendly_interface) {
+	global $config, $g;
+	/* build an array of interfaces to work with */
+	$iflist = array("wan" => "WAN");
+	for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++)
+		$iflist['opt' . $i] = $config['interfaces']['opt' . $i]['descr'];
+		$ng_interfaces_needed = 0;
+		$ng_interfaces_number = 0;
+		foreach ($iflist as $ifent => $ifname) {
+		if($config['interfaces'][$ifname]['ipaddr'] == "pppoe") {
+			$ng_interfaces_number++;
+		}
+		if($friendly_interface == $ifname)
+			break;
+	}
+	return $ng_interfaces_number;
+}
+
+/****f* pfsense-utils/reload_all_sync
+ * NAME
+ *   reload_all - reload all settings
+ *   * INPUTS
+ *   none
+ * RESULT
+ *   none
+ ******/
+function reload_all_sync() {
+	global $config, $g;
+
+	$g['booting'] = false;
+
+	touch("{$g['tmp_path']}/reloading_all");
+
+	$shutdown_webgui_needed = false;
+
+	if(file_exists("{$g['tmp_path']}/config.cache"))
+		unlink("{$g['tmp_path']}/config.cache");
+
+	/* parse config.xml again */
+	$config = parse_config(true);
+
+	/* set up our timezone */
+	system_timezone_configure();
+
+	/* set up our hostname */
+	system_hostname_configure();
+
+	/* make hosts file */
+	system_hosts_generate();
+
+	/* generate resolv.conf */
+	system_resolvconf_generate();
+
+	/* delete all old interface information */
+	$iflist = split(" ", str_replace("\n", "", `/sbin/ifconfig -l`));
+
+	$wan_if = $config['interfaces']['wan']['if'];
+	$lan_if = $config['interfaces']['lan']['if'];
+
+	/* build an array of interfaces to work with */
+	$iflist = array("lan" => "LAN", "wan" => "WAN");
+	for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++)
+		$iflist['opt' . $i] = "opt{$i}";
+
+	foreach ($iflist as $ifent => $ifname) {
+		$ifname_real = convert_friendly_interface_to_real_interface_name($ifname);
+		if(stristr($ifname, "lo0") == true)
+			continue;
+		/* do not process wan interface, its mandatory */
+		if($wan_if == $ifname_real)
+			continue;
+		/* do not process lan interface, its mandatory */
+		if($lan_if == $ifname_real)
+			continue;
+		mwexec("/sbin/ifconfig {$ifname_real} down");
+		mwexec("/sbin/ifconfig {$ifname_real} delete");
+	}
+
+	/* set up VLAN virtual interfaces */
+	interfaces_vlan_configure();
+
+	/* set up LAN interface */
+	interfaces_lan_configure();
+
+	/* set up WAN interface */
+	interfaces_wan_configure();
+
+	/* set up Optional interfaces */
+	interfaces_optional_configure();
+
+	/* bring up carp interfaces */
+	interfaces_carp_configure();
+
+	/* set up static routes */
+	system_routing_configure();
+
+	/* enable routing */
+	system_routing_enable();
+
+	/* ensure passwords are sync'd */
+	system_password_configure();
+
+	/* start dnsmasq service */
+	services_dnsmasq_configure();
+
+	/* start dyndns service */
+	services_dyndns_configure();
+
+	/* start DHCP service */
+	services_dhcpd_configure();
+
+	/* configure cron service */
+	configure_cron();
+
+	/* start the NTP client */
+	system_ntp_configure();
+
+	/* start ftp proxy helpers if they are enabled */
+	system_start_ftp_helpers();
+
+	/* start the captive portal */
+	captiveportal_configure();
+
+        /* reload the filter */
+	filter_configure_sync();
+
+	/* bring up carp interfaces*/
+	interfaces_carp_bring_up_final();
+
+	/* sync pw database */
+	conf_mount_rw();
+	mwexec("/usr/sbin/pwd_mkdb -d /etc/ /etc/master.passwd");
+	conf_mount_ro();
+
+	/* restart sshd */
+	touch("/tmp/start_sshd");
+
+	/* restart webConfigurator if needed */
+	if($shutdown_webgui_needed == true)
+		touch("/tmp/restart_webgui");
+
+	mwexec("/bin/rm /tmp/reload*");
+
+	unlink_if_exists("{$g['tmp_path']}/reloading_all");
+
+}
+
+function auto_login($status) {
+	$gettytab = file_get_contents("/etc/gettytab");
+	$getty_split = split("\n", $gettytab);
+	conf_mount_rw();
+	$fd = fopen("/etc/gettytab", "w");
+	foreach($getty_split as $gs) {
+		if(stristr($gs, ":ht:np:sp#115200") ) {
+			if($status == true) {
+				fwrite($fd, "	:ht:np:sp#115200:al=root:\n");
+			} else {
+				fwrite($fd, "	:ht:np:sp#115200:\n");
 			}
-		}
-		if($config['system']['firmware']['branch']) {
-			$params['branch'] = $config['system']['firmware']['branch'];
-		}
-		if(!$versions = call_pfsense_method('pfsense.get_firmware_version', $params)) {
-			return false;
 		} else {
-			$versions["current"] = $params;
-		}
-		return $versions;
-	}
-	
-	function get_disk_info() {
-		$diskout = "";
-		exec("/bin/df -h | /usr/bin/grep -w '/' | /usr/bin/awk '{ print $2, $3, $4, $5 }'", $diskout);
-		return explode(' ', $diskout[0]);
-		// $size, $used, $avail, $cap
-	}
-	
-	/****f* pfsense-utils/display_top_tabs
-	 * NAME
-	 *   display_top_tabs - display tabs with rounded edges
-	 * INPUTS
-	 *   $text	- array of tabs
-	 * RESULT
-	 *   null
-	 ******/
-	function display_top_tabs($tab_array) {
-		echo "<table cellpadding='0' cellspacing='0'>\n";
-		echo " <tr height='1'>\n";
-		$tabscounter = 0;
-		foreach ($tab_array as $ta) {
-			if($ta[1] == true) {
-				echo "  <td bgcolor='#EEEEEE' onClick=\"document.location='{$ta[2]}'\" style=\"cursor: pointer;\"><div id='tabactive'></div></td>\n";
-			} else {
-				echo "  <td bgcolor='#777777' onClick=\"document.location='{$ta[2]}'\" style=\"cursor: pointer;\"><div id='tabdeactive{$tabscounter}'></div></td>\n";
+			fwrite($fd, "{$gs}\n");
+		}
+	}
+	fclose($fd);
+	conf_mount_ro();
+}
+
+function setup_serial_port() {
+	global $g, $config;
+	conf_mount_rw();
+	/* serial console - write out /boot.config */
+	if(file_exists("/boot.config"))
+		$boot_config = file_get_contents("/boot.config");
+	else
+		$boot_config = "";
+
+	if($g['platform'] <> "cdrom") {
+		$boot_config_split = split("\n", $boot_config);
+		$fd = fopen("/boot.config","w");
+		if($fd) {
+			foreach($boot_config_split as $bcs) {
+				if(stristr($bcs, "-D")) {
+					/* DONT WRITE OUT, WE'LL DO IT LATER */
+				} else {
+					if($bcs <> "")
+						fwrite($fd, "{$bcs}\n");
+				}
 			}
-			$tabscounter++;
-		}
-		echo "</tr>\n<tr>\n";
-		foreach ($tab_array as $ta) {
-			if($ta[1] == true) {
-				echo "  <td bgcolor='#EEEEEE' onClick=\"document.location='{$ta[2]}'\" style=\"cursor: pointer;\"><B>&nbsp;&nbsp;&nbsp;{$ta[0]}";
-				echo "&nbsp;&nbsp;&nbsp;";
-				echo "<font size='-12'>&nbsp;</td>\n";
-			} else {
-				echo "  <td bgcolor='#777777' onClick=\"document.location='{$ta[2]}'\" style=\"cursor: pointer;\"><B>&nbsp;&nbsp;&nbsp;<a href='{$ta[2]}'>";
-				echo "<font color='white'>{$ta[0]}</a>&nbsp;&nbsp;&nbsp;";
-				echo "<font size='-12'>&nbsp;</td>\n";
+			if(isset($config['system']['enableserial'])) {
+				fwrite($fd, "-D");
 			}
+			fclose($fd);
 		}
-		echo "</tr>\n<tr height='5px'>\n";
-		foreach ($tab_array as $ta) {
-			if($ta[1] == true) {
-				echo "  <td bgcolor='#EEEEEE' onClick=\"document.location='{$ta[2]}'\" style=\"cursor: pointer;\"></td>\n";
-			} else {
-				echo "  <td bgcolor='#777777' onClick=\"document.location='{$ta[2]}'\" style=\"cursor: pointer;\"></td>\n";
+		/* serial console - write out /boot/loader.conf */
+		$boot_config = file_get_contents("/boot/loader.conf");
+		$boot_config_split = split("\n", $boot_config);
+		$fd = fopen("/boot/loader.conf","w");
+		if($fd) {
+			foreach($boot_config_split as $bcs) {
+				if(stristr($bcs, "console")) {
+					/* DONT WRITE OUT, WE'LL DO IT LATER */
+				} else {
+					if($bcs <> "")
+						fwrite($fd, "{$bcs}\n");
+				}
 			}
-			$tabscounter++;
-		}
-		echo " </tr>\n";
-		echo "</table>\n";
-	
-		echo "<script type=\"text/javascript\">";
-		echo "NiftyCheck();\n";
-		echo "Rounded(\"div#tabactive\",\"top\",\"#FFF\",\"#EEEEEE\",\"smooth\");\n";
-		for($x=0; $x<$tabscounter; $x++)
-			echo "Rounded(\"div#tabdeactive{$x}\",\"top\",\"#FFF\",\"#777777\",\"smooth\");\n";
-		echo "</script>";
-	}
-	
-	
-	/****f* pfsense-utils/display_topbar
-	 * NAME
-	 *   display_topbar - top a table off with rounded edges
-	 * INPUTS
-	 *   $text	- (optional) Text to include in bar
-	 * RESULT
-	 *   null
-	 ******/
-	function display_topbar($text = "", $bg_color="#990000", $replace_color="#FFFFFF", $rounding_style="smooth") {
-		echo "     <table width='100%' cellpadding='0' cellspacing='0'>\n";
-		echo "       <tr height='1'>\n";
-		echo "         <td width='100%' valign='top' color='{$bg_color}' bgcolor='{$bg_color}'>";
-		echo "		<div id='topbar'></div></td>\n";
-		echo "       </tr>\n";
-		echo "       <tr height='1'>\n";
-		if ($text != "")
-			echo "         <td height='1' class='listtopic'>{$text}</td>\n";
-		else
-			echo "         <td height='1' class='listtopic'></td>\n";
-		echo "       </tr>\n";
-		echo "     </table>";
-		echo "<script type=\"text/javascript\">";
-		echo "NiftyCheck();\n";
-		echo "Rounded(\"div#topbar\",\"top\",\"{$replace_color}\",\"{$bg_color}\",\"{$rounding_style}\");\n";
-		echo "</script>";
-	}
-	
-	/****f* pfsense-utils/generate_random_mac_address
-	 * NAME
-	 *   generate_random_mac - generates a random mac address
-	 * INPUTS
-	 *   none
-	 * RESULT
-	 *   $mac - a random mac address
-	 ******/
-	function generate_random_mac_address() {
-		$mac = "02";
-		for($x=0; $x<5; $x++)
-			$mac .= ":" . dechex(rand(16, 255));
-		return $mac;
-	}
-	
-	/****f* pfsense-utils/strncpy
-	 * NAME
-	 *   strncpy - copy strings
-	 * INPUTS
-	 *   &$dst, $src, $length
-	 * RESULT
-	 *   none
-	 ******/
-	function strncpy(&$dst, $src, $length) {
-		if (strlen($src) > $length) {
-			$dst = substr($src, 0, $length);
-		} else {
-			$dst = $src;
-		}
-	}
-	
-	/****f* pfsense-utils/reload_interfaces_sync
-	 * NAME
-	 *   reload_interfaces - reload all interfaces
-	 * INPUTS
-	 *   none
-	 * RESULT
-	 *   none
-	 ******/
-	function reload_interfaces_sync() {
-		global $config, $g, $debug;
-	
-		$shutdown_webgui_needed = false;
-	
-		touch("{$g['tmp_path']}/reloading_all");
-	
-		if($debug)
-			log_error("reload_interfaces_sync() is starting.");
-	
-		if(file_exists("{$g['tmp_path']}/config.cache"))
-			unlink("{$g['tmp_path']}/config.cache");
-	
-		/* parse config.xml again */
-		$config = parse_config(true);
-	
-		$wan_if = $config['interfaces']['wan']['if'];
-		$lan_if = $config['interfaces']['lan']['if'];
-	
-		if($debug)
-			log_error("Cleaning up Interfaces");
-	
-		/* build an array of interfaces to work with */
-		$iflist = array("lan" => "LAN", "wan" => "WAN");
-		for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++)
-			$iflist['opt' . $i] = "opt{$i}";
-	
-		foreach ($iflist as $ifent => $ifname) {
-			$ifname_real = convert_friendly_interface_to_real_interface_name($ifname);
-			if(stristr($ifname, "lo0") == true)
-				continue;
-			/* do not process wan interface, its mandatory */
-			if(stristr($ifname, "$wan_if") == true)
-				continue;
-			/* do not process lan interface, its mandatory */
-			if(stristr($ifname, "$lan_if") == true)
-				continue;
-			if($debug)
-				log_error("Downing and deleting $ifname_real - $ifname");
-			mwexec("/sbin/ifconfig {$ifname_real} down");
-			mwexec("/sbin/ifconfig {$ifname_real} delete");
-		}
-	
-		/* set up VLAN virtual interfaces */
-		if($debug)
-			log_error("Configuring VLANS");
-		interfaces_vlan_configure();
-	
-		/* set up LAN interface */
-		if($debug)
-			log_error("Configuring LAN");
-		interfaces_lan_configure();
-	
-		/* set up WAN interface */
-		if($debug)
-			log_error("Configuring WAN");
-		interfaces_wan_configure();
-	
-		/* set up Optional interfaces */
-		if($debug)
-			log_error("Configuring optional interfaces");
-		interfaces_optional_configure();
-	
-		/* set up static routes */
-		if($debug)
-			log_error("Configuring system Routing");
-		system_routing_configure();
-	
-		/* enable routing */
-		if($debug)
-			log_error("Enabling system routing");
-		system_routing_enable();
-	
-		/* setup captive portal if needed */
-		if($debug)
-			log_error("Configuring Captive portal");
-		captiveportal_configure();
-	
-		/* bring up carp interfaces */
-		if($debug)
-			log_error("Configuring CARP");
-		interfaces_carp_configure();
-	
-		/* bring up carp interfaces*/
-		if($debug)
-			log_error("Bringing up CARP interfaces");
-		interfaces_carp_bring_up_final();
-	
-		/* restart webConfigurator if needed */
-		if($shutdown_webgui_needed == true)
-			touch("/tmp/restart_webgui");
-	
-		/* start devd back up */
-		mwexec("/bin/rm /tmp/reload*");
-	
-		/* remove reloading_all trigger */
-		if($debug)
-			log_error("Removing {$g['tmp_path']}/reloading_all");
-		unlink_if_exists("{$g['tmp_path']}/reloading_all");
-	}
-	
-	/****f* pfsense-utils/reload_all
-	 * NAME
-	 *   reload_all - triggers a reload of all settings
-	 *   * INPUTS
-	 *   none
-	 * RESULT
-	 *   none
-	 ******/
-	function reload_all() {
-		touch("/tmp/reload_all");
-	}
-	
-	/****f* pfsense-utils/reload_interfaces
-	 * NAME
-	 *   reload_interfaces - triggers a reload of all interfaces
-	 * INPUTS
-	 *   none
-	 * RESULT
-	 *   none
-	 ******/
-	function reload_interfaces() {
-		touch("/tmp/reload_interfaces");
-	}
-	
-	/****f* pfsense-utils/sync_webgui_passwords
-	 * NAME
-	 *   sync_webgui_passwords - syncs webgui and ssh passwords
-	 * INPUTS
-	 *   none
-	 * RESULT
-	 *   none
-	 ******/
-	function sync_webgui_passwords() {
-		global $config, $g;
-		conf_mount_rw();
-		$fd = fopen("{$g['varrun_path']}/htpasswd", "w");
-		if (!$fd) {
-			printf("Error: cannot open htpasswd in system_password_configure().\n");
-			return 1;
-		}
-		/* set admin account */
-		$username = $config['system']['username'];
-	
-		/* set defined user account */
-		if($username <> "admin") {
-			$username = $config['system']['username'];
-			fwrite($fd, $username . ":" . $config['system']['password'] . "\n");
-		} else {
-			fwrite($fd, $username . ":" . $config['system']['password'] . "\n");
-		}
-		fclose($fd);
-		chmod("{$g['varrun_path']}/htpasswd", 0600);
-		$crypted_pw = $config['system']['password'];
-		mwexec("/usr/sbin/pwd_mkdb -d /etc -p /etc/master.passwd");
-		mwexec("/usr/sbin/pwd_mkdb -p /etc/master.passwd");
-		/* sync root */
-		$fd = popen("/usr/sbin/pw usermod -n root -H 0", "w");
-		fwrite($fd, $crypted_pw);
-		pclose($fd);
-		mwexec("/usr/sbin/pw usermod -n root -s /bin/sh");
-		/* sync admin */
-		$fd = popen("/usr/sbin/pw usermod -n admin -H 0", "w");
-		fwrite($fd, $crypted_pw);
-		pclose($fd);
-		mwexec("/usr/sbin/pw usermod -n admin -s /etc/rc.initial");
-		mwexec("/usr/sbin/pwd_mkdb -d /etc -p /etc/master.passwd");
-		mwexec("/usr/sbin/pwd_mkdb -p /etc/master.passwd");
-		conf_mount_ro();
-	}
-	
-	/****f* pfsense-utils/cleanup_opt_interfaces_after_removal
-	 * NAME
-	 *   cleanup_opt_interfaces_after_removal - renumber interfaces after removing
-	 *   * INPUTS
-	 *   optional interface number
-	 * RESULT
-	 *   none
-	 ******/
-	function cleanup_opt_interfaces_after_removal($opt_interface_num) {
-		/*	move all the interfaces up.  for example:
-		*		opt1 --> opt1
-		*		opt2 --> delete
-		*		opt3 --> opt2
-		*		opt4 --> opt3
-		*/
-		global $g, $config;
-		config_lock();
-		conf_mount_rw();
-		unlink_if_exists("{$g['tmp_path']}/config.cache");
-		$config_file = file_get_contents("/cf/conf/config.xml");
-		/* loop through and reassign deleted items */
-		for ($i = 500; isset ($config['interfaces']['opt' . $i]); $i--) {
-			if ($i < $opt_interface_num)
-				break;
-			if ($i == $opt_interface_num) {
-				/* item should be deleted */
-				str_replace("opt" . $i, "optXXXX", $config_file);
+			if(isset($config['system']['enableserial'])) {
+				fwrite($fd, "console=\"comconsole\"\n");
 			}
+			fclose($fd);
 		}
-		/* loop through and reassign optional items */
-		for ($i = 500; isset ($config['interfaces']['opt' . $i]); $i--) {
-			if ($i < $opt_interface_num)
-				break;
-			/* replace opt$i with $i -1 */
-			str_replace("opt" . $i, "opt" . ($i -1), $config_file);
-		}
-		$fd = fopen("/cf/conf/config.xml", "w");
-		fwrite($fd, $config_file);
-		fclose($fd);
-		$config = parse_config(true);
-		/* loop through and delete old rules */
-		$num_rules = count($config['filter']['rule']);
-		for($x = $num_rules; $x > 0; $x--) {
-			if($config['filter']['rule'][$x])
-				if($config['filter']['rule'][$x]['interface'] == "optXXXX")
-			 		unset($config['filter']['rule'][$x]['interface']);
-		}
-		$num_rules = count($config['nat']['advancedoutbound']['rule']);
-		for($x = $num_rules; $x > 0; $x--) {
-			if($config['nat']['advancedoutbound']['rule'][$x])
-				if($config['nat']['advancedoutbound']['rule'][$x]['interface'] == "optXXXX")
-			 		unset($config['nat']['advancedoutbound']['rule'][$x]['interface']);
-		}
-		$num_rules = count($config['nat']['rule']);
-		for($x = $num_rules; $x > 0; $x--) {
-			if($config['nat']['rule'][$x])
-				if($config['nat']['rule'][$x]['interface'] == "optXXXX")
-			 		unset($config['nat']['rule'][$x]['interface']);
-		}
-		conf_mount_ro();
-		config_unlock();
-		return true;
 	}
-	
-	/****f* pfsense-utils/get_number_of_wan_netgraph_interfaces_needed
-	 * NAME
-	 *   get_number_of_wan_netgraph_interfaces_needed - returns the
-	 *   		amount of netgraph interfaces needed for system wans
-	 *   * INPUTS
-	 *   none
-	 * RESULT
-	 *   number of needed netgraph (ng) interfaces
-	 ******/
-	function get_number_of_wan_netgraph_interfaces_needed() {
-		global $config, $g;
-		/* build an array of interfaces to work with */
-		$iflist = array("wan" => "WAN");
-		for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++)
-			$iflist['opt' . $i] = $config['interfaces']['opt' . $i]['descr'];
-		$ng_interfaces_needed = 0;
-		foreach ($iflist as $ifent => $ifname) {
-			if($config['interfaces'][$ifname]['ipaddr'] == "pppoe") {
-				$ng_interfaces_needed++;
+	$ttys = file_get_contents("/etc/ttys");
+	$ttys_split = split("\n", $ttys);
+	$fd = fopen("/etc/ttys", "w");
+	foreach($ttys_split as $tty) {
+		if(stristr($tty, "ttyd0")) {
+			if(isset($config['system']['enableserial'])) {
+				fwrite($fd, "ttyd0	\"/usr/libexec/getty bootupcli\"	dialup	on	secure\n");
+			} else {
+				fwrite($fd, "ttyd0	\"/usr/libexec/getty bootupcli\"	dialup	off	secure\n");
 			}
-		}
-		return $ng_interfaces_needed;
-	}
-	
-	function get_netgaph_interface_assignment($friendly_interface) {
-		global $config, $g;
-		/* build an array of interfaces to work with */
-		$iflist = array("wan" => "WAN");
-		for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++)
-			$iflist['opt' . $i] = $config['interfaces']['opt' . $i]['descr'];
-			$ng_interfaces_needed = 0;
-			$ng_interfaces_number = 0;
-			foreach ($iflist as $ifent => $ifname) {
-			if($config['interfaces'][$ifname]['ipaddr'] == "pppoe") {
-				$ng_interfaces_number++;
+		} else {
+			fwrite($fd, $tty . "\n");
+		}
+	}
+	fclose($fd);
+	if(isset($config['system']['disableconsolemenu'])) {
+		auto_login(false);
+	} else {
+		auto_login(true);
+	}
+	conf_mount_ro();
+	return;
+}
+
+function print_value_list($list, $count = 10, $separator = ",") {
+	$list = implode($separator, array_slice($list, 0, $count));
+	if(count($list) < $count) {
+		$list .= ".";
+	} else {
+		$list .= "...";
+	}
+	return $list;
+}
+
+function convert_friendly_interface_to_friendly_descr($interface) {
+	global $config;
+	/* attempt to resolve interface to friendly descr */
+	if($config['interfaces'][$interface]['descr'])
+		return $config['interfaces'][$interface]['descr'];
+	$tmp = convert_real_interface_to_friendly_descr($interface);
+	/* could not resolve, return back what was passed */
+	return $interface;
+}
+
+function convert_real_interface_to_friendly_descr($interface) {
+	global $config;
+	if($interface == $config['interfaces']['wan']['if'])
+		return "wan";
+	if($interface == $config['interfaces']['lan']['if'])
+		return "lan";
+	/* attempt to resolve interface to friendly descr */
+	$friendly_int = convert_real_interface_to_friendly_interface_name($interface);
+	if($config['interfaces'][$friendly_int]['descr'])
+		return $config['interfaces'][$friendly_int]['descr'];
+	/* could not resolve, return back what was passed */
+	return $interface;
+}
+
+function enable_rrd_graphing() {
+	global $config, $g;
+
+	if($g['booting']) 
+		echo "Generating RRD graphs...";
+
+	$rrddbpath = "/var/db/rrd/";
+	$rrdgraphpath = "/usr/local/www/rrd";
+
+	$traffic = "-traffic.rrd";
+	$packets = "-packets.rrd";
+	$states = "-states.rrd";
+	$quality = "-quality.rrd";
+	$queues = "-queues.rrd";
+	$queuesdrop = "-queuesdrop.rrd";
+	$spamd = "-spamd.rrd";
+	$proc = "-processor.rrd";
+
+	$rrdtool = "/usr/local/bin/rrdtool";
+	$netstat = "/usr/bin/netstat";
+	$awk = "/usr/bin/awk";
+	$tar = "/usr/bin/tar";
+	$pfctl = "/sbin/pfctl";
+	$php = "/usr/local/bin/php";
+	$top = "/usr/bin/top";
+	$spamd_gather = "/usr/local/bin/spamd_gather_stats.php";
+
+	$rrdtrafficinterval = 60;
+	$rrdqualityinterval = 60;
+	$rrdqueuesinterval = 60;
+	$rrdqueuesdropinterval = 60;
+	$rrdpacketsinterval = 60;
+	$rrdstatesinterval = 60;
+	$rrdspamdinterval = 60;
+	$rrdlbpoolinterval = 60;
+	$rrdprocinterval = 60;
+
+	$trafficvalid = $rrdtrafficinterval * 2;
+	$qualityvalid = $rrdqualityinterval * 2;
+	$queuesvalid = $rrdqueuesinterval * 2;
+	$queuesdropvalid = $rrdqueuesdropinterval * 2;
+	$packetsvalid = $rrdpacketsinterval * 2;
+	$statesvalid = $rrdstatesinterval*2;
+	$spamdvalid = $rrdspamdinterval * 2;
+	$lbpoolvalid = $rrdlbpoolinterval * 2;
+	$procvalid = $rrdlbpoolinterval * 2;
+
+	/* Asume GigE for now */
+	$downstream = 125000000;
+	$upstream = 125000000;
+
+	$rrdrestore = "";
+	$rrdreturn = "";
+
+	$config['rrd']['enable'] = true;
+
+	if (isset ($config['rrd']['enable'])) {
+
+		/* create directory if needed */
+		if (!is_dir("$rrddbpath")) {
+			mkdir("$rrddbpath", 0755);
+		}
+
+		if ($g['booting']) {
+			if ($g['platform'] != "pfSense") {
+				/* restore the databases, if we have one */
+				if (file_exists("{$g['cf_conf_path']}/rrd.tgz")) {
+					exec("cd /;LANG=C /usr/bin/tar -xzf {$g['cf_conf_path']}/rrd.tgz", $rrdrestore, $rrdreturn);
+					if((int)$rrdrestore <> 0) {
+						log_error("RRD restore failed exited with $rrdreturn, the error is: $rrdrestore[0]\n");
+					}
+				}
 			}
-			if($friendly_interface == $ifname)
-				break;
 		}
-		return $ng_interfaces_number;
-	}
-	
-	/****f* pfsense-utils/reload_all_sync
-	 * NAME
-	 *   reload_all - reload all settings
-	 *   * INPUTS
-	 *   none
-	 * RESULT
-	 *   none
-	 ******/
-	function reload_all_sync() {
-		global $config, $g;
-	
-		$g['booting'] = false;
-	
-		touch("{$g['tmp_path']}/reloading_all");
-	
-		$shutdown_webgui_needed = false;
-	
-		if(file_exists("{$g['tmp_path']}/config.cache"))
-			unlink("{$g['tmp_path']}/config.cache");
-	
-		/* parse config.xml again */
-		$config = parse_config(true);
-	
-		/* set up our timezone */
-		system_timezone_configure();
-	
-		/* set up our hostname */
-		system_hostname_configure();
-	
-		/* make hosts file */
-		system_hosts_generate();
-	
-		/* generate resolv.conf */
-		system_resolvconf_generate();
-	
-		/* delete all old interface information */
-		$iflist = split(" ", str_replace("\n", "", `/sbin/ifconfig -l`));
-	
-		$wan_if = $config['interfaces']['wan']['if'];
-		$lan_if = $config['interfaces']['lan']['if'];
-	
-		/* build an array of interfaces to work with */
-		$iflist = array("lan" => "LAN", "wan" => "WAN");
-		for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++)
-			$iflist['opt' . $i] = "opt{$i}";
-	
-		foreach ($iflist as $ifent => $ifname) {
-			$ifname_real = convert_friendly_interface_to_real_interface_name($ifname);
-			if(stristr($ifname, "lo0") == true)
+
+		/* db update script */
+		$rrdupdatesh = "#!/bin/sh\n";
+		$rrdupdatesh .= "\n";
+		$rrdupdatesh .= "counter=1\n";
+		$rrdupdatesh .= "while [ \"\$counter\" -ne 0 ]\n";
+		$rrdupdatesh .= "do\n";
+		$rrdupdatesh .= "";
+
+		$i = 0;
+		$vfaces = array (
+			"vlan.?*",
+			"enc.?*"
+		);
+		$ifdescrs = get_interface_list(true, true, $vfaces);
+		$ifdescrs['enc0']['friendly'] = "ipsec";
+		$ifdescrs['enc0']['descr'] = "IPSEC";
+		$ifdescrs['enc0']['up'] = true;
+
+		foreach ($ifdescrs as $realif => $ifdescr) {
+			$ifname = $ifdescr['friendly'];
+			$state = $ifdescr['up'];
+
+			/* skip interfaces that do not have a friendly name */
+			if ("$ifname" == "") {
 				continue;
-			/* do not process wan interface, its mandatory */
-			if($wan_if == $ifname_real)
-				continue;
-			/* do not process lan interface, its mandatory */
-			if($lan_if == $ifname_real)
+			}
+
+			/* or are down */
+			if (!$state) {
 				continue;
-			mwexec("/sbin/ifconfig {$ifname_real} down");
-			mwexec("/sbin/ifconfig {$ifname_real} delete");
-		}
-	
-		/* set up VLAN virtual interfaces */
-		interfaces_vlan_configure();
-	
-		/* set up LAN interface */
-		interfaces_lan_configure();
-	
-		/* set up WAN interface */
-		interfaces_wan_configure();
-	
-		/* set up Optional interfaces */
-		interfaces_optional_configure();
-	
-		/* bring up carp interfaces */
-		interfaces_carp_configure();
-	
-		/* set up static routes */
-		system_routing_configure();
-	
-		/* enable routing */
-		system_routing_enable();
-	
-		/* ensure passwords are sync'd */
-		system_password_configure();
-	
-		/* start dnsmasq service */
-		services_dnsmasq_configure();
-	
-		/* start dyndns service */
-		services_dyndns_configure();
-	
-		/* start DHCP service */
-		services_dhcpd_configure();
-	
-		/* configure cron service */
-		configure_cron();
-	
-		/* start the NTP client */
-		system_ntp_configure();
-	
-		/* start ftp proxy helpers if they are enabled */
-		system_start_ftp_helpers();
-	
-		/* start the captive portal */
-		captiveportal_configure();
-	
-	        /* reload the filter */
-		filter_configure_sync();
-	
-		/* bring up carp interfaces*/
-		interfaces_carp_bring_up_final();
-	
-		/* sync pw database */
-		conf_mount_rw();
-		mwexec("/usr/sbin/pwd_mkdb -d /etc/ /etc/master.passwd");
-		conf_mount_ro();
-	
-		/* restart sshd */
-		touch("/tmp/start_sshd");
-	
-		/* restart webConfigurator if needed */
-		if($shutdown_webgui_needed == true)
-			touch("/tmp/restart_webgui");
-	
-		mwexec("/bin/rm /tmp/reload*");
-	
-		unlink_if_exists("{$g['tmp_path']}/reloading_all");
-	
-	}
-	
-	function auto_login($status) {
-		$gettytab = file_get_contents("/etc/gettytab");
-		$getty_split = split("\n", $gettytab);
-		conf_mount_rw();
-		$fd = fopen("/etc/gettytab", "w");
-		foreach($getty_split as $gs) {
-			if(stristr($gs, ":ht:np:sp#115200") ) {
-				if($status == true) {
-					fwrite($fd, "	:ht:np:sp#115200:al=root:\n");
-				} else {
-					fwrite($fd, "	:ht:np:sp#115200:\n");
-				}
-			} else {
-				fwrite($fd, "{$gs}\n");
 			}
-		}
-		fclose($fd);
-		conf_mount_ro();
-	}
-	
-	function setup_serial_port() {
-		global $g, $config;
-		conf_mount_rw();
-		/* serial console - write out /boot.config */
-		if(file_exists("/boot.config"))
-			$boot_config = file_get_contents("/boot.config");
-		else
-			$boot_config = "";
-	
-		if($g['platform'] <> "cdrom") {
-			$boot_config_split = split("\n", $boot_config);
-			$fd = fopen("/boot.config","w");
-			if($fd) {
-				foreach($boot_config_split as $bcs) {
-					if(stristr($bcs, "-D")) {
-						/* DONT WRITE OUT, WE'LL DO IT LATER */
-					} else {
-						if($bcs <> "")
-							fwrite($fd, "{$bcs}\n");
-					}
-				}
-				if(isset($config['system']['enableserial'])) {
-					fwrite($fd, "-D");
+
+			/* TRAFFIC, set up the rrd file */
+			if (!file_exists("$rrddbpath$ifname$traffic")) {
+				/* create rrd file if it does not exist */
+				log_error("Create RRD database $rrddbpath$ifname$traffic");
+				$rrdcreate = "$rrdtool create $rrddbpath$ifname$traffic --step $rrdtrafficinterval ";
+				$rrdcreate .= "DS:in:COUNTER:$trafficvalid:0:$downstream ";
+				$rrdcreate .= "DS:out:COUNTER:$trafficvalid:0:$upstream ";
+				$rrdcreate .= "RRA:AVERAGE:0.5:1:1000 ";
+				$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
+				$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
+				$rrdcreate .= "RRA:AVERAGE:0.5:720:1000 ";
+				$rrdcreate .= "RRA:MAX:0.5:1:1000 ";
+				$rrdcreate .= "RRA:MAX:0.5:5:1000 ";
+				$rrdcreate .= "RRA:MAX:0.5:60:1000 ";
+				$rrdcreate .= "RRA:MAX:0.5:720:1000";
+
+				$rrdcreateoutput = array();
+				$rrdcreatereturn = "";
+
+				$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
+				if ($rrdcreatereturn != 0) {
+					log_error("RRD create failed exited with $rrdcreatereturn, the
+							error is: $rrdcreateoutput[0]\n");
 				}
-				fclose($fd);
 			}
-			/* serial console - write out /boot/loader.conf */
-			$boot_config = file_get_contents("/boot/loader.conf");
-			$boot_config_split = split("\n", $boot_config);
-			$fd = fopen("/boot/loader.conf","w");
-			if($fd) {
-				foreach($boot_config_split as $bcs) {
-					if(stristr($bcs, "console")) {
-						/* DONT WRITE OUT, WE'LL DO IT LATER */
-					} else {
-						if($bcs <> "")
-							fwrite($fd, "{$bcs}\n");
-					}
-				}
-				if(isset($config['system']['enableserial'])) {
-					fwrite($fd, "console=\"comconsole\"\n");
-				}
-				fclose($fd);
+
+			/* enter UNKNOWN values in the RRD so it knows we rebooted. */
+			if($g['booting']) {
+				exec("$rrdtool update $rrddbpath$ifname$traffic N:U:U");
 			}
-		}
-		$ttys = file_get_contents("/etc/ttys");
-		$ttys_split = split("\n", $ttys);
-		$fd = fopen("/etc/ttys", "w");
-		foreach($ttys_split as $tty) {
-			if(stristr($tty, "ttyd0")) {
-				if(isset($config['system']['enableserial'])) {
-					fwrite($fd, "ttyd0	\"/usr/libexec/getty bootupcli\"	dialup	on	secure\n");
-				} else {
-					fwrite($fd, "ttyd0	\"/usr/libexec/getty bootupcli\"	dialup	off	secure\n");
-				}
+
+			$rrdupdatesh .= "\n";
+			$rrdupdatesh .= "# polling traffic for interface $ifname $realif \n";
+			$rrdupdatesh .= "$rrdtool update $rrddbpath$ifname$traffic N:\\\n";
+			if(! is_macaddr(get_interface_mac($realif))) {
+				$rrdupdatesh .= "`$netstat -nbf link -I {$realif} | $awk '{getline 2;print \$6 \":\" \$9}'`\n";
 			} else {
-				fwrite($fd, $tty . "\n");
+				$rrdupdatesh .= "`$netstat -nbf link -I {$realif} | $awk '{getline 2;print \$7 \":\" \$10}'`\n";
 			}
-		}
-		fclose($fd);
-		if(isset($config['system']['disableconsolemenu'])) {
-			auto_login(false);
-		} else {
-			auto_login(true);
-		}
-		conf_mount_ro();
-		return;
-	}
-	
-	function print_value_list($list, $count = 10, $separator = ",") {
-		$list = implode($separator, array_slice($list, 0, $count));
-		if(count($list) < $count) {
-			$list .= ".";
-		} else {
-			$list .= "...";
-		}
-		return $list;
-	}
-	
-	function convert_friendly_interface_to_friendly_descr($interface) {
-		global $config;
-		/* attempt to resolve interface to friendly descr */
-		if($config['interfaces'][$interface]['descr'])
-			return $config['interfaces'][$interface]['descr'];
-		$tmp = convert_real_interface_to_friendly_descr($interface);
-		/* could not resolve, return back what was passed */
-		return $interface;
-	}
-	
-	function convert_real_interface_to_friendly_descr($interface) {
-		global $config;
-		if($interface == $config['interfaces']['wan']['if'])
-			return "wan";
-		if($interface == $config['interfaces']['lan']['if'])
-			return "lan";
-		/* attempt to resolve interface to friendly descr */
-		$friendly_int = convert_real_interface_to_friendly_interface_name($interface);
-		if($config['interfaces'][$friendly_int]['descr'])
-			return $config['interfaces'][$friendly_int]['descr'];
-		/* could not resolve, return back what was passed */
-		return $interface;
-	}
-	
-	function enable_rrd_graphing() {
-		global $config, $g;
-	
-		if($g['booting']) 
-			echo "Generating RRD graphs...";
-	
-		$rrddbpath = "/var/db/rrd/";
-		$rrdgraphpath = "/usr/local/www/rrd";
-	
-		$traffic = "-traffic.rrd";
-		$packets = "-packets.rrd";
-		$states = "-states.rrd";
-		$quality = "-quality.rrd";
-		$queues = "-queues.rrd";
-		$queuesdrop = "-queuesdrop.rrd";
-		$spamd = "-spamd.rrd";
-		$proc = "-processor.rrd";
-	
-		$rrdtool = "/usr/local/bin/rrdtool";
-		$netstat = "/usr/bin/netstat";
-		$awk = "/usr/bin/awk";
-		$tar = "/usr/bin/tar";
-		$pfctl = "/sbin/pfctl";
-		$php = "/usr/local/bin/php";
-		$top = "/usr/bin/top";
-		$spamd_gather = "/usr/local/bin/spamd_gather_stats.php";
-	
-		$rrdtrafficinterval = 60;
-		$rrdqualityinterval = 60;
-		$rrdqueuesinterval = 60;
-		$rrdqueuesdropinterval = 60;
-		$rrdpacketsinterval = 60;
-		$rrdstatesinterval = 60;
-		$rrdspamdinterval = 60;
-		$rrdlbpoolinterval = 60;
-		$rrdprocinterval = 60;
-	
-		$trafficvalid = $rrdtrafficinterval * 2;
-		$qualityvalid = $rrdqualityinterval * 2;
-		$queuesvalid = $rrdqueuesinterval * 2;
-		$queuesdropvalid = $rrdqueuesdropinterval * 2;
-		$packetsvalid = $rrdpacketsinterval * 2;
-		$statesvalid = $rrdstatesinterval*2;
-		$spamdvalid = $rrdspamdinterval * 2;
-		$lbpoolvalid = $rrdlbpoolinterval * 2;
-		$procvalid = $rrdlbpoolinterval * 2;
-	
-		/* Asume GigE for now */
-		$downstream = 125000000;
-		$upstream = 125000000;
-	
-		$rrdrestore = "";
-		$rrdreturn = "";
-	
-		$config['rrd']['enable'] = true;
-	
-		if (isset ($config['rrd']['enable'])) {
-	
-			/* create directory if needed */
-			if (!is_dir("$rrddbpath")) {
-				mkdir("$rrddbpath", 0755);
-			}
-	
-			if ($g['booting']) {
-				if ($g['platform'] != "pfSense") {
-					/* restore the databases, if we have one */
-					if (file_exists("{$g['cf_conf_path']}/rrd.tgz")) {
-						exec("cd /;LANG=C /usr/bin/tar -xzf {$g['cf_conf_path']}/rrd.tgz", $rrdrestore, $rrdreturn);
-						if((int)$rrdrestore <> 0) {
-							log_error("RRD restore failed exited with $rrdreturn, the error is: $rrdrestore[0]\n");
-						}
-					}
+
+			/* PACKETS, set up the rrd file */
+			if (!file_exists("$rrddbpath$ifname$packets")) {
+				/* create rrd file if it does not exist */
+				log_error("Create RRD database $rrddbpath$ifname$packets");
+				$rrdcreate = "$rrdtool create $rrddbpath$ifname$packets --step $rrdpacketsinterval ";
+				$rrdcreate .= "DS:in:COUNTER:$packetsvalid:0:$downstream ";
+				$rrdcreate .= "DS:out:COUNTER:$packetsvalid:0:$upstream ";
+				$rrdcreate .= "RRA:AVERAGE:0.5:1:1000 ";
+				$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
+				$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
+				$rrdcreate .= "RRA:AVERAGE:0.5:720:1000 ";
+				$rrdcreate .= "RRA:MAX:0.5:1:1000 ";
+				$rrdcreate .= "RRA:MAX:0.5:5:1000 ";
+				$rrdcreate .= "RRA:MAX:0.5:60:1000 ";
+				$rrdcreate .= "RRA:MAX:0.5:720:1000";
+
+				$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
+				if ($rrdcreatereturn != 0) {
+					log_error("RRD create failed exited with $rrdcreatereturn, the
+							error is: $rrdcreateoutput[0]\n");
 				}
 			}
-	
-			/* db update script */
-			$rrdupdatesh = "#!/bin/sh\n";
+
+			/* enter UNKNOWN values in the RRD so it knows we rebooted. */
+			if($g['booting']) {
+				exec("$rrdtool update $rrddbpath$ifname$packets N:U:U");
+			}
+
 			$rrdupdatesh .= "\n";
-			$rrdupdatesh .= "counter=1\n";
-			$rrdupdatesh .= "while [ \"\$counter\" -ne 0 ]\n";
-			$rrdupdatesh .= "do\n";
-			$rrdupdatesh .= "";
-	
-			$i = 0;
-			$vfaces = array (
-				"vlan.?*",
-				"enc.?*"
-			);
-			$ifdescrs = get_interface_list(true, true, $vfaces);
-			$ifdescrs['enc0']['friendly'] = "ipsec";
-			$ifdescrs['enc0']['descr'] = "IPSEC";
-			$ifdescrs['enc0']['up'] = true;
-	
-			foreach ($ifdescrs as $realif => $ifdescr) {
-				$ifname = $ifdescr['friendly'];
-				$state = $ifdescr['up'];
-	
-				/* skip interfaces that do not have a friendly name */
-				if ("$ifname" == "") {
-					continue;
-				}
-	
-				/* or are down */
-				if (!$state) {
-					continue;
-				}
-	
-				/* TRAFFIC, set up the rrd file */
-				if (!file_exists("$rrddbpath$ifname$traffic")) {
+			$rrdupdatesh .= "# polling packets for interface $ifname $realif \n";
+			$rrdupdatesh .= "$rrdtool update $rrddbpath$ifname$packets N:\\\n";
+			if(! is_macaddr(get_interface_mac($realif))) {
+				$rrdupdatesh .= "`$netstat -nbf link -I {$realif} | $awk '{getline 2;print \$4 \":\" \$7}'`\n";
+			} else {
+				$rrdupdatesh .= "`$netstat -nbf link -I {$realif} | $awk '{getline 2;print \$5 \":\" \$8}'`\n";
+			}
+			/* if an alternative gateway is defined, use it */
+			if ($config['system']['interfaces'][$ifname]['use_rrd_gateway'] <> "") {
+				$gatewayip = get_interface_gateway($ifname);
+				$monitorip = $config['system']['interfaces'][$ifname]['use_rrd_gateway'];
+				mwexec("/sbin/route add -host {$monitorip} {$gatewayip} 1> /dev/null 2>&1");
+			} else {
+				$monitorip = get_interface_gateway($ifname);
+			}
+			$numpings = 5;
+			$btick = '`';
+
+			if($monitorip <> "") {
+				/* QUALITY, create link quality database */
+				if (!file_exists("$rrddbpath$ifname$quality")) {
 					/* create rrd file if it does not exist */
-					log_error("Create RRD database $rrddbpath$ifname$traffic");
-					$rrdcreate = "$rrdtool create $rrddbpath$ifname$traffic --step $rrdtrafficinterval ";
-					$rrdcreate .= "DS:in:COUNTER:$trafficvalid:0:$downstream ";
-					$rrdcreate .= "DS:out:COUNTER:$trafficvalid:0:$upstream ";
+					log_error("Create RRD database $rrddbpath$ifname$quality");
+					$rrdcreate = "$rrdtool create $rrddbpath$ifname$quality --step $rrdqualityinterval ";
+					$rrdcreate .= "DS:loss:GAUGE:$qualityvalid:0:100 ";
+					$rrdcreate .= "DS:roundtrip:GAUGE:$qualityvalid:0:10000 ";
 					$rrdcreate .= "RRA:AVERAGE:0.5:1:1000 ";
 					$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
 					$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
-					$rrdcreate .= "RRA:AVERAGE:0.5:720:1000 ";
-					$rrdcreate .= "RRA:MAX:0.5:1:1000 ";
-					$rrdcreate .= "RRA:MAX:0.5:5:1000 ";
-					$rrdcreate .= "RRA:MAX:0.5:60:1000 ";
-					$rrdcreate .= "RRA:MAX:0.5:720:1000";
-	
-					$rrdcreateoutput = array();
-					$rrdcreatereturn = "";
-	
+					$rrdcreate .= "RRA:AVERAGE:0.5:720:1000";
+
 					$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
 					if ($rrdcreatereturn != 0) {
-						log_error("RRD create failed exited with $rrdcreatereturn, the
-								error is: $rrdcreateoutput[0]\n");
+						log_error("RRD create failed exited with $rrdcreatereturn, the error is: $rrdcreateoutput[0]\n");
 					}
 				}
-	
+
 				/* enter UNKNOWN values in the RRD so it knows we rebooted. */
 				if($g['booting']) {
-					exec("$rrdtool update $rrddbpath$ifname$traffic N:U:U");
+					exec("$rrdtool update $rrddbpath$ifname$quality N:U:U");
 				}
-	
-				$rrdupdatesh .= "\n";
-				$rrdupdatesh .= "# polling traffic for interface $ifname $realif \n";
-				$rrdupdatesh .= "$rrdtool update $rrddbpath$ifname$traffic N:\\\n";
-				if(! is_macaddr(get_interface_mac($realif))) {
-					$rrdupdatesh .= "`$netstat -nbf link -I {$realif} | $awk '{getline 2;print \$6 \":\" \$9}'`\n";
-				} else {
-					$rrdupdatesh .= "`$netstat -nbf link -I {$realif} | $awk '{getline 2;print \$7 \":\" \$10}'`\n";
+
+				/* the ping test function. We call this on the last line */
+				$rrdupdatesh .= "get_quality_stats_{$ifname} () {\n";
+				$rrdupdatesh .= "	packetloss_{$ifname}=100\n";
+				$rrdupdatesh .= "	roundtrip_{$ifname}=0\n";
+				$rrdupdatesh .= "	local out_{$ifname}\n";
+				$rrdupdatesh .= "	out_{$ifname}=$btick ping -c $numpings -q $monitorip $btick\n";
+				$rrdupdatesh .= "	if [ $? -eq 0 ]; then\n";
+				$rrdupdatesh .= "		packetloss_{$ifname}=$btick echo \$out_{$ifname} | cut -f18 -d' ' | cut -c -1 $btick\n";
+				$rrdupdatesh .= "		roundtrip_{$ifname}=$btick echo \$out_{$ifname} | cut -f24 -d' ' | cut -f2 -d'/' $btick\n";
+				$rrdupdatesh .= "	fi\n";
+				$rrdupdatesh .= "	$rrdtool update $rrddbpath$ifname$quality N:\$packetloss_{$ifname}:\$roundtrip_{$ifname}\n";
+				$rrdupdatesh .= "}\n\n";
+
+				$rrdupdatesh .= "get_quality_stats_{$ifname} &\n\n";
+			}
+
+			/* WAN interface only statistics */
+			if ("$ifname" == "wan") {
+
+				/* QUEUES, set up the queues databases */
+				if (!is_array($config['shaper']['queue'])) {
+					$config['shaper']['queue'] = array ();
 				}
-	
-				/* PACKETS, set up the rrd file */
-				if (!file_exists("$rrddbpath$ifname$packets")) {
-					/* create rrd file if it does not exist */
-					log_error("Create RRD database $rrddbpath$ifname$packets");
-					$rrdcreate = "$rrdtool create $rrddbpath$ifname$packets --step $rrdpacketsinterval ";
-					$rrdcreate .= "DS:in:COUNTER:$packetsvalid:0:$downstream ";
-					$rrdcreate .= "DS:out:COUNTER:$packetsvalid:0:$upstream ";
-					$rrdcreate .= "RRA:AVERAGE:0.5:1:1000 ";
-					$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
-					$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
-					$rrdcreate .= "RRA:AVERAGE:0.5:720:1000 ";
-					$rrdcreate .= "RRA:MAX:0.5:1:1000 ";
-					$rrdcreate .= "RRA:MAX:0.5:5:1000 ";
-					$rrdcreate .= "RRA:MAX:0.5:60:1000 ";
-					$rrdcreate .= "RRA:MAX:0.5:720:1000";
-	
-					$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
-					if ($rrdcreatereturn != 0) {
-						log_error("RRD create failed exited with $rrdcreatereturn, the
-								error is: $rrdcreateoutput[0]\n");
+				$a_queues = & $config['shaper']['queue'];
+
+				if (isset ($config['shaper']['enable'])) {
+					if (!file_exists("$rrddbpath$ifname$queues")) {
+						/* create rrd file if it does not exist */
+						log_error("Create RRD database $rrddbpath$ifname$queues");
+						$rrdcreate = "$rrdtool create $rrddbpath$ifname$queues --step $rrdqueuesinterval ";
+						/* loop list of shaper queues */
+						$q = 0;
+						foreach ($a_queues as $queue) {
+							$name = $queue['name'];
+							$rrdcreate .= "DS:$name:COUNTER:$queuesvalid:0:$downstream ";
+						}
+
+						$rrdcreate .= "RRA:AVERAGE:0.5:1:1000 ";
+						$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
+						$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
+						$rrdcreate .= "RRA:AVERAGE:0.5:720:1000";
+
+						$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
+						if ($rrdcreatereturn != 0) {
+							log_error("RRD create failed exited with $rrdcreatereturn, the
+									error is: $rrdcreateoutput[0]\n");
+						}
 					}
-				}
-	
-				/* enter UNKNOWN values in the RRD so it knows we rebooted. */
-				if($g['booting']) {
-					exec("$rrdtool update $rrddbpath$ifname$packets N:U:U");
-				}
-	
-				$rrdupdatesh .= "\n";
-				$rrdupdatesh .= "# polling packets for interface $ifname $realif \n";
-				$rrdupdatesh .= "$rrdtool update $rrddbpath$ifname$packets N:\\\n";
-				if(! is_macaddr(get_interface_mac($realif))) {
-					$rrdupdatesh .= "`$netstat -nbf link -I {$realif} | $awk '{getline 2;print \$4 \":\" \$7}'`\n";
-				} else {
-					$rrdupdatesh .= "`$netstat -nbf link -I {$realif} | $awk '{getline 2;print \$5 \":\" \$8}'`\n";
-				}
-				/* if an alternative gateway is defined, use it */
-				if ($config['system']['interfaces'][$ifname]['use_rrd_gateway'] <> "") {
-					$gatewayip = get_interface_gateway($ifname);
-					$monitorip = $config['system']['interfaces'][$ifname]['use_rrd_gateway'];
-					mwexec("/sbin/route add -host {$monitorip} {$gatewayip} 1> /dev/null 2>&1");
-				} else {
-					$monitorip = get_interface_gateway($ifname);
-				}
-				$numpings = 5;
-				$btick = '`';
-	
-				if($monitorip <> "") {
-					/* QUALITY, create link quality database */
-					if (!file_exists("$rrddbpath$ifname$quality")) {
+
+					if (!file_exists("$rrddbpath$ifname$queuesdrop")) {
 						/* create rrd file if it does not exist */
-						log_error("Create RRD database $rrddbpath$ifname$quality");
-						$rrdcreate = "$rrdtool create $rrddbpath$ifname$quality --step $rrdqualityinterval ";
-						$rrdcreate .= "DS:loss:GAUGE:$qualityvalid:0:100 ";
-						$rrdcreate .= "DS:roundtrip:GAUGE:$qualityvalid:0:10000 ";
+						log_error("Create RRD database $rrddbpath$ifname$queuesdrop");
+						$rrdcreate = "$rrdtool create $rrddbpath$ifname$queuesdrop --step $rrdqueuesdropinterval ";
+						/* loop list of shaper queues */
+						$q = 0;
+						foreach ($a_queues as $queue) {
+							$name = $queue['name'];
+							$rrdcreate .= "DS:$name:COUNTER:$queuesdropvalid:0:$downstream ";
+						}
+
 						$rrdcreate .= "RRA:AVERAGE:0.5:1:1000 ";
 						$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
 						$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
 						$rrdcreate .= "RRA:AVERAGE:0.5:720:1000";
-	
+
 						$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
 						if ($rrdcreatereturn != 0) {
 							log_error("RRD create failed exited with $rrdcreatereturn, the error is: $rrdcreateoutput[0]\n");
 						}
 					}
-	
-					/* enter UNKNOWN values in the RRD so it knows we rebooted. */
+
 					if($g['booting']) {
-						exec("$rrdtool update $rrddbpath$ifname$quality N:U:U");
-					}
-	
-					/* the ping test function. We call this on the last line */
-					$rrdupdatesh .= "get_quality_stats_{$ifname} () {\n";
-					$rrdupdatesh .= "	packetloss_{$ifname}=100\n";
-					$rrdupdatesh .= "	roundtrip_{$ifname}=0\n";
-					$rrdupdatesh .= "	local out_{$ifname}\n";
-					$rrdupdatesh .= "	out_{$ifname}=$btick ping -c $numpings -q $monitorip $btick\n";
-					$rrdupdatesh .= "	if [ $? -eq 0 ]; then\n";
-					$rrdupdatesh .= "		packetloss_{$ifname}=$btick echo \$out_{$ifname} | cut -f18 -d' ' | cut -c -1 $btick\n";
-					$rrdupdatesh .= "		roundtrip_{$ifname}=$btick echo \$out_{$ifname} | cut -f24 -d' ' | cut -f2 -d'/' $btick\n";
-					$rrdupdatesh .= "	fi\n";
-					$rrdupdatesh .= "	$rrdtool update $rrddbpath$ifname$quality N:\$packetloss_{$ifname}:\$roundtrip_{$ifname}\n";
-					$rrdupdatesh .= "}\n\n";
-	
-					$rrdupdatesh .= "get_quality_stats_{$ifname} &\n\n";
-				}
-	
-				/* WAN interface only statistics */
-				if ("$ifname" == "wan") {
-	
-					/* QUEUES, set up the queues databases */
-					if (!is_array($config['shaper']['queue'])) {
-						$config['shaper']['queue'] = array ();
-					}
-					$a_queues = & $config['shaper']['queue'];
-	
-					if (isset ($config['shaper']['enable'])) {
-						if (!file_exists("$rrddbpath$ifname$queues")) {
-							/* create rrd file if it does not exist */
-							log_error("Create RRD database $rrddbpath$ifname$queues");
-							$rrdcreate = "$rrdtool create $rrddbpath$ifname$queues --step $rrdqueuesinterval ";
-							/* loop list of shaper queues */
-							$q = 0;
-							foreach ($a_queues as $queue) {
-								$name = $queue['name'];
-								$rrdcreate .= "DS:$name:COUNTER:$queuesvalid:0:$downstream ";
-							}
-	
-							$rrdcreate .= "RRA:AVERAGE:0.5:1:1000 ";
-							$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
-							$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
-							$rrdcreate .= "RRA:AVERAGE:0.5:720:1000";
-	
-							$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
-							if ($rrdcreatereturn != 0) {
-								log_error("RRD create failed exited with $rrdcreatereturn, the
-										error is: $rrdcreateoutput[0]\n");
-							}
-						}
-	
-						if (!file_exists("$rrddbpath$ifname$queuesdrop")) {
-							/* create rrd file if it does not exist */
-							log_error("Create RRD database $rrddbpath$ifname$queuesdrop");
-							$rrdcreate = "$rrdtool create $rrddbpath$ifname$queuesdrop --step $rrdqueuesdropinterval ";
-							/* loop list of shaper queues */
-							$q = 0;
-							foreach ($a_queues as $queue) {
-								$name = $queue['name'];
-								$rrdcreate .= "DS:$name:COUNTER:$queuesdropvalid:0:$downstream ";
-							}
-	
-							$rrdcreate .= "RRA:AVERAGE:0.5:1:1000 ";
-							$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
-							$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
-							$rrdcreate .= "RRA:AVERAGE:0.5:720:1000";
-	
-							$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
-							if ($rrdcreatereturn != 0) {
-								log_error("RRD create failed exited with $rrdcreatereturn, the error is: $rrdcreateoutput[0]\n");
+						$rrdqcommand = "-t ";
+						$rrducommand = "N";
+						$q = 0;
+						foreach ($a_queues as $queue) {
+							if($q == 0) {
+								$rrdqcommand .= "{$queue['name']}";
+							} else {
+								$rrdqcommand .= ":{$queue['name']}";
 							}
+							$q++;
+							$rrducommand .= ":U";
 						}
-	
-						if($g['booting']) {
-							$rrdqcommand = "-t ";
-							$rrducommand = "N";
-							$q = 0;
-							foreach ($a_queues as $queue) {
-								if($q == 0) {
-									$rrdqcommand .= "{$queue['name']}";
-								} else {
-									$rrdqcommand .= ":{$queue['name']}";
-								}
-								$q++;
-								$rrducommand .= ":U";
-							}
-							exec("$rrdtool update $rrddbpath$ifname$queues $rrdqcommand $rrducommand");
-							exec("$rrdtool update $rrddbpath$ifname$queuesdrop $rrdqcommand $rrducommand");
-						}
-	
-						/* awk function to gather shaper data */
-						/* yes, it's special */
-						$rrdupdatesh .= "` pfctl -vsq | awk 'BEGIN {printf \"$rrdtool update $rrddbpath$ifname$queues \" } ";
-						$rrdupdatesh .= "{ ";
-						$rrdupdatesh .= "if ((\$1 == \"queue\") && ( \$2 ~ /^q/ )) { ";
-						$rrdupdatesh .= "dsname = dsname \":\" \$2 ; ";
-						$rrdupdatesh .= "q=1; ";
-						$rrdupdatesh .= "} ";
-						$rrdupdatesh .= "else if ((\$4 == \"bytes:\") && ( q == 1 ) ) { ";
-						$rrdupdatesh .= "dsdata = dsdata \":\" \$5 ; ";
-						$rrdupdatesh .= "q=0; ";
-						$rrdupdatesh .= "} ";
-						$rrdupdatesh .= "} END { ";
-						$rrdupdatesh .= "dsname = substr(dsname,2); ";
-						$rrdupdatesh .= "dsdata = substr(dsdata,2); ";
-						$rrdupdatesh .= "printf \"-t \" dsname \" N:\" dsdata }' ";
-						$rrdupdatesh .= "dsname=\"\" dsdata=\"\"`\n\n";
-	
-						$rrdupdatesh .= "` pfctl -vsq | awk 'BEGIN {printf \"$rrdtool update $rrddbpath$ifname$queuesdrop \" } ";
-						$rrdupdatesh .= "{ ";
-						$rrdupdatesh .= "if ((\$1 == \"queue\") && ( \$2 ~ /^q/ )) { ";
-						$rrdupdatesh .= "dsname = dsname \":\" \$2 ; ";
-						$rrdupdatesh .= "q=1; ";
-						$rrdupdatesh .= "} ";
-						$rrdupdatesh .= "else if ((\$4 == \"bytes:\") && ( q == 1 ) ) { ";
-						$rrdupdatesh .= "dsdata = dsdata \":\" \$8 ; ";
-						$rrdupdatesh .= "q=0; ";
-						$rrdupdatesh .= "} ";
-						$rrdupdatesh .= "} END { ";
-						$rrdupdatesh .= "dsname = substr(dsname,2); ";
-						$rrdupdatesh .= "dsdata = substr(dsdata,2); ";
-						$rrdupdatesh .= "printf \"-t \" dsname \" N:\" dsdata }' ";
-						$rrdupdatesh .= "dsname=\"\" dsdata=\"\"`\n\n";
+						exec("$rrdtool update $rrddbpath$ifname$queues $rrdqcommand $rrducommand");
+						exec("$rrdtool update $rrddbpath$ifname$queuesdrop $rrdqcommand $rrducommand");
 					}
+
+					/* awk function to gather shaper data */
+					/* yes, it's special */
+					$rrdupdatesh .= "` pfctl -vsq | awk 'BEGIN {printf \"$rrdtool update $rrddbpath$ifname$queues \" } ";
+					$rrdupdatesh .= "{ ";
+					$rrdupdatesh .= "if ((\$1 == \"queue\") && ( \$2 ~ /^q/ )) { ";
+					$rrdupdatesh .= "dsname = dsname \":\" \$2 ; ";
+					$rrdupdatesh .= "q=1; ";
+					$rrdupdatesh .= "} ";
+					$rrdupdatesh .= "else if ((\$4 == \"bytes:\") && ( q == 1 ) ) { ";
+					$rrdupdatesh .= "dsdata = dsdata \":\" \$5 ; ";
+					$rrdupdatesh .= "q=0; ";
+					$rrdupdatesh .= "} ";
+					$rrdupdatesh .= "} END { ";
+					$rrdupdatesh .= "dsname = substr(dsname,2); ";
+					$rrdupdatesh .= "dsdata = substr(dsdata,2); ";
+					$rrdupdatesh .= "printf \"-t \" dsname \" N:\" dsdata }' ";
+					$rrdupdatesh .= "dsname=\"\" dsdata=\"\"`\n\n";
+
+					$rrdupdatesh .= "` pfctl -vsq | awk 'BEGIN {printf \"$rrdtool update $rrddbpath$ifname$queuesdrop \" } ";
+					$rrdupdatesh .= "{ ";
+					$rrdupdatesh .= "if ((\$1 == \"queue\") && ( \$2 ~ /^q/ )) { ";
+					$rrdupdatesh .= "dsname = dsname \":\" \$2 ; ";
+					$rrdupdatesh .= "q=1; ";
+					$rrdupdatesh .= "} ";
+					$rrdupdatesh .= "else if ((\$4 == \"bytes:\") && ( q == 1 ) ) { ";
+					$rrdupdatesh .= "dsdata = dsdata \":\" \$8 ; ";
+					$rrdupdatesh .= "q=0; ";
+					$rrdupdatesh .= "} ";
+					$rrdupdatesh .= "} END { ";
+					$rrdupdatesh .= "dsname = substr(dsname,2); ";
+					$rrdupdatesh .= "dsdata = substr(dsdata,2); ";
+					$rrdupdatesh .= "printf \"-t \" dsname \" N:\" dsdata }' ";
+					$rrdupdatesh .= "dsname=\"\" dsdata=\"\"`\n\n";
 				}
 			}
-			$i++;
-	
-			/* System only statistics */
-			$ifname = "system";
-	
-				/* STATES, create pf states database */
-				if(! file_exists("$rrddbpath$ifname$states")) {
-					/* create rrd file if it does not exist */
-					log_error("Create RRD database $rrddbpath$ifname$states");
-					$rrdcreate = "$rrdtool create $rrddbpath$ifname$states --step $rrdstatesinterval ";
-					$rrdcreate .= "DS:pfrate:GAUGE:$statesvalid:0:10000000 ";
-					$rrdcreate .= "DS:pfstates:GAUGE:$statesvalid:0:10000000 ";
-					$rrdcreate .= "DS:pfnat:GAUGE:$statesvalid:0:10000000 ";
-					$rrdcreate .= "DS:srcip:GAUGE:$statesvalid:0:10000000 ";
-					$rrdcreate .= "DS:dstip:GAUGE:$statesvalid:0:10000000 ";
-					$rrdcreate .= "RRA:MIN:0.5:1:1000 ";
-					$rrdcreate .= "RRA:MIN:0.5:5:1000 ";
-					$rrdcreate .= "RRA:MIN:0.5:60:1000 ";
-					$rrdcreate .= "RRA:MIN:0.5:360:1000 ";
-					$rrdcreate .= "RRA:AVERAGE:0.5:1:1000 ";
-					$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
-					$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
-					$rrdcreate .= "RRA:AVERAGE:0.5:360:1000 ";
-					$rrdcreate .= "RRA:MAX:0.5:1:1000 ";
-					$rrdcreate .= "RRA:MAX:0.5:5:1000 ";
-					$rrdcreate .= "RRA:MAX:0.5:60:1000 ";
-					$rrdcreate .= "RRA:MAX:0.5:360:1000";
-	
-					$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
-					if($rrdcreatereturn != 0) {
-				                log_error("RRD create failed exited with $rrdcreatereturn, the
-							error is: $rrdcreateoutput[0]\n");
-					}
+		}
+		$i++;
+
+		/* System only statistics */
+		$ifname = "system";
+
+			/* STATES, create pf states database */
+			if(! file_exists("$rrddbpath$ifname$states")) {
+				/* create rrd file if it does not exist */
+				log_error("Create RRD database $rrddbpath$ifname$states");
+				$rrdcreate = "$rrdtool create $rrddbpath$ifname$states --step $rrdstatesinterval ";
+				$rrdcreate .= "DS:pfrate:GAUGE:$statesvalid:0:10000000 ";
+				$rrdcreate .= "DS:pfstates:GAUGE:$statesvalid:0:10000000 ";
+				$rrdcreate .= "DS:pfnat:GAUGE:$statesvalid:0:10000000 ";
+				$rrdcreate .= "DS:srcip:GAUGE:$statesvalid:0:10000000 ";
+				$rrdcreate .= "DS:dstip:GAUGE:$statesvalid:0:10000000 ";
+				$rrdcreate .= "RRA:MIN:0.5:1:1000 ";
+				$rrdcreate .= "RRA:MIN:0.5:5:1000 ";
+				$rrdcreate .= "RRA:MIN:0.5:60:1000 ";
+				$rrdcreate .= "RRA:MIN:0.5:360:1000 ";
+				$rrdcreate .= "RRA:AVERAGE:0.5:1:1000 ";
+				$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
+				$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
+				$rrdcreate .= "RRA:AVERAGE:0.5:360:1000 ";
+				$rrdcreate .= "RRA:MAX:0.5:1:1000 ";
+				$rrdcreate .= "RRA:MAX:0.5:5:1000 ";
+				$rrdcreate .= "RRA:MAX:0.5:60:1000 ";
+				$rrdcreate .= "RRA:MAX:0.5:360:1000";
+
+				$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
+				if($rrdcreatereturn != 0) {
+			                log_error("RRD create failed exited with $rrdcreatereturn, the
+						error is: $rrdcreateoutput[0]\n");
 				}
-	
-				/* enter UNKNOWN values in the RRD so it knows we rebooted. */
-				if($g['booting']) {
-					exec("$rrdtool update $rrddbpath$ifname$states N:U:U:U:U:U");
+			}
+
+			/* enter UNKNOWN values in the RRD so it knows we rebooted. */
+			if($g['booting']) {
+				exec("$rrdtool update $rrddbpath$ifname$states N:U:U:U:U:U");
+			}
+
+ 			/* the pf states gathering function. */
+ 			$rrdupdatesh .= "\n";
+ 			$rrdupdatesh .= "pfrate=\"` $pfctl -si | egrep \"inserts|removals\" | awk '{ pfrate = \$3 + pfrate } {print pfrate}'|tail -1 `\"\n";
+ 			$rrdupdatesh .= "pfstates=\"` $pfctl -ss | egrep -v \"<\\-.*?<\\-|\\->.*?\\->\" | wc -l|sed 's/ //g'`\"\n";
+			$rrdupdatesh .= "pfnat=\"` $pfctl -ss | egrep '<\\-.*?<\\-|\\->.*?\\->' | wc -l|sed 's/ //g' `\"\n";
+ 			$rrdupdatesh .= "srcip=\"` $pfctl -ss | egrep -v '<\\-.*?<\\-|\\->.*?\\->' | grep '\\->' | awk '{print \$3}' | awk -F: '{print \$1}' | sort -u|wc -l|sed 's/ //g' `\"\n";
+ 			$rrdupdatesh .= "dstip=\"` $pfctl -ss | egrep -v '<\\-.*?<\\-|\\->.*?\\->' | grep '<\\-' | awk '{print \$3}' | awk -F: '{print \$1}' | sort -u|wc -l|sed 's/ //g' `\"\n";
+			$rrdupdatesh .= "$rrdtool update $rrddbpath$ifname$states N:\$pfrate:\$pfstates:\$pfnat:\$srcip:\$dstip\n\n";
+
+			/* End pf states statistics */
+
+			/* CPU, create CPU statistics database */
+			if(! file_exists("$rrddbpath$ifname$proc")) {
+				/* create rrd file if it does not exist */
+				log_error("Create RRD database $rrddbpath$ifname$proc");
+				$rrdcreate = "$rrdtool create $rrddbpath$ifname$proc --step $rrdprocinterval ";
+				$rrdcreate .= "DS:user:GAUGE:$procvalid:0:10000000 ";
+				$rrdcreate .= "DS:nice:GAUGE:$procvalid:0:10000000 ";
+				$rrdcreate .= "DS:system:GAUGE:$procvalid:0:10000000 ";
+				$rrdcreate .= "DS:interrupt:GAUGE:$procvalid:0:10000000 ";
+				$rrdcreate .= "DS:processes:GAUGE:$procvalid:0:10000000 ";
+				$rrdcreate .= "RRA:MIN:0.5:1:1000 ";
+				$rrdcreate .= "RRA:MIN:0.5:5:1000 ";
+				$rrdcreate .= "RRA:MIN:0.5:60:1000 ";
+				$rrdcreate .= "RRA:MIN:0.5:360:1000 ";
+				$rrdcreate .= "RRA:AVERAGE:0.5:1:1000 ";
+				$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
+				$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
+				$rrdcreate .= "RRA:AVERAGE:0.5:360:1000 ";
+				$rrdcreate .= "RRA:MAX:0.5:1:1000 ";
+				$rrdcreate .= "RRA:MAX:0.5:5:1000 ";
+				$rrdcreate .= "RRA:MAX:0.5:60:1000 ";
+				$rrdcreate .= "RRA:MAX:0.5:360:1000";
+
+				$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
+				if($rrdcreatereturn != 0) {
+			                log_error("RRD create failed exited with $rrdcreatereturn, the
+						error is: $rrdcreateoutput[0]\n");
 				}
-	
-	 			/* the pf states gathering function. */
-	 			$rrdupdatesh .= "\n";
-	 			$rrdupdatesh .= "pfrate=\"` $pfctl -si | egrep \"inserts|removals\" | awk '{ pfrate = \$3 + pfrate } {print pfrate}'|tail -1 `\"\n";
-	 			$rrdupdatesh .= "pfstates=\"` $pfctl -ss | egrep -v \"<\\-.*?<\\-|\\->.*?\\->\" | wc -l|sed 's/ //g'`\"\n";
-				$rrdupdatesh .= "pfnat=\"` $pfctl -ss | egrep '<\\-.*?<\\-|\\->.*?\\->' | wc -l|sed 's/ //g' `\"\n";
-	 			$rrdupdatesh .= "srcip=\"` $pfctl -ss | egrep -v '<\\-.*?<\\-|\\->.*?\\->' | grep '\\->' | awk '{print \$3}' | awk -F: '{print \$1}' | sort -u|wc -l|sed 's/ //g' `\"\n";
-	 			$rrdupdatesh .= "dstip=\"` $pfctl -ss | egrep -v '<\\-.*?<\\-|\\->.*?\\->' | grep '<\\-' | awk '{print \$3}' | awk -F: '{print \$1}' | sort -u|wc -l|sed 's/ //g' `\"\n";
-				$rrdupdatesh .= "$rrdtool update $rrddbpath$ifname$states N:\$pfrate:\$pfstates:\$pfnat:\$srcip:\$dstip\n\n";
-	
-				/* End pf states statistics */
-	
-				/* CPU, create CPU statistics database */
-				if(! file_exists("$rrddbpath$ifname$proc")) {
-					/* create rrd file if it does not exist */
-					log_error("Create RRD database $rrddbpath$ifname$proc");
-					$rrdcreate = "$rrdtool create $rrddbpath$ifname$proc --step $rrdprocinterval ";
-					$rrdcreate .= "DS:user:GAUGE:$procvalid:0:10000000 ";
-					$rrdcreate .= "DS:nice:GAUGE:$procvalid:0:10000000 ";
-					$rrdcreate .= "DS:system:GAUGE:$procvalid:0:10000000 ";
-					$rrdcreate .= "DS:interrupt:GAUGE:$procvalid:0:10000000 ";
-					$rrdcreate .= "DS:processes:GAUGE:$procvalid:0:10000000 ";
-					$rrdcreate .= "RRA:MIN:0.5:1:1000 ";
-					$rrdcreate .= "RRA:MIN:0.5:5:1000 ";
-					$rrdcreate .= "RRA:MIN:0.5:60:1000 ";
-					$rrdcreate .= "RRA:MIN:0.5:360:1000 ";
-					$rrdcreate .= "RRA:AVERAGE:0.5:1:1000 ";
-					$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
-					$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
-					$rrdcreate .= "RRA:AVERAGE:0.5:360:1000 ";
-					$rrdcreate .= "RRA:MAX:0.5:1:1000 ";
-					$rrdcreate .= "RRA:MAX:0.5:5:1000 ";
-					$rrdcreate .= "RRA:MAX:0.5:60:1000 ";
-					$rrdcreate .= "RRA:MAX:0.5:360:1000";
-	
+			}
+
+			/* enter UNKNOWN values in the RRD so it knows we rebooted. */
+			if($g['booting']) {
+				exec("$rrdtool update $rrddbpath$ifname$proc N:U:U:U:U:U");
+			}
+
+ 			/* the CPU stats gathering function. */
+ 			$rrdupdatesh .= "`$top -d 2 -s 1 0 | $awk '{gsub(/%/, \"\")} BEGIN { ";
+			$rrdupdatesh .= "printf \"$rrdtool update $rrddbpath$ifname$proc \" } ";
+			$rrdupdatesh .= "{ if ( \$2 == \"processes:\" ) { ";
+			$rrdupdatesh .= "processes = \$1; ";
+			$rrdupdatesh .= "} ";
+			$rrdupdatesh .= "else if ( \$1 == \"CPU\" ) { ";
+			$rrdupdatesh .= "user = \$3; ";
+			$rrdupdatesh .= "nice = \$5; ";
+			$rrdupdatesh .= "sys = \$7; ";
+			$rrdupdatesh .= "interrupt = \$9; ";
+			$rrdupdatesh .= "} ";
+			$rrdupdatesh .= "} END { ";
+			$rrdupdatesh .= "printf \"N:\"user\":\"nice\":\"sys\":\"interrupt\":\"processes ";
+			$rrdupdatesh .= "}'`\n\n";
+
+			/* End CPU statistics */
+
+			/* SPAMD, set up the spamd rrd file */
+			if (isset($config['installedpackages']['spamdsettings']) &&
+				 isset ($config['installedpackages']['spamdsettings']['config'][0]['enablerrd'])) {
+				/* set up the spamd rrd file */
+				if (!file_exists("$rrddbpath$ifname$spamd")) {
+						/* create rrd file if it does not exist */
+						log_error("Create RRD database $rrddbpath$ifname$spamd");
+						$rrdcreate = "$rrdtool create $rrddbpath$ifname$spamd --step $rrdspamdinterval ";
+						$rrdcreate .= "DS:conn:GAUGE:$spamdvalid:0:10000 ";
+						$rrdcreate .= "DS:time:GAUGE:$spamdvalid:0:86400 ";
+						$rrdcreate .= "RRA:MIN:0.5:1:1000 ";
+						$rrdcreate .= "RRA:MIN:0.5:5:1000 ";
+						$rrdcreate .= "RRA:MIN:0.5:60:1000 ";
+						$rrdcreate .= "RRA:MIN:0.5:720:1000 ";
+						$rrdcreate .= "RRA:AVERAGE:0.5:1:1000 ";
+						$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
+						$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
+						$rrdcreate .= "RRA:AVERAGE:0.5:720:1000 ";
+						$rrdcreate .= "RRA:MAX:0.5:1:1000 ";
+						$rrdcreate .= "RRA:MAX:0.5:5:1000 ";
+						$rrdcreate .= "RRA:MAX:0.5:60:1000 ";
+						$rrdcreate .= "RRA:MAX:0.5:720:1000";
+
 					$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
-					if($rrdcreatereturn != 0) {
-				                log_error("RRD create failed exited with $rrdcreatereturn, the
+					if ($rrdcreatereturn != 0) {
+						log_error("RRD create failed exited with $rrdcreatereturn, the
 							error is: $rrdcreateoutput[0]\n");
 					}
 				}
-	
-				/* enter UNKNOWN values in the RRD so it knows we rebooted. */
-				if($g['booting']) {
-					exec("$rrdtool update $rrddbpath$ifname$proc N:U:U:U:U:U");
-				}
-	
-	 			/* the CPU stats gathering function. */
-	 			$rrdupdatesh .= "`$top -d 2 -s 1 0 | $awk '{gsub(/%/, \"\")} BEGIN { ";
-				$rrdupdatesh .= "printf \"$rrdtool update $rrddbpath$ifname$proc \" } ";
-				$rrdupdatesh .= "{ if ( \$2 == \"processes:\" ) { ";
-				$rrdupdatesh .= "processes = \$1; ";
-				$rrdupdatesh .= "} ";
-				$rrdupdatesh .= "else if ( \$1 == \"CPU\" ) { ";
-				$rrdupdatesh .= "user = \$3; ";
-				$rrdupdatesh .= "nice = \$5; ";
-				$rrdupdatesh .= "sys = \$7; ";
-				$rrdupdatesh .= "interrupt = \$9; ";
-				$rrdupdatesh .= "} ";
-				$rrdupdatesh .= "} END { ";
-				$rrdupdatesh .= "printf \"N:\"user\":\"nice\":\"sys\":\"interrupt\":\"processes ";
-				$rrdupdatesh .= "}'`\n\n";
-	
-				/* End CPU statistics */
-	
-				/* SPAMD, set up the spamd rrd file */
-				if (isset($config['installedpackages']['spamdsettings']) &&
-					 isset ($config['installedpackages']['spamdsettings']['config'][0]['enablerrd'])) {
-					/* set up the spamd rrd file */
-					if (!file_exists("$rrddbpath$ifname$spamd")) {
-							/* create rrd file if it does not exist */
-							log_error("Create RRD database $rrddbpath$ifname$spamd");
-							$rrdcreate = "$rrdtool create $rrddbpath$ifname$spamd --step $rrdspamdinterval ";
-							$rrdcreate .= "DS:conn:GAUGE:$spamdvalid:0:10000 ";
-							$rrdcreate .= "DS:time:GAUGE:$spamdvalid:0:86400 ";
-							$rrdcreate .= "RRA:MIN:0.5:1:1000 ";
-							$rrdcreate .= "RRA:MIN:0.5:5:1000 ";
-							$rrdcreate .= "RRA:MIN:0.5:60:1000 ";
-							$rrdcreate .= "RRA:MIN:0.5:720:1000 ";
-							$rrdcreate .= "RRA:AVERAGE:0.5:1:1000 ";
-							$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
-							$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
-							$rrdcreate .= "RRA:AVERAGE:0.5:720:1000 ";
-							$rrdcreate .= "RRA:MAX:0.5:1:1000 ";
-							$rrdcreate .= "RRA:MAX:0.5:5:1000 ";
-							$rrdcreate .= "RRA:MAX:0.5:60:1000 ";
-							$rrdcreate .= "RRA:MAX:0.5:720:1000";
-	
-						$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
-						if ($rrdcreatereturn != 0) {
-							log_error("RRD create failed exited with $rrdcreatereturn, the
-								error is: $rrdcreateoutput[0]\n");
-						}
-					}
-	
-					$rrdupdatesh .= "\n";
-					$rrdupdatesh .= "# polling spamd for connections and tarpitness \n";
-					$rrdupdatesh .= "$rrdtool update $rrddbpath$ifname$spamd \\\n";
-					$rrdupdatesh .= "`$php -q $spamd_gather`\n";
-	
-				}
-			/* End System statistics */
-	
-			$rrdupdatesh .= "sleep 60\n";
-			$rrdupdatesh .= "done\n";
-			log_error("Creating rrd update script");
-			/* write the rrd update script */
-			$updaterrdscript = "{$g['vardb_path']}/rrd/updaterrd.sh";
-			$fd = fopen("$updaterrdscript", "w");
-			fwrite($fd, "$rrdupdatesh");
-			fclose($fd);
-	
-			/* kill off traffic collectors */
-			kill_traffic_collector();
-	
-			/* start traffic collector */
-			mwexec_bg("/usr/bin/nice -n20 /bin/sh $updaterrdscript");
-	
-		} else {
-			/* kill off traffic collectors */
-			kill_traffic_collector();
-		}
-	
-		if($g['booting']) 
-			echo "done.\n";
-			
-	}
-	
-	function kill_traffic_collector() {
-			mwexec("ps awwwux | grep '/[u]pdaterrd.sh' | awk '{print $2}' | xargs kill");
-	}
-	
-	function update_filter_reload_status($text) {
-		global $g;
-		config_lock();
-		$fd = fopen("{$g['varrun_path']}/filter_reload_status", "w");
-		fwrite($fd, $text);
-		fclose($fd);
-		config_unlock();
-	}
-	
-	function get_interface_gateway($interface) {
-		global $config, $g;
-		$interface = strtolower($interface);
-		/*  if we are dhclient, obtain the gateway from the tmp file, otherwise
-		 *  grab the address from the configuration file.
-		 */
-		$tmpif = convert_real_interface_to_friendly_interface_name($interface);
-		if($tmpif <> $interface)
-			$interface = $tmpif;
-		$realif = $config['interfaces'][$interface]['if'];
-		if(file_exists("{$g['tmp_path']}/{$realif}_router")) {
-			$gw = file_get_contents("{$g['tmp_path']}/{$realif}_router");
-			$gw = rtrim($gw);
-		} else {
-			$gw = $config['interfaces'][$interface]['gateway'];
-		}
-		/* if wan is requested, return it */
-		if($interface == "wan")
-			return str_replace("\n", "", `route -n get default | grep gateway | awk '{ print $2 }'`);
-		/* return gateway */
-		return $gw;
-	}
-	
-	function is_dhcp_server_enabled() {
-		/* DHCP enabled on any interfaces? */
-		global $config, $g;
-		$dhcpdcfg = $config['dhcpd'];
-		$dhcpdenable = false;
-		foreach ($dhcpdcfg as $dhcpif => $dhcpifconf) {
-			if (isset ($dhcpifconf['enable']) && (($dhcpif == "lan") || (isset ($config['interfaces'][$dhcpif]['enable']) && $config['interfaces'][$dhcpif]['if'] && (!$config['interfaces'][$dhcpif]['bridge']))))
-				$dhcpdenable = true;
-			if (isset ($dhcpifconf['enable']) && (($dhcpif == "wan") || (isset ($config['interfaces'][$dhcpif]['enable']) && $config['interfaces'][$dhcpif]['if'] && (!$config['interfaces'][$dhcpif]['bridge']))))
-				$dhcpdenable = true;
-		}
-		return $dhcpdenable;
-	}
-	
-	/* return outside interfaces with a gateway */
-	function get_interfaces_with_gateway() {
-		global $config;
-		$ints = array();
-		$ifdescrs = get_interface_list();
-	
-		/* loop interfaces, check config for outbound */
-		foreach ($ifdescrs as $ifdescr => $ifname) {
-			$friendly = $ifname['friendly'];
-			if ($config['interfaces'][$friendly]['ipaddr'] == "dhcp") {
-				$ints[] = $friendly;
-				continue;
-			}
-			if ($config['interfaces'][$friendly]['ipaddr'] == "pppoe") {
-				$ints[] = $friendly;
-				continue;
-			}
-			if ($config['interfaces'][$friendly]['ipaddr'] == "pptp") {
-				$ints[] = $friendly;
-				continue;
-			}
-			if ($config['interfaces'][$friendly]['gateway'] <> "") {
-				$ints[] = $friendly;
-				continue;
+
+				$rrdupdatesh .= "\n";
+				$rrdupdatesh .= "# polling spamd for connections and tarpitness \n";
+				$rrdupdatesh .= "$rrdtool update $rrddbpath$ifname$spamd \\\n";
+				$rrdupdatesh .= "`$php -q $spamd_gather`\n";
+
 			}
-		}
-		return $ints;
-	}
-	
-	/* return true if interface has a gateway */
-	function interface_has_gateway($friendly) {
-		$friendly = strtolower($friendly);
-		if(in_array($friendly, get_interfaces_with_gateway())) {
-			return true;
-		} else {
-			/* extra check for real interface names if it falls through */
-			$friendly = convert_real_interface_to_friendly_interface_name($friendly);
-			return(in_array($friendly, get_interfaces_with_gateway()));
-		}
+		/* End System statistics */
+
+		$rrdupdatesh .= "sleep 60\n";
+		$rrdupdatesh .= "done\n";
+		log_error("Creating rrd update script");
+		/* write the rrd update script */
+		$updaterrdscript = "{$g['vardb_path']}/rrd/updaterrd.sh";
+		$fd = fopen("$updaterrdscript", "w");
+		fwrite($fd, "$rrdupdatesh");
+		fclose($fd);
+
+		/* kill off traffic collectors */
+		kill_traffic_collector();
+
+		/* start traffic collector */
+		mwexec_bg("/usr/bin/nice -n20 /bin/sh $updaterrdscript");
+
+	} else {
+		/* kill off traffic collectors */
+		kill_traffic_collector();
+	}
+
+	if($g['booting']) 
+		echo "done.\n";
+		
+}
+
+function kill_traffic_collector() {
+		mwexec("ps awwwux | grep '/[u]pdaterrd.sh' | awk '{print $2}' | xargs kill");
+}
+
+function update_filter_reload_status($text) {
+	global $g;
+	config_lock();
+	$fd = fopen("{$g['varrun_path']}/filter_reload_status", "w");
+	fwrite($fd, $text);
+	fclose($fd);
+	config_unlock();
+}
+
+function get_interface_gateway($interface) {
+	global $config, $g;
+	$interface = strtolower($interface);
+	/*  if we are dhclient, obtain the gateway from the tmp file, otherwise
+	 *  grab the address from the configuration file.
+	 */
+	$tmpif = convert_real_interface_to_friendly_interface_name($interface);
+	if($tmpif <> $interface)
+		$interface = $tmpif;
+	$realif = $config['interfaces'][$interface]['if'];
+	if(file_exists("{$g['tmp_path']}/{$realif}_router")) {
+		$gw = file_get_contents("{$g['tmp_path']}/{$realif}_router");
+		$gw = rtrim($gw);
+	} else {
+		$gw = $config['interfaces'][$interface]['gateway'];
+	}
+	/* if wan is requested, return it */
+	if($interface == "wan")
+		return str_replace("\n", "", `route -n get default | grep gateway | awk '{ print $2 }'`);
+	/* return gateway */
+	return $gw;
+}
+
+function is_dhcp_server_enabled() {
+	/* DHCP enabled on any interfaces? */
+	global $config, $g;
+	$dhcpdcfg = $config['dhcpd'];
+	$dhcpdenable = false;
+	foreach ($dhcpdcfg as $dhcpif => $dhcpifconf) {
+		if (isset ($dhcpifconf['enable']) && (($dhcpif == "lan") || (isset ($config['interfaces'][$dhcpif]['enable']) && $config['interfaces'][$dhcpif]['if'] && (!$config['interfaces'][$dhcpif]['bridge']))))
+			$dhcpdenable = true;
+		if (isset ($dhcpifconf['enable']) && (($dhcpif == "wan") || (isset ($config['interfaces'][$dhcpif]['enable']) && $config['interfaces'][$dhcpif]['if'] && (!$config['interfaces'][$dhcpif]['bridge']))))
+			$dhcpdenable = true;
+	}
+	return $dhcpdenable;
+}
+
+/* return outside interfaces with a gateway */
+function get_interfaces_with_gateway() {
+	global $config;
+	$ints = array();
+	$ifdescrs = get_interface_list();
+
+	/* loop interfaces, check config for outbound */
+	foreach ($ifdescrs as $ifdescr => $ifname) {
+		$friendly = $ifname['friendly'];
+		if ($config['interfaces'][$friendly]['ipaddr'] == "dhcp") {
+			$ints[] = $friendly;
+			continue;
+		}
+		if ($config['interfaces'][$friendly]['ipaddr'] == "pppoe") {
+			$ints[] = $friendly;
+			continue;
+		}
+		if ($config['interfaces'][$friendly]['ipaddr'] == "pptp") {
+			$ints[] = $friendly;
+			continue;
+		}
+		if ($config['interfaces'][$friendly]['gateway'] <> "") {
+			$ints[] = $friendly;
+			continue;
+		}
+	}
+	return $ints;
+}
+
+/* return true if interface has a gateway */
+function interface_has_gateway($friendly) {
+	$friendly = strtolower($friendly);
+	if(in_array($friendly, get_interfaces_with_gateway())) {
+		return true;
+	} else {
+		/* extra check for real interface names if it falls through */
+		$friendly = convert_real_interface_to_friendly_interface_name($friendly);
+		return(in_array($friendly, get_interfaces_with_gateway()));
 	}
-	
+}
+
 ?>
\ No newline at end of file