Code style services DHCP

6 files changed, 1832 insertions, 1526 deletions

diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php
index f0b5be9..653d777 100644
--- a/usr/local/www/services_dhcp.php
+++ b/usr/local/www/services_dhcp.php
@@ -44,24 +44,25 @@
 require("guiconfig.inc");
 require_once("filter.inc");
 
-if(!$g['services_dhcp_server_enable']) {
+if (!$g['services_dhcp_server_enable']) {
 	header("Location: /");
 	exit;
 }
 
 $if = $_GET['if'];
-if (!empty($_POST['if']))
+if (!empty($_POST['if'])) {
 	$if = $_POST['if'];
+}
 
 /* if OLSRD is enabled, allow WAN to house DHCP. */
-if($config['installedpackages']['olsrd']) {
-	foreach($config['installedpackages']['olsrd']['config'] as $olsrd) {
-			if($olsrd['enable']) {
-				$is_olsr_enabled = true;
-				break;
-			}
+if ($config['installedpackages']['olsrd']) {
+	foreach ($config['installedpackages']['olsrd']['config'] as $olsrd) {
+		if ($olsrd['enable']) {
+			$is_olsr_enabled = true;
+			break;
+		}
 	}
-}	
+}
 
 $iflist = get_configured_interface_with_descr();
 
@@ -70,23 +71,26 @@ if (!$if || !isset($iflist[$if])) {
 	foreach ($iflist as $ifent => $ifname) {
 		$oc = $config['interfaces'][$ifent];
 		if ((is_array($config['dhcpd'][$ifent]) && !isset($config['dhcpd'][$ifent]['enable']) && (!is_ipaddrv4($oc['ipaddr']))) ||
-			(!is_array($config['dhcpd'][$ifent]) && (!is_ipaddrv4($oc['ipaddr']))))
+		    (!is_array($config['dhcpd'][$ifent]) && (!is_ipaddrv4($oc['ipaddr'])))) {
 			continue;
+		}
 		$if = $ifent;
 		break;
 	}
 }
 
 $act = $_GET['act'];
-if (!empty($_POST['act']))
+if (!empty($_POST['act'])) {
 	$act = $_POST['act'];
+}
 
 $a_pools = array();
 
-if (is_array($config['dhcpd'][$if])){
+if (is_array($config['dhcpd'][$if])) {
 	$pool = $_GET['pool'];
-	if (is_numeric($_POST['pool']))
+	if (is_numeric($_POST['pool'])) {
 		$pool = $_POST['pool'];
+	}
 
 	// If we have a pool but no interface name, that's not valid. Redirect away.
 	if (is_numeric($pool) && empty($if)) {
@@ -94,16 +98,18 @@ if (is_array($config['dhcpd'][$if])){
 		exit;
 	}
 
-	if (!is_array($config['dhcpd'][$if]['pool']))
+	if (!is_array($config['dhcpd'][$if]['pool'])) {
 		$config['dhcpd'][$if]['pool'] = array();
+	}
 	$a_pools = &$config['dhcpd'][$if]['pool'];
 
-	if (is_numeric($pool) && $a_pools[$pool])
+	if (is_numeric($pool) && $a_pools[$pool]) {
 		$dhcpdconf = &$a_pools[$pool];
-	elseif ($act == "newpool")
+	} elseif ($act == "newpool") {
 		$dhcpdconf = array();
-	else
+	} else {
 		$dhcpdconf = &$config['dhcpd'][$if];
+	}
 }
 if (is_array($dhcpdconf)) {
 	// Global Options
@@ -118,14 +124,16 @@ if (is_array($dhcpdconf)) {
 		// then show it true/checked.
 		foreach ($config['dhcpd'] as $dhcpdifitem) {
 			$dhcpleaseinlocaltime = $dhcpdifitem['dhcpleaseinlocaltime'];
-			if ($dhcpleaseinlocaltime)
+			if ($dhcpleaseinlocaltime) {
 				break;
+			}
 		}
 
 		$pconfig['dhcpleaseinlocaltime'] = $dhcpleaseinlocaltime;
 
-		if (!is_array($dhcpdconf['staticmap']))
+		if (!is_array($dhcpdconf['staticmap'])) {
 			$dhcpdconf['staticmap'] = array();
+		}
 		$a_maps = &$dhcpdconf['staticmap'];
 	} else {
 		// Options that exist only in pools
@@ -142,8 +150,8 @@ if (is_array($dhcpdconf)) {
 	$pconfig['gateway'] = $dhcpdconf['gateway'];
 	$pconfig['domain'] = $dhcpdconf['domain'];
 	$pconfig['domainsearchlist'] = $dhcpdconf['domainsearchlist'];
-	list($pconfig['wins1'],$pconfig['wins2']) = $dhcpdconf['winsserver'];
-	list($pconfig['dns1'],$pconfig['dns2'],$pconfig['dns3'],$pconfig['dns4']) = $dhcpdconf['dnsserver'];
+	list($pconfig['wins1'], $pconfig['wins2']) = $dhcpdconf['winsserver'];
+	list($pconfig['dns1'], $pconfig['dns2'], $pconfig['dns3'], $pconfig['dns4']) = $dhcpdconf['dnsserver'];
 	$pconfig['denyunknown'] = isset($dhcpdconf['denyunknown']);
 	$pconfig['ddnsdomain'] = $dhcpdconf['ddnsdomain'];
 	$pconfig['ddnsdomainprimary'] = $dhcpdconf['ddnsdomainprimary'];
@@ -152,7 +160,7 @@ if (is_array($dhcpdconf)) {
 	$pconfig['ddnsupdate'] = isset($dhcpdconf['ddnsupdate']);
 	$pconfig['mac_allow'] = $dhcpdconf['mac_allow'];
 	$pconfig['mac_deny'] = $dhcpdconf['mac_deny'];
-	list($pconfig['ntp1'],$pconfig['ntp2']) = $dhcpdconf['ntpserver'];
+	list($pconfig['ntp1'], $pconfig['ntp2']) = $dhcpdconf['ntpserver'];
 	$pconfig['tftp'] = $dhcpdconf['tftp'];
 	$pconfig['ldap'] = $dhcpdconf['ldap'];
 	$pconfig['netboot'] = isset($dhcpdconf['netboot']);
@@ -172,9 +180,11 @@ function validate_partial_mac_list($maclist) {
 	$macs = explode(',', $maclist);
 
 	// Loop through and look for invalid MACs.
-	foreach ($macs as $mac)
-		if (!is_macaddr($mac, true))
+	foreach ($macs as $mac) {
+		if (!is_macaddr($mac, true)) {
 			return false;
+		}
+	}
 	return true;
 }
 
@@ -185,8 +195,8 @@ if (isset($_POST['submit'])) {
 	$pconfig = $_POST;
 
 	$numberoptions = array();
-	for($x=0; $x<99; $x++) {
-		if(isset($_POST["number{$x}"]) && ctype_digit($_POST["number{$x}"])) {
+	for ($x=0; $x<99; $x++) {
+		if (isset($_POST["number{$x}"]) && ctype_digit($_POST["number{$x}"])) {
 			$numbervalue = array();
 			$numbervalue['number'] = htmlspecialchars($_POST["number{$x}"]);
 			$numbervalue['type'] = htmlspecialchars($_POST["itemtype{$x}"]);
@@ -200,60 +210,76 @@ if (isset($_POST['submit'])) {
 	/* input validation */
 	if ($_POST['enable'] || is_numeric($pool) || $act == "newpool") {
 		$reqdfields = explode(" ", "range_from range_to");
-		$reqdfieldsn = array(gettext("Range begin"),gettext("Range end"));
+		$reqdfieldsn = array(gettext("Range begin"), gettext("Range end"));
 
 		do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
-		if (($_POST['range_from'] && !is_ipaddrv4($_POST['range_from'])))
+		if (($_POST['range_from'] && !is_ipaddrv4($_POST['range_from']))) {
 			$input_errors[] = gettext("A valid range must be specified.");
-		if (($_POST['range_to'] && !is_ipaddrv4($_POST['range_to'])))
+		}
+		if (($_POST['range_to'] && !is_ipaddrv4($_POST['range_to']))) {
 			$input_errors[] = gettext("A valid range must be specified.");
-		if (($_POST['gateway'] && $_POST['gateway'] != "none" && !is_ipaddrv4($_POST['gateway'])))
+		}
+		if (($_POST['gateway'] && $_POST['gateway'] != "none" && !is_ipaddrv4($_POST['gateway']))) {
 			$input_errors[] = gettext("A valid IP address must be specified for the gateway.");
-		if (($_POST['wins1'] && !is_ipaddrv4($_POST['wins1'])) || ($_POST['wins2'] && !is_ipaddrv4($_POST['wins2'])))
+		}
+		if (($_POST['wins1'] && !is_ipaddrv4($_POST['wins1'])) || ($_POST['wins2'] && !is_ipaddrv4($_POST['wins2']))) {
 			$input_errors[] = gettext("A valid IP address must be specified for the primary/secondary WINS servers.");
+		}
 		$parent_ip = get_interface_ip($_POST['if']);
 		if (is_ipaddrv4($parent_ip) && $_POST['gateway'] && $_POST['gateway'] != "none") {
 			$parent_sn = get_interface_subnet($_POST['if']);
-			if(!ip_in_subnet($_POST['gateway'], gen_subnet($parent_ip, $parent_sn) . "/" . $parent_sn) && !ip_in_interface_alias_subnet($_POST['if'], $_POST['gateway']))
+			if (!ip_in_subnet($_POST['gateway'], gen_subnet($parent_ip, $parent_sn) . "/" . $parent_sn) && !ip_in_interface_alias_subnet($_POST['if'], $_POST['gateway'])) {
 				$input_errors[] = sprintf(gettext("The gateway address %s does not lie within the chosen interface's subnet."), $_POST['gateway']);
+			}
 		}
-		if (($_POST['dns1'] && !is_ipaddrv4($_POST['dns1'])) || ($_POST['dns2'] && !is_ipaddrv4($_POST['dns2'])) || ($_POST['dns3'] && !is_ipaddrv4($_POST['dns3'])) || ($_POST['dns4'] && !is_ipaddrv4($_POST['dns4'])))
+		if (($_POST['dns1'] && !is_ipaddrv4($_POST['dns1'])) || ($_POST['dns2'] && !is_ipaddrv4($_POST['dns2'])) || ($_POST['dns3'] && !is_ipaddrv4($_POST['dns3'])) || ($_POST['dns4'] && !is_ipaddrv4($_POST['dns4']))) {
 			$input_errors[] = gettext("A valid IP address must be specified for each of the DNS servers.");
+		}
 
-		if ($_POST['deftime'] && (!is_numeric($_POST['deftime']) || ($_POST['deftime'] < 60)))
-				$input_errors[] = gettext("The default lease time must be at least 60 seconds.");
+		if ($_POST['deftime'] && (!is_numeric($_POST['deftime']) || ($_POST['deftime'] < 60))) {
+			$input_errors[] = gettext("The default lease time must be at least 60 seconds.");
+		}
 
 		if (isset($config['captiveportal']) && is_array($config['captiveportal'])) {
 			$deftime = 7200; // Default value if it's empty
-			if (is_numeric($_POST['deftime']))
+			if (is_numeric($_POST['deftime'])) {
 				$deftime = $_POST['deftime'];
+			}
 
 			foreach ($config['captiveportal'] as $cpZone => $cpdata) {
-				if (!isset($cpdata['enable']))
+				if (!isset($cpdata['enable'])) {
 					continue;
-				if (!isset($cpdata['timeout']) || !is_numeric($cpdata['timeout']))
+				}
+				if (!isset($cpdata['timeout']) || !is_numeric($cpdata['timeout'])) {
 					continue;
+				}
 				$cp_ifs = explode(',', $cpdata['interface']);
-				if (!in_array($if, $cp_ifs))
+				if (!in_array($if, $cp_ifs)) {
 					continue;
-				if ($cpdata['timeout'] > $deftime)
+				}
+				if ($cpdata['timeout'] > $deftime) {
 					$input_errors[] = sprintf(gettext(
 						"The Captive Portal zone '%s' has Hard Timeout parameter set to a value bigger than Default lease time (%s)."), $cpZone, $deftime);
+				}
 			}
 		}
 
-		if ($_POST['maxtime'] && (!is_numeric($_POST['maxtime']) || ($_POST['maxtime'] < 60) || ($_POST['maxtime'] <= $_POST['deftime'])))
+		if ($_POST['maxtime'] && (!is_numeric($_POST['maxtime']) || ($_POST['maxtime'] < 60) || ($_POST['maxtime'] <= $_POST['deftime']))) {
 			$input_errors[] = gettext("The maximum lease time must be at least 60 seconds and higher than the default lease time.");
-		if (($_POST['ddnsdomain'] && !is_domain($_POST['ddnsdomain'])))
+		}
+		if (($_POST['ddnsdomain'] && !is_domain($_POST['ddnsdomain']))) {
 			$input_errors[] = gettext("A valid domain name must be specified for the dynamic DNS registration.");
-		if (($_POST['ddnsdomain'] && !is_ipaddrv4($_POST['ddnsdomainprimary'])))
+		}
+		if (($_POST['ddnsdomain'] && !is_ipaddrv4($_POST['ddnsdomainprimary']))) {
 			$input_errors[] = gettext("A valid primary domain name server IP address must be specified for the dynamic domain name.");
+		}
 		if (($_POST['ddnsdomainkey'] && !$_POST['ddnsdomainkeyname']) ||
-			($_POST['ddnsdomainkeyname'] && !$_POST['ddnsdomainkey']))
+		    ($_POST['ddnsdomainkeyname'] && !$_POST['ddnsdomainkey'])) {
 			$input_errors[] = gettext("You must specify both a valid domain key and key name.");
+		}
 		if ($_POST['domainsearchlist']) {
-			$domain_array=preg_split("/[ ;]+/",$_POST['domainsearchlist']);
+			$domain_array = preg_split("/[ ;]+/", $_POST['domainsearchlist']);
 			foreach ($domain_array as $curdomain) {
 				if (!is_domain($curdomain)) {
 					$input_errors[] = gettext("A valid domain search list must be specified.");
@@ -263,64 +289,79 @@ if (isset($_POST['submit'])) {
 		}
 
 		// Validate MACs
-		if (!empty($_POST['mac_allow']) && !validate_partial_mac_list($_POST['mac_allow']))
+		if (!empty($_POST['mac_allow']) && !validate_partial_mac_list($_POST['mac_allow'])) {
 			$input_errors[] = gettext("If you specify a mac allow list, it must contain only valid partial MAC addresses.");
-		if (!empty($_POST['mac_deny']) && !validate_partial_mac_list($_POST['mac_deny']))
+		}
+		if (!empty($_POST['mac_deny']) && !validate_partial_mac_list($_POST['mac_deny'])) {
 			$input_errors[] = gettext("If you specify a mac deny list, it must contain only valid partial MAC addresses.");
+		}
 
-		if (($_POST['ntp1'] && !is_ipaddrv4($_POST['ntp1'])) || ($_POST['ntp2'] && !is_ipaddrv4($_POST['ntp2'])))
+		if (($_POST['ntp1'] && !is_ipaddrv4($_POST['ntp1'])) || ($_POST['ntp2'] && !is_ipaddrv4($_POST['ntp2']))) {
 			$input_errors[] = gettext("A valid IP address must be specified for the primary/secondary NTP servers.");
-		if (($_POST['domain'] && !is_domain($_POST['domain'])))
+		}
+		if (($_POST['domain'] && !is_domain($_POST['domain']))) {
 			$input_errors[] = gettext("A valid domain name must be specified for the DNS domain.");
-		if ($_POST['tftp'] && !is_ipaddrv4($_POST['tftp']) && !is_domain($_POST['tftp']) && !is_URL($_POST['tftp']))
+		}
+		if ($_POST['tftp'] && !is_ipaddrv4($_POST['tftp']) && !is_domain($_POST['tftp']) && !is_URL($_POST['tftp'])) {
 			$input_errors[] = gettext("A valid IP address or hostname must be specified for the TFTP server.");
-		if (($_POST['nextserver'] && !is_ipaddrv4($_POST['nextserver'])))
+		}
+		if (($_POST['nextserver'] && !is_ipaddrv4($_POST['nextserver']))) {
 			$input_errors[] = gettext("A valid IP address must be specified for the network boot server.");
+		}
 
-		if(gen_subnet($ifcfgip, $ifcfgsn) == $_POST['range_from'])
+		if (gen_subnet($ifcfgip, $ifcfgsn) == $_POST['range_from']) {
 			$input_errors[] = gettext("You cannot use the network address in the starting subnet range.");
-		if(gen_subnet_max($ifcfgip, $ifcfgsn) == $_POST['range_to'])
+		}
+		if (gen_subnet_max($ifcfgip, $ifcfgsn) == $_POST['range_to']) {
 			$input_errors[] = gettext("You cannot use the broadcast address in the ending subnet range.");
+		}
 
 		// Disallow a range that includes the virtualip
 		if (is_array($config['virtualip']['vip'])) {
-			foreach($config['virtualip']['vip'] as $vip) {
-				if($vip['interface'] == $if)
-					if($vip['subnet'] && is_inrange_v4($vip['subnet'], $_POST['range_from'], $_POST['range_to']))
-						$input_errors[] = sprintf(gettext("The subnet range cannot overlap with virtual IP address %s."),$vip['subnet']);
+			foreach ($config['virtualip']['vip'] as $vip) {
+				if ($vip['interface'] == $if) {
+					if ($vip['subnet'] && is_inrange_v4($vip['subnet'], $_POST['range_from'], $_POST['range_to'])) {
+						$input_errors[] = sprintf(gettext("The subnet range cannot overlap with virtual IP address %s."), $vip['subnet']);
+					}
+				}
 			}
 		}
 
 		$noip = false;
-		if(is_array($a_maps))
-			foreach ($a_maps as $map)
-				if (empty($map['ipaddr']))
+		if (is_array($a_maps)) {
+			foreach ($a_maps as $map) {
+				if (empty($map['ipaddr'])) {
 					$noip = true;
-		if ($_POST['staticarp'] && $noip)
+				}
+			}
+		}
+		if ($_POST['staticarp'] && $noip) {
 			$input_errors[] = "Cannot enable static ARP when you have static map entries without IP addresses. Ensure all static maps have IP addresses and try again.";
+		}
 
-		if(is_array($pconfig['numberoptions']['item'])) {
+		if (is_array($pconfig['numberoptions']['item'])) {
 			foreach ($pconfig['numberoptions']['item'] as $numberoption) {
-				if ( $numberoption['type'] == 'text' && strstr($numberoption['value'], '"') )
+				if ($numberoption['type'] == 'text' && strstr($numberoption['value'], '"')) {
 					$input_errors[] = gettext("Text type cannot include quotation marks.");
-				else if ( $numberoption['type'] == 'string' && !preg_match('/^"[^"]*"$/', $numberoption['value']) && !preg_match('/^[0-9a-f]{2}(?:\:[0-9a-f]{2})*$/i', $numberoption['value']) )
+				} else if ($numberoption['type'] == 'string' && !preg_match('/^"[^"]*"$/', $numberoption['value']) && !preg_match('/^[0-9a-f]{2}(?:\:[0-9a-f]{2})*$/i', $numberoption['value'])) {
 					$input_errors[] = gettext("String type must be enclosed in quotes like \"this\" or must be a series of octets specified in hexadecimal, separated by colons, like 01:23:45:67:89:ab:cd:ef");
-				else if ( $numberoption['type'] == 'boolean' && $numberoption['value'] != 'true' && $numberoption['value'] != 'false' && $numberoption['value'] != 'on' && $numberoption['value'] != 'off' )
+				} else if ($numberoption['type'] == 'boolean' && $numberoption['value'] != 'true' && $numberoption['value'] != 'false' && $numberoption['value'] != 'on' && $numberoption['value'] != 'off') {
 					$input_errors[] = gettext("Boolean type must be true, false, on, or off.");
-				else if ( $numberoption['type'] == 'unsigned integer 8' && (!is_numeric($numberoption['value']) || $numberoption['value'] < 0 || $numberoption['value'] > 255) )
+				} else if ($numberoption['type'] == 'unsigned integer 8' && (!is_numeric($numberoption['value']) || $numberoption['value'] < 0 || $numberoption['value'] > 255)) {
 					$input_errors[] = gettext("Unsigned 8-bit integer type must be a number in the range 0 to 255.");
-				else if ( $numberoption['type'] == 'unsigned integer 16' && (!is_numeric($numberoption['value']) || $numberoption['value'] < 0 || $numberoption['value'] > 65535) )
+				} else if ($numberoption['type'] == 'unsigned integer 16' && (!is_numeric($numberoption['value']) || $numberoption['value'] < 0 || $numberoption['value'] > 65535)) {
 					$input_errors[] = gettext("Unsigned 16-bit integer type must be a number in the range 0 to 65535.");
-				else if ( $numberoption['type'] == 'unsigned integer 32' && (!is_numeric($numberoption['value']) || $numberoption['value'] < 0 || $numberoption['value'] > 4294967295) )
+				} else if ($numberoption['type'] == 'unsigned integer 32' && (!is_numeric($numberoption['value']) || $numberoption['value'] < 0 || $numberoption['value'] > 4294967295)) {
 					$input_errors[] = gettext("Unsigned 32-bit integer type must be a number in the range 0 to 4294967295.");
-				else if ( $numberoption['type'] == 'signed integer 8' && (!is_numeric($numberoption['value']) || $numberoption['value'] < -128 || $numberoption['value'] > 127) )
+				} else if ($numberoption['type'] == 'signed integer 8' && (!is_numeric($numberoption['value']) || $numberoption['value'] < -128 || $numberoption['value'] > 127)) {
 					$input_errors[] = gettext("Signed 8-bit integer type must be a number in the range -128 to 127.");
-				else if ( $numberoption['type'] == 'signed integer 16' && (!is_numeric($numberoption['value']) || $numberoption['value'] < -32768 || $numberoption['value'] > 32767) )
+				} else if ($numberoption['type'] == 'signed integer 16' && (!is_numeric($numberoption['value']) || $numberoption['value'] < -32768 || $numberoption['value'] > 32767)) {
 					$input_errors[] = gettext("Signed 16-bit integer type must be a number in the range -32768 to 32767.");
-				else if ( $numberoption['type'] == 'signed integer 32' && (!is_numeric($numberoption['value']) || $numberoption['value'] < -2147483648 || $numberoption['value'] > 2147483647) )
+				} else if ($numberoption['type'] == 'signed integer 32' && (!is_numeric($numberoption['value']) || $numberoption['value'] < -2147483648 || $numberoption['value'] > 2147483647)) {
 					$input_errors[] = gettext("Signed 32-bit integer type must be a number in the range -2147483648 to 2147483647.");
-				else if ( $numberoption['type'] == 'ip-address' && !is_ipaddrv4($numberoption['value']) && !is_hostname($numberoption['value']) )
+				} else if ($numberoption['type'] == 'ip-address' && !is_ipaddrv4($numberoption['value']) && !is_hostname($numberoption['value'])) {
 					$input_errors[] = gettext("IP address or host type must be an IP address or host name.");
+				}
 			}
 		}
 
@@ -334,20 +375,23 @@ if (isset($_POST['submit'])) {
 				$input_errors[] = gettext("The specified range lies outside of the current subnet.");
 			}
 
-			if (ip2ulong($_POST['range_from']) > ip2ulong($_POST['range_to']))
+			if (ip2ulong($_POST['range_from']) > ip2ulong($_POST['range_to'])) {
 				$input_errors[] = gettext("The range is invalid (first element higher than second element).");
+			}
 
 			if (is_numeric($pool) || ($act == "newpool")) {
 				$rfrom = $config['dhcpd'][$if]['range']['from'];
 				$rto = $config['dhcpd'][$if]['range']['to'];
 
-				if (is_inrange_v4($_POST['range_from'], $rfrom, $rto) || is_inrange_v4($_POST['range_to'], $rfrom, $rto))
+				if (is_inrange_v4($_POST['range_from'], $rfrom, $rto) || is_inrange_v4($_POST['range_to'], $rfrom, $rto)) {
 					$input_errors[] = gettext("The specified range must not be within the DHCP range for this interface.");
+				}
 			}
 
 			foreach ($a_pools as $id => $p) {
-				if (is_numeric($pool) && ($id == $pool))
+				if (is_numeric($pool) && ($id == $pool)) {
 					continue;
+				}
 
 				if (is_inrange_v4($_POST['range_from'], $p['range']['from'], $p['range']['to']) ||
 				    is_inrange_v4($_POST['range_to'], $p['range']['from'], $p['range']['to'])) {
@@ -357,17 +401,19 @@ if (isset($_POST['submit'])) {
 			}
 
 			/* make sure that the DHCP Relay isn't enabled on this interface */
-			if (isset($config['dhcrelay']['enable']) && (stristr($config['dhcrelay']['interface'], $if) !== false))
-				$input_errors[] = sprintf(gettext("You must disable the DHCP relay on the %s interface before enabling the DHCP server."),$iflist[$if]);
+			if (isset($config['dhcrelay']['enable']) && (stristr($config['dhcrelay']['interface'], $if) !== false)) {
+				$input_errors[] = sprintf(gettext("You must disable the DHCP relay on the %s interface before enabling the DHCP server."), $iflist[$if]);
+			}
 
 			$dynsubnet_start = ip2ulong($_POST['range_from']);
 			$dynsubnet_end = ip2ulong($_POST['range_to']);
 			if (is_array($a_maps)) {
 				foreach ($a_maps as $map) {
-					if (empty($map['ipaddr']))
+					if (empty($map['ipaddr'])) {
 						continue;
+					}
 					if ((ip2ulong($map['ipaddr']) > $dynsubnet_start) &&
-						(ip2ulong($map['ipaddr']) < $dynsubnet_end)) {
+					    (ip2ulong($map['ipaddr']) < $dynsubnet_end)) {
 						$input_errors[] = sprintf(gettext("The DHCP range cannot overlap any static DHCP mappings."));
 						break;
 					}
@@ -381,8 +427,9 @@ if (isset($_POST['submit'])) {
 			if ($act == "newpool") {
 				$dhcpdconf = array();
 			} else {
-				if (!is_array($config['dhcpd'][$if]))
+				if (!is_array($config['dhcpd'][$if])) {
 					$config['dhcpd'][$if] = array();
+				}
 				$dhcpdconf = $config['dhcpd'][$if];
 			}
 		} else {
@@ -394,8 +441,9 @@ if (isset($_POST['submit'])) {
 				exit;
 			}
 		}
-		if (!is_array($dhcpdconf['range']))
+		if (!is_array($dhcpdconf['range'])) {
 			$dhcpdconf['range'] = array();
+		}
 
 		$dhcpd_enable_changed = false;
 
@@ -410,8 +458,9 @@ if (isset($_POST['submit'])) {
 			$dhcpdconf['enable'] = $new_dhcpd_enable;
 			$dhcpdconf['staticarp'] = ($_POST['staticarp']) ? true : false;
 			$previous = $dhcpdconf['failover_peerip'];
-			if($previous <> $_POST['failover_peerip'])
+			if ($previous <> $_POST['failover_peerip']) {
 				mwexec("/bin/rm -rf /var/dhcpd/var/db/*");
+			}
 			$dhcpdconf['failover_peerip'] = $_POST['failover_peerip'];
 			// dhcpleaseinlocaltime is global to all interfaces. So update the setting on all interfaces.
 			foreach ($config['dhcpd'] as &$dhcpdifitem) {
@@ -430,20 +479,26 @@ if (isset($_POST['submit'])) {
 		$dhcpdconf['netmask'] = $_POST['netmask'];
 
 		unset($dhcpdconf['winsserver']);
-		if ($_POST['wins1'])
+		if ($_POST['wins1']) {
 			$dhcpdconf['winsserver'][] = $_POST['wins1'];
-		if ($_POST['wins2'])
+		}
+		if ($_POST['wins2']) {
 			$dhcpdconf['winsserver'][] = $_POST['wins2'];
+		}
 
 		unset($dhcpdconf['dnsserver']);
-		if ($_POST['dns1'])
+		if ($_POST['dns1']) {
 			$dhcpdconf['dnsserver'][] = $_POST['dns1'];
-		if ($_POST['dns2'])
+		}
+		if ($_POST['dns2']) {
 			$dhcpdconf['dnsserver'][] = $_POST['dns2'];
-		if ($_POST['dns3'])
+		}
+		if ($_POST['dns3']) {
 			$dhcpdconf['dnsserver'][] = $_POST['dns3'];
-		if ($_POST['dns4'])
+		}
+		if ($_POST['dns4']) {
 			$dhcpdconf['dnsserver'][] = $_POST['dns4'];
+		}
 
 		$dhcpdconf['gateway'] = $_POST['gateway'];
 		$dhcpdconf['domain'] = $_POST['domain'];
@@ -458,10 +513,12 @@ if (isset($_POST['submit'])) {
 		$dhcpdconf['mac_deny'] = $_POST['mac_deny'];
 
 		unset($dhcpdconf['ntpserver']);
-		if ($_POST['ntp1'])
+		if ($_POST['ntp1']) {
 			$dhcpdconf['ntpserver'][] = $_POST['ntp1'];
-		if ($_POST['ntp2'])
+		}
+		if ($_POST['ntp2']) {
 			$dhcpdconf['ntpserver'][] = $_POST['ntp2'];
+		}
 
 		$dhcpdconf['tftp'] = $_POST['tftp'];
 		$dhcpdconf['ldap'] = $_POST['ldap'];
@@ -473,8 +530,9 @@ if (isset($_POST['submit'])) {
 		$dhcpdconf['rootpath'] = $_POST['rootpath'];
 
 		// Handle the custom options rowhelper
-		if(isset($dhcpdconf['numberoptions']['item']))
+		if (isset($dhcpdconf['numberoptions']['item'])) {
 			unset($dhcpdconf['numberoptions']['item']);
+		}
 
 		$dhcpdconf['numberoptions'] = $numberoptions;
 
@@ -510,14 +568,17 @@ if ((isset($_POST['submit']) || isset($_POST['apply'])) && (!$input_errors)) {
 			clear_subsystem_dirty('staticmaps');
 	} else {
 		$retvaldhcp = services_dhcpd_configure();
-		if ($retvaldhcp == 0)
+		if ($retvaldhcp == 0) {
 			clear_subsystem_dirty('staticmaps');
+		}
 	}
-	if ($dhcpd_enable_changed)
+	if ($dhcpd_enable_changed) {
 		$retvalfc = filter_configure();
+	}
 
-	if($retvaldhcp == 1 || $retvaldns == 1 || $retvalfc == 1)
+	if ($retvaldhcp == 1 || $retvaldns == 1 || $retvalfc == 1) {
 		$retval = 1;
+	}
 	$savemsg = get_std_save_message($retval);
 }
 
@@ -534,10 +595,11 @@ if ($act == "del") {
 	if ($a_maps[$_GET['id']]) {
 		unset($a_maps[$_GET['id']]);
 		write_config();
-		if(isset($config['dhcpd'][$if]['enable'])) {
+		if (isset($config['dhcpd'][$if]['enable'])) {
 			mark_subsystem_dirty('staticmaps');
-			if (isset($config['dnsmasq']['enable']) && isset($config['dnsmasq']['regdhcpstatic']))
+			if (isset($config['dnsmasq']['enable']) && isset($config['dnsmasq']['regdhcpstatic'])) {
 				mark_subsystem_dirty('hosts');
+			}
 		}
 		header("Location: services_dhcp.php?if={$if}");
 		exit;
@@ -545,7 +607,7 @@ if ($act == "del") {
 }
 
 $closehead = false;
-$pgtitle = array(gettext("Services"),gettext("DHCP server"));
+$pgtitle = array(gettext("Services"), gettext("DHCP server"));
 $shortcut_section = "dhcp";
 
 include("head.inc");
@@ -689,7 +751,8 @@ include("head.inc");
 <?php print_info_box_np(gettext("The static mapping configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="dhcp server">
-<tr><td>
+	<tr>
+		<td>
 <?php
 	/* active tabs */
 	$tab_array = array();
@@ -698,12 +761,14 @@ include("head.inc");
 	foreach ($iflist as $ifent => $ifname) {
 		$oc = $config['interfaces'][$ifent];
 		if ((is_array($config['dhcpd'][$ifent]) && !isset($config['dhcpd'][$ifent]['enable']) && (!is_ipaddrv4($oc['ipaddr']))) ||
-			(!is_array($config['dhcpd'][$ifent]) && (!is_ipaddrv4($oc['ipaddr']))))
+		    (!is_array($config['dhcpd'][$ifent]) && (!is_ipaddrv4($oc['ipaddr'])))) {
 			continue;
-		if ($ifent == $if)
+		}
+		if ($ifent == $if) {
 			$active = true;
-		else
+		} else {
 			$active = false;
+		}
 		$tab_array[] = array($ifname, $active, "services_dhcp.php?if={$ifent}");
 		$tabscounter++;
 	}
@@ -717,572 +782,655 @@ include("head.inc");
 	}
 	display_top_tabs($tab_array);
 ?>
-</td></tr>
-<tr>
-<td>
-	<div id="mainarea">
-		<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<div id="mainarea">
+			<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
 			<?php if (!is_numeric($pool) && !($act == "newpool")): ?>
-			<tr>
-			<td width="22%" valign="top" class="vtable">&nbsp;</td>
-			<td width="78%" class="vtable">
-				<input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> onclick="enable_change(false)" />
-			<strong><?php printf(gettext("Enable DHCP server on " .
-			"%s " .
-			"interface"),htmlspecialchars($iflist[$if]));?></strong></td>
-			</tr>
+				<tr>
+					<td width="22%" valign="top" class="vtable">&nbsp;</td>
+					<td width="78%" class="vtable">
+						<input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> onclick="enable_change(false)" />
+						<strong><?php printf(gettext("Enable DHCP server on %s interface"), htmlspecialchars($iflist[$if]));?></strong>
+					</td>
+				</tr>
 			<?php else: ?>
-			<tr>
-				<td colspan="2" class="listtopic"><?php echo gettext("Editing Pool-Specific Options. To return to the Interface, click its tab above."); ?></td>
-			</tr>
-			<?php endif; ?>
-			<tr>
-			<td width="22%" valign="top" class="vtable">&nbsp;</td>
-			<td width="78%" class="vtable">
-				<input name="denyunknown" id="denyunknown" type="checkbox" value="yes" <?php if ($pconfig['denyunknown']) echo "checked=\"checked\""; ?> />
-				<strong><?=gettext("Deny unknown clients");?></strong><br />
-				<?=gettext("If this is checked, only the clients defined below will get DHCP leases from this server. ");?></td>
-			</tr>
-			<?php if (is_numeric($pool) || ($act == "newpool")): ?>
 				<tr>
-				<td width="22%" valign="top" class="vncell"><?=gettext("Pool Description");?></td>
-				<td width="78%" class="vtable">
-					<input name="descr" type="text" class="formfld unknown" id="descr" size="20" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-				</td>
+					<td colspan="2" class="listtopic"><?php echo gettext("Editing Pool-Specific Options. To return to the Interface, click its tab above."); ?></td>
 				</tr>
 			<?php endif; ?>
-			<tr>
-			<td width="22%" valign="top" class="vncellreq"><?=gettext("Subnet");?></td>
-			<td width="78%" class="vtable">
-				<?=gen_subnet($ifcfgip, $ifcfgsn);?>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncellreq"><?=gettext("Subnet mask");?></td>
-			<td width="78%" class="vtable">
-				<?=gen_subnet_mask($ifcfgsn);?>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncellreq"><?=gettext("Available range");?></td>
-			<td width="78%" class="vtable">
-			<?php
-				$range_from = ip2long(long2ip32(ip2long($ifcfgip) & gen_subnet_mask_long($ifcfgsn)));
-				$range_from++;
-				echo long2ip32($range_from);
-			?>
-			-
-			<?php
-				$range_to = ip2long(long2ip32(ip2long($ifcfgip) | (~gen_subnet_mask_long($ifcfgsn))));
-				$range_to--;
-				echo long2ip32($range_to);
-			?>
+				<tr>
+					<td width="22%" valign="top" class="vtable">&nbsp;</td>
+					<td width="78%" class="vtable">
+						<input name="denyunknown" id="denyunknown" type="checkbox" value="yes" <?php if ($pconfig['denyunknown']) echo "checked=\"checked\""; ?> />
+						<strong><?=gettext("Deny unknown clients");?></strong><br />
+						<?=gettext("If this is checked, only the clients defined below will get DHCP leases from this server. ");?>
+					</td>
+				</tr>
 			<?php if (is_numeric($pool) || ($act == "newpool")): ?>
-				<br />In-use DHCP Pool Ranges:
-				<?php if (is_array($config['dhcpd'][$if]['range'])): ?>
-					<br /><?php echo $config['dhcpd'][$if]['range']['from']; ?>-<?php echo $config['dhcpd'][$if]['range']['to']; ?>
-				<?php endif; ?>
-				<?php foreach ($a_pools as $p): ?>
-					<?php if (is_array($p['range'])): ?>
-					<br /><?php echo $p['range']['from']; ?>-<?php echo $p['range']['to']; ?>
-					<?php endif; ?>
-				<?php endforeach; ?>
-			<?php endif; ?>
-			</td>
-			</tr>
-			<?php if($is_olsr_enabled): ?>
-			<tr>
-			<td width="22%" valign="top" class="vncellreq"><?=gettext("Subnet Mask");?></td>
-			<td width="78%" class="vtable">
-				<select name="netmask" class="formselect" id="netmask">
-				<?php
-				for ($i = 32; $i > 0; $i--) {
-					if($i <> 31) {
-						echo "<option value=\"{$i}\" ";
-						if ($i == $pconfig['netmask']) echo "selected=\"selected\"";
-						echo ">" . $i . "</option>";
-					}
-				}
-				?>
-				</select>
-			</td>
-			</tr>
+				<tr>
+					<td width="22%" valign="top" class="vncell"><?=gettext("Pool Description");?></td>
+					<td width="78%" class="vtable">
+						<input name="descr" type="text" class="formfld unknown" id="descr" size="20" value="<?=htmlspecialchars($pconfig['descr']);?>" />
+					</td>
+				</tr>
 			<?php endif; ?>
-			<tr>
-			<td width="22%" valign="top" class="vncellreq"><?=gettext("Range");?></td>
-			<td width="78%" class="vtable">
-				<input name="range_from" type="text" class="formfld unknown" id="range_from" size="20" value="<?=htmlspecialchars($pconfig['range_from']);?>" />
-				&nbsp;<?=gettext("to"); ?>&nbsp; <input name="range_to" type="text" class="formfld unknown" id="range_to" size="20" value="<?=htmlspecialchars($pconfig['range_to']);?>" />
-			</td>
-			</tr>
-			<?php if (!is_numeric($pool) && !($act == "newpool")): ?>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("Additional Pools");?></td>
-			<td width="78%" class="vtable">
-				<?php echo gettext("If you need additional pools of addresses inside of this subnet outside the above Range, they may be specified here."); ?>
-				<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="subnet">
 				<tr>
-					<td width="35%" class="listhdrr"><?=gettext("Pool Start");?></td>
-					<td width="35%" class="listhdrr"><?=gettext("Pool End");?></td>
-					<td width="20%" class="listhdrr"><?=gettext("Description");?></td>
-					<td width="10%" class="list">
-					<table border="0" cellspacing="0" cellpadding="1" summary="pool">
-					<tr>
-					<td valign="middle" width="17"></td>
-					<td valign="middle"><a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;act=newpool"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="plus" /></a></td>
-					</tr>
-					</table>
+					<td width="22%" valign="top" class="vncellreq"><?=gettext("Subnet");?></td>
+					<td width="78%" class="vtable">
+						<?=gen_subnet($ifcfgip, $ifcfgsn);?>
 					</td>
 				</tr>
-					<?php if(is_array($a_pools)): ?>
-					<?php $i = 0; foreach ($a_pools as $poolent): ?>
-					<?php if(!empty($poolent['range']['from']) && !empty($poolent['range']['to'])): ?>
 				<tr>
-				<td class="listlr" ondblclick="document.location='services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;pool=<?=$i;?>';">
-					<?=htmlspecialchars($poolent['range']['from']);?>
-				</td>
-				<td class="listr" ondblclick="document.location='services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;pool=<?=$i;?>';">
-					<?=htmlspecialchars($poolent['range']['to']);?>&nbsp;
-				</td>
-				<td class="listr" ondblclick="document.location='services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;pool=<?=$i;?>';">
-					<?=htmlspecialchars($poolent['descr']);?>&nbsp;
-				</td>
-				<td valign="middle" class="list nowrap">
-					<table border="0" cellspacing="0" cellpadding="1" summary="icons">
-					<tr>
-					<td valign="middle"><a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;pool=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a></td>
-					<td valign="middle"><a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;act=delpool&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this pool?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td>
-					</tr>
-					</table>
-				</td>
+					<td width="22%" valign="top" class="vncellreq"><?=gettext("Subnet mask");?></td>
+					<td width="78%" class="vtable">
+						<?=gen_subnet_mask($ifcfgsn);?>
+					</td>
 				</tr>
-				<?php endif; ?>
-				<?php $i++; endforeach; ?>
-				<?php endif; ?>
 				<tr>
-				<td class="list" colspan="3"></td>
-				<td class="list">
-					<table border="0" cellspacing="0" cellpadding="1" summary="add">
-					<tr>
-					<td valign="middle" width="17"></td>
-					<td valign="middle"><a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;act=newpool"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
-					</tr>
-					</table>
-				</td>
+					<td width="22%" valign="top" class="vncellreq"><?=gettext("Available range");?></td>
+					<td width="78%" class="vtable">
+						<?php
+							$range_from = ip2long(long2ip32(ip2long($ifcfgip) & gen_subnet_mask_long($ifcfgsn)));
+							$range_from++;
+							echo long2ip32($range_from);
+						?>
+						-
+						<?php
+							$range_to = ip2long(long2ip32(ip2long($ifcfgip) | (~gen_subnet_mask_long($ifcfgsn))));
+							$range_to--;
+							echo long2ip32($range_to);
+							if (is_numeric($pool) || ($act == "newpool")):
+						?>
+						<br />In-use DHCP Pool Ranges:
+						<?php
+								if (is_array($config['dhcpd'][$if]['range'])):
+						?>
+						<br />
+						<?php
+									echo $config['dhcpd'][$if]['range']['from'];
+						?>
+						-
+						<?php
+									echo $config['dhcpd'][$if]['range']['to'];
+								endif;
+						?>
+						<?php
+								foreach ($a_pools as $p):
+									if (is_array($p['range'])):
+						?>
+						<br />
+						<?php 
+										echo $p['range']['from'];
+						?>
+						-
+						<?php
+										echo $p['range']['to'];
+									endif;
+								endforeach;
+							endif;
+						?>
+					</td>
 				</tr>
-				</table>
-			</td>
-			</tr>
-			<?php endif; ?>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("WINS servers");?></td>
-			<td width="78%" class="vtable">
-				<input name="wins1" type="text" class="formfld unknown" id="wins1" size="20" value="<?=htmlspecialchars($pconfig['wins1']);?>" /><br />
-				<input name="wins2" type="text" class="formfld unknown" id="wins2" size="20" value="<?=htmlspecialchars($pconfig['wins2']);?>" />
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("DNS servers");?></td>
-			<td width="78%" class="vtable">
-				<input name="dns1" type="text" class="formfld unknown" id="dns1" size="20" value="<?=htmlspecialchars($pconfig['dns1']);?>" /><br />
-				<input name="dns2" type="text" class="formfld unknown" id="dns2" size="20" value="<?=htmlspecialchars($pconfig['dns2']);?>" /><br />
-				<input name="dns3" type="text" class="formfld unknown" id="dns3" size="20" value="<?=htmlspecialchars($pconfig['dns3']);?>" /><br />
-				<input name="dns4" type="text" class="formfld unknown" id="dns4" size="20" value="<?=htmlspecialchars($pconfig['dns4']);?>" /><br />
-				<?=gettext("NOTE: leave blank to use the system default DNS servers - this interface's IP if DNS forwarder is enabled, otherwise the servers configured on the General page.");?>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("Gateway");?></td>
-			<td width="78%" class="vtable">
-				<input name="gateway" type="text" class="formfld host" id="gateway" size="20" value="<?=htmlspecialchars($pconfig['gateway']);?>" /><br />
-				<?=gettext("The default is to use the IP on this interface of the firewall as the gateway. Specify an alternate gateway here if this is not the correct gateway for your network. Type \"none\" for no gateway assignment.");?>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("Domain name");?></td>
-			<td width="78%" class="vtable">
-				<input name="domain" type="text" class="formfld unknown" id="domain" size="20" value="<?=htmlspecialchars($pconfig['domain']);?>" /><br />
-				<?=gettext("The default is to use the domain name of this system as the default domain name provided by DHCP. You may specify an alternate domain name here.");?>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("Domain search list");?></td>
-			<td width="78%" class="vtable">
-				<input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="20" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>" /><br />
-				<?=gettext("The DHCP server can optionally provide a domain search list. Use the semicolon character as separator ");?>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("Default lease time");?></td>
-			<td width="78%" class="vtable">
-				<input name="deftime" type="text" class="formfld unknown" id="deftime" size="10" value="<?=htmlspecialchars($pconfig['deftime']);?>" />
-				<?=gettext("seconds");?><br />
-				<?=gettext("This is used for clients that do not ask for a specific " .
-				"expiration time."); ?><br />
-				<?=gettext("The default is 7200 seconds.");?>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("Maximum lease time");?></td>
-			<td width="78%" class="vtable">
-				<input name="maxtime" type="text" class="formfld unknown" id="maxtime" size="10" value="<?=htmlspecialchars($pconfig['maxtime']);?>" />
-				<?=gettext("seconds");?><br />
-				<?=gettext("This is the maximum lease time for clients that ask".
-				" for a specific expiration time."); ?><br />
-				<?=gettext("The default is 86400 seconds.");?>
-			</td>
-			</tr>
-			<?php if (!is_numeric($pool) && !($act == "newpool")): ?>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("Failover peer IP:");?></td>
-			<td width="78%" class="vtable">
-				<input name="failover_peerip" type="text" class="formfld host" id="failover_peerip" size="20" value="<?=htmlspecialchars($pconfig['failover_peerip']);?>" /><br />
-				<?=gettext("Leave blank to disable.  Enter the interface IP address of the other machine.  Machines must be using CARP. Interface's advskew determines whether the DHCPd process is Primary or Secondary. Ensure one machine's advskew<20 (and the other is >20).");?>
-			</td>
-			</tr>
-			<?php endif; ?>
-			<?php if (!is_numeric($pool) && !($act == "newpool")): ?>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("Static ARP");?></td>
-			<td width="78%" class="vtable">
-				<table summary="static arp">
-					<tr>
-					<td>
-						<input style="vertical-align:middle" type="checkbox" value="yes" name="staticarp" id="staticarp" <?php if($pconfig['staticarp']) echo " checked=\"checked\""; ?> />&nbsp;
+<?php if ($is_olsr_enabled): ?>
+				<tr>
+					<td width="22%" valign="top" class="vncellreq"><?=gettext("Subnet Mask");?></td>
+					<td width="78%" class="vtable">
+						<select name="netmask" class="formselect" id="netmask">
+							<?php
+							for ($i = 32; $i > 0; $i--) {
+								if ($i <> 31) {
+									echo "<option value=\"{$i}\" ";
+									if ($i == $pconfig['netmask']) {
+										echo "selected=\"selected\"";
+									}
+									echo ">" . $i . "</option>";
+								}
+							}
+							?>
+						</select>
 					</td>
-					<td><b><?=gettext("Enable Static ARP entries");?></b></td>
-					</tr>
-					<tr>
-					<td>&nbsp;</td>
-					<td>
-						<span class="red"><strong><?=gettext("Note:");?></strong></span> <?=gettext("This option persists even if DHCP server is disabled. Only the machines listed below will be able to communicate with the firewall on this NIC.");?>
+				</tr>
+<?php endif; ?>
+				<tr>
+					<td width="22%" valign="top" class="vncellreq"><?=gettext("Range");?></td>
+					<td width="78%" class="vtable">
+						<input name="range_from" type="text" class="formfld unknown" id="range_from" size="20" value="<?=htmlspecialchars($pconfig['range_from']);?>" />
+						&nbsp;<?=gettext("to"); ?>&nbsp; <input name="range_to" type="text" class="formfld unknown" id="range_to" size="20" value="<?=htmlspecialchars($pconfig['range_to']);?>" />
 					</td>
-					</tr>
-				</table>
-			</td>
-			</tr>
-			<?php endif; ?>
-			<?php if (!is_numeric($pool) && !($act == "newpool")): ?>
-			<tr>
-				<td width="22%" valign="top" class="vncell"><?=gettext("Time format change"); ?></td>
-				<td width="78%" class="vtable">
-				<table summary="time format">
-					<tr>
-					<td>
-						<input name="dhcpleaseinlocaltime" type="checkbox" id="dhcpleaseinlocaltime" value="yes" <?php if ($pconfig['dhcpleaseinlocaltime']) echo "checked=\"checked\""; ?> />
+				</tr>
+<?php
+	if (!is_numeric($pool) && !($act == "newpool")):
+?>
+				<tr>
+					<td width="22%" valign="top" class="vncell">
+						<?=gettext("Additional Pools");?>
 					</td>
-					<td>
-						<strong>
-							<?=gettext("Change DHCP display lease time from UTC to local time."); ?>
-						</strong>
+					<td width="78%" class="vtable">
+						<?php echo gettext("If you need additional pools of addresses inside of this subnet outside the above Range, they may be specified here."); ?>
+						<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="subnet">
+							<tr>
+								<td width="35%" class="listhdrr"><?=gettext("Pool Start");?></td>
+								<td width="35%" class="listhdrr"><?=gettext("Pool End");?></td>
+								<td width="20%" class="listhdrr"><?=gettext("Description");?></td>
+								<td width="10%" class="list">
+									<table border="0" cellspacing="0" cellpadding="1" summary="pool">
+										<tr>
+											<td valign="middle" width="17"></td>
+											<td valign="middle">
+												<a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;act=newpool"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="plus" /></a>
+											</td>
+										</tr>
+									</table>
+								</td>
+							</tr>
+<?php
+		if (is_array($a_pools)):
+			$i = 0;
+			foreach ($a_pools as $poolent):
+				if (!empty($poolent['range']['from']) && !empty($poolent['range']['to'])):
+?>
+							<tr>
+								<td class="listlr" ondblclick="document.location='services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;pool=<?=$i;?>';">
+									<?=htmlspecialchars($poolent['range']['from']);?>
+								</td>
+								<td class="listr" ondblclick="document.location='services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;pool=<?=$i;?>';">
+									<?=htmlspecialchars($poolent['range']['to']);?>&nbsp;
+								</td>
+								<td class="listr" ondblclick="document.location='services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;pool=<?=$i;?>';">
+									<?=htmlspecialchars($poolent['descr']);?>&nbsp;
+								</td>
+								<td valign="middle" class="list nowrap">
+									<table border="0" cellspacing="0" cellpadding="1" summary="icons">
+										<tr>
+											<td valign="middle">
+												<a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;pool=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a>
+											</td>
+											<td valign="middle">
+												<a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;act=delpool&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this pool?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a>
+											</td>
+										</tr>
+									</table>
+								</td>
+							</tr>
+<?php
+				endif;
+				$i++;
+			endforeach;
+		endif;
+?>
+							<tr>
+								<td class="list" colspan="3"></td>
+								<td class="list">
+									<table border="0" cellspacing="0" cellpadding="1" summary="add">
+										<tr>
+											<td valign="middle" width="17"></td>
+											<td valign="middle">
+												<a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;act=newpool"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a>
+											</td>
+										</tr>
+									</table>
+								</td>
+							</tr>
+						</table>
 					</td>
-					</tr>
-					<tr>
-					<td>&nbsp;</td>
-					<td>
-						<span class="red"><strong><?=gettext("Note:");?></strong></span> <?=gettext("By default DHCP leases are displayed in UTC time.  By checking this
-						box DHCP lease time will be displayed in local time and set to time zone selected.  This will be used for all DHCP interfaces lease time."); ?>
+				</tr>
+<?php
+	endif;
+?>
+				<tr>
+					<td width="22%" valign="top" class="vncell"><?=gettext("WINS servers");?></td>
+					<td width="78%" class="vtable">
+						<input name="wins1" type="text" class="formfld unknown" id="wins1" size="20" value="<?=htmlspecialchars($pconfig['wins1']);?>" /><br />
+						<input name="wins2" type="text" class="formfld unknown" id="wins2" size="20" value="<?=htmlspecialchars($pconfig['wins2']);?>" />
 					</td>
-					</tr>
-				</table>
-				</td>
-			</tr>
-			<?php endif; ?>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("Dynamic DNS");?></td>
-			<td width="78%" class="vtable">
-				<div id="showddnsbox">
-					<input type="button" onclick="show_ddns_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Dynamic DNS");?>
-				</div>
-				<div id="showddns" style="display:none">
-					<input style="vertical-align:middle" type="checkbox" value="yes" name="ddnsupdate" id="ddnsupdate" <?php if($pconfig['ddnsupdate']) echo " checked=\"checked\""; ?> />&nbsp;
-					<b><?=gettext("Enable registration of DHCP client names in DNS.");?></b><br />
-					<br/>
-					<input name="ddnsdomain" type="text" class="formfld unknown" id="ddnsdomain" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>" /><br />
-					<?=gettext("Note: Leave blank to disable dynamic DNS registration.");?><br />
-					<?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server.");?><br />
-					<input name="ddnsdomainprimary" type="text" class="formfld unknown" id="ddnsdomainprimary" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainprimary']);?>" /><br />
-					<?=gettext("Enter the primary domain name server IP address for the dynamic domain name.");?><br />
-					<input name="ddnsdomainkeyname" type="text" class="formfld unknown" id="ddnsdomainkeyname" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkeyname']);?>" /><br />
-					<?=gettext("Enter the dynamic DNS domain key name which will be used to register client names in the DNS server.");?><br />
-					<input name="ddnsdomainkey" type="text" class="formfld unknown" id="ddnsdomainkey" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkey']);?>" /><br />
-					<?=gettext("Enter the dynamic DNS domain key secret which will be used to register client names in the DNS server.");?>
-				</div>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("MAC Address Control");?></td>
-			<td width="78%" class="vtable">
-				<div id="showmaccontrolbox">
-					<input type="button" onclick="show_maccontrol_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show MAC Address Control");?>
-				</div>
-				<div id="showmaccontrol" style="display:none">
-					<input name="mac_allow" type="text" class="formfld unknown" id="mac_allow" size="20" value="<?=htmlspecialchars($pconfig['mac_allow']);?>" /><br />
-					<?=gettext("Enter a list of partial MAC addresses to allow, comma separated, no spaces, such as ");?>00:00:00,01:E5:FF<br />
-					<input name="mac_deny" type="text" class="formfld unknown" id="mac_deny" size="20" value="<?=htmlspecialchars($pconfig['mac_deny']);?>" /><br />
-					<?=gettext("Enter a list of partial MAC addresses to deny access, comma separated, no spaces, such as ");?>00:00:00,01:E5:FF
-				</div>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("NTP servers");?></td>
-			<td width="78%" class="vtable">
-				<div id="showntpbox">
-					<input type="button" onclick="show_ntp_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show NTP configuration");?>
-				</div>
-				<div id="showntp" style="display:none">
-					<input name="ntp1" type="text" class="formfld unknown" id="ntp1" size="20" value="<?=htmlspecialchars($pconfig['ntp1']);?>" /><br />
-					<input name="ntp2" type="text" class="formfld unknown" id="ntp2" size="20" value="<?=htmlspecialchars($pconfig['ntp2']);?>" />
-				</div>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("TFTP server");?></td>
-			<td width="78%" class="vtable">
-			<div id="showtftpbox">
-				<input type="button" onclick="show_tftp_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show TFTP configuration");?>
-			</div>
-			<div id="showtftp" style="display:none">
-				<input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>" /><br />
-				<?=gettext("Leave blank to disable.  Enter a full hostname or IP for the TFTP server.");?>
-			</div>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("LDAP URI");?></td>
-			<td width="78%" class="vtable">
-				<div id="showldapbox">
-					<input type="button" onclick="show_ldap_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show LDAP configuration");?>
-				</div>
-				<div id="showldap" style="display:none">
-					<input name="ldap" type="text" class="formfld unknown" id="ldap" size="80" value="<?=htmlspecialchars($pconfig['ldap']);?>" /><br />
-					<?=gettext("Leave blank to disable.  Enter a full URI for the LDAP server in the form ldap://ldap.example.com/dc=example,dc=com");?>
-				</div>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("Enable network booting");?></td>
-			<td width="78%" class="vtable">
-				<div id="shownetbootbox">
-					<input type="button" onclick="show_netboot_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Network booting");?>
-				</div>
-				<div id="shownetboot" style="display:none">
-					<input style="vertical-align:middle" type="checkbox" value="yes" name="netboot" id="netboot" <?php if($pconfig['netboot']) echo " checked=\"checked\""; ?> />&nbsp;
-					<b><?=gettext("Enables network booting.");?></b>
-					<br/>
-					<table border="0" cellspacing="0" cellpadding="2" summary="network booting">
-						<tr>
-							<td>
-								<?=gettext("Enter the IP of the"); ?> <b><?=gettext("next-server"); ?></b>
-							</td>
-							<td>
-								<input name="nextserver" type="text" class="formfld unknown" id="nextserver" size="20" value="<?=htmlspecialchars($pconfig['nextserver']);?>" /><br />
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<?=gettext("and the default bios filename");?>
-							</td>
-							<td>
-								<input name="filename" type="text" class="formfld unknown" id="filename" size="20" value="<?=htmlspecialchars($pconfig['filename']);?>" /><br />
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<?=gettext("and the UEFI 32bit filename  ");?>
-							</td>
-							<td>
-								<input name="filename32" type="text" class="formfld unknown" id="filename32" size="20" value="<?=htmlspecialchars($pconfig['filename32']);?>" /><br />
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<?=gettext("and the UEFI 64bit filename  ");?>
-							</td>
-							<td>
-								<input name="filename64" type="text" class="formfld unknown" id="filename64" size="20" value="<?=htmlspecialchars($pconfig['filename64']);?>" /><br />
-							</td>
-						</tr>
-					</table>
-					<?=gettext("Note: You need both a filename and a boot server configured for this to work!");?>
-					<?=gettext("You will need all three filenames and a boot server configured for UEFI to work!");?>
-					<?=gettext("Enter the"); ?> <b><?=gettext("root-path"); ?></b>-<?=gettext("string");?>
-					<input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>" /><br />
-					<?=gettext("Note: string-format: iscsi:(servername):(protocol):(port):(LUN):targetname");?>
-				</div>
-			</td>
-			</tr>
-			<?php if (!is_numeric($pool) && !($act == "newpool")): ?>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("Additional BOOTP/DHCP Options");?></td>
-			<td width="78%" class="vtable">
-				<div id="shownumbervaluebox">
-					<input type="button" onclick="show_shownumbervalue()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Additional BOOTP/DHCP Options");?>
-				</div>
-				<div id="shownumbervalue" style="display:none">
-				<table id="maintable" summary="bootp-dhcp options">
-				<tbody>
+				</tr>
+				<tr>
+					<td width="22%" valign="top" class="vncell"><?=gettext("DNS servers");?></td>
+					<td width="78%" class="vtable">
+						<input name="dns1" type="text" class="formfld unknown" id="dns1" size="20" value="<?=htmlspecialchars($pconfig['dns1']);?>" /><br />
+						<input name="dns2" type="text" class="formfld unknown" id="dns2" size="20" value="<?=htmlspecialchars($pconfig['dns2']);?>" /><br />
+						<input name="dns3" type="text" class="formfld unknown" id="dns3" size="20" value="<?=htmlspecialchars($pconfig['dns3']);?>" /><br />
+						<input name="dns4" type="text" class="formfld unknown" id="dns4" size="20" value="<?=htmlspecialchars($pconfig['dns4']);?>" /><br />
+						<?=gettext("NOTE: leave blank to use the system default DNS servers - this interface's IP if DNS forwarder is enabled, otherwise the servers configured on the General page.");?>
+					</td>
+				</tr>
+				<tr>
+					<td width="22%" valign="top" class="vncell"><?=gettext("Gateway");?></td>
+					<td width="78%" class="vtable">
+						<input name="gateway" type="text" class="formfld host" id="gateway" size="20" value="<?=htmlspecialchars($pconfig['gateway']);?>" /><br />
+						<?=gettext("The default is to use the IP on this interface of the firewall as the gateway. Specify an alternate gateway here if this is not the correct gateway for your network. Type \"none\" for no gateway assignment.");?>
+					</td>
+				</tr>
+				<tr>
+					<td width="22%" valign="top" class="vncell"><?=gettext("Domain name");?></td>
+					<td width="78%" class="vtable">
+						<input name="domain" type="text" class="formfld unknown" id="domain" size="20" value="<?=htmlspecialchars($pconfig['domain']);?>" /><br />
+						<?=gettext("The default is to use the domain name of this system as the default domain name provided by DHCP. You may specify an alternate domain name here.");?>
+					</td>
+				</tr>
+				<tr>
+					<td width="22%" valign="top" class="vncell"><?=gettext("Domain search list");?></td>
+					<td width="78%" class="vtable">
+						<input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="20" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>" /><br />
+						<?=gettext("The DHCP server can optionally provide a domain search list. Use the semicolon character as separator ");?>
+					</td>
+				</tr>
+				<tr>
+					<td width="22%" valign="top" class="vncell"><?=gettext("Default lease time");?></td>
+					<td width="78%" class="vtable">
+						<input name="deftime" type="text" class="formfld unknown" id="deftime" size="10" value="<?=htmlspecialchars($pconfig['deftime']);?>" />
+						<?=gettext("seconds");?><br />
+						<?=gettext("This is used for clients that do not ask for a specific expiration time."); ?><br />
+						<?=gettext("The default is 7200 seconds.");?>
+					</td>
+				</tr>
+				<tr>
+					<td width="22%" valign="top" class="vncell"><?=gettext("Maximum lease time");?></td>
+					<td width="78%" class="vtable">
+						<input name="maxtime" type="text" class="formfld unknown" id="maxtime" size="10" value="<?=htmlspecialchars($pconfig['maxtime']);?>" />
+						<?=gettext("seconds");?><br />
+						<?=gettext("This is the maximum lease time for clients that ask for a specific expiration time."); ?><br />
+						<?=gettext("The default is 86400 seconds.");?>
+					</td>
+				</tr>
+<?php
+	if (!is_numeric($pool) && !($act == "newpool")):
+?>
+				<tr>
+					<td width="22%" valign="top" class="vncell"><?=gettext("Failover peer IP:");?></td>
+					<td width="78%" class="vtable">
+						<input name="failover_peerip" type="text" class="formfld host" id="failover_peerip" size="20" value="<?=htmlspecialchars($pconfig['failover_peerip']);?>" /><br />
+						<?=gettext("Leave blank to disable.  Enter the interface IP address of the other machine.  Machines must be using CARP. Interface's advskew determines whether the DHCPd process is Primary or Secondary. Ensure one machine's advskew<20 (and the other is >20).");?>
+					</td>
+				</tr>
+<?php
+	endif;
+
+	if (!is_numeric($pool) && !($act == "newpool")):
+?>
+				<tr>
+					<td width="22%" valign="top" class="vncell"><?=gettext("Static ARP");?></td>
+					<td width="78%" class="vtable">
+						<table summary="static arp">
+							<tr>
+								<td>
+									<input style="vertical-align:middle" type="checkbox" value="yes" name="staticarp" id="staticarp" <?php if ($pconfig['staticarp']) echo " checked=\"checked\""; ?> />&nbsp;
+								</td>
+								<td><b><?=gettext("Enable Static ARP entries");?></b></td>
+							</tr>
+							<tr>
+								<td>&nbsp;</td>
+								<td>
+									<span class="red">
+										<strong><?=gettext("Note:");?></strong>
+									</span>
+									<?=gettext("This option persists even if DHCP server is disabled. Only the machines listed below will be able to communicate with the firewall on this NIC.");?>
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+<?php
+	endif;
+
+	if (!is_numeric($pool) && !($act == "newpool")): ?>
+				<tr>
+					<td width="22%" valign="top" class="vncell"><?=gettext("Time format change"); ?></td>
+					<td width="78%" class="vtable">
+						<table summary="time format">
+							<tr>
+								<td>
+									<input name="dhcpleaseinlocaltime" type="checkbox" id="dhcpleaseinlocaltime" value="yes" <?php if ($pconfig['dhcpleaseinlocaltime']) echo "checked=\"checked\""; ?> />
+								</td>
+								<td>
+									<strong>
+										<?=gettext("Change DHCP display lease time from UTC to local time."); ?>
+									</strong>
+								</td>
+							</tr>
+							<tr>
+								<td>&nbsp;</td>
+								<td>
+									<span class="red">
+										<strong><?=gettext("Note:");?></strong>
+									</span>
+									<?=gettext("By default DHCP leases are displayed in UTC time.  By checking this box DHCP lease time will be displayed in local time and set to time zone selected.  This will be used for all DHCP interfaces lease time."); ?>
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+<?php
+	endif;
+?>
+				<tr>
+					<td width="22%" valign="top" class="vncell"><?=gettext("Dynamic DNS");?></td>
+					<td width="78%" class="vtable">
+						<div id="showddnsbox">
+							<input type="button" onclick="show_ddns_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Dynamic DNS");?>
+						</div>
+						<div id="showddns" style="display:none">
+							<input style="vertical-align:middle" type="checkbox" value="yes" name="ddnsupdate" id="ddnsupdate" <?php if ($pconfig['ddnsupdate']) echo " checked=\"checked\""; ?> />&nbsp;
+							<b><?=gettext("Enable registration of DHCP client names in DNS.");?></b><br />
+							<br/>
+							<input name="ddnsdomain" type="text" class="formfld unknown" id="ddnsdomain" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>" /><br />
+							<?=gettext("Note: Leave blank to disable dynamic DNS registration.");?><br />
+							<?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server.");?><br />
+							<input name="ddnsdomainprimary" type="text" class="formfld unknown" id="ddnsdomainprimary" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainprimary']);?>" /><br />
+							<?=gettext("Enter the primary domain name server IP address for the dynamic domain name.");?><br />
+							<input name="ddnsdomainkeyname" type="text" class="formfld unknown" id="ddnsdomainkeyname" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkeyname']);?>" /><br />
+							<?=gettext("Enter the dynamic DNS domain key name which will be used to register client names in the DNS server.");?><br />
+							<input name="ddnsdomainkey" type="text" class="formfld unknown" id="ddnsdomainkey" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkey']);?>" /><br />
+							<?=gettext("Enter the dynamic DNS domain key secret which will be used to register client names in the DNS server.");?>
+						</div>
+					</td>
+				</tr>
+				<tr>
+					<td width="22%" valign="top" class="vncell"><?=gettext("MAC Address Control");?></td>
+					<td width="78%" class="vtable">
+						<div id="showmaccontrolbox">
+							<input type="button" onclick="show_maccontrol_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show MAC Address Control");?>
+						</div>
+						<div id="showmaccontrol" style="display:none">
+							<input name="mac_allow" type="text" class="formfld unknown" id="mac_allow" size="20" value="<?=htmlspecialchars($pconfig['mac_allow']);?>" /><br />
+							<?=gettext("Enter a list of partial MAC addresses to allow, comma separated, no spaces, such as ");?>00:00:00,01:E5:FF<br />
+							<input name="mac_deny" type="text" class="formfld unknown" id="mac_deny" size="20" value="<?=htmlspecialchars($pconfig['mac_deny']);?>" /><br />
+							<?=gettext("Enter a list of partial MAC addresses to deny access, comma separated, no spaces, such as ");?>00:00:00,01:E5:FF
+						</div>
+					</td>
+				</tr>
+				<tr>
+					<td width="22%" valign="top" class="vncell"><?=gettext("NTP servers");?></td>
+					<td width="78%" class="vtable">
+						<div id="showntpbox">
+							<input type="button" onclick="show_ntp_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show NTP configuration");?>
+						</div>
+						<div id="showntp" style="display:none">
+							<input name="ntp1" type="text" class="formfld unknown" id="ntp1" size="20" value="<?=htmlspecialchars($pconfig['ntp1']);?>" /><br />
+							<input name="ntp2" type="text" class="formfld unknown" id="ntp2" size="20" value="<?=htmlspecialchars($pconfig['ntp2']);?>" />
+						</div>
+					</td>
+				</tr>
 				<tr>
-				<td colspan="3">
-					<div style="padding:5px; margin-top: 16px; margin-bottom: 16px; border:1px dashed #000066; background-color: #ffffff; color: #000000; font-size: 8pt;" id="itemhelp">
-					<?=gettext("Enter the DHCP option number and the value for each item you would like to include in the DHCP lease information.  For a list of available options please visit this"); ?> <a href="http://www.iana.org/assignments/bootp-dhcp-parameters/" target="_blank"><?=gettext("URL"); ?></a>
-					</div>
-				</td>
+					<td width="22%" valign="top" class="vncell"><?=gettext("TFTP server");?></td>
+					<td width="78%" class="vtable">
+						<div id="showtftpbox">
+							<input type="button" onclick="show_tftp_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show TFTP configuration");?>
+						</div>
+						<div id="showtftp" style="display:none">
+							<input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>" /><br />
+							<?=gettext("Leave blank to disable.  Enter a full hostname or IP for the TFTP server.");?>
+						</div>
+					</td>
 				</tr>
 				<tr>
-				<td><div id="onecolumn"><?=gettext("Number");?></div></td>
-				<td><div id="twocolumn"><?=gettext("Type");?></div></td>
-				<td><div id="threecolumn"><?=gettext("Value");?></div></td>
+					<td width="22%" valign="top" class="vncell"><?=gettext("LDAP URI");?></td>
+					<td width="78%" class="vtable">
+						<div id="showldapbox">
+							<input type="button" onclick="show_ldap_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show LDAP configuration");?>
+						</div>
+						<div id="showldap" style="display:none">
+							<input name="ldap" type="text" class="formfld unknown" id="ldap" size="80" value="<?=htmlspecialchars($pconfig['ldap']);?>" /><br />
+							<?=gettext("Leave blank to disable.  Enter a full URI for the LDAP server in the form ldap://ldap.example.com/dc=example,dc=com");?>
+						</div>
+					</td>
 				</tr>
-				<?php $counter = 0; ?>
-				<?php
-					if($pconfig['numberoptions'])
-						foreach($pconfig['numberoptions']['item'] as $item):
-				?>
-					<?php
-						$number = $item['number'];
-						$itemtype = $item['type'];
-						$value = $item['value'];
-					?>
 				<tr>
-				<td>
-					<input autocomplete="off" name="number<?php echo $counter; ?>" type="text" class="formfld unknown" id="number<?php echo $counter; ?>" size="10" value="<?=htmlspecialchars($number);?>" />
-				</td>
-				<td>
-					<select name="itemtype<?php echo $counter; ?>" class="formselect" id="itemtype<?php echo $counter; ?>">
-					<?php
-					foreach ($customitemtypes as $typename => $typedescr) {
-						echo "<option value=\"{$typename}\" ";
-						if ($itemtype == $typename) echo "selected=\"selected\"";
-						echo ">" . $typedescr . "</option>";
+					<td width="22%" valign="top" class="vncell"><?=gettext("Enable network booting");?></td>
+					<td width="78%" class="vtable">
+						<div id="shownetbootbox">
+							<input type="button" onclick="show_netboot_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Network booting");?>
+						</div>
+						<div id="shownetboot" style="display:none">
+							<input style="vertical-align:middle" type="checkbox" value="yes" name="netboot" id="netboot" <?php if ($pconfig['netboot']) echo " checked=\"checked\""; ?> />&nbsp;
+							<b><?=gettext("Enables network booting.");?></b>
+							<br/>
+							<table border="0" cellspacing="0" cellpadding="2" summary="network booting">
+								<tr>
+									<td>
+										<?=gettext("Enter the IP of the"); ?> <b><?=gettext("next-server"); ?></b>
+									</td>
+									<td>
+										<input name="nextserver" type="text" class="formfld unknown" id="nextserver" size="20" value="<?=htmlspecialchars($pconfig['nextserver']);?>" /><br />
+									</td>
+								</tr>
+								<tr>
+									<td>
+										<?=gettext("and the default bios filename");?>
+									</td>
+									<td>
+										<input name="filename" type="text" class="formfld unknown" id="filename" size="20" value="<?=htmlspecialchars($pconfig['filename']);?>" /><br />
+									</td>
+								</tr>
+								<tr>
+									<td>
+										<?=gettext("and the UEFI 32bit filename  ");?>
+									</td>
+									<td>
+										<input name="filename32" type="text" class="formfld unknown" id="filename32" size="20" value="<?=htmlspecialchars($pconfig['filename32']);?>" /><br />
+									</td>
+								</tr>
+								<tr>
+									<td>
+										<?=gettext("and the UEFI 64bit filename  ");?>
+									</td>
+									<td>
+										<input name="filename64" type="text" class="formfld unknown" id="filename64" size="20" value="<?=htmlspecialchars($pconfig['filename64']);?>" /><br />
+									</td>
+								</tr>
+							</table>
+							<?=gettext("Note: You need both a filename and a boot server configured for this to work!");?>
+							<?=gettext("You will need all three filenames and a boot server configured for UEFI to work!");?>
+							<?=gettext("Enter the"); ?> <b><?=gettext("root-path"); ?></b>-<?=gettext("string");?>
+							<input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>" /><br />
+							<?=gettext("Note: string-format: iscsi:(servername):(protocol):(port):(LUN):targetname");?>
+						</div>
+					</td>
+				</tr>
+<?php
+	if (!is_numeric($pool) && !($act == "newpool")):
+?>
+				<tr>
+					<td width="22%" valign="top" class="vncell"><?=gettext("Additional BOOTP/DHCP Options");?></td>
+					<td width="78%" class="vtable">
+						<div id="shownumbervaluebox">
+							<input type="button" onclick="show_shownumbervalue()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Additional BOOTP/DHCP Options");?>
+						</div>
+						<div id="shownumbervalue" style="display:none">
+							<table id="maintable" summary="bootp-dhcp options">
+							<tbody>
+								<tr>
+									<td colspan="3">
+										<div style="padding:5px; margin-top: 16px; margin-bottom: 16px; border:1px dashed #000066; background-color: #ffffff; color: #000000; font-size: 8pt;" id="itemhelp">
+											<?=gettext("Enter the DHCP option number and the value for each item you would like to include in the DHCP lease information.  For a list of available options please visit this"); ?> <a href="http://www.iana.org/assignments/bootp-dhcp-parameters/" target="_blank"><?=gettext("URL"); ?></a>
+										</div>
+									</td>
+								</tr>
+								<tr>
+									<td><div id="onecolumn"><?=gettext("Number");?></div></td>
+									<td><div id="twocolumn"><?=gettext("Type");?></div></td>
+									<td><div id="threecolumn"><?=gettext("Value");?></div></td>
+								</tr>
+<?php
+		$counter = 0;
+		if ($pconfig['numberoptions']):
+			foreach ($pconfig['numberoptions']['item'] as $item):
+				$number = $item['number'];
+				$itemtype = $item['type'];
+				$value = $item['value'];
+?>
+								<tr>
+									<td>
+										<input autocomplete="off" name="number<?php echo $counter; ?>" type="text" class="formfld unknown" id="number<?php echo $counter; ?>" size="10" value="<?=htmlspecialchars($number);?>" />
+									</td>
+									<td>
+										<select name="itemtype<?php echo $counter; ?>" class="formselect" id="itemtype<?php echo $counter; ?>">
+<?php
+				foreach ($customitemtypes as $typename => $typedescr) {
+					echo "<option value=\"{$typename}\" ";
+					if ($itemtype == $typename) {
+						echo "selected=\"selected\"";
 					}
-					?>
-					</select>
-				</td>
-				<td>
-					<input autocomplete="off" name="value<?php echo $counter; ?>" type="text" class="formfld unknown" id="value<?php echo $counter; ?>" size="40" value="<?=htmlspecialchars($value);?>" />
-				</td>
-				<td>
-					<a onclick="removeRow(this); return false;" href="#"><img border="0" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" alt="delete" /></a>
-				</td>
+					echo ">" . $typedescr . "</option>";
+				}
+?>
+										</select>
+									</td>
+									<td>
+										<input autocomplete="off" name="value<?php echo $counter; ?>" type="text" class="formfld unknown" id="value<?php echo $counter; ?>" size="40" value="<?=htmlspecialchars($value);?>" />
+									</td>
+									<td>
+										<a onclick="removeRow(this); return false;" href="#"><img border="0" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" alt="delete" /></a>
+									</td>
+								</tr>
+<?php
+				$counter++;
+			endforeach;
+		endif; // numberoptions
+?>
+							</tbody>
+							</table>
+							<a onclick="javascript:addRowTo('maintable', 'formfldalias'); return false;" href="#">
+								<img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="<?=gettext("add another entry");?>" />
+							</a>
+							<script type="text/javascript">
+							//<![CDATA[
+								field_counter_js = 3;
+								rows = 1;
+								totalrows = <?php echo $counter; ?>;
+								loaded = <?php echo $counter; ?>;
+							//]]>
+							</script>
+						</div>
+					</td>
+				</tr>
+<?php
+	endif;
+?>
+				<tr>
+					<td width="22%" valign="top">&nbsp;</td>
+					<td width="78%">
+						<?php if ($act == "newpool"): ?>
+							<input type="hidden" name="act" value="newpool" />
+						<?php endif; ?>
+						<?php if (is_numeric($pool)): ?>
+							<input type="hidden" name="pool" value="<?php echo $pool; ?>" />
+						<?php endif; ?>
+						<input name="if" type="hidden" value="<?=htmlspecialchars($if);?>" />
+						<input name="submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change(true)" />
+					</td>
+				</tr>
+				<tr>
+					<td width="22%" valign="top">&nbsp;</td>
+					<td width="78%">
+						<p>
+							<span class="vexpl">
+								<span class="red"><strong><?=gettext("Note:");?>
+									<br />
+									</strong>
+								</span>
+								<?=gettext("The DNS servers entered in"); ?>
+								<a href="system.php"><?=gettext("System: General setup"); ?></a>
+								<?=gettext("(or the"); ?> <a href="services_dnsmasq.php"><?=gettext("DNS forwarder"); ?></a>, <?=gettext("if enabled)"); ?>
+							</span>
+							<span class="vexpl">
+								<?=gettext("will be assigned to clients by the DHCP server."); ?>
+								<br />
+								<br />
+								<?=gettext("The DHCP lease table can be viewed on the"); ?>
+								<a href="status_dhcp_leases.php"><?=gettext("Status: DHCP leases"); ?></a>
+								<?=gettext("page."); ?>
+								<br />
+							</span>
+						</p>
+					</td>
 				</tr>
-				<?php $counter++; ?>
-				<?php endforeach; ?>
-				</tbody>
-				</table>
-				<a onclick="javascript:addRowTo('maintable', 'formfldalias'); return false;" href="#">
-					<img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="<?=gettext("add another entry");?>" />
-				</a>
-				<script type="text/javascript">
-				//<![CDATA[
-					field_counter_js = 3;
-					rows = 1;
-					totalrows = <?php echo $counter; ?>;
-					loaded = <?php echo $counter; ?>;
-				//]]>
-				</script>
-				</div>
-
-				</td>
-			</tr>
-			<?php endif; ?>
-			<tr>
-			<td width="22%" valign="top">&nbsp;</td>
-			<td width="78%">
-				<?php if ($act == "newpool"): ?>
-				<input type="hidden" name="act" value="newpool" />
-				<?php endif; ?>
-				<?php if (is_numeric($pool)): ?>
-				<input type="hidden" name="pool" value="<?php echo $pool; ?>" />
-				<?php endif; ?>
-				<input name="if" type="hidden" value="<?=htmlspecialchars($if);?>" />
-				<input name="submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change(true)" />
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top">&nbsp;</td>
-			<td width="78%"> <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br />
-				</strong></span><?=gettext("The DNS servers entered in"); ?> <a href="system.php"><?=gettext("System: " .
-				"General setup"); ?></a> <?=gettext("(or the"); ?> <a href="services_dnsmasq.php"><?=gettext("DNS " .
-				"forwarder"); ?></a>, <?=gettext("if enabled)"); ?> </span><span class="vexpl"><?=gettext("will " .
-				"be assigned to clients by the DHCP server."); ?><br />
-				<br />
-				<?=gettext("The DHCP lease table can be viewed on the"); ?> <a href="status_dhcp_leases.php"><?=gettext("Status: " .
-				"DHCP leases"); ?></a> <?=gettext("page."); ?><br />
-				</span></p>
-			</td>
-			</tr>
-		</table>
-		<?php if (!is_numeric($pool) && !($act == "newpool")): ?>
-		<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="static mappings">
-		<tr>
-			<td colspan="5" valign="top" class="listtopic"><?=gettext("DHCP Static Mappings for this interface.");?></td>
-			<td>&nbsp;</td>
-		</tr>
-		<tr>
-			<td width="7%" class="listhdrr"><?=gettext("Static ARP");?></td>
-			<td width="18%" class="listhdrr"><?=gettext("MAC address");?></td>
-			<td width="15%" class="listhdrr"><?=gettext("IP address");?></td>
-			<td width="20%" class="listhdrr"><?=gettext("Hostname");?></td>
-			<td width="30%" class="listhdr"><?=gettext("Description");?></td>
-			<td width="10%" class="list">
-			<table border="0" cellspacing="0" cellpadding="1" summary="add">
-			<tr>
-			<td valign="middle" width="17"></td>
-			<td valign="middle"><a href="services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
-			</tr>
-			</table>
-			</td>
-		</tr>
-			<?php if(is_array($a_maps)): ?>
-			<?php $i = 0; foreach ($a_maps as $mapent): ?>
-			<?php if($mapent['mac'] <> "" or $mapent['ipaddr'] <> ""): ?>
-		<tr>
-		<td align="center" class="listlr" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&amp;id=<?=$i;?>';">
-			<?php if (isset($mapent['arp_table_static_entry'])): ?>
-				<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_alert.gif" alt="ARP Table Static Entry" width="17" height="17" border="0" alt="alert" />
-			<?php endif; ?>
-		</td>
-		<td class="listlr" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&amp;id=<?=$i;?>';">
-			<?=htmlspecialchars($mapent['mac']);?>
-		</td>
-		<td class="listr" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&amp;id=<?=$i;?>';">
-			<?=htmlspecialchars($mapent['ipaddr']);?>&nbsp;
-		</td>
-		<td class="listr" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&amp;id=<?=$i;?>';">
-			<?=htmlspecialchars($mapent['hostname']);?>&nbsp;
-		</td>
-		<td class="listbg" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&amp;id=<?=$i;?>';">
-			<?=htmlspecialchars($mapent['descr']);?>&nbsp;
-		</td>
-		<td valign="middle" class="list nowrap">
-			<table border="0" cellspacing="0" cellpadding="1" summary="icons">
-			<tr>
-			<td valign="middle"><a href="services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&amp;id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a></td>
-			<td valign="middle"><a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this mapping?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td>
-			</tr>
 			</table>
-		</td>
-		</tr>
-		<?php endif; ?>
-		<?php $i++; endforeach; ?>
-		<?php endif; ?>
-		<tr>
-		<td class="list" colspan="5"></td>
-		<td class="list">
-			<table border="0" cellspacing="0" cellpadding="1" summary="add">
-			<tr>
-			<td valign="middle" width="17"></td>
-			<td valign="middle"><a href="services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
-			</tr>
+<?php
+	if (!is_numeric($pool) && !($act == "newpool")):
+?>
+			<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="static mappings">
+				<tr>
+					<td colspan="5" valign="top" class="listtopic"><?=gettext("DHCP Static Mappings for this interface.");?></td>
+					<td>&nbsp;</td>
+				</tr>
+				<tr>
+					<td width="7%" class="listhdrr"><?=gettext("Static ARP");?></td>
+					<td width="18%" class="listhdrr"><?=gettext("MAC address");?></td>
+					<td width="15%" class="listhdrr"><?=gettext("IP address");?></td>
+					<td width="20%" class="listhdrr"><?=gettext("Hostname");?></td>
+					<td width="30%" class="listhdr"><?=gettext("Description");?></td>
+					<td width="10%" class="list">
+						<table border="0" cellspacing="0" cellpadding="1" summary="add">
+							<tr>
+								<td valign="middle" width="17"></td>
+								<td valign="middle">
+									<a href="services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a>
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+<?php
+		if (is_array($a_maps)):
+			$i = 0;
+			foreach ($a_maps as $mapent):
+				if ($mapent['mac'] <> "" or $mapent['ipaddr'] <> ""):
+?>
+				<tr>
+					<td align="center" class="listlr" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&amp;id=<?=$i;?>';">
+						<?php if (isset($mapent['arp_table_static_entry'])): ?>
+							<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_alert.gif" alt="ARP Table Static Entry" width="17" height="17" border="0" alt="alert" />
+						<?php endif; ?>
+					</td>
+					<td class="listlr" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&amp;id=<?=$i;?>';">
+						<?=htmlspecialchars($mapent['mac']);?>
+					</td>
+					<td class="listr" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&amp;id=<?=$i;?>';">
+						<?=htmlspecialchars($mapent['ipaddr']);?>&nbsp;
+					</td>
+					<td class="listr" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&amp;id=<?=$i;?>';">
+						<?=htmlspecialchars($mapent['hostname']);?>&nbsp;
+					</td>
+					<td class="listbg" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&amp;id=<?=$i;?>';">
+						<?=htmlspecialchars($mapent['descr']);?>&nbsp;
+					</td>
+					<td valign="middle" class="list nowrap">
+						<table border="0" cellspacing="0" cellpadding="1" summary="icons">
+							<tr>
+								<td valign="middle"><a href="services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&amp;id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a></td>
+								<td valign="middle"><a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this mapping?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+<?php
+				endif;
+				$i++;
+			endforeach;
+		endif;
+?>
+				<tr>
+					<td class="list" colspan="5"></td>
+					<td class="list">
+						<table border="0" cellspacing="0" cellpadding="1" summary="add">
+							<tr>
+								<td valign="middle" width="17"></td>
+								<td valign="middle"><a href="services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
+							</tr>
+						</table>
+					</td>
+				</tr>
 			</table>
+<?php
+	endif;
+?>
+			</div>
 		</td>
-		</tr>
-		</table>
-		<?php endif; ?>
-	</div>
-</td>
-</tr>
+	</tr>
 </table>
 </form>
 <script type="text/javascript">
diff --git a/usr/local/www/services_dhcp_edit.php b/usr/local/www/services_dhcp_edit.php
index 8bd9664..357c7d6 100644
--- a/usr/local/www/services_dhcp_edit.php
+++ b/usr/local/www/services_dhcp_edit.php
@@ -53,7 +53,7 @@ function staticmaps_sort($ifgui) {
 
 require_once('globals.inc');
 
-if(!$g['services_dhcp_server_enable']) {
+if (!$g['services_dhcp_server_enable']) {
 	header("Location: /");
 	exit;
 }
@@ -63,23 +63,28 @@ require("guiconfig.inc");
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dhcp.php');
 
 $if = $_GET['if'];
-if ($_POST['if'])
+if ($_POST['if']) {
 	$if = $_POST['if'];
+}
 
 if (!$if) {
 	header("Location: services_dhcp.php");
 	exit;
 }
 
-if (!is_array($config['dhcpd']))
+if (!is_array($config['dhcpd'])) {
 	$config['dhcpd'] = array();
-if (!is_array($config['dhcpd'][$if]))
+}
+if (!is_array($config['dhcpd'][$if])) {
 	$config['dhcpd'][$if] = array();
-if (!is_array($config['dhcpd'][$if]['staticmap']))
+}
+if (!is_array($config['dhcpd'][$if]['staticmap'])) {
 	$config['dhcpd'][$if]['staticmap'] = array();
+}
 
-if (!is_array($config['dhcpd'][$if]['pool']))
+if (!is_array($config['dhcpd'][$if]['pool'])) {
 	$config['dhcpd'][$if]['pool'] = array();
+}
 $a_pools = &$config['dhcpd'][$if]['pool'];
 
 $static_arp_enabled=isset($config['dhcpd'][$if]['staticarp']);
@@ -89,10 +94,12 @@ $ifcfgip = get_interface_ip($if);
 $ifcfgsn = get_interface_subnet($if);
 $ifcfgdescr = convert_friendly_interface_to_friendly_descr($if);
 
-if (is_numericint($_GET['id']))
+if (is_numericint($_GET['id'])) {
 	$id = $_GET['id'];
-if (isset($_POST['id']) && is_numericint($_POST['id']))
+}
+if (isset($_POST['id']) && is_numericint($_POST['id'])) {
 	$id = $_POST['id'];
+}
 
 if (isset($id) && $a_maps[$id]) {
 	$pconfig['mac'] = $a_maps[$id]['mac'];
@@ -108,14 +115,14 @@ if (isset($id) && $a_maps[$id]) {
 	$pconfig['gateway'] = $a_maps[$id]['gateway'];
 	$pconfig['domain'] = $a_maps[$id]['domain'];
 	$pconfig['domainsearchlist'] = $a_maps[$id]['domainsearchlist'];
-	list($pconfig['wins1'],$pconfig['wins2']) = $a_maps[$id]['winsserver'];
-	list($pconfig['dns1'],$pconfig['dns2'],$pconfig['dns3'],$pconfig['dns4']) = $a_maps[$id]['dnsserver'];
+	list($pconfig['wins1'], $pconfig['wins2']) = $a_maps[$id]['winsserver'];
+	list($pconfig['dns1'], $pconfig['dns2'], $pconfig['dns3'], $pconfig['dns4']) = $a_maps[$id]['dnsserver'];
 	$pconfig['ddnsdomain'] = $a_maps[$id]['ddnsdomain'];
 	$pconfig['ddnsdomainprimary'] = $a_maps[$id]['ddnsdomainprimary'];
 	$pconfig['ddnsdomainkeyname'] = $a_maps[$id]['ddnsdomainkeyname'];
 	$pconfig['ddnsdomainkey'] = $a_maps[$id]['ddnsdomainkey'];
 	$pconfig['ddnsupdate'] = isset($a_maps[$id]['ddnsupdate']);
-	list($pconfig['ntp1'],$pconfig['ntp2']) = $a_maps[$id]['ntpserver'];
+	list($pconfig['ntp1'], $pconfig['ntp2']) = $a_maps[$id]['ntpserver'];
 	$pconfig['tftp'] = $a_maps[$id]['tftp'];
 } else {
 	$pconfig['mac'] = $_GET['mac'];
@@ -157,17 +164,19 @@ if ($_POST) {
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
-    /* either MAC or Client-ID must be specified */
-    if (empty($_POST['mac']) && empty($_POST['cid']))
-        $input_errors[] = gettext("Either MAC address or Client identifier must be specified");
+	/* either MAC or Client-ID must be specified */
+	if (empty($_POST['mac']) && empty($_POST['cid'])) {
+		$input_errors[] = gettext("Either MAC address or Client identifier must be specified");
+	}
 
 	/* normalize MAC addresses - lowercase and convert Windows-ized hyphenated MACs to colon delimited */
 	$_POST['mac'] = strtolower(str_replace("-", ":", $_POST['mac']));
 
 	if ($_POST['hostname']) {
 		preg_match("/\-\$/", $_POST['hostname'], $matches);
-		if($matches)
+		if ($matches) {
 			$input_errors[] = gettext("The hostname cannot end with a hyphen according to RFC952");
+		}
 		if (!is_hostname($_POST['hostname'])) {
 			$input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'.");
 		} else {
@@ -182,20 +191,24 @@ if ($_POST) {
 	if (($_POST['mac'] && !is_macaddr($_POST['mac']))) {
 		$input_errors[] = gettext("A valid MAC address must be specified.");
 	}
-	if($static_arp_enabled && !$_POST['ipaddr']) {
+	if ($static_arp_enabled && !$_POST['ipaddr']) {
 		$input_errors[] = gettext("Static ARP is enabled.  You must specify an IP address.");
 	}
 
 	/* check for overlaps */
 	foreach ($a_maps as $mapent) {
-		if (isset($id) && ($a_maps[$id]) && ($a_maps[$id] === $mapent))
+		if (isset($id) && ($a_maps[$id]) && ($a_maps[$id] === $mapent)) {
 			continue;
+		}
 		/* The fully qualified hostname (hostname + '.' + domainname) must be unique.
 		 * The unqualified hostname does not have to be unique as long as the fully
 		 * qualified hostname is unique. */
 		$existingFqn = "{$mapent['hostname']}.{$mapent['domain']}";
 		$candidateFqn = "{$_POST['hostname']}.{$_POST['domain']}";
-		if ((($existingFqn == $candidateFqn) && $mapent['hostname']) || (($mapent['mac'] == $_POST['mac']) && $mapent['mac']) || (($mapent['ipaddr'] == $_POST['ipaddr']) && $mapent['ipaddr'] ) || (($mapent['cid'] == $_POST['cid']) && $mapent['cid'])) {
+		if ((($existingFqn == $candidateFqn) && $mapent['hostname']) ||
+		    (($mapent['mac'] == $_POST['mac']) && $mapent['mac']) ||
+		    (($mapent['ipaddr'] == $_POST['ipaddr']) && $mapent['ipaddr']) ||
+		    (($mapent['cid'] == $_POST['cid']) && $mapent['cid'])) {
 			$input_errors[] = gettext("This fully qualified hostname (Hostname + Domainname), IP, MAC address or Client identifier already exists.");
 			break;
 		}
@@ -206,7 +219,7 @@ if ($_POST) {
 		$dynsubnet_start = ip2ulong($config['dhcpd'][$if]['range']['from']);
 		$dynsubnet_end = ip2ulong($config['dhcpd'][$if]['range']['to']);
 		if ((ip2ulong($_POST['ipaddr']) >= $dynsubnet_start) &&
-			(ip2ulong($_POST['ipaddr']) <= $dynsubnet_end)) {
+		    (ip2ulong($_POST['ipaddr']) <= $dynsubnet_end)) {
 			$input_errors[] = sprintf(gettext("The IP address must not be within the DHCP range for this interface."));
 		}
 
@@ -220,38 +233,50 @@ if ($_POST) {
 		$lansubnet_start = ip2ulong(long2ip32(ip2long($ifcfgip) & gen_subnet_mask_long($ifcfgsn)));
 		$lansubnet_end = ip2ulong(long2ip32(ip2long($ifcfgip) | (~gen_subnet_mask_long($ifcfgsn))));
 		if ((ip2ulong($_POST['ipaddr']) < $lansubnet_start) ||
-			(ip2ulong($_POST['ipaddr']) > $lansubnet_end)) {
-			$input_errors[] = sprintf(gettext("The IP address must lie in the %s subnet."),$ifcfgdescr);
+		    (ip2ulong($_POST['ipaddr']) > $lansubnet_end)) {
+			$input_errors[] = sprintf(gettext("The IP address must lie in the %s subnet."), $ifcfgdescr);
 		}
 	}
 
-	if (($_POST['gateway'] && !is_ipaddrv4($_POST['gateway'])))
+	if (($_POST['gateway'] && !is_ipaddrv4($_POST['gateway']))) {
 		$input_errors[] = gettext("A valid IP address must be specified for the gateway.");
-	if (($_POST['wins1'] && !is_ipaddrv4($_POST['wins1'])) || ($_POST['wins2'] && !is_ipaddrv4($_POST['wins2'])))
+	}
+	if (($_POST['wins1'] && !is_ipaddrv4($_POST['wins1'])) || ($_POST['wins2'] && !is_ipaddrv4($_POST['wins2']))) {
 		$input_errors[] = gettext("A valid IP address must be specified for the primary/secondary WINS servers.");
+	}
 
 	$parent_ip = get_interface_ip($POST['if']);
 	if (is_ipaddrv4($parent_ip) && $_POST['gateway']) {
 		$parent_sn = get_interface_subnet($_POST['if']);
-		if(!ip_in_subnet($_POST['gateway'], gen_subnet($parent_ip, $parent_sn) . "/" . $parent_sn) && !ip_in_interface_alias_subnet($_POST['if'], $_POST['gateway']))
+		if (!ip_in_subnet($_POST['gateway'], gen_subnet($parent_ip, $parent_sn) . "/" . $parent_sn) && !ip_in_interface_alias_subnet($_POST['if'], $_POST['gateway'])) {
 			$input_errors[] = sprintf(gettext("The gateway address %s does not lie within the chosen interface's subnet."), $_POST['gateway']);
+		}
 	}
-	if (($_POST['dns1'] && !is_ipaddrv4($_POST['dns1'])) || ($_POST['dns2'] && !is_ipaddrv4($_POST['dns2'])) || ($_POST['dns3'] && !is_ipaddrv4($_POST['dns3'])) || ($_POST['dns4'] && !is_ipaddrv4($_POST['dns4'])))
+	if (($_POST['dns1'] && !is_ipaddrv4($_POST['dns1'])) ||
+	    ($_POST['dns2'] && !is_ipaddrv4($_POST['dns2'])) ||
+	    ($_POST['dns3'] && !is_ipaddrv4($_POST['dns3'])) ||
+	    ($_POST['dns4'] && !is_ipaddrv4($_POST['dns4']))) {
 		$input_errors[] = gettext("A valid IP address must be specified for each of the DNS servers.");
+	}
 
-	if ($_POST['deftime'] && (!is_numeric($_POST['deftime']) || ($_POST['deftime'] < 60)))
+	if ($_POST['deftime'] && (!is_numeric($_POST['deftime']) || ($_POST['deftime'] < 60))) {
 		$input_errors[] = gettext("The default lease time must be at least 60 seconds.");
-	if ($_POST['maxtime'] && (!is_numeric($_POST['maxtime']) || ($_POST['maxtime'] < 60) || ($_POST['maxtime'] <= $_POST['deftime'])))
+	}
+	if ($_POST['maxtime'] && (!is_numeric($_POST['maxtime']) || ($_POST['maxtime'] < 60) || ($_POST['maxtime'] <= $_POST['deftime']))) {
 		$input_errors[] = gettext("The maximum lease time must be at least 60 seconds and higher than the default lease time.");
-	if (($_POST['ddnsdomain'] && !is_domain($_POST['ddnsdomain'])))
+	}
+	if (($_POST['ddnsdomain'] && !is_domain($_POST['ddnsdomain']))) {
 		$input_errors[] = gettext("A valid domain name must be specified for the dynamic DNS registration.");
-	if (($_POST['ddnsdomain'] && !is_ipaddrv4($_POST['ddnsdomainprimary'])))
+	}
+	if (($_POST['ddnsdomain'] && !is_ipaddrv4($_POST['ddnsdomainprimary']))) {
 		$input_errors[] = gettext("A valid primary domain name server IP address must be specified for the dynamic domain name.");
+	}
 	if (($_POST['ddnsdomainkey'] && !$_POST['ddnsdomainkeyname']) ||
-		($_POST['ddnsdomainkeyname'] && !$_POST['ddnsdomainkey']))
+	    ($_POST['ddnsdomainkeyname'] && !$_POST['ddnsdomainkey'])) {
 		$input_errors[] = gettext("You must specify both a valid domain key and key name.");
+	}
 	if ($_POST['domainsearchlist']) {
-		$domain_array=preg_split("/[ ;]+/",$_POST['domainsearchlist']);
+		$domain_array=preg_split("/[ ;]+/", $_POST['domainsearchlist']);
 		foreach ($domain_array as $curdomain) {
 			if (!is_domain($curdomain)) {
 				$input_errors[] = gettext("A valid domain search list must be specified.");
@@ -260,12 +285,15 @@ if ($_POST) {
 		}
 	}
 
-	if (($_POST['ntp1'] && !is_ipaddrv4($_POST['ntp1'])) || ($_POST['ntp2'] && !is_ipaddrv4($_POST['ntp2'])))
+	if (($_POST['ntp1'] && !is_ipaddrv4($_POST['ntp1'])) || ($_POST['ntp2'] && !is_ipaddrv4($_POST['ntp2']))) {
 		$input_errors[] = gettext("A valid IP address must be specified for the primary/secondary NTP servers.");
-	if ($_POST['tftp'] && !is_ipaddrv4($_POST['tftp']) && !is_domain($_POST['tftp']) && !is_URL($_POST['tftp']))
+	}
+	if ($_POST['tftp'] && !is_ipaddrv4($_POST['tftp']) && !is_domain($_POST['tftp']) && !is_URL($_POST['tftp'])) {
 		$input_errors[] = gettext("A valid IP address or hostname must be specified for the TFTP server.");
-	if (($_POST['nextserver'] && !is_ipaddrv4($_POST['nextserver'])))
+	}
+	if (($_POST['nextserver'] && !is_ipaddrv4($_POST['nextserver']))) {
 		$input_errors[] = gettext("A valid IP address must be specified for the network boot server.");
+	}
 
 	if (!$input_errors) {
 		$mapent = array();
@@ -281,20 +309,26 @@ if ($_POST) {
 		$mapent['maxleasetime'] = $_POST['maxtime'];
 
 		unset($mapent['winsserver']);
-		if ($_POST['wins1'])
+		if ($_POST['wins1']) {
 			$mapent['winsserver'][] = $_POST['wins1'];
-		if ($_POST['wins2'])
+		}
+		if ($_POST['wins2']) {
 			$mapent['winsserver'][] = $_POST['wins2'];
+		}
 
 		unset($mapent['dnsserver']);
-		if ($_POST['dns1'])
+		if ($_POST['dns1']) {
 			$mapent['dnsserver'][] = $_POST['dns1'];
-		if ($_POST['dns2'])
+		}
+		if ($_POST['dns2']) {
 			$mapent['dnsserver'][] = $_POST['dns2'];
-		if ($_POST['dns3'])
+		}
+		if ($_POST['dns3']) {
 			$mapent['dnsserver'][] = $_POST['dns3'];
-		if ($_POST['dns4'])
+		}
+		if ($_POST['dns4']) {
 			$mapent['dnsserver'][] = $_POST['dns4'];
+		}
 
 		$mapent['gateway'] = $_POST['gateway'];
 		$mapent['domain'] = $_POST['domain'];
@@ -306,28 +340,33 @@ if ($_POST) {
 		$mapent['ddnsupdate'] = ($_POST['ddnsupdate']) ? true : false;
 
 		unset($mapent['ntpserver']);
-		if ($_POST['ntp1'])
+		if ($_POST['ntp1']) {
 			$mapent['ntpserver'][] = $_POST['ntp1'];
-		if ($_POST['ntp2'])
+		}
+		if ($_POST['ntp2']) {
 			$mapent['ntpserver'][] = $_POST['ntp2'];
+		}
 
 		$mapent['tftp'] = $_POST['tftp'];
 		$mapent['ldap'] = $_POST['ldap'];
 
-		if (isset($id) && $a_maps[$id])
+		if (isset($id) && $a_maps[$id]) {
 			$a_maps[$id] = $mapent;
-		else
+		} else {
 			$a_maps[] = $mapent;
+		}
 		staticmaps_sort($if);
 
 		write_config();
 
-		if(isset($config['dhcpd'][$if]['enable'])) {
+		if (isset($config['dhcpd'][$if]['enable'])) {
 			mark_subsystem_dirty('staticmaps');
-			if (isset($config['dnsmasq']['enable']) && isset($config['dnsmasq']['regdhcpstatic']))
+			if (isset($config['dnsmasq']['enable']) && isset($config['dnsmasq']['regdhcpstatic'])) {
 				mark_subsystem_dirty('hosts');
-			if (isset($config['unbound']['enable']) && isset($config['unbound']['regdhcpstatic']))
+			}
+			if (isset($config['unbound']['enable']) && isset($config['unbound']['regdhcpstatic'])) {
 				mark_subsystem_dirty('unbound');
+			}
 		}
 
 		header("Location: services_dhcp.php?if={$if}");
@@ -336,7 +375,7 @@ if ($_POST) {
 }
 
 $closehead = false;
-$pgtitle = array(gettext("Services"),gettext("DHCP"),gettext("Edit static mapping"));
+$pgtitle = array(gettext("Services"), gettext("DHCP"), gettext("Edit static mapping"));
 $shortcut_section = "dhcp";
 
 include("head.inc");
@@ -369,192 +408,212 @@ include("head.inc");
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
-            <form action="services_dhcp_edit.php" method="post" name="iform" id="iform">
-              <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0" summary="static mapping">
-				<tr>
-					<td colspan="2" valign="top" class="listtopic"><?=sprintf(gettext("Static DHCP Mapping on %s"),$ifcfgdescr);?></td>
-				</tr>
-                <tr>
-                  <td width="22%" valign="top" class="vncell"><?=gettext("MAC address");?></td>
-                  <td width="78%" class="vtable">
-                    <input name="mac" type="text" class="formfld unknown" id="mac" size="30" value="<?=htmlspecialchars($pconfig['mac']);?>" />
-		    <?php
-			$ip = getenv('REMOTE_ADDR');
-			$mac = `/usr/sbin/arp -an | grep {$ip} | cut -d" " -f4`;
-			$mac = str_replace("\n","",$mac);
-		    ?>
-		    <a onclick="document.forms[0].mac.value='<?=$mac?>';" href="#"><?=gettext("Copy my MAC address");?></a>
-                    <br />
-                    <span class="vexpl"><?=gettext("Enter a MAC address in the following format: ".
-                    "xx:xx:xx:xx:xx:xx");?></span></td>
-                </tr>
-                <tr>
-                  <td width="22%" valign="top" class="vncell"><?=gettext("Client identifier");?></td>
-                  <td width="78%" class="vtable">
-                    <input name="cid" type="text" class="formfld unknown" id="cid" size="30" value="<?=htmlspecialchars($pconfig['cid']);?>" />
-                  </td>
-                </tr>
-                <tr>
-                  <td width="22%" valign="top" class="vncell"><?=gettext("IP address");?></td>
-                  <td width="78%" class="vtable">
-                    <input name="ipaddr" type="text" class="formfld unknown" id="ipaddr" size="20" value="<?=htmlspecialchars($pconfig['ipaddr']);?>" />
-                    <br />
-			<?=gettext("If an IPv4 address is entered, the address must be outside of the pool.");?>
-			<br />
-			<?=gettext("If no IPv4 address is given, one will be dynamically allocated from the pool.");?>
+<form action="services_dhcp_edit.php" method="post" name="iform" id="iform">
+	<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0" summary="static mapping">
+		<tr>
+			<td colspan="2" valign="top" class="listtopic"><?=sprintf(gettext("Static DHCP Mapping on %s"), $ifcfgdescr);?></td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncell"><?=gettext("MAC address");?></td>
+			<td width="78%" class="vtable">
+				<input name="mac" type="text" class="formfld unknown" id="mac" size="30" value="<?=htmlspecialchars($pconfig['mac']);?>" />
+				<?php
+					$ip = getenv('REMOTE_ADDR');
+					$mac = `/usr/sbin/arp -an | grep {$ip} | cut -d" " -f4`;
+					$mac = str_replace("\n", "", $mac);
+				?>
+				<a onclick="document.forms[0].mac.value='<?=$mac?>';" href="#"><?=gettext("Copy my MAC address");?></a>
+				<br />
+				<span class="vexpl">
+					<?=gettext("Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx");?>
+				</span>
 			</td>
-                </tr>
-                <tr>
-                  <td width="22%" valign="top" class="vncell"><?=gettext("Hostname");?></td>
-                  <td width="78%" class="vtable">
-                    <input name="hostname" type="text" class="formfld unknown" id="hostname" size="20" value="<?=htmlspecialchars($pconfig['hostname']);?>" />
-                    <br /> <span class="vexpl"><?=gettext("Name of the host, without domain part.");?></span></td>
-                </tr>
-                <?php if($netboot_enabled) { ?>
+		</tr>
 		<tr>
-		  <td width="22%" valign="top" class="vncell">Netboot Filename</td>
-		  <td width="78%" class="vtable">
-		    <input name="filename" type="text" class="formfld unknown" id="filename" size="20" value="<?=htmlspecialchars($pconfig['filename']);?>" />
-		    <br /> <span class="vexpl">Name of the file that should be loaded when this host boots off of the network, overrides setting on main page.</span></td>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Client identifier");?></td>
+			<td width="78%" class="vtable">
+				<input name="cid" type="text" class="formfld unknown" id="cid" size="30" value="<?=htmlspecialchars($pconfig['cid']);?>" />
+			</td>
 		</tr>
 		<tr>
-		  <td width="22%" valign="top" class="vncell">Root Path</td>
-		  <td width="78%" class="vtable">
-			<input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>" />
-		    <br /> <span class="vexpl"><?=gettext("Enter the"); ?> <b><?=gettext("root-path"); ?></b>-<?=gettext("string");?>, overrides setting on main page.</span></td>
+			<td width="22%" valign="top" class="vncell"><?=gettext("IP address");?></td>
+			<td width="78%" class="vtable">
+				<input name="ipaddr" type="text" class="formfld unknown" id="ipaddr" size="20" value="<?=htmlspecialchars($pconfig['ipaddr']);?>" />
+				<br />
+				<?=gettext("If an IPv4 address is entered, the address must be outside of the pool.");?>
+				<br />
+				<?=gettext("If no IPv4 address is given, one will be dynamically allocated from the pool.");?>
+			</td>
 		</tr>
-		<?php } ?>
-                <tr>
-                  <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
-                  <td width="78%" class="vtable">
-                    <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-                    <br /> <span class="vexpl"><?=gettext("You may enter a description here ".
-                    "for your reference (not parsed).");?></span></td>
-                </tr>
-                <tr>
-                  <td width="22%" valign="top" class="vncell"><?=gettext("ARP Table Static Entry");?></td>
-                  <td width="78%" class="vtable">
-                    <input name="arp_table_static_entry" id="arp_table_static_entry" type="checkbox" value="yes" <?php if ($pconfig['arp_table_static_entry']) echo "checked=\"checked\""; ?> />
-                    <br /> <span class="vexpl"><?=gettext("Create an ARP Table Static Entry for this MAC &amp; IP Address pair. ".
-                    "");?></span></td>
-                </tr>
 		<tr>
-		<td width="22%" valign="top" class="vncell"><?=gettext("WINS servers");?></td>
-		<td width="78%" class="vtable">
-			<input name="wins1" type="text" class="formfld unknown" id="wins1" size="20" value="<?=htmlspecialchars($pconfig['wins1']);?>" /><br />
-			<input name="wins2" type="text" class="formfld unknown" id="wins2" size="20" value="<?=htmlspecialchars($pconfig['wins2']);?>" />
-		</td>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Hostname");?></td>
+			<td width="78%" class="vtable">
+				<input name="hostname" type="text" class="formfld unknown" id="hostname" size="20" value="<?=htmlspecialchars($pconfig['hostname']);?>" />
+				<br />
+				<span class="vexpl">
+					<?=gettext("Name of the host, without domain part.");?>
+				</span>
+			</td>
 		</tr>
+<?php
+	if ($netboot_enabled) {
+?>
 		<tr>
-		<td width="22%" valign="top" class="vncell"><?=gettext("DNS servers");?></td>
-		<td width="78%" class="vtable">
-			<input name="dns1" type="text" class="formfld unknown" id="dns1" size="20" value="<?=htmlspecialchars($pconfig['dns1']);?>" /><br />
-			<input name="dns2" type="text" class="formfld unknown" id="dns2" size="20" value="<?=htmlspecialchars($pconfig['dns2']);?>" /><br />
-			<input name="dns3" type="text" class="formfld unknown" id="dns3" size="20" value="<?=htmlspecialchars($pconfig['dns3']);?>" /><br />
-			<input name="dns4" type="text" class="formfld unknown" id="dns4" size="20" value="<?=htmlspecialchars($pconfig['dns4']);?>" /><br />
-			<?=gettext("NOTE: leave blank to use the system default DNS servers - this interface's IP if DNS forwarder is enabled, otherwise the servers configured on the General page.");?>
-		</td>
+			<td width="22%" valign="top" class="vncell">Netboot Filename</td>
+			<td width="78%" class="vtable">
+				<input name="filename" type="text" class="formfld unknown" id="filename" size="20" value="<?=htmlspecialchars($pconfig['filename']);?>" />
+				<br />
+				<span class="vexpl">Name of the file that should be loaded when this host boots off of the network, overrides setting on main page.</span>
+			</td>
 		</tr>
 		<tr>
-		<td width="22%" valign="top" class="vncell"><?=gettext("Gateway");?></td>
-		<td width="78%" class="vtable">
-			<input name="gateway" type="text" class="formfld host" id="gateway" size="20" value="<?=htmlspecialchars($pconfig['gateway']);?>" /><br />
-			 <?=gettext("The default is to use the IP on this interface of the firewall as the gateway. Specify an alternate gateway here if this is not the correct gateway for your network.");?>
-		</td>
+			<td width="22%" valign="top" class="vncell">Root Path</td>
+			<td width="78%" class="vtable">
+				<input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>" />
+				<br />
+				<span class="vexpl">
+					<?=gettext("Enter the"); ?> <b><?=gettext("root-path"); ?></b>-<?=gettext("string");?>, overrides setting on main page.
+				</span>
+			</td>
 		</tr>
+<?php
+	}
+?>
 		<tr>
-		<td width="22%" valign="top" class="vncell"><?=gettext("Domain name");?></td>
-		<td width="78%" class="vtable">
-			<input name="domain" type="text" class="formfld unknown" id="domain" size="20" value="<?=htmlspecialchars($pconfig['domain']);?>" /><br />
-			 <?=gettext("The default is to use the domain name of this system as the default domain name provided by DHCP. You may specify an alternate domain name here.");?>
-		</td>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
+			<td width="78%" class="vtable">
+				<input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
+				<br />
+				<span class="vexpl">
+					<?=gettext("You may enter a description here for your reference (not parsed).");?>
+				</span>
+			</td>
 		</tr>
 		<tr>
-		<td width="22%" valign="top" class="vncell"><?=gettext("Domain search list");?></td>
-		<td width="78%" class="vtable">
-			<input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="20" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>" /><br />
-			<?=gettext("The DHCP server can optionally provide a domain search list. Use the semicolon character as separator ");?>
-		</td>
+			<td width="22%" valign="top" class="vncell"><?=gettext("ARP Table Static Entry");?></td>
+			<td width="78%" class="vtable">
+				<input name="arp_table_static_entry" id="arp_table_static_entry" type="checkbox" value="yes" <?php if ($pconfig['arp_table_static_entry']) echo "checked=\"checked\""; ?> />
+				<br />
+				<span class="vexpl">
+					<?=gettext("Create an ARP Table Static Entry for this MAC &amp; IP Address pair. ");?>
+				</span>
+			</td>
 		</tr>
 		<tr>
-		<td width="22%" valign="top" class="vncell"><?=gettext("Default lease time");?></td>
-		<td width="78%" class="vtable">
-			<input name="deftime" type="text" class="formfld unknown" id="deftime" size="10" value="<?=htmlspecialchars($pconfig['deftime']);?>" />
-			<?=gettext("seconds");?><br />
-			<?=gettext("This is used for clients that do not ask for a specific " .
-			"expiration time."); ?><br />
-			<?=gettext("The default is 7200 seconds.");?>
-		</td>
+			<td width="22%" valign="top" class="vncell"><?=gettext("WINS servers");?></td>
+			<td width="78%" class="vtable">
+				<input name="wins1" type="text" class="formfld unknown" id="wins1" size="20" value="<?=htmlspecialchars($pconfig['wins1']);?>" /><br />
+				<input name="wins2" type="text" class="formfld unknown" id="wins2" size="20" value="<?=htmlspecialchars($pconfig['wins2']);?>" />
+			</td>
 		</tr>
 		<tr>
-		<td width="22%" valign="top" class="vncell"><?=gettext("Maximum lease time");?></td>
-		<td width="78%" class="vtable">
-			<input name="maxtime" type="text" class="formfld unknown" id="maxtime" size="10" value="<?=htmlspecialchars($pconfig['maxtime']);?>" />
-			<?=gettext("seconds");?><br />
-			<?=gettext("This is the maximum lease time for clients that ask".
-			" for a specific expiration time."); ?><br />
-			<?=gettext("The default is 86400 seconds.");?>
-		</td>
+			<td width="22%" valign="top" class="vncell"><?=gettext("DNS servers");?></td>
+			<td width="78%" class="vtable">
+				<input name="dns1" type="text" class="formfld unknown" id="dns1" size="20" value="<?=htmlspecialchars($pconfig['dns1']);?>" /><br />
+				<input name="dns2" type="text" class="formfld unknown" id="dns2" size="20" value="<?=htmlspecialchars($pconfig['dns2']);?>" /><br />
+				<input name="dns3" type="text" class="formfld unknown" id="dns3" size="20" value="<?=htmlspecialchars($pconfig['dns3']);?>" /><br />
+				<input name="dns4" type="text" class="formfld unknown" id="dns4" size="20" value="<?=htmlspecialchars($pconfig['dns4']);?>" /><br />
+				<?=gettext("NOTE: leave blank to use the system default DNS servers - this interface's IP if DNS forwarder is enabled, otherwise the servers configured on the General page.");?>
+			</td>
 		</tr>
 		<tr>
-		<td width="22%" valign="top" class="vncell"><?=gettext("Dynamic DNS");?></td>
-		<td width="78%" class="vtable">
-			<div id="showddnsbox">
-				<input type="button" onclick="show_ddns_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Dynamic DNS");?>
-			</div>
-			<div id="showddns" style="display:none">
-				<input style="vertical-align:middle" type="checkbox" value="yes" name="ddnsupdate" id="ddnsupdate" <?php if($pconfig['ddnsupdate']) echo "checked=\"checked\""; ?> />&nbsp;
-				<b><?=gettext("Enable registration of DHCP client names in DNS.");?></b><br />
-				<p>
-				<input name="ddnsdomain" type="text" class="formfld unknown" id="ddnsdomain" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>" /><br />
-				<?=gettext("Note: Leave blank to disable dynamic DNS registration.");?><br />
-				<?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server.");?><br />
-				<input name="ddnsdomainprimary" type="text" class="formfld unknown" id="ddnsdomainprimary" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainprimary']);?>" /><br />
-				<?=gettext("Enter the primary domain name server IP address for the dynamic domain name.");?><br />
-				<input name="ddnsdomainkeyname" type="text" class="formfld unknown" id="ddnsdomainkeyname" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkeyname']);?>" /><br />
-				<?=gettext("Enter the dynamic DNS domain key name which will be used to register client names in the DNS server.");?><br />
-				<input name="ddnsdomainkey" type="text" class="formfld unknown" id="ddnsdomainkey" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkey']);?>" /><br />
-				<?=gettext("Enter the dynamic DNS domain key secret which will be used to register client names in the DNS server.");?>
-				</p>
-			</div>
-		</td>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Gateway");?></td>
+			<td width="78%" class="vtable">
+				<input name="gateway" type="text" class="formfld host" id="gateway" size="20" value="<?=htmlspecialchars($pconfig['gateway']);?>" /><br />
+				<?=gettext("The default is to use the IP on this interface of the firewall as the gateway. Specify an alternate gateway here if this is not the correct gateway for your network.");?>
+			</td>
 		</tr>
 		<tr>
-		<td width="22%" valign="top" class="vncell"><?=gettext("NTP servers");?></td>
-		<td width="78%" class="vtable">
-			<div id="showntpbox">
-				<input type="button" onclick="show_ntp_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show NTP configuration");?>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Domain name");?></td>
+			<td width="78%" class="vtable">
+				<input name="domain" type="text" class="formfld unknown" id="domain" size="20" value="<?=htmlspecialchars($pconfig['domain']);?>" /><br />
+				 <?=gettext("The default is to use the domain name of this system as the default domain name provided by DHCP. You may specify an alternate domain name here.");?>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Domain search list");?></td>
+			<td width="78%" class="vtable">
+				<input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="20" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>" /><br />
+				<?=gettext("The DHCP server can optionally provide a domain search list. Use the semicolon character as separator ");?>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Default lease time");?></td>
+			<td width="78%" class="vtable">
+				<input name="deftime" type="text" class="formfld unknown" id="deftime" size="10" value="<?=htmlspecialchars($pconfig['deftime']);?>" />
+				<?=gettext("seconds");?><br />
+				<?=gettext("This is used for clients that do not ask for a specific expiration time."); ?><br />
+				<?=gettext("The default is 7200 seconds.");?>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Maximum lease time");?></td>
+			<td width="78%" class="vtable">
+				<input name="maxtime" type="text" class="formfld unknown" id="maxtime" size="10" value="<?=htmlspecialchars($pconfig['maxtime']);?>" />
+				<?=gettext("seconds");?><br />
+				<?=gettext("This is the maximum lease time for clients that ask for a specific expiration time."); ?><br />
+				<?=gettext("The default is 86400 seconds.");?>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Dynamic DNS");?></td>
+			<td width="78%" class="vtable">
+				<div id="showddnsbox">
+					<input type="button" onclick="show_ddns_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Dynamic DNS");?>
+				</div>
+				<div id="showddns" style="display:none">
+					<input style="vertical-align:middle" type="checkbox" value="yes" name="ddnsupdate" id="ddnsupdate" <?php if ($pconfig['ddnsupdate']) echo "checked=\"checked\""; ?> />&nbsp;
+					<b><?=gettext("Enable registration of DHCP client names in DNS.");?></b><br />
+					<p>
+						<input name="ddnsdomain" type="text" class="formfld unknown" id="ddnsdomain" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>" /><br />
+						<?=gettext("Note: Leave blank to disable dynamic DNS registration.");?><br />
+						<?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server.");?><br />
+						<input name="ddnsdomainprimary" type="text" class="formfld unknown" id="ddnsdomainprimary" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainprimary']);?>" /><br />
+						<?=gettext("Enter the primary domain name server IP address for the dynamic domain name.");?><br />
+						<input name="ddnsdomainkeyname" type="text" class="formfld unknown" id="ddnsdomainkeyname" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkeyname']);?>" /><br />
+						<?=gettext("Enter the dynamic DNS domain key name which will be used to register client names in the DNS server.");?><br />
+						<input name="ddnsdomainkey" type="text" class="formfld unknown" id="ddnsdomainkey" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkey']);?>" /><br />
+						<?=gettext("Enter the dynamic DNS domain key secret which will be used to register client names in the DNS server.");?>
+					</p>
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncell"><?=gettext("NTP servers");?></td>
+			<td width="78%" class="vtable">
+				<div id="showntpbox">
+					<input type="button" onclick="show_ntp_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show NTP configuration");?>
+				</div>
+				<div id="showntp" style="display:none">
+					<input name="ntp1" type="text" class="formfld unknown" id="ntp1" size="20" value="<?=htmlspecialchars($pconfig['ntp1']);?>" /><br />
+					<input name="ntp2" type="text" class="formfld unknown" id="ntp2" size="20" value="<?=htmlspecialchars($pconfig['ntp2']);?>" />
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncell"><?=gettext("TFTP server");?></td>
+			<td width="78%" class="vtable">
+			<div id="showtftpbox">
+				<input type="button" onclick="show_tftp_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show TFTP configuration");?>
 			</div>
-			<div id="showntp" style="display:none">
-				<input name="ntp1" type="text" class="formfld unknown" id="ntp1" size="20" value="<?=htmlspecialchars($pconfig['ntp1']);?>" /><br />
-				<input name="ntp2" type="text" class="formfld unknown" id="ntp2" size="20" value="<?=htmlspecialchars($pconfig['ntp2']);?>" />
+			<div id="showtftp" style="display:none">
+				<input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>" /><br />
+				<?=gettext("Leave blank to disable.  Enter a full hostname or IP for the TFTP server.");?>
 			</div>
-		</td>
+			</td>
 		</tr>
 		<tr>
-		<td width="22%" valign="top" class="vncell"><?=gettext("TFTP server");?></td>
-		<td width="78%" class="vtable">
-		<div id="showtftpbox">
-			<input type="button" onclick="show_tftp_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show TFTP configuration");?>
-		</div>
-		<div id="showtftp" style="display:none">
-			<input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>" /><br />
-			<?=gettext("Leave blank to disable.  Enter a full hostname or IP for the TFTP server.");?>
-		</div>
-		</td>
+			<td width="22%" valign="top">&nbsp;</td>
+			<td width="78%">
+				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
+				<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
+				<?php if (isset($id) && $a_maps[$id]): ?>
+				<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
+				<?php endif; ?>
+				<input name="if" type="hidden" value="<?=htmlspecialchars($if);?>" />
+			</td>
 		</tr>
-                <tr>
-                  <td width="22%" valign="top">&nbsp;</td>
-                  <td width="78%">
-                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
-                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
-                    <?php if (isset($id) && $a_maps[$id]): ?>
-                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
-                    <?php endif; ?>
-                    <input name="if" type="hidden" value="<?=htmlspecialchars($if);?>" />
-                  </td>
-                </tr>
-              </table>
+	</table>
 </form>
 <?php include("fend.inc"); ?>
 </body>
diff --git a/usr/local/www/services_dhcp_relay.php b/usr/local/www/services_dhcp_relay.php
index 607002c..ae69c3a 100644
--- a/usr/local/www/services_dhcp_relay.php
+++ b/usr/local/www/services_dhcp_relay.php
@@ -42,10 +42,11 @@
 require("guiconfig.inc");
 
 $pconfig['enable'] = isset($config['dhcrelay']['enable']);
-if (empty($config['dhcrelay']['interface']))
+if (empty($config['dhcrelay']['interface'])) {
 	$pconfig['interface'] = array();
-else
+} else {
 	$pconfig['interface'] = explode(",", $config['dhcrelay']['interface']);
+}
 $pconfig['server'] = $config['dhcrelay']['server'];
 $pconfig['agentoption'] = isset($config['dhcrelay']['agentoption']);
 
@@ -57,7 +58,7 @@ $iflist = get_configured_interface_with_descr();
  */
 $dhcpd_enabled = false;
 if (is_array($config['dhcpd'])) {
-	foreach($config['dhcpd'] as $dhcpif => $dhcp) {
+	foreach ($config['dhcpd'] as $dhcpif => $dhcp) {
 		if (isset($dhcp['enable']) && isset($config['interfaces'][$dhcpif]['enable'])) {
 			$dhcpd_enabled = true;
 			break;
@@ -80,8 +81,9 @@ if ($_POST) {
 		if ($_POST['server']) {
 			$checksrv = explode(",", $_POST['server']);
 			foreach ($checksrv as $srv) {
-				if (!is_ipaddr($srv))
+				if (!is_ipaddr($srv)) {
 					$input_errors[] = gettext("A valid Destination Server IP address must be specified.");
+				}
 			}
 		}
 	}
@@ -102,7 +104,7 @@ if ($_POST) {
 }
 
 $closehead = false;
-$pgtitle = array(gettext("Services"),gettext("DHCP Relay"));
+$pgtitle = array(gettext("Services"), gettext("DHCP Relay"));
 $shortcut_section = "dhcp";
 include("head.inc");
 
@@ -132,73 +134,76 @@ function enable_change(enable_over) {
 <?php if ($savemsg) print_info_box($savemsg); ?>
 
 <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="dhcp relay">
-  <tr>
-    <td>
-	<div id="mainarea">
-              <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
-		<tr>
+	<tr>
+		<td>
+			<div id="mainarea">
+				<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
+					<tr>
 <?php
 	if ($dhcpd_enabled) {
 		echo "<td>DHCP Server is currently enabled. Cannot enable the DHCP Relay service while the DHCP Server is enabled on any interface.";
-			echo "</td></tr></table></div></td></tr></table></form>";
-			include("fend.inc"); 
-			echo "</body></html>";
-			exit;
-		}
+		echo "</td></tr></table></div></td></tr></table></form>";
+		include("fend.inc");
+		echo "</body></html>";
+		exit;
+	}
 ?>
 
-			<td colspan="2" valign="top" class="listtopic"><?=gettext("DHCP Relay configuration"); ?></td>
-		</tr>
-		<tr>
-                        <td width="22%" valign="top" class="vncellreq">Enable</td>
-                        <td width="78%" class="vtable">
-			<input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> onclick="enable_change(false)" />
-                          <strong><?php printf(gettext("Enable DHCP relay on interface"));?></strong>
-			</td>
-		</tr>
-		<tr>
-                        <td width="22%" valign="top" class="vncellreq">Interface(s)</td>
-                        <td width="78%" class="vtable">
-				<select id="interface" name="interface[]" multiple="multiple" class="formselect" size="3">
-			<?php
-                                foreach ($iflist as $ifent => $ifdesc) {
-					if (!is_ipaddr(get_interface_ip($ifent)))
-						continue;
-					echo "<option value=\"{$ifent}\"";
-					if (in_array($ifent, $pconfig['interface']))
-						echo " selected=\"selected\"";
-					echo ">{$ifdesc}</option>\n";
-				}
-			?>
-                                </select>
-				<br />Interfaces without an IP address will not be shown.
-			</td>
-		</tr>
-		<tr>
-	              <td width="22%" valign="top" class="vtable">&nbsp;</td>
-                      <td width="78%" class="vtable">
-<input name="agentoption" type="checkbox" value="yes" <?php if ($pconfig['agentoption']) echo "checked=\"checked\""; ?> />
-                      <strong><?=gettext("Append circuit ID and agent ID to requests"); ?></strong><br />
-                      <?php printf(gettext("If this is checked, the DHCP relay will append the circuit ID (%s interface number) and the agent ID to the DHCP request."), $g['product_name']); ?></td>
-		</tr>
-		<tr>
-                        <td width="22%" valign="top" class="vncellreq"><?=gettext("Destination server");?></td>
-                        <td width="78%" class="vtable">
-                          <input name="server" type="text" class="formfld unknown" id="server" size="20" value="<?=htmlspecialchars($pconfig['server']);?>" />
-                          <br />
-			  <?=gettext("This is the IP address of the server to which DHCP requests are relayed. You can enter multiple server IP addresses, separated by commas.");?>
-                        </td>
-		</tr>
-		<tr>
-                        <td width="22%" valign="top">&nbsp;</td>
-                        <td width="78%">
-                          <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change(true)" />
-                        </td>
-		</tr>
-	</table>
-	</div>
-    </td>
-  </tr>
+						<td colspan="2" valign="top" class="listtopic"><?=gettext("DHCP Relay configuration"); ?></td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncellreq">Enable</td>
+						<td width="78%" class="vtable">
+							<input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> onclick="enable_change(false)" />
+							<strong><?php printf(gettext("Enable DHCP relay on interface"));?></strong>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncellreq">Interface(s)</td>
+						<td width="78%" class="vtable">
+							<select id="interface" name="interface[]" multiple="multiple" class="formselect" size="3">
+							<?php
+								foreach ($iflist as $ifent => $ifdesc) {
+									if (!is_ipaddr(get_interface_ip($ifent))) {
+										continue;
+									}
+									echo "<option value=\"{$ifent}\"";
+									if (in_array($ifent, $pconfig['interface'])) {
+										echo " selected=\"selected\"";
+									}
+									echo ">{$ifdesc}</option>\n";
+								}
+							?>
+							</select>
+							<br />Interfaces without an IP address will not be shown.
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vtable">&nbsp;</td>
+						<td width="78%" class="vtable">
+							<input name="agentoption" type="checkbox" value="yes" <?php if ($pconfig['agentoption']) echo "checked=\"checked\""; ?> />
+							<strong><?=gettext("Append circuit ID and agent ID to requests"); ?></strong><br />
+							<?php printf(gettext("If this is checked, the DHCP relay will append the circuit ID (%s interface number) and the agent ID to the DHCP request."), $g['product_name']); ?>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncellreq"><?=gettext("Destination server");?></td>
+						<td width="78%" class="vtable">
+							<input name="server" type="text" class="formfld unknown" id="server" size="20" value="<?=htmlspecialchars($pconfig['server']);?>" />
+							<br />
+							<?=gettext("This is the IP address of the server to which DHCP requests are relayed. You can enter multiple server IP addresses, separated by commas.");?>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top">&nbsp;</td>
+						<td width="78%">
+							<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change(true)" />
+						</td>
+					</tr>
+				</table>
+			</div>
+		</td>
+	</tr>
 </table>
 </form>
 <script type="text/javascript">
diff --git a/usr/local/www/services_dhcpv6.php b/usr/local/www/services_dhcpv6.php
index 5683e5d..9888f03 100644
--- a/usr/local/www/services_dhcpv6.php
+++ b/usr/local/www/services_dhcpv6.php
@@ -48,7 +48,7 @@
 require("guiconfig.inc");
 require_once("filter.inc");
 
-if(!$g['services_dhcp_server_enable']) {
+if (!$g['services_dhcp_server_enable']) {
 	header("Location: /");
 	exit;
 }
@@ -56,19 +56,20 @@ if(!$g['services_dhcp_server_enable']) {
 /*  Fix failover DHCP problem
  *  http://article.gmane.org/gmane.comp.security.firewalls.pfsense.support/18749
  */
-ini_set("memory_limit","64M");
+ini_set("memory_limit", "64M");
 
 $if = $_GET['if'];
-if ($_POST['if'])
+if ($_POST['if']) {
 	$if = $_POST['if'];
+}
 
 /* if OLSRD is enabled, allow WAN to house DHCP. */
-if($config['installedpackages']['olsrd']) {
-	foreach($config['installedpackages']['olsrd']['config'] as $olsrd) {
-			if($olsrd['enable']) {
-				$is_olsr_enabled = true;
-				break;
-			}
+if ($config['installedpackages']['olsrd']) {
+	foreach ($config['installedpackages']['olsrd']['config'] as $olsrd) {
+		if ($olsrd['enable']) {
+			$is_olsr_enabled = true;
+			break;
+		}
 	}
 }
 
@@ -80,14 +81,15 @@ if (!$if || !isset($iflist[$if])) {
 	foreach ($iflist as $ifent => $ifname) {
 		$oc = $config['interfaces'][$ifent];
 		if ((is_array($config['dhcpdv6'][$ifent]) && !isset($config['dhcpdv6'][$ifent]['enable']) && !(is_ipaddrv6($oc['ipaddrv6']) && (!is_linklocal($oc['ipaddrv6'])))) ||
-			(!is_array($config['dhcpdv6'][$ifent]) && !(is_ipaddrv6($oc['ipaddrv6']) && (!is_linklocal($oc['ipaddrv6'])))))
+		    (!is_array($config['dhcpdv6'][$ifent]) && !(is_ipaddrv6($oc['ipaddrv6']) && (!is_linklocal($oc['ipaddrv6']))))) {
 			continue;
+		}
 		$if = $ifent;
 		break;
 	}
 }
 
-if (is_array($config['dhcpdv6'][$if])){
+if (is_array($config['dhcpdv6'][$if])) {
 	/* DHCPv6 */
 	if (is_array($config['dhcpdv6'][$if]['range'])) {
 		$pconfig['range_from'] = $config['dhcpdv6'][$if]['range']['from'];
@@ -102,15 +104,15 @@ if (is_array($config['dhcpdv6'][$if])){
 	$pconfig['maxtime'] = $config['dhcpdv6'][$if]['maxleasetime'];
 	$pconfig['domain'] = $config['dhcpdv6'][$if]['domain'];
 	$pconfig['domainsearchlist'] = $config['dhcpdv6'][$if]['domainsearchlist'];
-	list($pconfig['wins1'],$pconfig['wins2']) = $config['dhcpdv6'][$if]['winsserver'];
-	list($pconfig['dns1'],$pconfig['dns2'],$pconfig['dns3'],$pconfig['dns4']) = $config['dhcpdv6'][$if]['dnsserver'];
+	list($pconfig['wins1'], $pconfig['wins2']) = $config['dhcpdv6'][$if]['winsserver'];
+	list($pconfig['dns1'], $pconfig['dns2'], $pconfig['dns3'], $pconfig['dns4']) = $config['dhcpdv6'][$if]['dnsserver'];
 	$pconfig['enable'] = isset($config['dhcpdv6'][$if]['enable']);
 	$pconfig['ddnsdomain'] = $config['dhcpdv6'][$if]['ddnsdomain'];
 	$pconfig['ddnsdomainprimary'] = $config['dhcpdv6'][$if]['ddnsdomainprimary'];
 	$pconfig['ddnsdomainkeyname'] = $config['dhcpdv6'][$if]['ddnsdomainkeyname'];
 	$pconfig['ddnsdomainkey'] = $config['dhcpdv6'][$if]['ddnsdomainkey'];
 	$pconfig['ddnsupdate'] = isset($config['dhcpdv6'][$if]['ddnsupdate']);
-	list($pconfig['ntp1'],$pconfig['ntp2']) = $config['dhcpdv6'][$if]['ntpserver'];
+	list($pconfig['ntp1'], $pconfig['ntp2']) = $config['dhcpdv6'][$if]['ntpserver'];
 	$pconfig['tftp'] = $config['dhcpdv6'][$if]['tftp'];
 	$pconfig['ldap'] = $config['dhcpdv6'][$if]['ldap'];
 	$pconfig['netboot'] = isset($config['dhcpdv6'][$if]['netboot']);
@@ -118,8 +120,9 @@ if (is_array($config['dhcpdv6'][$if])){
 	$pconfig['netmask'] = $config['dhcpdv6'][$if]['netmask'];
 	$pconfig['numberoptions'] = $config['dhcpdv6'][$if]['numberoptions'];
 	$pconfig['dhcpv6leaseinlocaltime'] = $config['dhcpdv6'][$if]['dhcpv6leaseinlocaltime'];
-	if (!is_array($config['dhcpdv6'][$if]['staticmap']))
+	if (!is_array($config['dhcpdv6'][$if]['staticmap'])) {
 		$config['dhcpdv6'][$if]['staticmap'] = array();
+	}
 	$a_maps = &$config['dhcpdv6'][$if]['staticmap'];
 }
 
@@ -134,11 +137,12 @@ $ifcfgsn = get_interface_subnetv6($if);
 $dhcrelay_enabled = false;
 $dhcrelaycfg = $config['dhcrelay6'];
 
-if(is_array($dhcrelaycfg)) {
+if (is_array($dhcrelaycfg)) {
 	foreach ($dhcrelaycfg as $dhcrelayif => $dhcrelayifconf) {
 		if (isset($dhcrelayifconf['enable']) && isset($iflist[$dhcrelayif]) &&
-			(!link_interface_to_bridge($dhcrelayif)))
+		    (!link_interface_to_bridge($dhcrelayif))) {
 			$dhcrelay_enabled = true;
+		}
 	}
 }
 
@@ -153,8 +157,8 @@ if ($_POST) {
 	$pconfig = $_POST;
 
 	$numberoptions = array();
-	for($x=0; $x<99; $x++) {
-		if(isset($_POST["number{$x}"]) && ctype_digit($_POST["number{$x}"])) {
+	for ($x=0; $x<99; $x++) {
+		if (isset($_POST["number{$x}"]) && ctype_digit($_POST["number{$x}"])) {
 			$numbervalue = array();
 			$numbervalue['number'] = htmlspecialchars($_POST["number{$x}"]);
 			$numbervalue['value'] = htmlspecialchars($_POST["value{$x}"]);
@@ -167,36 +171,50 @@ if ($_POST) {
 	/* input validation */
 	if ($_POST['enable']) {
 		$reqdfields = explode(" ", "range_from range_to");
-		$reqdfieldsn = array(gettext("Range begin"),gettext("Range end"));
+		$reqdfieldsn = array(gettext("Range begin"), gettext("Range end"));
 
 		do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
-		if (($_POST['prefixrange_from'] && !is_ipaddrv6($_POST['prefixrange_from'])))
+		if (($_POST['prefixrange_from'] && !is_ipaddrv6($_POST['prefixrange_from']))) {
 			$input_errors[] = gettext("A valid range must be specified.");
-		if (($_POST['prefixrange_to'] && !is_ipaddrv6($_POST['prefixrange_to'])))
+		}
+		if (($_POST['prefixrange_to'] && !is_ipaddrv6($_POST['prefixrange_to']))) {
 			$input_errors[] = gettext("A valid prefix range must be specified.");
-		if (($_POST['range_from'] && !is_ipaddrv6($_POST['range_from'])))
+		}
+		if (($_POST['range_from'] && !is_ipaddrv6($_POST['range_from']))) {
 			$input_errors[] = gettext("A valid range must be specified.");
-		if (($_POST['range_to'] && !is_ipaddrv6($_POST['range_to'])))
+		}
+		if (($_POST['range_to'] && !is_ipaddrv6($_POST['range_to']))) {
 			$input_errors[] = gettext("A valid range must be specified.");
-		if (($_POST['gateway'] && !is_ipaddrv6($_POST['gateway'])))
+		}
+		if (($_POST['gateway'] && !is_ipaddrv6($_POST['gateway']))) {
 			$input_errors[] = gettext("A valid IPv6 address must be specified for the gateway.");
-		if (($_POST['dns1'] && !is_ipaddrv6($_POST['dns1'])) || ($_POST['dns2'] && !is_ipaddrv6($_POST['dns2'])) || ($_POST['dns3'] && !is_ipaddrv6($_POST['dns3'])) || ($_POST['dns4'] && !is_ipaddrv6($_POST['dns4'])))
+		}
+		if (($_POST['dns1'] && !is_ipaddrv6($_POST['dns1'])) ||
+		    ($_POST['dns2'] && !is_ipaddrv6($_POST['dns2'])) ||
+		    ($_POST['dns3'] && !is_ipaddrv6($_POST['dns3'])) ||
+		    ($_POST['dns4'] && !is_ipaddrv6($_POST['dns4']))) {
 			$input_errors[] = gettext("A valid IPv6 address must be specified for each of the DNS servers.");
+		}
 
-		if ($_POST['deftime'] && (!is_numeric($_POST['deftime']) || ($_POST['deftime'] < 60)))
+		if ($_POST['deftime'] && (!is_numeric($_POST['deftime']) || ($_POST['deftime'] < 60))) {
 			$input_errors[] = gettext("The default lease time must be at least 60 seconds.");
-		if ($_POST['maxtime'] && (!is_numeric($_POST['maxtime']) || ($_POST['maxtime'] < 60) || ($_POST['maxtime'] <= $_POST['deftime'])))
+		}
+		if ($_POST['maxtime'] && (!is_numeric($_POST['maxtime']) || ($_POST['maxtime'] < 60) || ($_POST['maxtime'] <= $_POST['deftime']))) {
 			$input_errors[] = gettext("The maximum lease time must be at least 60 seconds and higher than the default lease time.");
-		if (($_POST['ddnsdomain'] && !is_domain($_POST['ddnsdomain'])))
+		}
+		if (($_POST['ddnsdomain'] && !is_domain($_POST['ddnsdomain']))) {
 			$input_errors[] = gettext("A valid domain name must be specified for the dynamic DNS registration.");
-		if (($_POST['ddnsdomain'] && !is_ipaddrv4($_POST['ddnsdomainprimary'])))
+		}
+		if (($_POST['ddnsdomain'] && !is_ipaddrv4($_POST['ddnsdomainprimary']))) {
 			$input_errors[] = gettext("A valid primary domain name server IPv4 address must be specified for the dynamic domain name.");
+		}
 		if (($_POST['ddnsdomainkey'] && !$_POST['ddnsdomainkeyname']) ||
-			($_POST['ddnsdomainkeyname'] && !$_POST['ddnsdomainkey']))
+		    ($_POST['ddnsdomainkeyname'] && !$_POST['ddnsdomainkey'])) {
 			$input_errors[] = gettext("You must specify both a valid domain key and key name.");
+		}
 		if ($_POST['domainsearchlist']) {
-			$domain_array=preg_split("/[ ;]+/",$_POST['domainsearchlist']);
+			$domain_array=preg_split("/[ ;]+/", $_POST['domainsearchlist']);
 			foreach ($domain_array as $curdomain) {
 				if (!is_domain($curdomain)) {
 					$input_errors[] = gettext("A valid domain search list must be specified.");
@@ -205,47 +223,58 @@ if ($_POST) {
 			}
 		}
 
-		if (($_POST['ntp1'] && !is_ipaddrv6($_POST['ntp1'])) || ($_POST['ntp2'] && !is_ipaddrv6($_POST['ntp2'])))
+		if (($_POST['ntp1'] && !is_ipaddrv6($_POST['ntp1'])) || ($_POST['ntp2'] && !is_ipaddrv6($_POST['ntp2']))) {
 			$input_errors[] = gettext("A valid IPv6 address must be specified for the primary/secondary NTP servers.");
-		if (($_POST['domain'] && !is_domain($_POST['domain'])))
+		}
+		if (($_POST['domain'] && !is_domain($_POST['domain']))) {
 			$input_errors[] = gettext("A valid domain name must be specified for the DNS domain.");
-		if ($_POST['tftp'] && !is_ipaddr($_POST['tftp']) && !is_domain($_POST['tftp']) && !is_URL($_POST['tftp']))
+		}
+		if ($_POST['tftp'] && !is_ipaddr($_POST['tftp']) && !is_domain($_POST['tftp']) && !is_URL($_POST['tftp'])) {
 			$input_errors[] = gettext("A valid IPv6 address or hostname must be specified for the TFTP server.");
-		if (($_POST['bootfile_url'] && !is_URL($_POST['bootfile_url'])))
+		}
+		if (($_POST['bootfile_url'] && !is_URL($_POST['bootfile_url']))) {
 			$input_errors[] = gettext("A valid URL must be specified for the network bootfile.");
+		}
 
 		// Disallow a range that includes the virtualip
 		if (is_array($config['virtualip']['vip'])) {
-			foreach($config['virtualip']['vip'] as $vip) {
-				if($vip['interface'] == $if)
-					if($vip['subnetv6'] && is_inrange_v6($vip['subnetv6'], $_POST['range_from'], $_POST['range_to']))
-						$input_errors[] = sprintf(gettext("The subnet range cannot overlap with virtual IPv6 address %s."),$vip['subnetv6']);
+			foreach ($config['virtualip']['vip'] as $vip) {
+				if ($vip['interface'] == $if) {
+					if ($vip['subnetv6'] && is_inrange_v6($vip['subnetv6'], $_POST['range_from'], $_POST['range_to'])) {
+						$input_errors[] = sprintf(gettext("The subnet range cannot overlap with virtual IPv6 address %s."), $vip['subnetv6']);
+					}
+				}
 			}
 		}
 
 		$noip = false;
-		if(is_array($a_maps))
-			foreach ($a_maps as $map)
-				if (empty($map['ipaddrv6']))
+		if (is_array($a_maps)) {
+			foreach ($a_maps as $map) {
+				if (empty($map['ipaddrv6'])) {
 					$noip = true;
+				}
+			}
+		}
 		if (!$input_errors) {
 			/* make sure the range lies within the current subnet */
 			$subnet_start = gen_subnetv6($ifcfgip, $ifcfgsn);
 			$subnet_end = gen_subnetv6_max($ifcfgip, $ifcfgsn);
 
 			if (is_ipaddrv6($ifcfgip)) {
-				if ((! is_inrange_v6($_POST['range_from'], $subnet_start, $subnet_end)) ||
-			   	 (! is_inrange_v6($_POST['range_to'], $subnet_start, $subnet_end))) {
+				if ((!is_inrange_v6($_POST['range_from'], $subnet_start, $subnet_end)) ||
+				    (!is_inrange_v6($_POST['range_to'], $subnet_start, $subnet_end))) {
 					$input_errors[] = gettext("The specified range lies outside of the current subnet.");
 				}
 			}
 			/* "from" cannot be higher than "to" */
-			if (inet_pton($_POST['range_from']) > inet_pton($_POST['range_to']))
+			if (inet_pton($_POST['range_from']) > inet_pton($_POST['range_to'])) {
 				$input_errors[] = gettext("The range is invalid (first element higher than second element).");
+			}
 
 			/* make sure that the DHCP Relay isn't enabled on this interface */
-			if (isset($config['dhcrelay'][$if]['enable']))
-				$input_errors[] = sprintf(gettext("You must disable the DHCP relay on the %s interface before enabling the DHCP server."),$iflist[$if]);
+			if (isset($config['dhcrelay'][$if]['enable'])) {
+				$input_errors[] = sprintf(gettext("You must disable the DHCP relay on the %s interface before enabling the DHCP server."), $iflist[$if]);
+			}
 
 
 			/* Verify static mappings do not overlap:
@@ -254,12 +283,13 @@ if ($_POST) {
 			$dynsubnet_start = inet_pton($_POST['range_from']);
 			$dynsubnet_end = inet_pton($_POST['range_to']);
 
-			if(is_array($a_maps)) {
+			if (is_array($a_maps)) {
 				foreach ($a_maps as $map) {
-					if (empty($map['ipaddrv6']))
+					if (empty($map['ipaddrv6'])) {
 						continue;
+					}
 					if ((inet_pton($map['ipaddrv6']) > $dynsubnet_start) &&
-						(inet_pton($map['ipaddrv6']) < $dynsubnet_end)) {
+					    (inet_pton($map['ipaddrv6']) < $dynsubnet_end)) {
 						$input_errors[] = sprintf(gettext("The DHCP range cannot overlap any static DHCP mappings."));
 						break;
 					}
@@ -269,12 +299,15 @@ if ($_POST) {
 	}
 
 	if (!$input_errors) {
-		if (!is_array($config['dhcpdv6'][$if]))
+		if (!is_array($config['dhcpdv6'][$if])) {
 			$config['dhcpdv6'][$if] = array();
-		if (!is_array($config['dhcpdv6'][$if]['range']))
+		}
+		if (!is_array($config['dhcpdv6'][$if]['range'])) {
 			$config['dhcpdv6'][$if]['range'] = array();
-		if (!is_array($config['dhcpdv6'][$if]['prefixrange']))
+		}
+		if (!is_array($config['dhcpdv6'][$if]['prefixrange'])) {
 			$config['dhcpdv6'][$if]['prefixrange'] = array();
+		}
 
 		$config['dhcpdv6'][$if]['range']['from'] = $_POST['range_from'];
 		$config['dhcpdv6'][$if]['range']['to'] = $_POST['range_to'];
@@ -288,14 +321,18 @@ if ($_POST) {
 		unset($config['dhcpdv6'][$if]['winsserver']);
 
 		unset($config['dhcpdv6'][$if]['dnsserver']);
-		if ($_POST['dns1'])
+		if ($_POST['dns1']) {
 			$config['dhcpdv6'][$if]['dnsserver'][] = $_POST['dns1'];
-		if ($_POST['dns2'])
+		}
+		if ($_POST['dns2']) {
 			$config['dhcpdv6'][$if]['dnsserver'][] = $_POST['dns2'];
-		if ($_POST['dns3'])
+		}
+		if ($_POST['dns3']) {
 			$config['dhcpdv6'][$if]['dnsserver'][] = $_POST['dns3'];
-		if ($_POST['dns4'])
+		}
+		if ($_POST['dns4']) {
 			$config['dhcpdv6'][$if]['dnsserver'][] = $_POST['dns4'];
+		}
 
 		$config['dhcpdv6'][$if]['domain'] = $_POST['domain'];
 		$config['dhcpdv6'][$if]['domainsearchlist'] = $_POST['domainsearchlist'];
@@ -307,10 +344,12 @@ if ($_POST) {
 		$config['dhcpdv6'][$if]['ddnsupdate'] = ($_POST['ddnsupdate']) ? true : false;
 
 		unset($config['dhcpdv6'][$if]['ntpserver']);
-		if ($_POST['ntp1'])
+		if ($_POST['ntp1']) {
 			$config['dhcpdv6'][$if]['ntpserver'][] = $_POST['ntp1'];
-		if ($_POST['ntp2'])
+		}
+		if ($_POST['ntp2']) {
 			$config['dhcpdv6'][$if]['ntpserver'][] = $_POST['ntp2'];
+		}
 
 		$config['dhcpdv6'][$if]['tftp'] = $_POST['tftp'];
 		$config['dhcpdv6'][$if]['ldap'] = $_POST['ldap'];
@@ -319,8 +358,9 @@ if ($_POST) {
 		$config['dhcpdv6'][$if]['dhcpv6leaseinlocaltime'] = $_POST['dhcpv6leaseinlocaltime'];
 
 		// Handle the custom options rowhelper
-		if(isset($config['dhcpdv6'][$if]['numberoptions']['item']))
+		if (isset($config['dhcpdv6'][$if]['numberoptions']['item'])) {
 			unset($config['dhcpdv6'][$if]['numberoptions']['item']);
+		}
 
 		$config['dhcpdv6'][$if]['numberoptions'] = $numberoptions;
 
@@ -348,13 +388,16 @@ if ($_POST) {
 			}
 		} else {
 			$retvaldhcp = services_dhcpd_configure();
-			if ($retvaldhcp == 0)
+			if ($retvaldhcp == 0) {
 				clear_subsystem_dirty('staticmaps');
+			}
 		}
-		if ($dhcpdv6_enable_changed)
+		if ($dhcpdv6_enable_changed) {
 			$retvalfc = filter_configure();
-		if($retvaldhcp == 1 || $retvaldns == 1 || $retvalfc == 1)
+		}
+		if ($retvaldhcp == 1 || $retvaldns == 1 || $retvalfc == 1) {
 			$retval = 1;
+		}
 		$savemsg = get_std_save_message($retval);
 	}
 }
@@ -363,10 +406,11 @@ if ($_GET['act'] == "del") {
 	if ($a_maps[$_GET['id']]) {
 		unset($a_maps[$_GET['id']]);
 		write_config();
-		if(isset($config['dhcpdv6'][$if]['enable'])) {
+		if (isset($config['dhcpdv6'][$if]['enable'])) {
 			mark_subsystem_dirty('staticmapsv6');
-			if (isset($config['dnsmasq']['enable']) && isset($config['dnsmasq']['regdhcpstaticv6']))
+			if (isset($config['dnsmasq']['enable']) && isset($config['dnsmasq']['regdhcpstaticv6'])) {
 				mark_subsystem_dirty('hosts');
+			}
 		}
 		header("Location: services_dhcpv6.php?if={$if}");
 		exit;
@@ -374,7 +418,7 @@ if ($_GET['act'] == "del") {
 }
 
 $closehead = false;
-$pgtitle = array(gettext("Services"),gettext("DHCPv6 server"));
+$pgtitle = array(gettext("Services"), gettext("DHCPv6 server"));
 $shortcut_section = "dhcp6";
 
 include("head.inc");
@@ -484,7 +528,8 @@ include("head.inc");
 <?php print_info_box_np(gettext("The static mapping configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="dhcpv6 server">
-<tr><td>
+	<tr>
+		<td>
 <?php
 	/* active tabs */
 	$tab_array = array();
@@ -493,26 +538,29 @@ include("head.inc");
 	foreach ($iflist as $ifent => $ifname) {
 		$oc = $config['interfaces'][$ifent];
 		if ((is_array($config['dhcpdv6'][$ifent]) && !isset($config['dhcpdv6'][$ifent]['enable']) && !(is_ipaddrv6($oc['ipaddrv6']) && (!is_linklocal($oc['ipaddrv6'])))) ||
-			(!is_array($config['dhcpdv6'][$ifent]) && !(is_ipaddrv6($oc['ipaddrv6']) && (!is_linklocal($oc['ipaddrv6'])))))
+		    (!is_array($config['dhcpdv6'][$ifent]) && !(is_ipaddrv6($oc['ipaddrv6']) && (!is_linklocal($oc['ipaddrv6']))))) {
 			continue;
-		if ($ifent == $if)
+		}
+		if ($ifent == $if) {
 			$active = true;
-		else
+		} else {
 			$active = false;
+		}
 		$tab_array[] = array($ifname, $active, "services_dhcpv6.php?if={$ifent}");
 		$tabscounter++;
 	}
 	/* tack on PPPoE or PPtP servers here */
 	/* pppoe server */
 	if (is_array($config['pppoes']['pppoe'])) {
-		foreach($config['pppoes']['pppoe'] as $pppoe) {
+		foreach ($config['pppoes']['pppoe'] as $pppoe) {
 			if ($pppoe['mode'] == "server") {
 				$ifent = "poes". $pppoe['pppoeid'];
 				$ifname = strtoupper($ifent);
-				if ($ifent == $if)
+				if ($ifent == $if) {
 					$active = true;
-				else
+				} else {
 					$active = false;
+				}
 				$tab_array[] = array($ifname, $active, "services_dhcpv6.php?if={$ifent}");
 				$tabscounter++;
 			}
@@ -528,390 +576,413 @@ include("head.inc");
 	}
 	display_top_tabs($tab_array);
 ?>
-</td></tr>
-<tr><td class="tabnavtbl">
+		</td>
+	</tr>
+	<tr>
+		<td class="tabnavtbl">
 <?php
-$tab_array = array();
-$tab_array[] = array(gettext("DHCPv6 Server"),         true,  "services_dhcpv6.php?if={$if}");
-$tab_array[] = array(gettext("Router Advertisements"), false, "services_router_advertisements.php?if={$if}");
-display_top_tabs($tab_array);
+	$tab_array = array();
+	$tab_array[] = array(gettext("DHCPv6 Server"),         true,  "services_dhcpv6.php?if={$if}");
+	$tab_array[] = array(gettext("Router Advertisements"), false, "services_router_advertisements.php?if={$if}");
+	display_top_tabs($tab_array);
 ?>
-</td></tr>
-<tr>
-<td>
-	<div id="mainarea">
-		<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
-		<tr>
-			<td width="22%" valign="top" class="vncellreq"><?=gettext("DHCPv6 Server");?></td>
-			<td width="78%" class="vtable">
-				<input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> onclick="enable_change(false);" />
-			<strong><?php printf(gettext("Enable DHCPv6 server on " .
-			"%s " .
-			"interface"),htmlspecialchars($iflist[$if]));?></strong></td>
-			</tr>
-			<?php
-			/* the PPPoE Server could well have no IPv6 address and operate fine with just link-local, just hide these */
-			if(is_ipaddrv6($ifcfgip)) {
-			?>
-			<tr>
-			<td width="22%" valign="top" class="vncellreq"><?=gettext("Subnet");?></td>
-			<td width="78%" class="vtable">
-				<?=gen_subnetv6($ifcfgip, $ifcfgsn);?>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncellreq"><?=gettext("Subnet mask");?></td>
-			<td width="78%" class="vtable">
-				<?=$ifcfgsn;?> bits
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncellreq"><?=gettext("Available range");?></td>
-			<td width="78%" class="vtable">
-			<?php
-				$range_from = gen_subnetv6($ifcfgip, $ifcfgsn);
-				echo $range_from;
-
-			?>
-			-
-			<?php
-				$range_to = gen_subnetv6_max($ifcfgip, $ifcfgsn);
-				echo $range_to;
-			?>
-			</td>
-			</tr>
-			<?php } ?>
-
-			<?php if($is_olsr_enabled): ?>
-			<tr>
-			<td width="22%" valign="top" class="vncellreq"><?=gettext("Subnet Mask");?></td>
-			<td width="78%" class="vtable">
-				<select name="netmask" class="formselect" id="netmask">
-				<?php
-				for ($i = 128; $i > 0; $i--) {
-					if($i <> 127) {
-						echo "<option value=\"{$i}\" ";
-						if ($i == $pconfig['netmask']) echo "selected";
-						echo ">" . $i . "</option>";
-					}
-				}
-				?>
-				</select>
-			</td>
-			</tr>
-			<?php endif; ?>
-			<tr>
-			<td width="22%" valign="top" class="vncellreq"><?=gettext("Range");?></td>
-			<td width="78%" class="vtable">
-				<input name="range_from" type="text" class="formfld unknown" id="range_from" size="28" value="<?=htmlspecialchars($pconfig['range_from']);?>" />
-				&nbsp;<?=gettext("to"); ?>&nbsp; <input name="range_to" type="text" class="formfld unknown" id="range_to" size="28" value="<?=htmlspecialchars($pconfig['range_to']);?>" />
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("Prefix Delegation Range");?></td>
-			<td width="78%" class="vtable">
-				<input name="prefixrange_from" type="text" class="formfld unknown" id="prefixrange_from" size="28" value="<?=htmlspecialchars($pconfig['prefixrange_from']);?>" />
-				&nbsp;<?=gettext("to"); ?>&nbsp; <input name="prefixrange_to" type="text" class="formfld unknown" id="prefixrange_to" size="28" value="<?=htmlspecialchars($pconfig['prefixrange_to']);?>" />
-				&nbsp;<br /><?=gettext("Prefix Delegation Size"); ?>:&nbsp; <select name="prefixrange_length" class="formselect" id="prefixrange_length">
-					<option value="48" <?php if($pconfig['prefixrange_length'] == 48) echo "selected=\"selected\""; ?>>48</option>
-					<option value="52" <?php if($pconfig['prefixrange_length'] == 52) echo "selected=\"selected\""; ?>>52</option>
-					<option value="56" <?php if($pconfig['prefixrange_length'] == 56) echo "selected=\"selected\""; ?>>56</option>
-					<option value="60" <?php if($pconfig['prefixrange_length'] == 60) echo "selected=\"selected\""; ?>>60</option>
-					<option value="62" <?php if($pconfig['prefixrange_length'] == 62) echo "selected=\"selected\""; ?>>62</option>
-					<option value="63" <?php if($pconfig['prefixrange_length'] == 63) echo "selected=\"selected\""; ?>>63</option>
-					<option value="64" <?php if($pconfig['prefixrange_length'] == 64) echo "selected=\"selected\""; ?>>64</option>
-				</select> <br />
-				<?php echo gettext("You can define a Prefix range here for DHCP Prefix Delegation. This allows for 
-					assigning networks to subrouters. The start and end of the range must end on boundaries of the prefix delegation size."); ?>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("DNS servers");?></td>
-			<td width="78%" class="vtable">
-				<input name="dns1" type="text" class="formfld unknown" id="dns1" size="28" value="<?=htmlspecialchars($pconfig['dns1']);?>" /><br />
-				<input name="dns2" type="text" class="formfld unknown" id="dns2" size="28" value="<?=htmlspecialchars($pconfig['dns2']);?>" /><br />
-				<input name="dns3" type="text" class="formfld unknown" id="dns3" size="28" value="<?=htmlspecialchars($pconfig['dns3']);?>" /><br />
-				<input name="dns4" type="text" class="formfld unknown" id="dns4" size="28" value="<?=htmlspecialchars($pconfig['dns4']);?>" /><br />
-				<?=gettext("NOTE: leave blank to use the system default DNS servers - this interface's IP if DNS forwarder is enabled, otherwise the servers configured on the General page.");?>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("Domain name");?></td>
-			<td width="78%" class="vtable">
-				<input name="domain" type="text" class="formfld unknown" id="domain" size="28" value="<?=htmlspecialchars($pconfig['domain']);?>" /><br />
-				 <?=gettext("The default is to use the domain name of this system as the default domain name provided by DHCP. You may specify an alternate domain name here.");?>
-			 </td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("Domain search list");?></td>
-			<td width="78%" class="vtable">
-				<input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="28" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>" /><br />
-				<?=gettext("The DHCP server can optionally provide a domain search list. Use the semicolon character as separator");?>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("Default lease time");?></td>
-			<td width="78%" class="vtable">
-				<input name="deftime" type="text" class="formfld unknown" id="deftime" size="10" value="<?=htmlspecialchars($pconfig['deftime']);?>" />
-				<?=gettext("seconds");?><br />
-				<?=gettext("This is used for clients that do not ask for a specific " .
-				"expiration time."); ?><br />
-				<?=gettext("The default is 7200 seconds.");?>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("Maximum lease time");?></td>
-			<td width="78%" class="vtable">
-				<input name="maxtime" type="text" class="formfld unknown" id="maxtime" size="10" value="<?=htmlspecialchars($pconfig['maxtime']);?>" />
-				<?=gettext("seconds");?><br />
-				<?=gettext("This is the maximum lease time for clients that ask".
-				" for a specific expiration time."); ?><br />
-				<?=gettext("The default is 86400 seconds.");?>
-			</td>
-			</tr>
-			<tr>
-				<td width="22%" valign="top" class="vncell"><?=gettext("Time format change"); ?></td>
-				<td width="78%" class="vtable">
-				<table summary="time format change">
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<div id="mainarea">
+				<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
 					<tr>
-					<td>
-						<input name="dhcpv6leaseinlocaltime" type="checkbox" id="dhcpv6leaseinlocaltime" value="yes" <?php if ($pconfig['dhcpv6leaseinlocaltime']) echo "checked=\"checked\""; ?> />
-					</td>
-					<td>
-						<strong>
-							<?=gettext("Change DHCPv6 display lease time from UTC to local time."); ?>
-						</strong>
-					</td>
+						<td width="22%" valign="top" class="vncellreq"><?=gettext("DHCPv6 Server");?></td>
+						<td width="78%" class="vtable">
+							<input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> onclick="enable_change(false);" />
+							<strong><?php printf(gettext("Enable DHCPv6 server on %s interface"), htmlspecialchars($iflist[$if]));?></strong>
+						</td>
 					</tr>
+<?php
+	/* the PPPoE Server could well have no IPv6 address and operate fine with just link-local, just hide these */
+	if (is_ipaddrv6($ifcfgip)) {
+?>
 					<tr>
-					<td>&nbsp;</td>
-					<td>
-						<span class="red"><strong><?=gettext("Note:");?></strong></span> <?=gettext("By default DHCPv6 leases are displayed in UTC time.  By checking this 
-						box DHCPv6 lease time will be displayed in local time and set to time zone selected.  This will be used for all DHCPv6 interfaces lease time."); ?>
-					
-					</td>
+						<td width="22%" valign="top" class="vncellreq"><?=gettext("Subnet");?></td>
+						<td width="78%" class="vtable">
+							<?=gen_subnetv6($ifcfgip, $ifcfgsn);?>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncellreq"><?=gettext("Subnet mask");?></td>
+						<td width="78%" class="vtable">
+							<?=$ifcfgsn;?> bits
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncellreq"><?=gettext("Available range");?></td>
+						<td width="78%" class="vtable">
+							<?php
+								$range_from = gen_subnetv6($ifcfgip, $ifcfgsn);
+								echo $range_from;
+							?>
+							-
+							<?php
+								$range_to = gen_subnetv6_max($ifcfgip, $ifcfgsn);
+								echo $range_to;
+							?>
+						</td>
+					</tr>
+<?php
+	}
+
+	if ($is_olsr_enabled):
+?>
+					<tr>
+						<td width="22%" valign="top" class="vncellreq"><?=gettext("Subnet Mask");?></td>
+						<td width="78%" class="vtable">
+							<select name="netmask" class="formselect" id="netmask">
+								<?php
+									for ($i = 128; $i > 0; $i--) {
+										if ($i <> 127) {
+											echo "<option value=\"{$i}\" ";
+											if ($i == $pconfig['netmask']) {
+												echo "selected";
+											}
+											echo ">" . $i . "</option>";
+										}
+									}
+								?>
+							</select>
+						</td>
+					</tr>
+<?php
+	endif;
+?>
+					<tr>
+						<td width="22%" valign="top" class="vncellreq"><?=gettext("Range");?></td>
+						<td width="78%" class="vtable">
+							<input name="range_from" type="text" class="formfld unknown" id="range_from" size="28" value="<?=htmlspecialchars($pconfig['range_from']);?>" />
+							&nbsp;<?=gettext("to"); ?>&nbsp; <input name="range_to" type="text" class="formfld unknown" id="range_to" size="28" value="<?=htmlspecialchars($pconfig['range_to']);?>" />
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncell"><?=gettext("Prefix Delegation Range");?></td>
+						<td width="78%" class="vtable">
+							<input name="prefixrange_from" type="text" class="formfld unknown" id="prefixrange_from" size="28" value="<?=htmlspecialchars($pconfig['prefixrange_from']);?>" />
+							&nbsp;<?=gettext("to"); ?>&nbsp; <input name="prefixrange_to" type="text" class="formfld unknown" id="prefixrange_to" size="28" value="<?=htmlspecialchars($pconfig['prefixrange_to']);?>" />
+							&nbsp;<br /><?=gettext("Prefix Delegation Size"); ?>:&nbsp;
+							<select name="prefixrange_length" class="formselect" id="prefixrange_length">
+								<option value="48" <?php if ($pconfig['prefixrange_length'] == 48) echo "selected=\"selected\""; ?>>48</option>
+								<option value="52" <?php if ($pconfig['prefixrange_length'] == 52) echo "selected=\"selected\""; ?>>52</option>
+								<option value="56" <?php if ($pconfig['prefixrange_length'] == 56) echo "selected=\"selected\""; ?>>56</option>
+								<option value="60" <?php if ($pconfig['prefixrange_length'] == 60) echo "selected=\"selected\""; ?>>60</option>
+								<option value="62" <?php if ($pconfig['prefixrange_length'] == 62) echo "selected=\"selected\""; ?>>62</option>
+								<option value="63" <?php if ($pconfig['prefixrange_length'] == 63) echo "selected=\"selected\""; ?>>63</option>
+								<option value="64" <?php if ($pconfig['prefixrange_length'] == 64) echo "selected=\"selected\""; ?>>64</option>
+							</select> <br />
+							<?php echo gettext("You can define a Prefix range here for DHCP Prefix Delegation. This allows for
+								assigning networks to subrouters. The start and end of the range must end on boundaries of the prefix delegation size."); ?>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncell"><?=gettext("DNS servers");?></td>
+						<td width="78%" class="vtable">
+							<input name="dns1" type="text" class="formfld unknown" id="dns1" size="28" value="<?=htmlspecialchars($pconfig['dns1']);?>" /><br />
+							<input name="dns2" type="text" class="formfld unknown" id="dns2" size="28" value="<?=htmlspecialchars($pconfig['dns2']);?>" /><br />
+							<input name="dns3" type="text" class="formfld unknown" id="dns3" size="28" value="<?=htmlspecialchars($pconfig['dns3']);?>" /><br />
+							<input name="dns4" type="text" class="formfld unknown" id="dns4" size="28" value="<?=htmlspecialchars($pconfig['dns4']);?>" /><br />
+							<?=gettext("NOTE: leave blank to use the system default DNS servers - this interface's IP if DNS forwarder is enabled, otherwise the servers configured on the General page.");?>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncell"><?=gettext("Domain name");?></td>
+						<td width="78%" class="vtable">
+							<input name="domain" type="text" class="formfld unknown" id="domain" size="28" value="<?=htmlspecialchars($pconfig['domain']);?>" /><br />
+							<?=gettext("The default is to use the domain name of this system as the default domain name provided by DHCP. You may specify an alternate domain name here.");?>
+						 </td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncell"><?=gettext("Domain search list");?></td>
+						<td width="78%" class="vtable">
+							<input name="domainsearchlist" type="text" class="formfld unknown" id="domainsearchlist" size="28" value="<?=htmlspecialchars($pconfig['domainsearchlist']);?>" /><br />
+							<?=gettext("The DHCP server can optionally provide a domain search list. Use the semicolon character as separator");?>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncell"><?=gettext("Default lease time");?></td>
+						<td width="78%" class="vtable">
+							<input name="deftime" type="text" class="formfld unknown" id="deftime" size="10" value="<?=htmlspecialchars($pconfig['deftime']);?>" />
+							<?=gettext("seconds");?><br />
+							<?=gettext("This is used for clients that do not ask for a specific expiration time."); ?><br />
+							<?=gettext("The default is 7200 seconds.");?>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncell"><?=gettext("Maximum lease time");?></td>
+						<td width="78%" class="vtable">
+							<input name="maxtime" type="text" class="formfld unknown" id="maxtime" size="10" value="<?=htmlspecialchars($pconfig['maxtime']);?>" />
+							<?=gettext("seconds");?><br />
+							<?=gettext("This is the maximum lease time for clients that ask for a specific expiration time."); ?><br />
+							<?=gettext("The default is 86400 seconds.");?>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncell"><?=gettext("Time format change"); ?></td>
+						<td width="78%" class="vtable">
+							<table summary="time format change">
+								<tr>
+									<td>
+										<input name="dhcpv6leaseinlocaltime" type="checkbox" id="dhcpv6leaseinlocaltime" value="yes" <?php if ($pconfig['dhcpv6leaseinlocaltime']) echo "checked=\"checked\""; ?> />
+									</td>
+									<td>
+										<strong>
+											<?=gettext("Change DHCPv6 display lease time from UTC to local time."); ?>
+										</strong>
+									</td>
+								</tr>
+								<tr>
+									<td>&nbsp;</td>
+									<td>
+										<span class="red">
+											<strong><?=gettext("Note:");?></strong>
+										</span>
+										<?=gettext("By default DHCPv6 leases are displayed in UTC time.  By checking this box DHCPv6 lease time will be displayed in local time and set to time zone selected.  This will be used for all DHCPv6 interfaces lease time."); ?>
+									</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncell"><?=gettext("Dynamic DNS");?></td>
+						<td width="78%" class="vtable">
+							<div id="showddnsbox">
+								<input type="button" onclick="show_ddns_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Dynamic DNS");?>
+							</div>
+							<div id="showddns" style="display:none">
+								<input style="vertical-align:middle" type="checkbox" value="yes" name="ddnsupdate" id="ddnsupdate" <?php if ($pconfig['ddnsupdate']) echo " checked=\"checked\""; ?> />&nbsp;
+								<b><?=gettext("Enable registration of DHCP client names in DNS.");?></b><br />
+								<p>
+									<input name="ddnsdomain" type="text" class="formfld unknown" id="ddnsdomain" size="28" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>" /><br />
+									<?=gettext("Note: Leave blank to disable dynamic DNS registration.");?><br />
+									<?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server.");?><br />
+									<input name="ddnsdomainprimary" type="text" class="formfld unknown" id="ddnsdomainprimary" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainprimary']);?>" /><br />
+									<?=gettext("Enter the primary domain name server IP address for the dynamic domain name.");?><br />
+									<input name="ddnsdomainkeyname" type="text" class="formfld unknown" id="ddnsdomainkeyname" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkeyname']);?>" /><br />
+									<?=gettext("Enter the dynamic DNS domain key name which will be used to register client names in the DNS server.");?><br />
+									<input name="ddnsdomainkey" type="text" class="formfld unknown" id="ddnsdomainkey" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkey']);?>" /><br />
+									<?=gettext("Enter the dynamic DNS domain key secret which will be used to register client names in the DNS server.");?>
+								</p>
+							</div>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncell"><?=gettext("NTP servers");?></td>
+						<td width="78%" class="vtable">
+							<div id="showntpbox">
+								<input type="button" onclick="show_ntp_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show NTP configuration");?>
+							</div>
+							<div id="showntp" style="display:none">
+								<input name="ntp1" type="text" class="formfld unknown" id="ntp1" size="28" value="<?=htmlspecialchars($pconfig['ntp1']);?>" /><br />
+								<input name="ntp2" type="text" class="formfld unknown" id="ntp2" size="28" value="<?=htmlspecialchars($pconfig['ntp2']);?>" />
+							</div>
+						</td>
+					</tr>
+					<!-- ISC dhcpd does not support tftp for ipv6 yet. See redmine #2016
+					<tr>
+						<td width="22%" valign="top" class="vncell"><?=gettext("TFTP server");?></td>
+						<td width="78%" class="vtable">
+							<div id="showtftpbox">
+								<input type="button" onclick="show_tftp_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show TFTP configuration");?>
+							</div>
+							<div id="showtftp" style="display:none">
+								<input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>" /><br />
+								<?=gettext("Leave blank to disable.  Enter a full hostname or IP for the TFTP server.");?>
+							</div>
+						</td>
+					</tr>
+					-->
+					<tr>
+						<td width="22%" valign="top" class="vncell"><?=gettext("LDAP URI");?></td>
+						<td width="78%" class="vtable">
+							<div id="showldapbox">
+								<input type="button" onclick="show_ldap_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show LDAP configuration");?>
+							</div>
+							<div id="showldap" style="display:none">
+								<input name="ldap" type="text" class="formfld unknown" id="ldap" size="80" value="<?=htmlspecialchars($pconfig['ldap']);?>" /><br />
+								<?=gettext("Leave blank to disable.  Enter a full URI for the LDAP server in the form ldap://ldap.example.com/dc=example,dc=com");?>
+							</div>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncell"><?=gettext("Enable network booting");?></td>
+						<td width="78%" class="vtable">
+							<div id="shownetbootbox">
+								<input type="button" onclick="show_netboot_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Network booting");?>
+							</div>
+							<div id="shownetboot" style="display:none">
+								<input style="vertical-align:middle" type="checkbox" value="yes" name="netboot" id="netboot" <?php if ($pconfig['netboot']) echo " checked=\"checked\""; ?> />&nbsp;
+								<b><?=gettext("Enables network booting.");?></b>
+								<br/>
+								<?=gettext("Enter the Bootfile URL");?>
+								<input name="bootfile_url" type="text" class="formfld unknown" id="bootfile_url" size="28" value="<?=htmlspecialchars($pconfig['bootfile_url']);?>" />
+							</div>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncell"><?=gettext("Additional BOOTP/DHCP Options");?></td>
+						<td width="78%" class="vtable">
+							<div id="shownumbervaluebox">
+								<input type="button" onclick="show_shownumbervalue()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Additional BOOTP/DHCP Options");?>
+							</div>
+							<div id="shownumbervalue" style="display:none">
+								<table id="maintable" summary="bootp-dhcp options">
+								<tbody>
+									<tr>
+										<td colspan="3">
+											<div style="padding:5px; margin-top: 16px; margin-bottom: 16px; border:1px dashed #000066; background-color: #ffffff; color: #000000; font-size: 8pt;" id="itemhelp">
+												<?=gettext("Enter the DHCP option number and the value for each item you would like to include in the DHCP lease information.  For a list of available options please visit this"); ?> <a href="http://www.iana.org/assignments/bootp-dhcp-parameters/" target="_blank"><?=gettext("URL"); ?></a>
+											</div>
+										</td>
+									</tr>
+									<tr>
+										<td><div id="onecolumn"><?=gettext("Number");?></div></td>
+										<td><div id="twocolumn"><?=gettext("Value");?></div></td>
+									</tr>
+<?php
+	$counter = 0;
+	if ($pconfig['numberoptions']):
+		foreach ($pconfig['numberoptions']['item'] as $item):
+			$number = $item['number'];
+			$value = $item['value'];
+?>
+									<tr>
+										<td>
+											<input autocomplete="off" name="number<?php echo $counter; ?>" type="text" class="formfld" id="number<?php echo $counter; ?>" size="10" value="<?=htmlspecialchars($number);?>" />
+										</td>
+										<td>
+											<input autocomplete="off" name="value<?php echo $counter; ?>" type="text" class="formfld" id="value<?php echo $counter; ?>" size="55" value="<?=htmlspecialchars($value);?>" />
+										</td>
+										<td>
+											<input type="image" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" onclick="removeRow(this); return false;" value="<?=gettext("Delete");?>" />
+										</td>
+									</tr>
+<?php
+			$counter++;
+		endforeach;
+	endif;
+?>
+								</tbody>
+								</table>
+								<a onclick="javascript:addRowTo('maintable', 'formfldalias'); return false;" href="#">
+									<img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="<?=gettext("add another entry");?>" />
+								</a>
+								<script type="text/javascript">
+								//<![CDATA[
+									field_counter_js = 2;
+									rows = 1;
+									totalrows = <?php echo $counter; ?>;
+									loaded = <?php echo $counter; ?>;
+								//]]>
+								</script>
+							</div>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top">&nbsp;</td>
+						<td width="78%">
+							<input name="if" type="hidden" value="<?=$if;?>" />
+							<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change(true)" />
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top">&nbsp;</td>
+						<td width="78%">
+							<p>
+								<span class="vexpl">
+									<span class="red">
+										<strong>
+											<?=gettext("Note:");?><br />
+										</strong>
+									</span>
+									<?=gettext("The DNS servers entered in"); ?> <a href="system.php"><?=gettext("System: General setup"); ?></a>\
+									<?=gettext("(or the"); ?> <a href="services_dnsmasq.php"><?=gettext("DNS forwarder"); ?></a>, <?=gettext("if enabled)"); ?>
+								</span>
+								<span class="vexpl">
+									<?=gettext("will be assigned to clients by the DHCP server."); ?><br />
+									<br />
+									<?=gettext("The DHCP lease table can be viewed on the"); ?> <a href="status_dhcpv6_leases.php"><?=gettext("Status: DHCPv6 leases"); ?></a> <?=gettext("page."); ?><br />
+								</span>
+							</p>
+						</td>
 					</tr>
 				</table>
-				</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("Dynamic DNS");?></td>
-			<td width="78%" class="vtable">
-				<div id="showddnsbox">
-					<input type="button" onclick="show_ddns_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Dynamic DNS");?>
-				</div>
-				<div id="showddns" style="display:none">
-					<input style="vertical-align:middle" type="checkbox" value="yes" name="ddnsupdate" id="ddnsupdate" <?php if($pconfig['ddnsupdate']) echo " checked=\"checked\""; ?> />&nbsp;
-					<b><?=gettext("Enable registration of DHCP client names in DNS.");?></b><br />
-					<p>
-					<input name="ddnsdomain" type="text" class="formfld unknown" id="ddnsdomain" size="28" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>" /><br />
-					<?=gettext("Note: Leave blank to disable dynamic DNS registration.");?><br />
-					<?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server.");?><br />
-					<input name="ddnsdomainprimary" type="text" class="formfld unknown" id="ddnsdomainprimary" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainprimary']);?>" /><br />
-					<?=gettext("Enter the primary domain name server IP address for the dynamic domain name.");?><br />
-					<input name="ddnsdomainkeyname" type="text" class="formfld unknown" id="ddnsdomainkeyname" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkeyname']);?>" /><br />
-					<?=gettext("Enter the dynamic DNS domain key name which will be used to register client names in the DNS server.");?><br />
-					<input name="ddnsdomainkey" type="text" class="formfld unknown" id="ddnsdomainkey" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomainkey']);?>" /><br />
-					<?=gettext("Enter the dynamic DNS domain key secret which will be used to register client names in the DNS server.");?>
-					</p>
-				</div>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("NTP servers");?></td>
-			<td width="78%" class="vtable">
-				<div id="showntpbox">
-					<input type="button" onclick="show_ntp_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show NTP configuration");?>
-				</div>
-				<div id="showntp" style="display:none">
-					<input name="ntp1" type="text" class="formfld unknown" id="ntp1" size="28" value="<?=htmlspecialchars($pconfig['ntp1']);?>" /><br />
-					<input name="ntp2" type="text" class="formfld unknown" id="ntp2" size="28" value="<?=htmlspecialchars($pconfig['ntp2']);?>" />
-				</div>
-			</td>
-			</tr>
-			<!-- ISC dhcpd does not support tftp for ipv6 yet. See redmine #2016
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("TFTP server");?></td>
-			<td width="78%" class="vtable">
-			<div id="showtftpbox">
-				<input type="button" onclick="show_tftp_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show TFTP configuration");?>
-			</div>
-			<div id="showtftp" style="display:none">
-				<input name="tftp" type="text" class="formfld unknown" id="tftp" size="50" value="<?=htmlspecialchars($pconfig['tftp']);?>" /><br />
-				<?=gettext("Leave blank to disable.  Enter a full hostname or IP for the TFTP server.");?>
-			</div>
-			</td>
-			</tr>
-			-->
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("LDAP URI");?></td>
-			<td width="78%" class="vtable">
-				<div id="showldapbox">
-					<input type="button" onclick="show_ldap_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show LDAP configuration");?>
-				</div>
-				<div id="showldap" style="display:none">
-					<input name="ldap" type="text" class="formfld unknown" id="ldap" size="80" value="<?=htmlspecialchars($pconfig['ldap']);?>" /><br />
-					<?=gettext("Leave blank to disable.  Enter a full URI for the LDAP server in the form ldap://ldap.example.com/dc=example,dc=com");?>
-				</div>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("Enable network booting");?></td>
-			<td width="78%" class="vtable">
-				<div id="shownetbootbox">
-					<input type="button" onclick="show_netboot_config()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Network booting");?>
-				</div>
-				<div id="shownetboot" style="display:none">
-					<input style="vertical-align:middle" type="checkbox" value="yes" name="netboot" id="netboot" <?php if($pconfig['netboot']) echo " checked=\"checked\""; ?> />&nbsp;
-					<b><?=gettext("Enables network booting.");?></b>
-					<br/>
-					<?=gettext("Enter the Bootfile URL");?>
-					<input name="bootfile_url" type="text" class="formfld unknown" id="bootfile_url" size="28" value="<?=htmlspecialchars($pconfig['bootfile_url']);?>" />
-				</div>
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top" class="vncell"><?=gettext("Additional BOOTP/DHCP Options");?></td>
-			<td width="78%" class="vtable">
-				<div id="shownumbervaluebox">
-					<input type="button" onclick="show_shownumbervalue()" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show Additional BOOTP/DHCP Options");?>
-				</div>
-				<div id="shownumbervalue" style="display:none">
-				<table id="maintable" summary="bootp-dhcp options">
-				<tbody>
-				<tr>
-				<td colspan="3">
-					<div style="padding:5px; margin-top: 16px; margin-bottom: 16px; border:1px dashed #000066; background-color: #ffffff; color: #000000; font-size: 8pt;" id="itemhelp">
-					<?=gettext("Enter the DHCP option number and the value for each item you would like to include in the DHCP lease information.  For a list of available options please visit this"); ?> <a href="http://www.iana.org/assignments/bootp-dhcp-parameters/" target="_blank"><?=gettext("URL"); ?></a>
-					</div>
-				</td>
-				</tr>
-				<tr>
-				<td><div id="onecolumn"><?=gettext("Number");?></div></td>
-				<td><div id="twocolumn"><?=gettext("Value");?></div></td>
-				</tr>
-				<?php $counter = 0; ?>
-				<?php
-					if($pconfig['numberoptions'])
-						foreach($pconfig['numberoptions']['item'] as $item):
-				?>
-					<?php
-						$number = $item['number'];
-						$value = $item['value'];
-					?>
-				<tr>
-				<td>
-					<input autocomplete="off" name="number<?php echo $counter; ?>" type="text" class="formfld" id="number<?php echo $counter; ?>" size="10" value="<?=htmlspecialchars($number);?>" />
-				</td>
-				<td>
-					<input autocomplete="off" name="value<?php echo $counter; ?>" type="text" class="formfld" id="value<?php echo $counter; ?>" size="55" value="<?=htmlspecialchars($value);?>" />
-				</td>
-				<td>
-					<input type="image" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" onclick="removeRow(this); return false;" value="<?=gettext("Delete");?>" />
-				</td>
-				</tr>
-				<?php $counter++; ?>
-				<?php endforeach; ?>
-				</tbody>
+				<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="static mappings">
+					<tr>
+						<td colspan="4" valign="top" class="listtopic"><?=gettext("DHCPv6 Static Mappings for this interface.");?></td>
+						<td>&nbsp;</td>
+					</tr>
+					<tr>
+						<td width="25%" class="listhdrr"><?=gettext("DUID");?></td>
+						<td width="15%" class="listhdrr"><?=gettext("IPv6 address");?></td>
+						<td width="20%" class="listhdrr"><?=gettext("Hostname");?></td>
+						<td width="30%" class="listhdr"><?=gettext("Description");?></td>
+						<td width="10%" class="list">
+							<table border="0" cellspacing="0" cellpadding="1" summary="add">
+								<tr>
+									<td valign="middle" width="17"></td>
+									<td valign="middle">
+										<a href="services_dhcpv6_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a>
+									</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+<?php
+	if (is_array($a_maps)):
+		$i = 0;
+		foreach ($a_maps as $mapent):
+			if ($mapent['duid'] <> "" or $mapent['ipaddrv6'] <> ""):
+?>
+					<tr>
+						<td class="listlr" ondblclick="document.location='services_dhcpv6_edit.php?if=<?=$if;?>&amp;id=<?=$i;?>';">
+							<?=htmlspecialchars($mapent['duid']);?>
+						</td>
+						<td class="listr" ondblclick="document.location='services_dhcpv6_edit.php?if=<?=$if;?>&amp;id=<?=$i;?>';">
+							<?=htmlspecialchars($mapent['ipaddrv6']);?>&nbsp;
+						</td>
+						<td class="listr" ondblclick="document.location='services_dhcpv6_edit.php?if=<?=$if;?>&amp;id=<?=$i;?>';">
+							<?=htmlspecialchars($mapent['hostname']);?>&nbsp;
+						</td>
+						<td class="listbg" ondblclick="document.location='services_dhcpv6_edit.php?if=<?=$if;?>&amp;id=<?=$i;?>';">
+							<?=htmlspecialchars($mapent['descr']);?>&nbsp;
+						</td>
+						<td valign="middle" class="list nowrap">
+							<table border="0" cellspacing="0" cellpadding="1" summary="icons">
+								<tr>
+									<td valign="middle"><a href="services_dhcpv6_edit.php?if=<?=$if;?>&amp;id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a></td>
+									<td valign="middle"><a href="services_dhcpv6.php?if=<?=$if;?>&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this mapping?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+<?php
+			endif;
+			$i++;
+		endforeach;
+	endif;
+?>
+					<tr>
+						<td class="list" colspan="4"></td>
+						<td class="list">
+							<table border="0" cellspacing="0" cellpadding="1" summary="add">
+								<tr>
+									<td valign="middle" width="17"></td>
+									<td valign="middle"><a href="services_dhcpv6_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
 				</table>
-				<a onclick="javascript:addRowTo('maintable', 'formfldalias'); return false;" href="#">
-					<img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="<?=gettext("add another entry");?>" />
-				</a>
-				<script type="text/javascript">
-				//<![CDATA[
-					field_counter_js = 2;
-					rows = 1;
-					totalrows = <?php echo $counter; ?>;
-					loaded = <?php echo $counter; ?>;
-				//]]>
-				</script>
-				</div>
-
-				</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top">&nbsp;</td>
-			<td width="78%">
-				<input name="if" type="hidden" value="<?=$if;?>" />
-				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change(true)" />
-			</td>
-			</tr>
-			<tr>
-			<td width="22%" valign="top">&nbsp;</td>
-			<td width="78%"> <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br />
-				</strong></span><?=gettext("The DNS servers entered in"); ?> <a href="system.php"><?=gettext("System: " .
-				"General setup"); ?></a> <?=gettext("(or the"); ?> <a href="services_dnsmasq.php"><?=gettext("DNS " .
-				"forwarder"); ?></a>, <?=gettext("if enabled)"); ?> </span><span class="vexpl"><?=gettext("will " .
-				"be assigned to clients by the DHCP server."); ?><br />
-				<br />
-				<?=gettext("The DHCP lease table can be viewed on the"); ?> <a href="status_dhcpv6_leases.php"><?=gettext("Status: " .
-				"DHCPv6 leases"); ?></a> <?=gettext("page."); ?><br />
-				</span></p>
-			</td>
-			</tr>
-		</table>
-		<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="static mappings">
-		<tr>
-			<td colspan="4" valign="top" class="listtopic"><?=gettext("DHCPv6 Static Mappings for this interface.");?></td>
-			<td>&nbsp;</td>
-		</tr>
-		<tr>
-			<td width="25%" class="listhdrr"><?=gettext("DUID");?></td>
-			<td width="15%" class="listhdrr"><?=gettext("IPv6 address");?></td>
-			<td width="20%" class="listhdrr"><?=gettext("Hostname");?></td>
-			<td width="30%" class="listhdr"><?=gettext("Description");?></td>
-			<td width="10%" class="list">
-			<table border="0" cellspacing="0" cellpadding="1" summary="add">
-			<tr>
-			<td valign="middle" width="17"></td>
-			<td valign="middle"><a href="services_dhcpv6_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
-			</tr>
-			</table>
-			</td>
-		</tr>
-			<?php if(is_array($a_maps)): ?>
-			<?php $i = 0; foreach ($a_maps as $mapent): ?>
-			<?php if($mapent['duid'] <> "" or $mapent['ipaddrv6'] <> ""): ?>
-		<tr>
-		<td class="listlr" ondblclick="document.location='services_dhcpv6_edit.php?if=<?=$if;?>&amp;id=<?=$i;?>';">
-			<?=htmlspecialchars($mapent['duid']);?>
-		</td>
-		<td class="listr" ondblclick="document.location='services_dhcpv6_edit.php?if=<?=$if;?>&amp;id=<?=$i;?>';">
-			<?=htmlspecialchars($mapent['ipaddrv6']);?>&nbsp;
-		</td>
-		<td class="listr" ondblclick="document.location='services_dhcpv6_edit.php?if=<?=$if;?>&amp;id=<?=$i;?>';">
-			<?=htmlspecialchars($mapent['hostname']);?>&nbsp;
-		</td>
-		<td class="listbg" ondblclick="document.location='services_dhcpv6_edit.php?if=<?=$if;?>&amp;id=<?=$i;?>';">
-			<?=htmlspecialchars($mapent['descr']);?>&nbsp;
-		</td>
-		<td valign="middle" class="list nowrap">
-			<table border="0" cellspacing="0" cellpadding="1" summary="icons">
-			<tr>
-			<td valign="middle"><a href="services_dhcpv6_edit.php?if=<?=$if;?>&amp;id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a></td>
-			<td valign="middle"><a href="services_dhcpv6.php?if=<?=$if;?>&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this mapping?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td>
-			</tr>
-			</table>
-		</td>
-		</tr>
-		<?php endif; ?>
-		<?php $i++; endforeach; ?>
-		<?php endif; ?>
-		<tr>
-		<td class="list" colspan="4"></td>
-		<td class="list">
-			<table border="0" cellspacing="0" cellpadding="1" summary="add">
-			<tr>
-			<td valign="middle" width="17"></td>
-			<td valign="middle"><a href="services_dhcpv6_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
-			</tr>
-			</table>
+			</div>
 		</td>
-		</tr>
-		</table>
-	</div>
-</td>
-</tr>
+	</tr>
 </table>
 </form>
 <script type="text/javascript">
diff --git a/usr/local/www/services_dhcpv6_edit.php b/usr/local/www/services_dhcpv6_edit.php
index 76993e6..aea880d 100644
--- a/usr/local/www/services_dhcpv6_edit.php
+++ b/usr/local/www/services_dhcpv6_edit.php
@@ -1,24 +1,24 @@
-<?php 
+<?php
 /* $Id$ */
 /*
 	services_dhcpv6_edit.php
 	part of m0n0wall (http://m0n0.ch/wall)
-	
+
 	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
 	Copyright (C) 2011 Seth Mos <seth.mos@dds.nl>.
 	Copyright (C) 2013-2015 Electric Sheep Fencing, LP
 	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
@@ -43,20 +43,20 @@
 ##|-PRIV
 
 function staticmapcmp($a, $b) {
-        return ipcmp($a['ipaddrv6'], $b['ipaddrv6']);
+	return ipcmp($a['ipaddrv6'], $b['ipaddrv6']);
 }
 
 function staticmaps_sort($ifgui) {
-        global $g, $config;
+	global $g, $config;
 
-        usort($config['dhcpdv6'][$ifgui]['staticmap'], "staticmapcmp");
+	usort($config['dhcpdv6'][$ifgui]['staticmap'], "staticmapcmp");
 }
 
 require_once('globals.inc');
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dhcpv6.php');
 
-if(!$g['services_dhcp_server_enable']) {
+if (!$g['services_dhcp_server_enable']) {
 	header("Location: /");
 	exit;
 }
@@ -64,45 +64,51 @@ if(!$g['services_dhcp_server_enable']) {
 require("guiconfig.inc");
 
 $if = $_GET['if'];
-if ($_POST['if'])
+if ($_POST['if']) {
 	$if = $_POST['if'];
-	
+}
+
 if (!$if) {
 	header("Location: services_dhcpv6.php");
 	exit;
 }
 
-if (!is_array($config['dhcpdv6']))
+if (!is_array($config['dhcpdv6'])) {
 	$config['dhcpdv6'] = array();
-if (!is_array($config['dhcpdv6'][$if]))
+}
+if (!is_array($config['dhcpdv6'][$if])) {
 	$config['dhcpdv6'][$if] = array();
-if (!is_array($config['dhcpdv6'][$if]['staticmap']))
+}
+if (!is_array($config['dhcpdv6'][$if]['staticmap'])) {
 	$config['dhcpdv6'][$if]['staticmap'] = array();
+}
 
-$netboot_enabled=isset($config['dhcpdv6'][$if]['netboot']);
+$netboot_enabled = isset($config['dhcpdv6'][$if]['netboot']);
 $a_maps = &$config['dhcpdv6'][$if]['staticmap'];
 $ifcfgipv6 = get_interface_ipv6($if);
 $ifcfgsnv6 = get_interface_subnetv6($if);
 $ifcfgdescr = convert_friendly_interface_to_friendly_descr($if);
 
-if (is_numericint($_GET['id']))
+if (is_numericint($_GET['id'])) {
 	$id = $_GET['id'];
-if (isset($_POST['id']) && is_numericint($_POST['id']))
+}
+if (isset($_POST['id']) && is_numericint($_POST['id'])) {
 	$id = $_POST['id'];
+}
 
 if (isset($id) && $a_maps[$id]) {
-        $pconfig['duid'] = $a_maps[$id]['duid'];
+	$pconfig['duid'] = $a_maps[$id]['duid'];
 	$pconfig['hostname'] = $a_maps[$id]['hostname'];
-        $pconfig['ipaddrv6'] = $a_maps[$id]['ipaddrv6'];
+	$pconfig['ipaddrv6'] = $a_maps[$id]['ipaddrv6'];
 	$pconfig['filename'] = $a_maps[$id]['filename'];
-		$pconfig['rootpath'] = $a_maps[$id]['rootpath'];
-        $pconfig['descr'] = $a_maps[$id]['descr'];
+	$pconfig['rootpath'] = $a_maps[$id]['rootpath'];
+	$pconfig['descr'] = $a_maps[$id]['descr'];
 } else {
-        $pconfig['duid'] = $_GET['duid'];
+	$pconfig['duid'] = $_GET['duid'];
 	$pconfig['hostname'] = $_GET['hostname'];
 	$pconfig['filename'] = $_GET['filename'];
-		$pconfig['rootpath'] = $a_maps[$id]['rootpath'];
-        $pconfig['descr'] = $_GET['descr'];
+	$pconfig['rootpath'] = $a_maps[$id]['rootpath'];
+	$pconfig['descr'] = $_GET['descr'];
 }
 
 if ($_POST) {
@@ -113,13 +119,14 @@ if ($_POST) {
 	/* input validation */
 	$reqdfields = explode(" ", "duid");
 	$reqdfieldsn = array(gettext("DUID"));
-	
+
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
 	if ($_POST['hostname']) {
 		preg_match("/\-\$/", $_POST['hostname'], $matches);
-		if($matches)
-			$input_errors[] = gettext("The hostname cannot end with a hyphen according to RFC952");		
+		if ($matches) {
+			$input_errors[] = gettext("The hostname cannot end with a hyphen according to RFC952");
+		}
 		if (!is_hostname($_POST['hostname'])) {
 			$input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'.");
 		} else {
@@ -134,18 +141,19 @@ if ($_POST) {
 	if (empty($_POST['duid'])) {
 		$input_errors[] = gettext("A valid DUID must be specified.");
 	}
-	
+
 	/* check for overlaps */
 	foreach ($a_maps as $mapent) {
-		if (isset($id) && ($a_maps[$id]) && ($a_maps[$id] === $mapent))
+		if (isset($id) && ($a_maps[$id]) && ($a_maps[$id] === $mapent)) {
 			continue;
+		}
 
 		if ((($mapent['hostname'] == $_POST['hostname']) && $mapent['hostname'])  || ($mapent['duid'] == $_POST['duid'])) {
 			$input_errors[] = gettext("This Hostname, IP or DUID already exists.");
 			break;
 		}
 	}
-		
+
 	/* make sure it's not within the dynamic subnet */
 	if ($_POST['ipaddrv6']) {
 		/* oh boy, we need to be able to somehow do this at some point. skip */
@@ -160,20 +168,23 @@ if ($_POST) {
 		$mapent['filename'] = $_POST['filename'];
 		$mapent['rootpath'] = $_POST['rootpath'];
 
-		if (isset($id) && $a_maps[$id])
+		if (isset($id) && $a_maps[$id]) {
 			$a_maps[$id] = $mapent;
-		else
+		} else {
 			$a_maps[] = $mapent;
+		}
 		staticmaps_sort($if);
-		
+
 		write_config();
 
-		if(isset($config['dhcpdv6'][$if]['enable'])) {
+		if (isset($config['dhcpdv6'][$if]['enable'])) {
 			mark_subsystem_dirty('staticmaps');
-			if (isset($config['dnsmasq']['enable']) && isset($config['dnsmasq']['regdhcpstatic']))
+			if (isset($config['dnsmasq']['enable']) && isset($config['dnsmasq']['regdhcpstatic'])) {
 				mark_subsystem_dirty('hosts');
-			if (isset($config['unbound']['enable']) && isset($config['unbound']['regdhcpstatic']))
+			}
+			if (isset($config['unbound']['enable']) && isset($config['unbound']['regdhcpstatic'])) {
 				mark_subsystem_dirty('unbound');
+			}
 
 		}
 
@@ -182,7 +193,7 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = array(gettext("Services"),gettext("DHCPv6"),gettext("Edit static mapping"));
+$pgtitle = array(gettext("Services"), gettext("DHCPv6"), gettext("Edit static mapping"));
 $shortcut_section = "dhcp6";
 
 include("head.inc");
@@ -192,69 +203,77 @@ include("head.inc");
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
-            <form action="services_dhcpv6_edit.php" method="post" name="iform" id="iform">
-              <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="static mapping">
-				<tr>
-					<td colspan="2" valign="top" class="listtopic"><?=gettext("Static DHCPv6 Mapping");?></td>
-				</tr>	
-                <tr> 
-                  <td width="22%" valign="top" class="vncellreq"><?=gettext("DUID");?></td>
-                  <td width="78%" class="vtable"> 
-                    <input name="duid" type="text" class="formfld unknown" id="duid" size="40" value="<?=htmlspecialchars($pconfig['duid']);?>" />
-                    <br />
-                    <span class="vexpl"><?=gettext("Enter a DUID in the following format: ");?><br />
+<form action="services_dhcpv6_edit.php" method="post" name="iform" id="iform">
+	<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="static mapping">
+		<tr>
+			<td colspan="2" valign="top" class="listtopic"><?=gettext("Static DHCPv6 Mapping");?></td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncellreq"><?=gettext("DUID");?></td>
+			<td width="78%" class="vtable">
+				<input name="duid" type="text" class="formfld unknown" id="duid" size="40" value="<?=htmlspecialchars($pconfig['duid']);?>" />
+				<br />
+				<span class="vexpl"><?=gettext("Enter a DUID in the following format: ");?><br />
 "DUID-LLT - ETH -- TIME --- ---- address ----" <br />
-"xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx"</span></td>
-                </tr>
-                <tr>
-                  <td width="22%" valign="top" class="vncell"><?=gettext("IPv6 address");?></td>
-                  <td width="78%" class="vtable"> 
-                    <input name="ipaddrv6" type="text" class="formfld unknown" id="ipaddrv6" size="28" value="<?=htmlspecialchars($pconfig['ipaddrv6']);?>" />
-                    <br />
-			<?=gettext("If an IPv6 address is entered, the address must be outside of the pool.");?>
-			<br />
-			<?=gettext("If no IPv6 address is given, one will be dynamically allocated from the pool.");?>
+"xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx"</span>
 			</td>
-                </tr>
-                <tr> 
-                  <td width="22%" valign="top" class="vncell"><?=gettext("Hostname");?></td>
-                  <td width="78%" class="vtable"> 
-                    <input name="hostname" type="text" class="formfld unknown" id="hostname" size="28" value="<?=htmlspecialchars($pconfig['hostname']);?>" />
-                    <br /> <span class="vexpl"><?=gettext("Name of the host, without domain part.");?></span></td>
-                </tr>				
-                <?php if($netboot_enabled) { ?>
+		</tr>
 		<tr>
-		  <td width="22%" valign="top" class="vncell">Netboot filename</td>
-		  <td width="78%" class="vtable">
-		    <input name="filename" type="text" class="formfld unknown" id="filename" size="28" value="<?=htmlspecialchars($pconfig['filename']);?>" />
-		    <br /> <span class="vexpl">Name of the file that should be loaded when this host boots off of the network, overrides setting on main page.</span></td>
+			<td width="22%" valign="top" class="vncell"><?=gettext("IPv6 address");?></td>
+			<td width="78%" class="vtable">
+				<input name="ipaddrv6" type="text" class="formfld unknown" id="ipaddrv6" size="28" value="<?=htmlspecialchars($pconfig['ipaddrv6']);?>" />
+				<br />
+				<?=gettext("If an IPv6 address is entered, the address must be outside of the pool.");?>
+				<br />
+				<?=gettext("If no IPv6 address is given, one will be dynamically allocated from the pool.");?>
+			</td>
 		</tr>
 		<tr>
-		  <td width="22%" valign="top" class="vncell">Root Path</td>
-		  <td width="78%" class="vtable">
-			<input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>" />
-		    <br /> <span class="vexpl"><?=gettext("Enter the"); ?> <b><?=gettext("root-path"); ?></b>-<?=gettext("string");?>, overrides setting on main page.</span></td>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Hostname");?></td>
+			<td width="78%" class="vtable">
+				<input name="hostname" type="text" class="formfld unknown" id="hostname" size="28" value="<?=htmlspecialchars($pconfig['hostname']);?>" />
+				<br /> <span class="vexpl"><?=gettext("Name of the host, without domain part.");?></span>
+			</td>
+		</tr>
+<?php
+	if ($netboot_enabled) {
+?>
+		<tr>
+			<td width="22%" valign="top" class="vncell">Netboot filename</td>
+			<td width="78%" class="vtable">
+				<input name="filename" type="text" class="formfld unknown" id="filename" size="28" value="<?=htmlspecialchars($pconfig['filename']);?>" />
+				<br /> <span class="vexpl">Name of the file that should be loaded when this host boots off of the network, overrides setting on main page.</span>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top" class="vncell">Root Path</td>
+			<td width="78%" class="vtable">
+				<input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>" />
+				<br /> <span class="vexpl"><?=gettext("Enter the"); ?> <b><?=gettext("root-path"); ?></b>-<?=gettext("string");?>, overrides setting on main page.</span>
+			</td>
+		</tr>
+<?php
+	}
+?>
+		<tr>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
+			<td width="78%" class="vtable">
+				<input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
+				<br /> <span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed).");?></span>
+			</td>
+		</tr>
+		<tr>
+			<td width="22%" valign="top">&nbsp;</td>
+			<td width="78%">
+				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
+				<input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
+				<?php if (isset($id) && $a_maps[$id]): ?>
+				<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
+				<?php endif; ?>
+				<input name="if" type="hidden" value="<?=htmlspecialchars($if);?>" />
+			</td>
 		</tr>
-		<?php } ?>
-                <tr> 
-                  <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
-                  <td width="78%" class="vtable"> 
-                    <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-                    <br /> <span class="vexpl"><?=gettext("You may enter a description here ".
-                    "for your reference (not parsed).");?></span></td>
-                </tr>
-                <tr> 
-                  <td width="22%" valign="top">&nbsp;</td>
-                  <td width="78%"> 
-                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
-                    <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
-                    <?php if (isset($id) && $a_maps[$id]): ?>
-                    <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
-                    <?php endif; ?>
-                    <input name="if" type="hidden" value="<?=htmlspecialchars($if);?>" />
-                  </td>
-                </tr>
-              </table>
+	</table>
 </form>
 <?php include("fend.inc"); ?>
 </body>
diff --git a/usr/local/www/services_dhcpv6_relay.php b/usr/local/www/services_dhcpv6_relay.php
index 6b6ebe1..c6e5daf 100644
--- a/usr/local/www/services_dhcpv6_relay.php
+++ b/usr/local/www/services_dhcpv6_relay.php
@@ -43,10 +43,11 @@
 require("guiconfig.inc");
 
 $pconfig['enable'] = isset($config['dhcrelay6']['enable']);
-if (empty($config['dhcrelay6']['interface']))
+if (empty($config['dhcrelay6']['interface'])) {
 	$pconfig['interface'] = array();
-else
+} else {
 	$pconfig['interface'] = explode(",", $config['dhcrelay6']['interface']);
+}
 $pconfig['server'] = $config['dhcrelay6']['server'];
 $pconfig['agentoption'] = isset($config['dhcrelay6']['agentoption']);
 
@@ -58,7 +59,7 @@ $iflist = get_configured_interface_with_descr();
  */
 $dhcpd_enabled = false;
 if (is_array($config['dhcpdv6'])) {
-	foreach($config['dhcpdv6'] as $dhcp) {
+	foreach ($config['dhcpdv6'] as $dhcp) {
 		if (isset($dhcp['enable']) && isset($config['interfaces'][$dhcpif]['enable'])) {
 			$dhcpd_enabled = true;
 			break;
@@ -81,8 +82,9 @@ if ($_POST) {
 		if ($_POST['server']) {
 			$checksrv = explode(",", $_POST['server']);
 			foreach ($checksrv as $srv) {
-				if (!is_ipaddrv6($srv))
-					$input_errors[] = gettext("A valid Destination Server IPv6 address  must be specified.");
+				if (!is_ipaddrv6($srv)) {
+					$input_errors[] = gettext("A valid Destination Server IPv6 address must be specified.");
+				}
 			}
 		}
 	}
@@ -98,12 +100,11 @@ if ($_POST) {
 		$retval = 0;
 		$retval = services_dhcrelay6_configure();
 		$savemsg = get_std_save_message($retval);
-
 	}
 }
 
 $closehead = false;
-$pgtitle = array(gettext("Services"),gettext("DHCPv6 Relay"));
+$pgtitle = array(gettext("Services"), gettext("DHCPv6 Relay"));
 $shortcut_section = "dhcp6";
 include("head.inc");
 
@@ -133,73 +134,76 @@ function enable_change(enable_over) {
 <?php if ($savemsg) print_info_box($savemsg); ?>
 
 <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="dhcpv6 relay">
-  <tr>
-    <td>
-	<div id="mainarea">
-              <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
-		<tr>
-<?php 
+	<tr>
+		<td>
+			<div id="mainarea">
+				<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
+					<tr>
+<?php
 	if ($dhcpd_enabled) {
 		echo "<td>DHCPv6 Server is currently enabled.  Cannot enable the DHCPv6 Relay service while the DHCPv6 Server is enabled on any interface.";
-			echo "</td></tr></table></div></td></tr></table></form>";
-			include("fend.inc"); 
-			echo "</body></html>";
-			exit;
-		}
+		echo "</td></tr></table></div></td></tr></table></form>";
+		include("fend.inc");
+		echo "</body></html>";
+		exit;
+	}
 ?>
 
-			<td colspan="2" valign="top" class="listtopic"><?=gettext("DHCPv6 Relay configuration"); ?></td>
-		</tr>
-		<tr>
-                        <td width="22%" valign="top" class="vncellreq">Enable</td>
-                        <td width="78%" class="vtable">
-			<input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> onclick="enable_change(false)" />
-                          <strong><?php printf(gettext("Enable DHCPv6 relay on interface"));?></strong>
-			</td>
-		</tr>
-		<tr>
-                        <td width="22%" valign="top" class="vncellreq">Interface(s)</td>
-                        <td width="78%" class="vtable">
-				<select id="interface" name="interface[]" multiple="multiple" class="formselect" size="3">
-			<?php
-                                foreach ($iflist as $ifent => $ifdesc) {
-					if (!is_ipaddrv6(get_interface_ipv6($ifent)))
-						continue;
-					echo "<option value=\"{$ifent}\"";
-					if (in_array($ifent, $pconfig['interface']))
-						echo " selected=\"selected\"";
-					echo ">{$ifdesc}</option>\n";
-				}
-			?>
-                                </select>
-				<br /><?=gettext("Interfaces without an IPv6 address will not be shown."); ?>
-			</td>
-		</tr>
-		<tr>
-	              <td width="22%" valign="top" class="vtable">&nbsp;</td>
-                      <td width="78%" class="vtable">
-<input name="agentoption" type="checkbox" value="yes" <?php if ($pconfig['agentoption']) echo "checked=\"checked\""; ?> />
-                      <strong><?=gettext("Append circuit ID and agent ID to requests"); ?></strong><br />
-                      <?php printf(gettext("If this is checked, the DHCPv6 relay will append the circuit ID (%s interface number) and the agent ID to the DHCPv6 request."), $g['product_name']); ?></td>
-		</tr>
-		<tr>
-                        <td width="22%" valign="top" class="vncell"><?=gettext("Destination server");?></td>
-                        <td width="78%" class="vtable">
-                          <input name="server" type="text" class="formfld unknown" id="server" size="20" value="<?=htmlspecialchars($pconfig['server']);?>" />
-                          <br />
-			  <?=gettext("This is the IPv6 address of the server to which DHCPv6 requests are relayed. You can enter multiple server IPv6 addresses, separated by commas. ");?>
-                        </td>
-		</tr>
-		<tr>
-                        <td width="22%" valign="top">&nbsp;</td>
-                        <td width="78%">
-                          <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change(true)" />
-                        </td>
-		</tr>
-	</table>
-	</div>
-    </td>
-  </tr>
+						<td colspan="2" valign="top" class="listtopic"><?=gettext("DHCPv6 Relay configuration"); ?></td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncellreq">Enable</td>
+						<td width="78%" class="vtable">
+							<input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> onclick="enable_change(false)" />
+							<strong><?php printf(gettext("Enable DHCPv6 relay on interface"));?></strong>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncellreq">Interface(s)</td>
+						<td width="78%" class="vtable">
+							<select id="interface" name="interface[]" multiple="multiple" class="formselect" size="3">
+							<?php
+								foreach ($iflist as $ifent => $ifdesc) {
+									if (!is_ipaddrv6(get_interface_ipv6($ifent))) {
+										continue;
+									}
+									echo "<option value=\"{$ifent}\"";
+									if (in_array($ifent, $pconfig['interface'])) {
+										echo " selected=\"selected\"";
+									}
+									echo ">{$ifdesc}</option>\n";
+								}
+							?>
+							</select>
+							<br /><?=gettext("Interfaces without an IPv6 address will not be shown."); ?>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vtable">&nbsp;</td>
+						<td width="78%" class="vtable">
+							<input name="agentoption" type="checkbox" value="yes" <?php if ($pconfig['agentoption']) echo "checked=\"checked\""; ?> />
+							<strong><?=gettext("Append circuit ID and agent ID to requests"); ?></strong><br />
+							<?php printf(gettext("If this is checked, the DHCPv6 relay will append the circuit ID (%s interface number) and the agent ID to the DHCPv6 request."), $g['product_name']); ?>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncell"><?=gettext("Destination server");?></td>
+						<td width="78%" class="vtable">
+							<input name="server" type="text" class="formfld unknown" id="server" size="20" value="<?=htmlspecialchars($pconfig['server']);?>" />
+							<br />
+						<?=gettext("This is the IPv6 address of the server to which DHCPv6 requests are relayed. You can enter multiple server IPv6 addresses, separated by commas. ");?>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top">&nbsp;</td>
+						<td width="78%">
+							<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change(true)" />
+						</td>
+					</tr>
+				</table>
+			</div>
+		</td>
+	</tr>
 </table>
 </form>
 <script type="text/javascript">