Revert "Fixed #5148"

Accidentally broke spaces/tabs
This reverts commit 910b77ad1682740e481df29fc2d9c528a13c2da4.

1 files changed, 2934 insertions, 2987 deletions

diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php
index dbf3d21..ddde649 100644
--- a/src/usr/local/www/interfaces.php
+++ b/src/usr/local/www/interfaces.php
@@ -1,64 +1,64 @@
 <?php
 /* $Id$ */
 /*
-    interfaces.php
+	interfaces.php
 */
 /* ====================================================================
- *  Copyright (c)  2004-2015  Electric Sheep Fencing, LLC. All rights reserved.
- *  Copyright (c)  2004-2008 Scott Ullrich
- *  Copyright (c) 2006 Daniel S. Haischt
- *  Copyright (c) 2008-2010 Ermal Luçi
+ *	Copyright (c)  2004-2015  Electric Sheep Fencing, LLC. All rights reserved.
+ *	Copyright (c)  2004-2008 Scott Ullrich
+ *	Copyright (c) 2006 Daniel S. Haischt
+ *	Copyright (c) 2008-2010 Ermal Luçi
  *
- *  Redistribution and use in source and binary forms, with or without modification,
- *  are permitted provided that the following conditions are met:
+ *	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.
+ *	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.
+ *	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.
  *
- *  3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *    "This product includes software developed by the pfSense Project
- *     for use in the pfSense software distribution. (http://www.pfsense.org/).
+ *	3. All advertising materials mentioning features or use of this software
+ *	  must display the following acknowledgment:
+ *	  "This product includes software developed by the pfSense Project
+ *	   for use in the pfSense software distribution. (http://www.pfsense.org/).
  *
- *  4. The names "pfSense" and "pfSense Project" must not be used to
- *     endorse or promote products derived from this software without
- *     prior written permission. For written permission, please contact
- *     coreteam@pfsense.org.
+ *	4. The names "pfSense" and "pfSense Project" must not be used to
+ *	   endorse or promote products derived from this software without
+ *	   prior written permission. For written permission, please contact
+ *	   coreteam@pfsense.org.
  *
- *  5. Products derived from this software may not be called "pfSense"
- *    nor may "pfSense" appear in their names without prior written
- *    permission of the Electric Sheep Fencing, LLC.
+ *	5. Products derived from this software may not be called "pfSense"
+ *	  nor may "pfSense" appear in their names without prior written
+ *	  permission of the Electric Sheep Fencing, LLC.
  *
- *  6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
+ *	6. Redistributions of any form whatsoever must retain the following
+ *	  acknowledgment:
  *
- *  "This product includes software developed by the pfSense Project
- *  for use in the pfSense software distribution (http://www.pfsense.org/).
+ *	"This product includes software developed by the pfSense Project
+ *	for use in the pfSense software distribution (http://www.pfsense.org/).
  *
- *  THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY
- *  EXPRESSED 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 pfSense PROJECT OR
- *  ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- *  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- *  OF THE POSSIBILITY OF SUCH DAMAGE.
+ *	THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY
+ *	EXPRESSED 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 pfSense PROJECT OR
+ *	ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *	NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ *	STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ *	OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  ====================================================================
+ *	====================================================================
  *
  */
 /*
-    pfSense_BUILDER_BINARIES:   /usr/sbin/arp
-    pfSense_MODULE: interfaces
+	pfSense_BUILDER_BINARIES:	/usr/sbin/arp
+	pfSense_MODULE: interfaces
 */
 
 ##|+PRIV
@@ -81,9 +81,9 @@ require_once("xmlparse_attr.inc");
 define("ALLOWWEP", false);
 
 if (isset($_POST['referer'])) {
-    $referer = $_POST['referer'];
+	$referer = $_POST['referer'];
 } else {
-    $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces.php');
+	$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces.php');
 }
 
 // Get configured interface list
@@ -91,12 +91,12 @@ $ifdescrs = get_configured_interface_with_descr(false, true);
 
 $if = "wan";
 if ($_REQUEST['if']) {
-    $if = $_REQUEST['if'];
+	$if = $_REQUEST['if'];
 }
 
 if (empty($ifdescrs[$if])) {
-    header("Location: interfaces.php");
-    exit;
+	header("Location: interfaces.php");
+	exit;
 }
 
 define("CRON_MONTHLY_PATTERN", "0 0 1 * *");
@@ -105,23 +105,23 @@ define("CRON_DAILY_PATTERN", "0 0 * * *");
 define("CRON_HOURLY_PATTERN", "0 * * * *");
 
 if (!is_array($pconfig)) {
-    $pconfig = array();
+	$pconfig = array();
 }
 
 if (!is_array($config['ppps'])) {
-    $config['ppps'] = array();
+	$config['ppps'] = array();
 }
 if (!is_array($config['ppps']['ppp'])) {
-    $config['ppps']['ppp'] = array();
+	$config['ppps']['ppp'] = array();
 }
 $a_ppps = &$config['ppps']['ppp'];
 
 function remove_bad_chars($string) {
-    return preg_replace('/[^a-z_0-9]/i', '', $string);
+	return preg_replace('/[^a-z_0-9]/i', '', $string);
 }
 
 if (!is_array($config['gateways']['gateway_item'])) {
-    $config['gateways']['gateway_item'] = array();
+	$config['gateways']['gateway_item'] = array();
 }
 $a_gateways = &$config['gateways']['gateway_item'];
 
@@ -131,93 +131,93 @@ $old_wancfg['realif'] = get_real_interface($if);
 $old_ppps = $a_ppps;
 // Populate page descr if it does not exist.
 if ($if == "wan" && !$wancfg['descr']) {
-    $wancfg['descr'] = "WAN";
+	$wancfg['descr'] = "WAN";
 } else if ($if == "lan" && !$wancfg['descr']) {
-    $wancfg['descr'] = "LAN";
+	$wancfg['descr'] = "LAN";
 }
 
 /* NOTE: The code here is used to set the $pppid for the curious */
 foreach ($a_ppps as $pppid => $ppp) {
-    if ($wancfg['if'] == $ppp['if']) {
-        break;
-    }
+	if ($wancfg['if'] == $ppp['if']) {
+		break;
+	}
 }
 
 $type_disabled = (substr($wancfg['if'], 0, 3) == 'gre') ? 'disabled="disabled"' : '';
 
 if ($wancfg['if'] == $a_ppps[$pppid]['if']) {
-    $pconfig['pppid'] = $pppid;
-    $pconfig['ptpid'] = $a_ppps[$pppid]['ptpid'];
-    $pconfig['port'] = $a_ppps[$pppid]['ports'];
-    if ($a_ppps[$pppid]['type'] == "ppp") {
-        $pconfig['ppp_username'] = $a_ppps[$pppid]['username'];
-        $pconfig['ppp_password'] = base64_decode($a_ppps[$pppid]['password']);
-
-        $pconfig['phone'] = $a_ppps[$pppid]['phone'];
-        $pconfig['apn'] = $a_ppps[$pppid]['apn'];
-    } else if ($a_ppps[$pppid]['type'] == "pppoe") {
-        $pconfig['pppoe_username'] = $a_ppps[$pppid]['username'];
-        $pconfig['pppoe_password'] = base64_decode($a_ppps[$pppid]['password']);
-        $pconfig['provider'] = $a_ppps[$pppid]['provider'];
-        $pconfig['pppoe_dialondemand'] = isset($a_ppps[$pppid]['ondemand']);
-        $pconfig['pppoe_idletimeout'] = $a_ppps[$pppid]['idletimeout'];
-
-        /* ================================================ */
-        /* = force a connection reset at a specific time? = */
-        /* ================================================ */
-
-        if (isset($a_ppps[$pppid]['pppoe-reset-type'])) {
-            $pconfig['pppoe-reset-type'] = $a_ppps[$pppid]['pppoe-reset-type'];
-            $itemhash = getMPDCRONSettings($a_ppps[$pppid]['if']);
-            if ($itemhash) {
-                $cronitem = $itemhash['ITEM'];
-            }
-            if (isset($cronitem)) {
-                $resetTime = "{$cronitem['minute']} {$cronitem['hour']} {$cronitem['mday']} {$cronitem['month']} {$cronitem['wday']}";
-            } else {
-                $resetTime = NULL;
-            }
-            //log_error("ResetTime:".$resetTime);
-            if ($a_ppps[$pppid]['pppoe-reset-type'] == "custom") {
-                if ($cronitem) {
-                    $pconfig['pppoe_pr_custom'] = true;
-                    $pconfig['pppoe_resetminute'] = $cronitem['minute'];
-                    $pconfig['pppoe_resethour'] = $cronitem['hour'];
-                    if ($cronitem['mday'] != "*" && $cronitem['month'] != "*") {
-                        $pconfig['pppoe_resetdate'] = "{$cronitem['month']}/{$cronitem['mday']}/" . date("Y");
-                    }
-                }
-            } else if ($a_ppps[$pppid]['pppoe-reset-type'] == "preset") {
-                $pconfig['pppoe_pr_preset'] = true;
-                switch ($resetTime) {
-                    case CRON_MONTHLY_PATTERN:
-                        $pconfig['pppoe_monthly'] = true;
-                        break;
-                    case CRON_WEEKLY_PATTERN:
-                        $pconfig['pppoe_weekly'] = true;
-                        break;
-                    case CRON_DAILY_PATTERN:
-                        $pconfig['pppoe_daily'] = true;
-                        break;
-                    case CRON_HOURLY_PATTERN:
-                        $pconfig['pppoe_hourly'] = true;
-                        break;
-                }
-            }
-        } // End force pppoe reset at specific time
-        // End if type == pppoe
-    } else if ($a_ppps[$pppid]['type'] == "pptp" || $a_ppps[$pppid]['type'] == "l2tp") {
-        $pconfig['pptp_username'] = $a_ppps[$pppid]['username'];
-        $pconfig['pptp_password'] = base64_decode($a_ppps[$pppid]['password']);
-        $pconfig['pptp_local'] = explode(",", $a_ppps[$pppid]['localip']);
-        $pconfig['pptp_subnet'] = explode(",", $a_ppps[$pppid]['subnet']);
-        $pconfig['pptp_remote'] = explode(",", $a_ppps[$pppid]['gateway']);
-        $pconfig['pptp_dialondemand'] = isset($a_ppps[$pppid]['ondemand']);
-        $pconfig['pptp_idletimeout'] = $a_ppps[$pppid]['timeout'];
-    }
+	$pconfig['pppid'] = $pppid;
+	$pconfig['ptpid'] = $a_ppps[$pppid]['ptpid'];
+	$pconfig['port'] = $a_ppps[$pppid]['ports'];
+	if ($a_ppps[$pppid]['type'] == "ppp") {
+		$pconfig['ppp_username'] = $a_ppps[$pppid]['username'];
+		$pconfig['ppp_password'] = base64_decode($a_ppps[$pppid]['password']);
+
+		$pconfig['phone'] = $a_ppps[$pppid]['phone'];
+		$pconfig['apn'] = $a_ppps[$pppid]['apn'];
+	} else if ($a_ppps[$pppid]['type'] == "pppoe") {
+		$pconfig['pppoe_username'] = $a_ppps[$pppid]['username'];
+		$pconfig['pppoe_password'] = base64_decode($a_ppps[$pppid]['password']);
+		$pconfig['provider'] = $a_ppps[$pppid]['provider'];
+		$pconfig['pppoe_dialondemand'] = isset($a_ppps[$pppid]['ondemand']);
+		$pconfig['pppoe_idletimeout'] = $a_ppps[$pppid]['idletimeout'];
+
+		/* ================================================ */
+		/* = force a connection reset at a specific time? = */
+		/* ================================================ */
+
+		if (isset($a_ppps[$pppid]['pppoe-reset-type'])) {
+			$pconfig['pppoe-reset-type'] = $a_ppps[$pppid]['pppoe-reset-type'];
+			$itemhash = getMPDCRONSettings($a_ppps[$pppid]['if']);
+			if ($itemhash) {
+				$cronitem = $itemhash['ITEM'];
+			}
+			if (isset($cronitem)) {
+				$resetTime = "{$cronitem['minute']} {$cronitem['hour']} {$cronitem['mday']} {$cronitem['month']} {$cronitem['wday']}";
+			} else {
+				$resetTime = NULL;
+			}
+			//log_error("ResetTime:".$resetTime);
+			if ($a_ppps[$pppid]['pppoe-reset-type'] == "custom") {
+				if ($cronitem) {
+					$pconfig['pppoe_pr_custom'] = true;
+					$pconfig['pppoe_resetminute'] = $cronitem['minute'];
+					$pconfig['pppoe_resethour'] = $cronitem['hour'];
+					if ($cronitem['mday'] != "*" && $cronitem['month'] != "*") {
+						$pconfig['pppoe_resetdate'] = "{$cronitem['month']}/{$cronitem['mday']}/" . date("Y");
+					}
+				}
+			} else if ($a_ppps[$pppid]['pppoe-reset-type'] == "preset") {
+				$pconfig['pppoe_pr_preset'] = true;
+				switch ($resetTime) {
+					case CRON_MONTHLY_PATTERN:
+						$pconfig['pppoe_monthly'] = true;
+						break;
+					case CRON_WEEKLY_PATTERN:
+						$pconfig['pppoe_weekly'] = true;
+						break;
+					case CRON_DAILY_PATTERN:
+						$pconfig['pppoe_daily'] = true;
+						break;
+					case CRON_HOURLY_PATTERN:
+						$pconfig['pppoe_hourly'] = true;
+						break;
+				}
+			}
+		} // End force pppoe reset at specific time
+		// End if type == pppoe
+	} else if ($a_ppps[$pppid]['type'] == "pptp" || $a_ppps[$pppid]['type'] == "l2tp") {
+		$pconfig['pptp_username'] = $a_ppps[$pppid]['username'];
+		$pconfig['pptp_password'] = base64_decode($a_ppps[$pppid]['password']);
+		$pconfig['pptp_local'] = explode(",", $a_ppps[$pppid]['localip']);
+		$pconfig['pptp_subnet'] = explode(",", $a_ppps[$pppid]['subnet']);
+		$pconfig['pptp_remote'] = explode(",", $a_ppps[$pppid]['gateway']);
+		$pconfig['pptp_dialondemand'] = isset($a_ppps[$pppid]['ondemand']);
+		$pconfig['pptp_idletimeout'] = $a_ppps[$pppid]['timeout'];
+	}
 } else {
-    $pconfig['ptpid'] = interfaces_ptpid_next();
-    $pppid = count($a_ppps);
+	$pconfig['ptpid'] = interfaces_ptpid_next();
+	$pppid = count($a_ppps);
 }
 $pconfig['dhcphostname'] = $wancfg['dhcphostname'];
 $pconfig['alias-address'] = $wancfg['alias-address'];
@@ -282,82 +282,82 @@ $pconfig['descr'] = remove_bad_chars($wancfg['descr']);
 $pconfig['enable'] = isset($wancfg['enable']);
 
 if (is_array($config['aliases']['alias'])) {
-    foreach ($config['aliases']['alias'] as $alias) {
-        if ($alias['name'] == $wancfg['descr']) {
-            $input_errors[] = sprintf(gettext("Sorry, an alias with the name %s already exists."), $wancfg['descr']);
-        }
-    }
+	foreach ($config['aliases']['alias'] as $alias) {
+		if ($alias['name'] == $wancfg['descr']) {
+			$input_errors[] = sprintf(gettext("Sorry, an alias with the name %s already exists."), $wancfg['descr']);
+		}
+	}
 }
 
 switch ($wancfg['ipaddr']) {
-    case "dhcp":
-        $pconfig['type'] = "dhcp";
-        break;
-    case "pppoe":
-    case "pptp":
-    case "l2tp":
-    case "ppp":
-        $pconfig['type'] = $wancfg['ipaddr'];
-        break;
-    default:
-        if (is_ipaddrv4($wancfg['ipaddr'])) {
-            $pconfig['type'] = "staticv4";
-            $pconfig['ipaddr'] = $wancfg['ipaddr'];
-            $pconfig['subnet'] = $wancfg['subnet'];
-            $pconfig['gateway'] = $wancfg['gateway'];
-        } else {
-            $pconfig['type'] = "none";
-        }
-        break;
+	case "dhcp":
+		$pconfig['type'] = "dhcp";
+		break;
+	case "pppoe":
+	case "pptp":
+	case "l2tp":
+	case "ppp":
+		$pconfig['type'] = $wancfg['ipaddr'];
+		break;
+	default:
+		if (is_ipaddrv4($wancfg['ipaddr'])) {
+			$pconfig['type'] = "staticv4";
+			$pconfig['ipaddr'] = $wancfg['ipaddr'];
+			$pconfig['subnet'] = $wancfg['subnet'];
+			$pconfig['gateway'] = $wancfg['gateway'];
+		} else {
+			$pconfig['type'] = "none";
+		}
+		break;
 }
 
 switch ($wancfg['ipaddrv6']) {
-    case "slaac":
-        $pconfig['type6'] = "slaac";
-        break;
-    case "dhcp6":
-        $pconfig['dhcp6-duid'] = $wancfg['dhcp6-duid'];
-        if (!isset($wancfg['dhcp6-ia-pd-len'])) {
-            $wancfg['dhcp6-ia-pd-len'] = "none";
-        }
-        $pconfig['dhcp6-ia-pd-len'] = $wancfg['dhcp6-ia-pd-len'];
-        $pconfig['dhcp6-ia-pd-send-hint'] = isset($wancfg['dhcp6-ia-pd-send-hint']);
-        $pconfig['type6'] = "dhcp6";
-        $pconfig['dhcp6prefixonly'] = isset($wancfg['dhcp6prefixonly']);
-        $pconfig['dhcp6usev4iface'] = isset($wancfg['dhcp6usev4iface']);
-        break;
-    case "6to4":
-        $pconfig['type6'] = "6to4";
-        break;
-    case "track6":
-        $pconfig['type6'] = "track6";
-        $pconfig['track6-interface'] = $wancfg['track6-interface'];
-        if ($wancfg['track6-prefix-id'] == "") {
-            $pconfig['track6-prefix-id'] = 0;
-        } else {
-            $pconfig['track6-prefix-id'] = $wancfg['track6-prefix-id'];
-        }
-        $pconfig['track6-prefix-id--hex'] = sprintf("%x", $pconfig['track6-prefix-id']);
-        break;
-    case "6rd":
-        $pconfig['prefix-6rd'] = $wancfg['prefix-6rd'];
-        if ($wancfg['prefix-6rd-v4plen'] == "") {
-            $wancfg['prefix-6rd-v4plen'] = "0";
-        }
-        $pconfig['prefix-6rd-v4plen'] = $wancfg['prefix-6rd-v4plen'];
-        $pconfig['type6'] = "6rd";
-        $pconfig['gateway-6rd'] = $wancfg['gateway-6rd'];
-        break;
-    default:
-        if (is_ipaddrv6($wancfg['ipaddrv6'])) {
-            $pconfig['type6'] = "staticv6";
-            $pconfig['ipaddrv6'] = $wancfg['ipaddrv6'];
-            $pconfig['subnetv6'] = $wancfg['subnetv6'];
-            $pconfig['gatewayv6'] = $wancfg['gatewayv6'];
-        } else {
-            $pconfig['type6'] = "none";
-        }
-        break;
+	case "slaac":
+		$pconfig['type6'] = "slaac";
+		break;
+	case "dhcp6":
+		$pconfig['dhcp6-duid'] = $wancfg['dhcp6-duid'];
+		if (!isset($wancfg['dhcp6-ia-pd-len'])) {
+			$wancfg['dhcp6-ia-pd-len'] = "none";
+		}
+		$pconfig['dhcp6-ia-pd-len'] = $wancfg['dhcp6-ia-pd-len'];
+		$pconfig['dhcp6-ia-pd-send-hint'] = isset($wancfg['dhcp6-ia-pd-send-hint']);
+		$pconfig['type6'] = "dhcp6";
+		$pconfig['dhcp6prefixonly'] = isset($wancfg['dhcp6prefixonly']);
+		$pconfig['dhcp6usev4iface'] = isset($wancfg['dhcp6usev4iface']);
+		break;
+	case "6to4":
+		$pconfig['type6'] = "6to4";
+		break;
+	case "track6":
+		$pconfig['type6'] = "track6";
+		$pconfig['track6-interface'] = $wancfg['track6-interface'];
+		if ($wancfg['track6-prefix-id'] == "") {
+			$pconfig['track6-prefix-id'] = 0;
+		} else {
+			$pconfig['track6-prefix-id'] = $wancfg['track6-prefix-id'];
+		}
+		$pconfig['track6-prefix-id--hex'] = sprintf("%x", $pconfig['track6-prefix-id']);
+		break;
+	case "6rd":
+		$pconfig['prefix-6rd'] = $wancfg['prefix-6rd'];
+		if ($wancfg['prefix-6rd-v4plen'] == "") {
+			$wancfg['prefix-6rd-v4plen'] = "0";
+		}
+		$pconfig['prefix-6rd-v4plen'] = $wancfg['prefix-6rd-v4plen'];
+		$pconfig['type6'] = "6rd";
+		$pconfig['gateway-6rd'] = $wancfg['gateway-6rd'];
+		break;
+	default:
+		if (is_ipaddrv6($wancfg['ipaddrv6'])) {
+			$pconfig['type6'] = "staticv6";
+			$pconfig['ipaddrv6'] = $wancfg['ipaddrv6'];
+			$pconfig['subnetv6'] = $wancfg['subnetv6'];
+			$pconfig['gatewayv6'] = $wancfg['gatewayv6'];
+		} else {
+			$pconfig['type6'] = "none";
+		}
+		break;
 }
 
 // print_r($pconfig);
@@ -370,1309 +370,1309 @@ $pconfig['mss'] = $wancfg['mss'];
 
 /* Wireless interface? */
 if (isset($wancfg['wireless'])) {
-    /* Sync first to be sure it displays the actual settings that will be used */
-    interface_sync_wireless_clones($wancfg, false);
-    /* Get wireless modes */
-    $wlanif = get_real_interface($if);
-    if (!does_interface_exist($wlanif)) {
-        interface_wireless_clone($wlanif, $wancfg);
-    }
-    $wlanbaseif = interface_get_wireless_base($wancfg['if']);
-    preg_match("/^(.*?)([0-9]*)$/", $wlanbaseif, $wlanbaseif_split);
-    $wl_modes = get_wireless_modes($if);
-    $wl_chaninfo = get_wireless_channel_info($if);
-    $wl_sysctl_prefix = 'dev.' . $wlanbaseif_split[1] . '.' . $wlanbaseif_split[2];
-    $wl_sysctl = get_sysctl(
-        array(
-            "{$wl_sysctl_prefix}.diversity",
-            "{$wl_sysctl_prefix}.txantenna",
-            "{$wl_sysctl_prefix}.rxantenna",
-            "{$wl_sysctl_prefix}.slottime",
-            "{$wl_sysctl_prefix}.acktimeout",
-            "{$wl_sysctl_prefix}.ctstimeout"));
-    $wl_regdomain_xml_attr = array();
-    $wl_regdomain_xml = parse_xml_regdomain($wl_regdomain_xml_attr);
-    $wl_regdomains = &$wl_regdomain_xml['regulatory-domains']['rd'];
-    $wl_regdomains_attr = &$wl_regdomain_xml_attr['regulatory-domains']['rd'];
-    $wl_countries = &$wl_regdomain_xml['country-codes']['country'];
-    $wl_countries_attr = &$wl_regdomain_xml_attr['country-codes']['country'];
-    $pconfig['persistcommonwireless'] = isset($config['wireless']['interfaces'][$wlanbaseif]);
-    $pconfig['standard'] = $wancfg['wireless']['standard'];
-    $pconfig['mode'] = $wancfg['wireless']['mode'];
-    $pconfig['protmode'] = $wancfg['wireless']['protmode'];
-    $pconfig['ssid'] = $wancfg['wireless']['ssid'];
-    $pconfig['channel'] = $wancfg['wireless']['channel'];
-    $pconfig['txpower'] = $wancfg['wireless']['txpower'];
-    $pconfig['diversity'] = $wancfg['wireless']['diversity'];
-    $pconfig['txantenna'] = $wancfg['wireless']['txantenna'];
-    $pconfig['rxantenna'] = $wancfg['wireless']['rxantenna'];
-    $pconfig['distance'] = $wancfg['wireless']['distance'];
-    $pconfig['regdomain'] = $wancfg['wireless']['regdomain'];
-    $pconfig['regcountry'] = $wancfg['wireless']['regcountry'];
-    $pconfig['reglocation'] = $wancfg['wireless']['reglocation'];
-    $pconfig['wme_enable'] = isset($wancfg['wireless']['wme']['enable']);
-    if (isset($wancfg['wireless']['puren']['enable'])) {
-        $pconfig['puremode'] = '11n';
-    } else if (isset($wancfg['wireless']['pureg']['enable'])) {
-        $pconfig['puremode'] = '11g';
-    } else {
-        $pconfig['puremode'] = 'any';
-    }
-    $pconfig['apbridge_enable'] = isset($wancfg['wireless']['apbridge']['enable']);
-    $pconfig['authmode'] = $wancfg['wireless']['authmode'];
-    $pconfig['hidessid_enable'] = isset($wancfg['wireless']['hidessid']['enable']);
-    $pconfig['auth_server_addr'] = $wancfg['wireless']['auth_server_addr'];
-    $pconfig['auth_server_port'] = $wancfg['wireless']['auth_server_port'];
-    $pconfig['auth_server_shared_secret'] = $wancfg['wireless']['auth_server_shared_secret'];
-    $pconfig['auth_server_addr2'] = $wancfg['wireless']['auth_server_addr2'];
-    $pconfig['auth_server_port2'] = $wancfg['wireless']['auth_server_port2'];
-    $pconfig['auth_server_shared_secret2'] = $wancfg['wireless']['auth_server_shared_secret2'];
-    if (is_array($wancfg['wireless']['wpa'])) {
-        $pconfig['debug_mode'] = $wancfg['wireless']['wpa']['debug_mode'];
-        $pconfig['macaddr_acl'] = $wancfg['wireless']['wpa']['macaddr_acl'];
-        $pconfig['mac_acl_enable'] = isset($wancfg['wireless']['wpa']['mac_acl_enable']);
-        $pconfig['auth_algs'] = $wancfg['wireless']['wpa']['auth_algs'];
-        $pconfig['wpa_mode'] = $wancfg['wireless']['wpa']['wpa_mode'];
-        $pconfig['wpa_key_mgmt'] = $wancfg['wireless']['wpa']['wpa_key_mgmt'];
-        $pconfig['wpa_pairwise'] = $wancfg['wireless']['wpa']['wpa_pairwise'];
-        $pconfig['wpa_group_rekey'] = $wancfg['wireless']['wpa']['wpa_group_rekey'];
-        $pconfig['wpa_gmk_rekey'] = $wancfg['wireless']['wpa']['wpa_gmk_rekey'];
-        $pconfig['wpa_strict_rekey'] = isset($wancfg['wireless']['wpa']['wpa_strict_rekey']);
-        $pconfig['passphrase'] = $wancfg['wireless']['wpa']['passphrase'];
-        $pconfig['ieee8021x'] = isset($wancfg['wireless']['wpa']['ieee8021x']['enable']);
-        $pconfig['rsn_preauth'] = isset($wancfg['wireless']['wpa']['rsn_preauth']);
-        $pconfig['ext_wpa_sw'] = $wancfg['wireless']['wpa']['ext_wpa_sw'];
-        $pconfig['wpa_enable'] = isset($wancfg['wireless']['wpa']['enable']);
-    }
-
-    $pconfig['mac_acl'] = $wancfg['wireless']['mac_acl'];
-
-    if(ALLOWWEP) {
-        $pconfig['wep_enable'] = isset($wancfg['wireless']['wep']['enable']);
-
-        if (is_array($wancfg['wireless']['wep']) && is_array($wancfg['wireless']['wep']['key'])) {
-            $i = 1;
-            foreach ($wancfg['wireless']['wep']['key'] as $wepkey) {
-                $pconfig['key' . $i] = $wepkey['value'];
-                if (isset($wepkey['txkey'])) {
-                    $pconfig['txkey'] = $i;
-                }
-                $i++;
-            }
-            if (!isset($wepkey['txkey'])) {
-                $pconfig['txkey'] = 1;
-            }
-        }
-    }
+	/* Sync first to be sure it displays the actual settings that will be used */
+	interface_sync_wireless_clones($wancfg, false);
+	/* Get wireless modes */
+	$wlanif = get_real_interface($if);
+	if (!does_interface_exist($wlanif)) {
+		interface_wireless_clone($wlanif, $wancfg);
+	}
+	$wlanbaseif = interface_get_wireless_base($wancfg['if']);
+	preg_match("/^(.*?)([0-9]*)$/", $wlanbaseif, $wlanbaseif_split);
+	$wl_modes = get_wireless_modes($if);
+	$wl_chaninfo = get_wireless_channel_info($if);
+	$wl_sysctl_prefix = 'dev.' . $wlanbaseif_split[1] . '.' . $wlanbaseif_split[2];
+	$wl_sysctl = get_sysctl(
+		array(
+			"{$wl_sysctl_prefix}.diversity",
+			"{$wl_sysctl_prefix}.txantenna",
+			"{$wl_sysctl_prefix}.rxantenna",
+			"{$wl_sysctl_prefix}.slottime",
+			"{$wl_sysctl_prefix}.acktimeout",
+			"{$wl_sysctl_prefix}.ctstimeout"));
+	$wl_regdomain_xml_attr = array();
+	$wl_regdomain_xml = parse_xml_regdomain($wl_regdomain_xml_attr);
+	$wl_regdomains = &$wl_regdomain_xml['regulatory-domains']['rd'];
+	$wl_regdomains_attr = &$wl_regdomain_xml_attr['regulatory-domains']['rd'];
+	$wl_countries = &$wl_regdomain_xml['country-codes']['country'];
+	$wl_countries_attr = &$wl_regdomain_xml_attr['country-codes']['country'];
+	$pconfig['persistcommonwireless'] = isset($config['wireless']['interfaces'][$wlanbaseif]);
+	$pconfig['standard'] = $wancfg['wireless']['standard'];
+	$pconfig['mode'] = $wancfg['wireless']['mode'];
+	$pconfig['protmode'] = $wancfg['wireless']['protmode'];
+	$pconfig['ssid'] = $wancfg['wireless']['ssid'];
+	$pconfig['channel'] = $wancfg['wireless']['channel'];
+	$pconfig['txpower'] = $wancfg['wireless']['txpower'];
+	$pconfig['diversity'] = $wancfg['wireless']['diversity'];
+	$pconfig['txantenna'] = $wancfg['wireless']['txantenna'];
+	$pconfig['rxantenna'] = $wancfg['wireless']['rxantenna'];
+	$pconfig['distance'] = $wancfg['wireless']['distance'];
+	$pconfig['regdomain'] = $wancfg['wireless']['regdomain'];
+	$pconfig['regcountry'] = $wancfg['wireless']['regcountry'];
+	$pconfig['reglocation'] = $wancfg['wireless']['reglocation'];
+	$pconfig['wme_enable'] = isset($wancfg['wireless']['wme']['enable']);
+	if (isset($wancfg['wireless']['puren']['enable'])) {
+		$pconfig['puremode'] = '11n';
+	} else if (isset($wancfg['wireless']['pureg']['enable'])) {
+		$pconfig['puremode'] = '11g';
+	} else {
+		$pconfig['puremode'] = 'any';
+	}
+	$pconfig['apbridge_enable'] = isset($wancfg['wireless']['apbridge']['enable']);
+	$pconfig['authmode'] = $wancfg['wireless']['authmode'];
+	$pconfig['hidessid_enable'] = isset($wancfg['wireless']['hidessid']['enable']);
+	$pconfig['auth_server_addr'] = $wancfg['wireless']['auth_server_addr'];
+	$pconfig['auth_server_port'] = $wancfg['wireless']['auth_server_port'];
+	$pconfig['auth_server_shared_secret'] = $wancfg['wireless']['auth_server_shared_secret'];
+	$pconfig['auth_server_addr2'] = $wancfg['wireless']['auth_server_addr2'];
+	$pconfig['auth_server_port2'] = $wancfg['wireless']['auth_server_port2'];
+	$pconfig['auth_server_shared_secret2'] = $wancfg['wireless']['auth_server_shared_secret2'];
+	if (is_array($wancfg['wireless']['wpa'])) {
+		$pconfig['debug_mode'] = $wancfg['wireless']['wpa']['debug_mode'];
+		$pconfig['macaddr_acl'] = $wancfg['wireless']['wpa']['macaddr_acl'];
+		$pconfig['mac_acl_enable'] = isset($wancfg['wireless']['wpa']['mac_acl_enable']);
+		$pconfig['auth_algs'] = $wancfg['wireless']['wpa']['auth_algs'];
+		$pconfig['wpa_mode'] = $wancfg['wireless']['wpa']['wpa_mode'];
+		$pconfig['wpa_key_mgmt'] = $wancfg['wireless']['wpa']['wpa_key_mgmt'];
+		$pconfig['wpa_pairwise'] = $wancfg['wireless']['wpa']['wpa_pairwise'];
+		$pconfig['wpa_group_rekey'] = $wancfg['wireless']['wpa']['wpa_group_rekey'];
+		$pconfig['wpa_gmk_rekey'] = $wancfg['wireless']['wpa']['wpa_gmk_rekey'];
+		$pconfig['wpa_strict_rekey'] = isset($wancfg['wireless']['wpa']['wpa_strict_rekey']);
+		$pconfig['passphrase'] = $wancfg['wireless']['wpa']['passphrase'];
+		$pconfig['ieee8021x'] = isset($wancfg['wireless']['wpa']['ieee8021x']['enable']);
+		$pconfig['rsn_preauth'] = isset($wancfg['wireless']['wpa']['rsn_preauth']);
+		$pconfig['ext_wpa_sw'] = $wancfg['wireless']['wpa']['ext_wpa_sw'];
+		$pconfig['wpa_enable'] = isset($wancfg['wireless']['wpa']['enable']);
+	}
+
+	$pconfig['mac_acl'] = $wancfg['wireless']['mac_acl'];
+
+	if(ALLOWWEP) {
+		$pconfig['wep_enable'] = isset($wancfg['wireless']['wep']['enable']);
+
+		if (is_array($wancfg['wireless']['wep']) && is_array($wancfg['wireless']['wep']['key'])) {
+			$i = 1;
+			foreach ($wancfg['wireless']['wep']['key'] as $wepkey) {
+				$pconfig['key' . $i] = $wepkey['value'];
+				if (isset($wepkey['txkey'])) {
+					$pconfig['txkey'] = $i;
+				}
+				$i++;
+			}
+			if (!isset($wepkey['txkey'])) {
+				$pconfig['txkey'] = 1;
+			}
+		}
+	}
 }
 
 if ($_POST['apply']) {
-    unset($input_errors);
-    if (!is_subsystem_dirty('interfaces')) {
-        $input_errors[] = gettext("You have already applied your settings!");
-    } else {
-        unlink_if_exists("{$g['tmp_path']}/config.cache");
-        clear_subsystem_dirty('interfaces');
-
-        if (file_exists("{$g['tmp_path']}/.interfaces.apply")) {
-            $toapplylist = unserialize(file_get_contents("{$g['tmp_path']}/.interfaces.apply"));
-            foreach ($toapplylist as $ifapply => $ifcfgo) {
-                if (isset($config['interfaces'][$ifapply]['enable'])) {
-                    interface_bring_down($ifapply, false, $ifcfgo);
-                    interface_configure($ifapply, true);
-                } else {
-                    interface_bring_down($ifapply, true, $ifcfgo);
-                    if (isset($config['dhcpd'][$ifapply]['enable']) ||
-                        isset($config['dhcpdv6'][$ifapply]['enable'])) {
-                        services_dhcpd_configure();
-                    }
-                }
-            }
-        }
-        /* restart snmp so that it binds to correct address */
-        services_snmpd_configure();
-
-        /* sync filter configuration */
-        setup_gateways_monitor();
-
-        clear_subsystem_dirty('interfaces');
-
-        filter_configure();
-
-        enable_rrd_graphing();
-
-        if (is_subsystem_dirty('staticroutes') && (system_routing_configure() == 0)) {
-            clear_subsystem_dirty('staticroutes');
-        }
-    }
-    @unlink("{$g['tmp_path']}/.interfaces.apply");
-    header("Location: interfaces.php?if={$if}");
-    exit;
+	unset($input_errors);
+	if (!is_subsystem_dirty('interfaces')) {
+		$input_errors[] = gettext("You have already applied your settings!");
+	} else {
+		unlink_if_exists("{$g['tmp_path']}/config.cache");
+		clear_subsystem_dirty('interfaces');
+
+		if (file_exists("{$g['tmp_path']}/.interfaces.apply")) {
+			$toapplylist = unserialize(file_get_contents("{$g['tmp_path']}/.interfaces.apply"));
+			foreach ($toapplylist as $ifapply => $ifcfgo) {
+				if (isset($config['interfaces'][$ifapply]['enable'])) {
+					interface_bring_down($ifapply, false, $ifcfgo);
+					interface_configure($ifapply, true);
+				} else {
+					interface_bring_down($ifapply, true, $ifcfgo);
+					if (isset($config['dhcpd'][$ifapply]['enable']) ||
+						isset($config['dhcpdv6'][$ifapply]['enable'])) {
+						services_dhcpd_configure();
+					}
+				}
+			}
+		}
+		/* restart snmp so that it binds to correct address */
+		services_snmpd_configure();
+
+		/* sync filter configuration */
+		setup_gateways_monitor();
+
+		clear_subsystem_dirty('interfaces');
+
+		filter_configure();
+
+		enable_rrd_graphing();
+
+		if (is_subsystem_dirty('staticroutes') && (system_routing_configure() == 0)) {
+			clear_subsystem_dirty('staticroutes');
+		}
+	}
+	@unlink("{$g['tmp_path']}/.interfaces.apply");
+	header("Location: interfaces.php?if={$if}");
+	exit;
 } else if ($_POST && $_POST['enable'] != "yes") {
-    unset($wancfg['enable']);
-    if (isset($wancfg['wireless'])) {
-        interface_sync_wireless_clones($wancfg, false);
-    }
-    write_config("Interface {$_POST['descr']}({$if}) is now disabled.");
-    mark_subsystem_dirty('interfaces');
-    if (file_exists("{$g['tmp_path']}/.interfaces.apply")) {
-        $toapplylist = unserialize(file_get_contents("{$g['tmp_path']}/.interfaces.apply"));
-    } else {
-        $toapplylist = array();
-    }
-    $toapplylist[$if]['ifcfg'] = $wancfg;
-    $toapplylist[$if]['ppps'] = $a_ppps;
-    /* we need to be able remove IP aliases for IPv6 */
-    file_put_contents("{$g['tmp_path']}/.interfaces.apply", serialize($toapplylist));
-    header("Location: interfaces.php?if={$if}");
-    exit;
+	unset($wancfg['enable']);
+	if (isset($wancfg['wireless'])) {
+		interface_sync_wireless_clones($wancfg, false);
+	}
+	write_config("Interface {$_POST['descr']}({$if}) is now disabled.");
+	mark_subsystem_dirty('interfaces');
+	if (file_exists("{$g['tmp_path']}/.interfaces.apply")) {
+		$toapplylist = unserialize(file_get_contents("{$g['tmp_path']}/.interfaces.apply"));
+	} else {
+		$toapplylist = array();
+	}
+	$toapplylist[$if]['ifcfg'] = $wancfg;
+	$toapplylist[$if]['ppps'] = $a_ppps;
+	/* we need to be able remove IP aliases for IPv6 */
+	file_put_contents("{$g['tmp_path']}/.interfaces.apply", serialize($toapplylist));
+	header("Location: interfaces.php?if={$if}");
+	exit;
 } else if ($_POST) {
 
-    unset($input_errors);
-    $pconfig = $_POST;
-
-    if (is_numeric("0x" . $_POST['track6-prefix-id--hex'])) {
-        $pconfig['track6-prefix-id'] = intval($_POST['track6-prefix-id--hex'], 16);
-    } else {
-        $pconfig['track6-prefix-id'] = 0;
-    }
-    conf_mount_rw();
-
-    /* filter out spaces from descriptions */
-    $_POST['descr'] = remove_bad_chars($_POST['descr']);
-
-    /* okay first of all, cause we are just hiding the PPPoE HTML
-     * fields related to PPPoE resets, we are going to unset $_POST
-     * vars, if the reset feature should not be used. Otherwise the
-     * data validation procedure below, may trigger a false error
-     * message.
-     */
-    if (empty($_POST['pppoe-reset-type'])) {
-        unset($_POST['pppoe_pr_type']);
-        unset($_POST['pppoe_resethour']);
-        unset($_POST['pppoe_resetminute']);
-        unset($_POST['pppoe_resetdate']);
-        unset($_POST['pppoe_pr_preset_val']);
-    }
-    /* description unique? */
-    foreach ($ifdescrs as $ifent => $ifdescr) {
-        if ($if != $ifent && $ifdescr == $_POST['descr']) {
-            $input_errors[] = gettext("An interface with the specified description already exists.");
-            break;
-        }
-    }
-    if (is_numeric($_POST['descr'])) {
-        $input_errors[] = gettext("The interface description cannot contain only numbers.");
-    }
-    /* input validation */
-    if (isset($config['dhcpd']) && isset($config['dhcpd'][$if]['enable']) && (!preg_match("/^staticv4/", $_POST['type']))) {
-        $input_errors[] = gettext("The DHCP Server is active on this interface and it can be used only with a static IP configuration. Please disable the DHCP Server service on this interface first, then change the interface configuration.");
-    }
-    if (isset($config['dhcpdv6']) && isset($config['dhcpdv6'][$if]['enable']) && (!preg_match("/^staticv6/", $_POST['type6']))) {
-        $input_errors[] = gettext("The DHCP6 Server is active on this interface and it can be used only with a static IPv6 configuration. Please disable the DHCPv6 Server service on this interface first, then change the interface configuration.");
-    }
-
-    switch (strtolower($_POST['type'])) {
-        case "staticv4":
-            $reqdfields = explode(" ", "ipaddr subnet gateway");
-            $reqdfieldsn = array(gettext("IPv4 address"), gettext("Subnet bit count"), gettext("Gateway"));
-            do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
-            break;
-        case "none":
-            if (is_array($config['virtualip']['vip'])) {
-                foreach ($config['virtualip']['vip'] as $vip) {
-                    if (is_ipaddrv4($vip['subnet']) && $vip['interface'] == $if) {
-                        $input_errors[] = gettext("This interface is referenced by IPv4 VIPs. Please delete those before setting the interface to 'none' configuration.");
-                    }
-                }
-            }
-            break;
-        case "ppp":
-            $reqdfields = explode(" ", "port phone");
-            $reqdfieldsn = array(gettext("Modem Port"), gettext("Phone Number"));
-            do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
-            break;
-        case "pppoe":
-            if ($_POST['pppoe_dialondemand']) {
-                $reqdfields = explode(" ", "pppoe_username pppoe_password pppoe_dialondemand pppoe_idletimeout");
-                $reqdfieldsn = array(gettext("PPPoE username"), gettext("PPPoE password"), gettext("Dial on demand"), gettext("Idle timeout value"));
-            } else {
-                $reqdfields = explode(" ", "pppoe_username pppoe_password");
-                $reqdfieldsn = array(gettext("PPPoE username"), gettext("PPPoE password"));
-            }
-            do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
-            break;
-        case "pptp":
-            if ($_POST['pptp_dialondemand']) {
-                $reqdfields = explode(" ", "pptp_username pptp_password pptp_local pptp_subnet pptp_remote pptp_dialondemand pptp_idletimeout");
-                $reqdfieldsn = array(gettext("PPTP username"), gettext("PPTP password"), gettext("PPTP local IP address"), gettext("PPTP subnet"), gettext("PPTP remote IP address"), gettext("Dial on demand"), gettext("Idle timeout value"));
-            } else {
-                $reqdfields = explode(" ", "pptp_username pptp_password pptp_local pptp_subnet pptp_remote");
-                $reqdfieldsn = array(gettext("PPTP username"), gettext("PPTP password"), gettext("PPTP local IP address"), gettext("PPTP subnet"), gettext("PPTP remote IP address"));
-            }
-            do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
-            break;
-        case "l2tp":
-            if ($_POST['pptp_dialondemand']) {
-                $reqdfields = explode(" ", "pptp_username pptp_password pptp_remote pptp_dialondemand pptp_idletimeout");
-                $reqdfieldsn = array(gettext("L2TP username"), gettext("L2TP password"), gettext("L2TP remote IP address"), gettext("Dial on demand"), gettext("Idle timeout value"));
-            } else {
-                $reqdfields = explode(" ", "pptp_username pptp_password pptp_remote");
-                $reqdfieldsn = array(gettext("L2TP username"), gettext("L2TP password"), gettext("L2TP remote IP address"));
-            }
-            do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
-            break;
-    }
-    switch (strtolower($_POST['type6'])) {
-        case "staticv6":
-            $reqdfields = explode(" ", "ipaddrv6 subnetv6 gatewayv6");
-            $reqdfieldsn = array(gettext("IPv6 address"), gettext("Subnet bit count"), gettext("Gateway"));
-            do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
-            break;
-        case "none":
-            if (is_array($config['virtualip']['vip'])) {
-                foreach ($config['virtualip']['vip'] as $vip) {
-                    if (is_ipaddrv6($vip['subnet']) && $vip['interface'] == $if) {
-                        $input_errors[] = gettext("This interface is referenced by IPv6 VIPs. Please delete those before setting the interface to 'none' configuration.");
-                    }
-                }
-            }
-            break;
-        case "dhcp6":
-            if (in_array($wancfg['ipaddrv6'], array())) {
-                $input_errors[] = sprintf(gettext("You have to reassign the interface to be able to configure as %s."), $_POST['type6']);
-            }
-            if ($_POST['dhcp6-ia-pd-send-hint'] && strtolower($_POST['dhcp6-ia-pd-len']) == 'none') {
-                $input_errors[] = gettext('DHCPv6 Prefix Delegation size must be provided when Send IPv6 prefix hint flag is checked');
-            }
-            break;
-        case "6rd":
-            foreach ($ifdescrs as $ifent => $ifdescr) {
-                if ($if != $ifent && ($config[interfaces][$ifent]['ipaddrv6'] == $_POST['type6'])) {
-                    if ($config[interfaces][$ifent]['prefix-6rd'] == $_POST['prefix-6rd']) {
-                        $input_errors[] = gettext("You can only have one interface configured in 6rd with same prefix.");
-                        break;
-                    }
-                }
-            }
-            if (in_array($wancfg['ipaddrv6'], array())) {
-                $input_errors[] = sprintf(gettext("You have to reassign the interface to be able to configure as %s."), $_POST['type6']);
-            }
-            break;
-        case "6to4":
-            foreach ($ifdescrs as $ifent => $ifdescr) {
-                if ($if != $ifent && ($config[interfaces][$ifent]['ipaddrv6'] == $_POST['type6'])) {
-                    $input_errors[] = sprintf(gettext("You can only have one interface configured as 6to4."), $_POST['type6']);
-                    break;
-                }
-            }
-            if (in_array($wancfg['ipaddrv6'], array())) {
-                $input_errors[] = sprintf(gettext("You have to reassign the interface to be able to configure as %s."), $_POST['type6']);
-            }
-            break;
-        case "track6":
-            /* needs to check if $track6-prefix-id is used on another interface */
-            if (in_array($wancfg['ipaddrv6'], array())) {
-                $input_errors[] = sprintf(gettext("You have to reassign the interface to be able to configure as %s."), $_POST['type6']);
-            }
-
-            if ($_POST['track6-prefix-id--hex'] != "" && !is_numeric("0x" . $_POST['track6-prefix-id--hex'])) {
-                $input_errors[] = gettext("You must enter a valid hexadecimal number for the IPv6 prefix ID.");
-            } else {
-                $track6_prefix_id = intval($_POST['track6-prefix-id--hex'], 16);
-                if ($track6_prefix_id < 0 || $track6_prefix_id > $_POST['ipv6-num-prefix-ids-' . $_POST['track6-interface']]) {
-                    $input_errors[] = gettext("You specified an IPv6 prefix ID that is out of range.") .
-                        " ({$_POST['track6-interface']}) - (0) - (" . sprintf('%x', $_POST['ipv6-num-prefix-ids-' . $_POST['track6-interface']]) . ")";
-                } else {
-                    foreach ($ifdescrs as $ifent => $ifdescr) {
-                        if ($if == $ifent) {
-                            continue;
-                        }
-                        if ($config['interfaces'][$ifent]['ipaddrv6'] == 'track6' &&
-                            $config['interfaces'][$ifent]['track6-interface'] == $_POST['track6-interface'] &&
-                            $config['interfaces'][$ifent]['track6-prefix-id'] == $track6_prefix_id) {
-                            $input_errors[] = sprintf(gettext("This track6 prefix ID is already being used in %s."), $ifdescr);
-                        }
-                    }
-                }
-            }
-            break;
-    }
-
-    /* normalize MAC addresses - lowercase and convert Windows-ized hyphenated MACs to colon delimited */
-    $staticroutes = get_staticroutes(true);
-    $_POST['spoofmac'] = strtolower(str_replace("-", ":", $_POST['spoofmac']));
-    if ($_POST['ipaddr']) {
-        if (!is_ipaddrv4($_POST['ipaddr'])) {
-            $input_errors[] = gettext("A valid IPv4 address must be specified.");
-        } else {
-            $where_ipaddr_configured = where_is_ipaddr_configured($_POST['ipaddr'], $if, true, true, $_POST['subnet']);
-            if (count($where_ipaddr_configured)) {
-                $subnet_conflict_text = sprintf(gettext("IPv4 address %s is being used by or overlaps with:"), $_POST['ipaddr'] . "/" . $_POST['subnet']);
-                foreach ($where_ipaddr_configured as $subnet_conflict) {
-                    $subnet_conflict_text .= " " . convert_friendly_interface_to_friendly_descr($subnet_conflict['if']) . " (" . $subnet_conflict['ip_or_subnet'] . ")";
-                }
-                $input_errors[] = $subnet_conflict_text;
-            }
-
-            /* Do not accept network or broadcast address, except if subnet is 31 or 32 */
-            if ($_POST['subnet'] < 31) {
-                if ($_POST['ipaddr'] == gen_subnet($_POST['ipaddr'], $_POST['subnet'])) {
-                    $input_errors[] = gettext("This IPv4 address is the network address and cannot be used");
-                } else if ($_POST['ipaddr'] == gen_subnet_max($_POST['ipaddr'], $_POST['subnet'])) {
-                    $input_errors[] = gettext("This IPv4 address is the broadcast address and cannot be used");
-                }
-            }
-
-            foreach ($staticroutes as $route_subnet) {
-                list($network, $subnet) = explode("/", $route_subnet);
-                if ($_POST['subnet'] == $subnet && $network == gen_subnet($_POST['ipaddr'], $_POST['subnet'])) {
-                    $input_errors[] = gettext("This IPv4 address conflicts with a Static Route.");
-                    break;
-                }
-                unset($network, $subnet);
-            }
-        }
-    }
-    if ($_POST['ipaddrv6']) {
-        if (!is_ipaddrv6($_POST['ipaddrv6'])) {
-            $input_errors[] = gettext("A valid IPv6 address must be specified.");
-        } else {
-            $where_ipaddr_configured = where_is_ipaddr_configured($_POST['ipaddrv6'], $if, true, true, $_POST['subnetv6']);
-            if (count($where_ipaddr_configured)) {
-                $subnet_conflict_text = sprintf(gettext("IPv6 address %s is being used by or overlaps with:"), $_POST['ipaddrv6'] . "/" . $_POST['subnetv6']);
-                foreach ($where_ipaddr_configured as $subnet_conflict) {
-                    $subnet_conflict_text .= " " . convert_friendly_interface_to_friendly_descr($subnet_conflict['if']) . " (" . $subnet_conflict['ip_or_subnet'] . ")";
-                }
-                $input_errors[] = $subnet_conflict_text;
-            }
-
-            foreach ($staticroutes as $route_subnet) {
-                list($network, $subnet) = explode("/", $route_subnet);
-                if ($_POST['subnetv6'] == $subnet && $network == gen_subnetv6($_POST['ipaddrv6'], $_POST['subnetv6'])) {
-                    $input_errors[] = gettext("This IPv6 address conflicts with a Static Route.");
-                    break;
-                }
-                unset($network, $subnet);
-            }
-        }
-    }
-    if (($_POST['subnet'] && !is_numeric($_POST['subnet']))) {
-        $input_errors[] = gettext("A valid subnet bit count must be specified.");
-    }
-    if (($_POST['subnetv6'] && !is_numeric($_POST['subnetv6']))) {
-        $input_errors[] = gettext("A valid subnet bit count must be specified.");
-    }
-    if (($_POST['alias-address'] && !is_ipaddrv4($_POST['alias-address']))) {
-        $input_errors[] = gettext("A valid alias IP address must be specified.");
-    }
-    if (($_POST['alias-subnet'] && !is_numeric($_POST['alias-subnet']))) {
-        $input_errors[] = gettext("A valid alias subnet bit count must be specified.");
-    }
-    if ($_POST['dhcprejectfrom'] && !is_ipaddrv4($_POST['dhcprejectfrom'])) {
-        $input_errors[] = gettext("A valid alias IP address must be specified to reject DHCP Leases from.");
-    }
-    if (($_POST['gateway'] != "none") || ($_POST['gatewayv6'] != "none")) {
-        $match = false;
-        foreach ($a_gateways as $gateway) {
-            if (in_array($_POST['gateway'], $gateway)) {
-                $match = true;
-            }
-        }
-        foreach ($a_gateways as $gateway) {
-            if (in_array($_POST['gatewayv6'], $gateway)) {
-                $match = true;
-            }
-        }
-        if (!$match) {
-            $input_errors[] = gettext("A valid gateway must be specified.");
-        }
-    }
-    if (($_POST['provider'] && !is_domain($_POST['provider']))) {
-        $input_errors[] = gettext("The service name contains invalid characters.");
-    }
-    if (($_POST['pppoe_idletimeout'] != "") && !is_numericint($_POST['pppoe_idletimeout'])) {
-        $input_errors[] = gettext("The idle timeout value must be an integer.");
-    }
-    if ($_POST['pppoe_resethour'] != "" && !is_numericint($_POST['pppoe_resethour']) &&
-        $_POST['pppoe_resethour'] >= 0 && $_POST['pppoe_resethour'] <=23) {
-            $input_errors[] = gettext("A valid PPPoE reset hour must be specified (0-23).");
-    }
-    if ($_POST['pppoe_resetminute'] != "" && !is_numericint($_POST['pppoe_resetminute']) &&
-        $_POST['pppoe_resetminute'] >= 0 && $_POST['pppoe_resetminute'] <=59) {
-            $input_errors[] = gettext("A valid PPPoE reset minute must be specified (0-59).");
-    }
-    if ($_POST['pppoe_resetdate'] != "" && !is_numeric(str_replace("/", "", $_POST['pppoe_resetdate']))) {
-        $input_errors[] = gettext("A valid PPPoE reset date must be specified (mm/dd/yyyy).");
-    }
-    if (($_POST['pptp_local'] && !is_ipaddrv4($_POST['pptp_local']))) {
-        $input_errors[] = gettext("A valid PPTP local IP address must be specified.");
-    }
-    if (($_POST['pptp_subnet'] && !is_numeric($_POST['pptp_subnet']))) {
-        $input_errors[] = gettext("A valid PPTP subnet bit count must be specified.");
-    }
-    if (($_POST['pptp_remote'] && !is_ipaddrv4($_POST['pptp_remote']) && !is_hostname($_POST['gateway'][$iface]))) {
-        $input_errors[] = gettext("A valid PPTP remote IP address must be specified.");
-    }
-    if (($_POST['pptp_idletimeout'] != "") && !is_numericint($_POST['pptp_idletimeout'])) {
-        $input_errors[] = gettext("The idle timeout value must be an integer.");
-    }
-    if (($_POST['spoofmac'] && !is_macaddr($_POST['spoofmac']))) {
-        $input_errors[] = gettext("A valid MAC address must be specified.");
-    }
-    if ($_POST['mtu']) {
-        if (!is_numericint($_POST['mtu'])) {
-            $input_errors[] = "MTU must be an integer.";
-        }
-        if (substr($wancfg['if'], 0, 3) == 'gif') {
-            $min_mtu = 1280;
-            $max_mtu = 8192;
-        } else {
-            $min_mtu = 576;
-            $max_mtu = 9000;
-        }
-
-        if ($_POST['mtu'] < $min_mtu || $_POST['mtu'] > $max_mtu) {
-            $input_errors[] = sprintf(gettext("The MTU must be between %d and %d bytes."), $min_mtu, $max_mtu);
-        }
-
-        unset($min_mtu, $max_mtu);
-
-        if (stristr($wancfg['if'], "_vlan")) {
-            $realhwif_array = get_parent_interface($wancfg['if']);
-            // Need code to handle MLPPP if we ever use $realhwif for MLPPP handling
-            $parent_realhwif = $realhwif_array[0];
-            $parent_if = convert_real_interface_to_friendly_interface_name($parent_realhwif);
-            if (!empty($parent_if) && !empty($config['interfaces'][$parent_if]['mtu'])) {
-                if ($_POST['mtu'] > intval($config['interfaces'][$parent_if]['mtu'])) {
-                    $input_errors[] = gettext("The MTU of a VLAN cannot be greater than that of its parent interface.");
-                }
-            }
-        } else {
-            foreach ($config['interfaces'] as $idx => $ifdata) {
-                if (($idx == $if) || !preg_match('/_vlan[0-9]/', $ifdata['if'])) {
-                    continue;
-                }
-
-                $realhwif_array = get_parent_interface($ifdata['if']);
-                // Need code to handle MLPPP if we ever use $realhwif for MLPPP handling
-                $parent_realhwif = $realhwif_array[0];
-
-                if ($parent_realhwif != $wancfg['if']) {
-                    continue;
-                }
-
-                if (isset($ifdata['mtu']) && $ifdata['mtu'] > $_POST['mtu']) {
-                    $input_errors[] = sprintf(gettext("Interface %s (VLAN) has MTU set to a larger value"), $ifdata['descr']);
-                }
-            }
-        }
-    }
-    if ($_POST['mss'] != '') {
-        if (!is_numericint($_POST['mss']) || ($_POST['mss'] < 576 || $_POST['mss'] > 65535)) {
-            $input_errors[] = gettext("The MSS must be an integer between 576 and 65535 bytes.");
-        }
-    }
-    /* Wireless interface? */
-    if (isset($wancfg['wireless'])) {
-        $reqdfields = array("mode");
-        $reqdfieldsn = array(gettext("Mode"));
-        if ($_POST['mode'] == 'hostap') {
-            $reqdfields[] = "ssid";
-            $reqdfieldsn[] = gettext("SSID");
-            if (isset($_POST['channel']) && $_POST['channel'] == "0") {
-                // auto channel with hostap is broken, prevent this for now.
-                $input_errors[] = gettext("A specific channel, not auto, must be selected for Access Point mode.");
-            }
-        }
-        if (stristr($_POST['standard'], '11n')) {
-            if (!($_POST['wme_enable'])) {
-                $input_errors[] = gettext("802.11n standards require enabling WME.");
-            }
-        }
-        do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
-        check_wireless_mode();
-        if (isset($_POST['wpa_group_rekey']) && (!is_numericint($_POST['wpa_group_rekey']) || $_POST['wpa_group_rekey'] < 1 || $_POST['wpa_group_rekey'] > 9999)) {
-            $input_errors[] = gettext("Key Rotation must be an integer between 1 and 9999.");
-        }
-        if (isset($_POST['wpa_gmk_rekey']) && (!is_numericint($_POST['wpa_gmk_rekey']) || $_POST['wpa_gmk_rekey'] < 1 || $_POST['wpa_gmk_rekey'] > 9999)) {
-            $input_errors[] = gettext("Master Key Regeneration must be an integer between 1 and 9999.");
-        }
-        if (isset($_POST['wpa_group_rekey']) && isset($_POST['wpa_gmk_rekey'])) {
-            if ($_POST['wpa_group_rekey'] > $_POST['wpa_gmk_rekey']) {
-                $input_errors[] = gettext("Master Key Regeneration must be greater than Key Rotation.");
-            }
-        }
-        if (!empty($_POST['auth_server_addr'])) {
-            if (!is_domain($_POST['auth_server_addr']) && !is_ipaddr($_POST['auth_server_addr'])) {
-                $input_errors[] = gettext("802.1X Authentication Server must be an IP or hostname.");
-            }
-        }
-        if (!empty($_POST['auth_server_addr2'])) {
-            if (!is_domain($_POST['auth_server_addr2']) && !is_ipaddr($_POST['auth_server_addr2'])) {
-                $input_errors[] = gettext("Secondary 802.1X Authentication Server must be an IP or hostname.");
-            }
-        }
-        if (!empty($_POST['auth_server_port'])) {
-            if (!is_port($_POST['auth_server_port'])) {
-                $input_errors[] = gettext("802.1X Authentication Server Port must be a valid port number (1-65535).");
-            }
-        }
-        if (!empty($_POST['auth_server_port2'])) {
-            if (!is_port($_POST['auth_server_port2'])) {
-                $input_errors[] = gettext("Secondary 802.1X Authentication Server Port must be a valid port number (1-65535).");
-            }
-        }
-        if (isset($_POST['channel']) && !is_numericint($_POST['channel'])) {
-            if (!is_numericint($_POST['channel'])) {
-                $input_errors[] = gettext("Invalid channel specified.");
-            } else {
-                if ($_POST['channel'] > 255 || $_POST['channel'] < 0) {
-                    $input_errors[] = gettext("Channel must be between 0-255.");
-                }
-            }
-        }
-        if (!empty($_POST['distance']) && !is_numericint($_POST['distance'])) {
-            $input_errors[] = gettext("Distance must be an integer.");
-        }
-        if (isset($_POST['standard']) && (stristr($_POST['standard'], '11na') || stristr($_POST['standard'], '11a'))) {
-            if ($_POST['channel'] != 0 && $_POST['channel'] < 15) {
-                $input_errors[] = gettext("Channel selected is not valid for 802.11a or 802.11na.");
-            }
-        }
-        if (isset($_POST['standard']) && ($_POST['standard'] == "11b" || $_POST['standard'] == "11g")) {
-            if ($_POST['channel'] > 14) {
-                $input_errors[] = gettext("Channel selected is not valid for 802.11b or 802.11g.");
-            }
-        }
-        if (!empty($_POST['protmode']) && !in_array($_POST['protmode'], array("off", "cts", "rtscts"))) {
-            $input_errors[] = gettext("Invalid option chosen for OFDM Protection Mode");
-        }
-
-        if(ALLOWWEP) {
-            /* loop through keys and enforce size */
-            for ($i = 1; $i <= 4; $i++) {
-                if ($_POST['key' . $i]) {
-                    /* 64 bit */
-                    if (strlen($_POST['key' . $i]) == 5) {
-                        continue;
-                    }
-
-                    if (strlen($_POST['key' . $i]) == 10) {
-                        /* hex key */
-                        if (stristr($_POST['key' . $i], "0x") == false) {
-                            $_POST['key' . $i] = "0x" . $_POST['key' . $i];
-                        }
-                        continue;
-                    }
-
-                    if (strlen($_POST['key' . $i]) == 12) {
-                        /* hex key */
-                        if (stristr($_POST['key' . $i], "0x") == false) {
-                            $_POST['key' . $i] = "0x" . $_POST['key' . $i];
-                        }
-                        continue;
-                    }
-
-                    /* 128 bit */
-                    if (strlen($_POST['key' . $i]) == 13) {
-                        continue;
-                    }
-
-                    if (strlen($_POST['key' . $i]) == 26) {
-                        /* hex key */
-                        if (stristr($_POST['key' . $i], "0x") == false) {
-                            $_POST['key' . $i] = "0x" . $_POST['key' . $i];
-                        }
-                        continue;
-                    }
-
-                    if (strlen($_POST['key' . $i]) == 28) {
-                        continue;
-                    }
-
-                    $input_errors[] = gettext("Invalid WEP key. Enter a valid 40, 64, 104 or 128 bit WEP key.");
-                    break;
-                }
-            }
-        }
-
-        if ($_POST['passphrase']) {
-            $passlen = strlen($_POST['passphrase']);
-            if ($passlen < 8 || $passlen > 63) {
-                $input_errors[] = gettext("The WPA passphrase must be between 8 and 63 characters long.");
-            }
-        }
-
-        if ($_POST['wpa_enable'] == "yes") {
-            if (empty($_POST['passphrase']) && stristr($_POST['wpa_key_mgmt'], "WPA-PSK")) {
-                $input_errors[] = gettext("A WPA Passphrase must be specified when WPA PSK is enabled.");
-            }
-        }
-    }
-    if (!$input_errors) {
-        if ($wancfg['ipaddr'] != $_POST['type']) {
-            if (in_array($wancfg['ipaddr'], array("ppp", "pppoe", "pptp", "l2tp"))) {
-                $wancfg['if'] = $a_ppps[$pppid]['ports'];
-                unset($a_ppps[$pppid]);
-            } else if ($wancfg['ipaddr'] == "dhcp") {
-                kill_dhclient_process($wancfg['if']);
-            }
-            if ($wancfg['ipaddrv6'] == "dhcp6") {
-                $pid = find_dhcp6c_process($wancfg['if']);
-                if ($pid) {
-                    posix_kill($pid, SIGTERM);
-                }
-            }
-        }
-        $ppp = array();
-        if ($wancfg['ipaddr'] != "ppp") {
-            unset($wancfg['ipaddr']);
-        }
-        if ($wancfg['ipaddrv6'] != "ppp") {
-            unset($wancfg['ipaddrv6']);
-        }
-        unset($wancfg['subnet']);
-        unset($wancfg['gateway']);
-        unset($wancfg['subnetv6']);
-        unset($wancfg['gatewayv6']);
-        unset($wancfg['dhcphostname']);
-        unset($wancfg['dhcprejectfrom']);
-        unset($wancfg['dhcp6-duid']);
-        unset($wancfg['dhcp6-ia-pd-len']);
-        unset($wancfg['dhcp6-ia-pd-send-hint']);
-        unset($wancfg['dhcp6prefixonly']);
-        unset($wancfg['dhcp6usev4iface']);
-        unset($wancfg['track6-interface']);
-        unset($wancfg['track6-prefix-id']);
-        unset($wancfg['prefix-6rd']);
-        unset($wancfg['prefix-6rd-v4plen']);
-        unset($wancfg['gateway-6rd']);
-
-        unset($wancfg['adv_dhcp_pt_timeout']);
-        unset($wancfg['adv_dhcp_pt_retry']);
-        unset($wancfg['adv_dhcp_pt_select_timeout']);
-        unset($wancfg['adv_dhcp_pt_reboot']);
-        unset($wancfg['adv_dhcp_pt_backoff_cutoff']);
-        unset($wancfg['adv_dhcp_pt_initial_interval']);
-
-        unset($wancfg['adv_dhcp_pt_values']);
-
-        unset($wancfg['adv_dhcp_send_options']);
-        unset($wancfg['adv_dhcp_request_options']);
-        unset($wancfg['adv_dhcp_required_options']);
-        unset($wancfg['adv_dhcp_option_modifiers']);
-
-        unset($wancfg['adv_dhcp_config_advanced']);
-        unset($wancfg['adv_dhcp_config_file_override']);
-        unset($wancfg['adv_dhcp_config_file_override_path']);
-
-        unset($wancfg['adv_dhcp6_interface_statement_send_options']);
-        unset($wancfg['adv_dhcp6_interface_statement_request_options']);
-        unset($wancfg['adv_dhcp6_interface_statement_information_only_enable']);
-        unset($wancfg['adv_dhcp6_interface_statement_script']);
-
-        unset($wancfg['adv_dhcp6_id_assoc_statement_address_enable']);
-        unset($wancfg['adv_dhcp6_id_assoc_statement_address']);
-        unset($wancfg['adv_dhcp6_id_assoc_statement_address_id']);
-        unset($wancfg['adv_dhcp6_id_assoc_statement_address_pltime']);
-        unset($wancfg['adv_dhcp6_id_assoc_statement_address_vltime']);
-
-        unset($wancfg['adv_dhcp6_id_assoc_statement_prefix_enable']);
-        unset($wancfg['adv_dhcp6_id_assoc_statement_prefix']);
-        unset($wancfg['adv_dhcp6_id_assoc_statement_prefix_id']);
-        unset($wancfg['adv_dhcp6_id_assoc_statement_prefix_pltime']);
-        unset($wancfg['adv_dhcp6_id_assoc_statement_prefix_vltime']);
-
-        unset($wancfg['adv_dhcp6_prefix_interface_statement_sla_id']);
-        unset($wancfg['adv_dhcp6_prefix_interface_statement_sla_len']);
-
-        unset($wancfg['adv_dhcp6_authentication_statement_authname']);
-        unset($wancfg['adv_dhcp6_authentication_statement_protocol']);
-        unset($wancfg['adv_dhcp6_authentication_statement_algorithm']);
-        unset($wancfg['adv_dhcp6_authentication_statement_rdm']);
-
-        unset($wancfg['adv_dhcp6_key_info_statement_keyname']);
-        unset($wancfg['adv_dhcp6_key_info_statement_realm']);
-        unset($wancfg['adv_dhcp6_key_info_statement_keyid']);
-        unset($wancfg['adv_dhcp6_key_info_statement_secret']);
-        unset($wancfg['adv_dhcp6_key_info_statement_expire']);
-
-        unset($wancfg['adv_dhcp6_config_advanced']);
-        unset($wancfg['adv_dhcp6_config_file_override']);
-        unset($wancfg['adv_dhcp6_config_file_override_path']);
-
-        unset($wancfg['pppoe_password']);
-        unset($wancfg['pptp_username']);
-        unset($wancfg['pptp_password']);
-        unset($wancfg['provider']);
-        unset($wancfg['ondemand']);
-        unset($wancfg['timeout']);
-        if (empty($wancfg['pppoe']['pppoe-reset-type'])) {
-            unset($wancfg['pppoe']['pppoe-reset-type']);
-        }
-        unset($wancfg['local']);
-
-        unset($wancfg['remote']);
-        if (is_array($a_ppps[$pppid]) && in_array($wancfg['ipaddr'], array("ppp", "pppoe", "pptp", "l2tp"))) {
-            if ($wancfg['ipaddr'] != 'ppp') {
-                unset($a_ppps[$pppid]['apn']);
-                unset($a_ppps[$pppid]['phone']);
-                unset($a_ppps[$pppid]['provider']);
-                unset($a_ppps[$pppid]['ondemand']);
-            }
-            if (in_array($wancfg['ipaddr'], array("pppoe", "pptp", "l2tp"))) {
-                unset($a_ppps[$pppid]['localip']);
-                unset($a_ppps[$pppid]['subnet']);
-                unset($a_ppps[$pppid]['gateway']);
-            }
-            if ($wancfg['ipaddr'] != 'pppoe') {
-                unset($a_ppps[$pppid]['pppoe-reset-type']);
-            }
-            if ($wancfg['type'] != $_POST['type']) {
-                unset($a_ppps[$pppid]['idletimeout']);
-            }
-        }
-
-        $wancfg['descr'] = remove_bad_chars($_POST['descr']);
-        $wancfg['enable'] = $_POST['enable'] == "yes" ? true : false;
-
-        /* let return_gateways_array() do the magic on dynamic interfaces for us */
-        switch ($_POST['type']) {
-            case "staticv4":
-                $wancfg['ipaddr'] = $_POST['ipaddr'];
-                $wancfg['subnet'] = $_POST['subnet'];
-                if ($_POST['gateway'] != "none") {
-                    $wancfg['gateway'] = $_POST['gateway'];
-                }
-                break;
-            case "dhcp":
-                $wancfg['ipaddr'] = "dhcp";
-                $wancfg['dhcphostname'] = $_POST['dhcphostname'];
-                $wancfg['alias-address'] = $_POST['alias-address'];
-                $wancfg['alias-subnet'] = $_POST['alias-subnet'];
-                $wancfg['dhcprejectfrom'] = $_POST['dhcprejectfrom'];
-
-                $wancfg['adv_dhcp_pt_timeout'] = $_POST['adv_dhcp_pt_timeout'];
-                $wancfg['adv_dhcp_pt_retry'] = $_POST['adv_dhcp_pt_retry'];
-                $wancfg['adv_dhcp_pt_select_timeout'] = $_POST['adv_dhcp_pt_select_timeout'];
-                $wancfg['adv_dhcp_pt_reboot'] = $_POST['adv_dhcp_pt_reboot'];
-                $wancfg['adv_dhcp_pt_backoff_cutoff'] = $_POST['adv_dhcp_pt_backoff_cutoff'];
-                $wancfg['adv_dhcp_pt_initial_interval'] = $_POST['adv_dhcp_pt_initial_interval'];
-
-                $wancfg['adv_dhcp_pt_values'] = $_POST['adv_dhcp_pt_values'];
-
-                $wancfg['adv_dhcp_send_options'] = $_POST['adv_dhcp_send_options'];
-                $wancfg['adv_dhcp_request_options'] = $_POST['adv_dhcp_request_options'];
-                $wancfg['adv_dhcp_required_options'] = $_POST['adv_dhcp_required_options'];
-                $wancfg['adv_dhcp_option_modifiers'] = $_POST['adv_dhcp_option_modifiers'];
-
-                $wancfg['adv_dhcp_config_advanced'] = $_POST['adv_dhcp_config_advanced'];
-                $wancfg['adv_dhcp_config_file_override'] = $_POST['adv_dhcp_config_file_override'];
-                $wancfg['adv_dhcp_config_file_override_path'] = $_POST['adv_dhcp_config_file_override_path'];
-
-                $wancfg['dhcp_plus'] = $_POST['dhcp_plus'] == "yes" ? true : false;
-                if ($gateway_item) {
-                    $a_gateways[] = $gateway_item;
-                }
-                break;
-            case "ppp":
-                $a_ppps[$pppid]['ptpid'] = $_POST['ptpid'];
-                $a_ppps[$pppid]['type'] = $_POST['type'];
-                $a_ppps[$pppid]['if'] = $_POST['type'].$_POST['ptpid'];
-                $a_ppps[$pppid]['ports'] = $_POST['port'];
-                $a_ppps[$pppid]['username'] = $_POST['ppp_username'];
-                $a_ppps[$pppid]['password'] = base64_encode($_POST['ppp_password']);
-                $a_ppps[$pppid]['phone'] = $_POST['phone'];
-                $a_ppps[$pppid]['apn'] = $_POST['apn'];
-                $wancfg['if'] = $_POST['type'] . $_POST['ptpid'];
-                $wancfg['ipaddr'] = $_POST['type'];
-                break;
-
-            case "pppoe":
-                $a_ppps[$pppid]['ptpid'] = $_POST['ptpid'];
-                $a_ppps[$pppid]['type'] = $_POST['type'];
-                $a_ppps[$pppid]['if'] = $_POST['type'].$_POST['ptpid'];
-                if (isset($_POST['ppp_port'])) {
-                    $a_ppps[$pppid]['ports'] = $_POST['ppp_port'];
-                } else {
-                    $a_ppps[$pppid]['ports'] = $wancfg['if'];
-                }
-                $a_ppps[$pppid]['username'] = $_POST['pppoe_username'];
-                $a_ppps[$pppid]['password'] = base64_encode($_POST['pppoe_password']);
-                if (!empty($_POST['provider'])) {
-                    $a_ppps[$pppid]['provider'] = $_POST['provider'];
-                } else {
-                    $a_ppps[$pppid]['provider'] = true;
-                }
-                $a_ppps[$pppid]['ondemand'] = $_POST['pppoe_dialondemand'] ? true : false;
-                if (!empty($_POST['pppoe_idletimeout'])) {
-                    $a_ppps[$pppid]['idletimeout'] = $_POST['pppoe_idletimeout'];
-                } else {
-                    unset($a_ppps[$pppid]['idletimeout']);
-                }
-
-                if (!empty($_POST['pppoe-reset-type'])) {
-                    $a_ppps[$pppid]['pppoe-reset-type'] = $_POST['pppoe-reset-type'];
-                } else {
-                    unset($a_ppps[$pppid]['pppoe-reset-type']);
-                }
-                $wancfg['if'] = $_POST['type'].$_POST['ptpid'];
-                $wancfg['ipaddr'] = $_POST['type'];
-                if ($gateway_item) {
-                    $a_gateways[] = $gateway_item;
-                }
-
-                break;
-            case "pptp":
-            case "l2tp":
-                $a_ppps[$pppid]['ptpid'] = $_POST['ptpid'];
-                $a_ppps[$pppid]['type'] = $_POST['type'];
-                $a_ppps[$pppid]['if'] = $_POST['type'].$_POST['ptpid'];
-                if (isset($_POST['ppp_port'])) {
-                    $a_ppps[$pppid]['ports'] = $_POST['ppp_port'];
-                } else {
-                    $a_ppps[$pppid]['ports'] = $wancfg['if'];
-                }
-                $a_ppps[$pppid]['username'] = $_POST['pptp_username'];
-                $a_ppps[$pppid]['password'] = base64_encode($_POST['pptp_password']);
-                $a_ppps[$pppid]['localip'] = $_POST['pptp_local'];
-                $a_ppps[$pppid]['subnet'] = $_POST['pptp_subnet'];
-                $a_ppps[$pppid]['gateway'] = $_POST['pptp_remote'];
-                $a_ppps[$pppid]['ondemand'] = $_POST['pptp_dialondemand'] ? true : false;
-                if (!empty($_POST['pptp_idletimeout'])) {
-                    $a_ppps[$pppid]['idletimeout'] = $_POST['pptp_idletimeout'];
-                } else {
-                    unset($a_ppps[$pppid]['idletimeout']);
-                }
-                $wancfg['if'] = $_POST['type'].$_POST['ptpid'];
-                $wancfg['ipaddr'] = $_POST['type'];
-                if ($gateway_item) {
-                    $a_gateways[] = $gateway_item;
-                }
-                break;
-            case "none":
-                break;
-        }
-        switch ($_POST['type6']) {
-            case "staticv6":
-                $wancfg['ipaddrv6'] = $_POST['ipaddrv6'];
-                $wancfg['subnetv6'] = $_POST['subnetv6'];
-                if ($_POST['gatewayv6'] != "none") {
-                    $wancfg['gatewayv6'] = $_POST['gatewayv6'];
-                }
-                break;
-            case "slaac":
-                $wancfg['ipaddrv6'] = "slaac";
-                break;
-            case "dhcp6":
-                $wancfg['ipaddrv6'] = "dhcp6";
-                $wancfg['dhcp6-duid'] = $_POST['dhcp6-duid'];
-                $wancfg['dhcp6-ia-pd-len'] = $_POST['dhcp6-ia-pd-len'];
-                if ($_POST['dhcp6-ia-pd-send-hint'] == "yes") {
-                    $wancfg['dhcp6-ia-pd-send-hint'] = true;
-                }
-                if ($_POST['dhcp6prefixonly'] == "yes") {
-                    $wancfg['dhcp6prefixonly'] = true;
-                }
-                if ($_POST['dhcp6usev4iface'] == "yes") {
-                    $wancfg['dhcp6usev4iface'] = true;
-                }
-
-                if (!empty($_POST['adv_dhcp6_interface_statement_send_options'])) {
-                    $wancfg['adv_dhcp6_interface_statement_send_options'] = $_POST['adv_dhcp6_interface_statement_send_options'];
-                }
-                if (!empty($_POST['adv_dhcp6_interface_statement_request_options'])) {
-                    $wancfg['adv_dhcp6_interface_statement_request_options'] = $_POST['adv_dhcp6_interface_statement_request_options'];
-                }
-                if (isset($_POST['adv_dhcp6_interface_statement_information_only_enable'])) {
-                    $wancfg['adv_dhcp6_interface_statement_information_only_enable'] = $_POST['adv_dhcp6_interface_statement_information_only_enable'];
-                }
-                if (!empty($_POST['adv_dhcp6_interface_statement_script'])) {
-                    $wancfg['adv_dhcp6_interface_statement_script'] = $_POST['adv_dhcp6_interface_statement_script'];
-                }
-
-                if (isset($_POST['adv_dhcp6_id_assoc_statement_address_enable'])) {
-                    $wancfg['adv_dhcp6_id_assoc_statement_address_enable'] = $_POST['adv_dhcp6_id_assoc_statement_address_enable'];
-                }
-                if (!empty($_POST['adv_dhcp6_id_assoc_statement_address'])) {
-                    $wancfg['adv_dhcp6_id_assoc_statement_address'] = $_POST['adv_dhcp6_id_assoc_statement_address'];
-                }
-                if (is_numericint($_POST['adv_dhcp6_id_assoc_statement_address_id'])) {
-                    $wancfg['adv_dhcp6_id_assoc_statement_address_id'] = $_POST['adv_dhcp6_id_assoc_statement_address_id'];
-                }
-                if (!empty($_POST['adv_dhcp6_id_assoc_statement_address_pltime'])) {
-                    $wancfg['adv_dhcp6_id_assoc_statement_address_pltime'] = $_POST['adv_dhcp6_id_assoc_statement_address_pltime'];
-                }
-                if (!empty($_POST['adv_dhcp6_id_assoc_statement_address_vltime'])) {
-                    $wancfg['adv_dhcp6_id_assoc_statement_address_vltime'] = $_POST['adv_dhcp6_id_assoc_statement_address_vltime'];
-                }
-
-                if (isset($_POST['adv_dhcp6_id_assoc_statement_prefix_enable'])) {
-                    $wancfg['adv_dhcp6_id_assoc_statement_prefix_enable'] = $_POST['adv_dhcp6_id_assoc_statement_prefix_enable'];
-                }
-                if (!empty($_POST['adv_dhcp6_id_assoc_statement_prefix'])) {
-                    $wancfg['adv_dhcp6_id_assoc_statement_prefix'] = $_POST['adv_dhcp6_id_assoc_statement_prefix'];
-                }
-                if (is_numericint($_POST['adv_dhcp6_id_assoc_statement_prefix_id'])) {
-                    $wancfg['adv_dhcp6_id_assoc_statement_prefix_id'] = $_POST['adv_dhcp6_id_assoc_statement_prefix_id'];
-                }
-                if (!empty($_POST['adv_dhcp6_id_assoc_statement_prefix_pltime'])) {
-                    $wancfg['adv_dhcp6_id_assoc_statement_prefix_pltime'] = $_POST['adv_dhcp6_id_assoc_statement_prefix_pltime'];
-                }
-                if (!empty($_POST['adv_dhcp6_id_assoc_statement_prefix_vltime'])) {
-                    $wancfg['adv_dhcp6_id_assoc_statement_prefix_vltime'] = $_POST['adv_dhcp6_id_assoc_statement_prefix_vltime'];
-                }
-
-                if (is_numericint($_POST['adv_dhcp6_prefix_interface_statement_sla_id'])) {
-                    $wancfg['adv_dhcp6_prefix_interface_statement_sla_id'] = $_POST['adv_dhcp6_prefix_interface_statement_sla_id'];
-                }
-                if (is_numericint($_POST['adv_dhcp6_prefix_interface_statement_sla_len'])) {
-                    $wancfg['adv_dhcp6_prefix_interface_statement_sla_len'] = $_POST['adv_dhcp6_prefix_interface_statement_sla_len'];
-                }
-
-                if (!empty($_POST['adv_dhcp6_authentication_statement_authname'])) {
-                    $wancfg['adv_dhcp6_authentication_statement_authname'] = $_POST['adv_dhcp6_authentication_statement_authname'];
-                }
-                if (!empty($_POST['adv_dhcp6_authentication_statement_protocol'])) {
-                    $wancfg['adv_dhcp6_authentication_statement_protocol'] = $_POST['adv_dhcp6_authentication_statement_protocol'];
-                }
-                if (!empty($_POST['adv_dhcp6_authentication_statement_algorithm'])) {
-                    $wancfg['adv_dhcp6_authentication_statement_algorithm'] = $_POST['adv_dhcp6_authentication_statement_algorithm'];
-                }
-                if (!empty($_POST['adv_dhcp6_authentication_statement_rdm'])) {
-                    $wancfg['adv_dhcp6_authentication_statement_rdm'] = $_POST['adv_dhcp6_authentication_statement_rdm'];
-                }
-
-                if (!empty($_POST['adv_dhcp6_key_info_statement_keyname'])) {
-                    $wancfg['adv_dhcp6_key_info_statement_keyname'] = $_POST['adv_dhcp6_key_info_statement_keyname'];
-                }
-                if (!empty($_POST['adv_dhcp6_key_info_statement_realm'])) {
-                    $wancfg['adv_dhcp6_key_info_statement_realm'] = $_POST['adv_dhcp6_key_info_statement_realm'];
-                }
-                if (!empty($_POST['adv_dhcp6_key_info_statement_keyid'])) {
-                    $wancfg['adv_dhcp6_key_info_statement_keyid'] = $_POST['adv_dhcp6_key_info_statement_keyid'];
-                }
-                if (!empty($_POST['adv_dhcp6_key_info_statement_secret'])) {
-                    $wancfg['adv_dhcp6_key_info_statement_secret'] = $_POST['adv_dhcp6_key_info_statement_secret'];
-                }
-                if (!empty($_POST['adv_dhcp6_key_info_statement_expire'])) {
-                    $wancfg['adv_dhcp6_key_info_statement_expire'] = $_POST['adv_dhcp6_key_info_statement_expire'];
-                }
-
-                if (!empty($_POST['adv_dhcp6_config_advanced'])) {
-                    $wancfg['adv_dhcp6_config_advanced'] = $_POST['adv_dhcp6_config_advanced'];
-                }
-                if (!empty($_POST['adv_dhcp6_config_file_override'])) {
-                    $wancfg['adv_dhcp6_config_file_override'] = $_POST['adv_dhcp6_config_file_override'];
-                }
-                if (!empty($_POST['adv_dhcp6_config_file_override_path'])) {
-                    $wancfg['adv_dhcp6_config_file_override_path'] = $_POST['adv_dhcp6_config_file_override_path'];
-                }
-
-                if ($gateway_item) {
-                    $a_gateways[] = $gateway_item;
-                }
-                break;
-            case "6rd":
-                $wancfg['ipaddrv6'] = "6rd";
-                $wancfg['prefix-6rd'] = $_POST['prefix-6rd'];
-                $wancfg['prefix-6rd-v4plen'] = $_POST['prefix-6rd-v4plen'];
-                $wancfg['gateway-6rd'] = $_POST['gateway-6rd'];
-                if ($gateway_item) {
-                    $a_gateways[] = $gateway_item;
-                }
-                break;
-            case "6to4":
-                $wancfg['ipaddrv6'] = "6to4";
-                break;
-            case "track6":
-                $wancfg['ipaddrv6'] = "track6";
-                $wancfg['track6-interface'] = $_POST['track6-interface'];
-                if ($_POST['track6-prefix-id--hex'] === "") {
-                    $wancfg['track6-prefix-id'] = 0;
-                } else if (is_numeric("0x" . $_POST['track6-prefix-id--hex'])) {
-                    $wancfg['track6-prefix-id'] = intval($_POST['track6-prefix-id--hex'], 16);
-                } else {
-                    $wancfg['track6-prefix-id'] = 0;
-                }
-                break;
-            case "none":
-                break;
-        }
-        handle_pppoe_reset($_POST);
-
-        if ($_POST['blockpriv'] == "yes") {
-            $wancfg['blockpriv'] = true;
-        } else {
-            unset($wancfg['blockpriv']);
-        }
-        if ($_POST['blockbogons'] == "yes") {
-            $wancfg['blockbogons'] = true;
-        } else {
-            unset($wancfg['blockbogons']);
-        }
-        $wancfg['spoofmac'] = $_POST['spoofmac'];
-        if (empty($_POST['mtu'])) {
-            unset($wancfg['mtu']);
-        } else {
-            $wancfg['mtu'] = $_POST['mtu'];
-        }
-        if (empty($_POST['mss'])) {
-            unset($wancfg['mss']);
-        } else {
-            $wancfg['mss'] = $_POST['mss'];
-        }
-        if (empty($_POST['mediaopt'])) {
-            unset($wancfg['media']);
-            unset($wancfg['mediaopt']);
-        } else {
-            $mediaopts = explode(' ', $_POST['mediaopt']);
-            if ($mediaopts[0] != '') {
-                $wancfg['media'] = $mediaopts[0];
-            }
-            if ($mediaopts[1] != '') {
-                $wancfg['mediaopt'] = $mediaopts[1];
-            } else {
-                unset($wancfg['mediaopt']);
-            }
-        }
-        if (isset($wancfg['wireless'])) {
-            handle_wireless_post();
-        }
-
-        conf_mount_ro();
-        write_config();
-
-        if (file_exists("{$g['tmp_path']}/.interfaces.apply")) {
-            $toapplylist = unserialize(file_get_contents("{$g['tmp_path']}/.interfaces.apply"));
-        } else {
-            $toapplylist = array();
-        }
-        $toapplylist[$if]['ifcfg'] = $old_wancfg;
-        $toapplylist[$if]['ppps'] = $old_ppps;
-        file_put_contents("{$g['tmp_path']}/.interfaces.apply", serialize($toapplylist));
-
-        mark_subsystem_dirty('interfaces');
-
-        /* regenerate cron settings/crontab file */
-        configure_cron();
-
-        header("Location: interfaces.php?if={$if}");
-        exit;
-    }
+	unset($input_errors);
+	$pconfig = $_POST;
+
+	if (is_numeric("0x" . $_POST['track6-prefix-id--hex'])) {
+		$pconfig['track6-prefix-id'] = intval($_POST['track6-prefix-id--hex'], 16);
+	} else {
+		$pconfig['track6-prefix-id'] = 0;
+	}
+	conf_mount_rw();
+
+	/* filter out spaces from descriptions */
+	$_POST['descr'] = remove_bad_chars($_POST['descr']);
+
+	/* okay first of all, cause we are just hiding the PPPoE HTML
+	 * fields related to PPPoE resets, we are going to unset $_POST
+	 * vars, if the reset feature should not be used. Otherwise the
+	 * data validation procedure below, may trigger a false error
+	 * message.
+	 */
+	if (empty($_POST['pppoe-reset-type'])) {
+		unset($_POST['pppoe_pr_type']);
+		unset($_POST['pppoe_resethour']);
+		unset($_POST['pppoe_resetminute']);
+		unset($_POST['pppoe_resetdate']);
+		unset($_POST['pppoe_pr_preset_val']);
+	}
+	/* description unique? */
+	foreach ($ifdescrs as $ifent => $ifdescr) {
+		if ($if != $ifent && $ifdescr == $_POST['descr']) {
+			$input_errors[] = gettext("An interface with the specified description already exists.");
+			break;
+		}
+	}
+	if (is_numeric($_POST['descr'])) {
+		$input_errors[] = gettext("The interface description cannot contain only numbers.");
+	}
+	/* input validation */
+	if (isset($config['dhcpd']) && isset($config['dhcpd'][$if]['enable']) && (!preg_match("/^staticv4/", $_POST['type']))) {
+		$input_errors[] = gettext("The DHCP Server is active on this interface and it can be used only with a static IP configuration. Please disable the DHCP Server service on this interface first, then change the interface configuration.");
+	}
+	if (isset($config['dhcpdv6']) && isset($config['dhcpdv6'][$if]['enable']) && (!preg_match("/^staticv6/", $_POST['type6']))) {
+		$input_errors[] = gettext("The DHCP6 Server is active on this interface and it can be used only with a static IPv6 configuration. Please disable the DHCPv6 Server service on this interface first, then change the interface configuration.");
+	}
+
+	switch (strtolower($_POST['type'])) {
+		case "staticv4":
+			$reqdfields = explode(" ", "ipaddr subnet gateway");
+			$reqdfieldsn = array(gettext("IPv4 address"), gettext("Subnet bit count"), gettext("Gateway"));
+			do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
+			break;
+		case "none":
+			if (is_array($config['virtualip']['vip'])) {
+				foreach ($config['virtualip']['vip'] as $vip) {
+					if (is_ipaddrv4($vip['subnet']) && $vip['interface'] == $if) {
+						$input_errors[] = gettext("This interface is referenced by IPv4 VIPs. Please delete those before setting the interface to 'none' configuration.");
+					}
+				}
+			}
+			break;
+		case "ppp":
+			$reqdfields = explode(" ", "port phone");
+			$reqdfieldsn = array(gettext("Modem Port"), gettext("Phone Number"));
+			do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
+			break;
+		case "pppoe":
+			if ($_POST['pppoe_dialondemand']) {
+				$reqdfields = explode(" ", "pppoe_username pppoe_password pppoe_dialondemand pppoe_idletimeout");
+				$reqdfieldsn = array(gettext("PPPoE username"), gettext("PPPoE password"), gettext("Dial on demand"), gettext("Idle timeout value"));
+			} else {
+				$reqdfields = explode(" ", "pppoe_username pppoe_password");
+				$reqdfieldsn = array(gettext("PPPoE username"), gettext("PPPoE password"));
+			}
+			do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
+			break;
+		case "pptp":
+			if ($_POST['pptp_dialondemand']) {
+				$reqdfields = explode(" ", "pptp_username pptp_password pptp_local pptp_subnet pptp_remote pptp_dialondemand pptp_idletimeout");
+				$reqdfieldsn = array(gettext("PPTP username"), gettext("PPTP password"), gettext("PPTP local IP address"), gettext("PPTP subnet"), gettext("PPTP remote IP address"), gettext("Dial on demand"), gettext("Idle timeout value"));
+			} else {
+				$reqdfields = explode(" ", "pptp_username pptp_password pptp_local pptp_subnet pptp_remote");
+				$reqdfieldsn = array(gettext("PPTP username"), gettext("PPTP password"), gettext("PPTP local IP address"), gettext("PPTP subnet"), gettext("PPTP remote IP address"));
+			}
+			do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
+			break;
+		case "l2tp":
+			if ($_POST['pptp_dialondemand']) {
+				$reqdfields = explode(" ", "pptp_username pptp_password pptp_remote pptp_dialondemand pptp_idletimeout");
+				$reqdfieldsn = array(gettext("L2TP username"), gettext("L2TP password"), gettext("L2TP remote IP address"), gettext("Dial on demand"), gettext("Idle timeout value"));
+			} else {
+				$reqdfields = explode(" ", "pptp_username pptp_password pptp_remote");
+				$reqdfieldsn = array(gettext("L2TP username"), gettext("L2TP password"), gettext("L2TP remote IP address"));
+			}
+			do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
+			break;
+	}
+	switch (strtolower($_POST['type6'])) {
+		case "staticv6":
+			$reqdfields = explode(" ", "ipaddrv6 subnetv6 gatewayv6");
+			$reqdfieldsn = array(gettext("IPv6 address"), gettext("Subnet bit count"), gettext("Gateway"));
+			do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
+			break;
+		case "none":
+			if (is_array($config['virtualip']['vip'])) {
+				foreach ($config['virtualip']['vip'] as $vip) {
+					if (is_ipaddrv6($vip['subnet']) && $vip['interface'] == $if) {
+						$input_errors[] = gettext("This interface is referenced by IPv6 VIPs. Please delete those before setting the interface to 'none' configuration.");
+					}
+				}
+			}
+			break;
+		case "dhcp6":
+			if (in_array($wancfg['ipaddrv6'], array())) {
+				$input_errors[] = sprintf(gettext("You have to reassign the interface to be able to configure as %s."), $_POST['type6']);
+			}
+			if ($_POST['dhcp6-ia-pd-send-hint'] && strtolower($_POST['dhcp6-ia-pd-len']) == 'none') {
+				$input_errors[] = gettext('DHCPv6 Prefix Delegation size must be provided when Send IPv6 prefix hint flag is checked');
+			}
+			break;
+		case "6rd":
+			foreach ($ifdescrs as $ifent => $ifdescr) {
+				if ($if != $ifent && ($config[interfaces][$ifent]['ipaddrv6'] == $_POST['type6'])) {
+					if ($config[interfaces][$ifent]['prefix-6rd'] == $_POST['prefix-6rd']) {
+						$input_errors[] = gettext("You can only have one interface configured in 6rd with same prefix.");
+						break;
+					}
+				}
+			}
+			if (in_array($wancfg['ipaddrv6'], array())) {
+				$input_errors[] = sprintf(gettext("You have to reassign the interface to be able to configure as %s."), $_POST['type6']);
+			}
+			break;
+		case "6to4":
+			foreach ($ifdescrs as $ifent => $ifdescr) {
+				if ($if != $ifent && ($config[interfaces][$ifent]['ipaddrv6'] == $_POST['type6'])) {
+					$input_errors[] = sprintf(gettext("You can only have one interface configured as 6to4."), $_POST['type6']);
+					break;
+				}
+			}
+			if (in_array($wancfg['ipaddrv6'], array())) {
+				$input_errors[] = sprintf(gettext("You have to reassign the interface to be able to configure as %s."), $_POST['type6']);
+			}
+			break;
+		case "track6":
+			/* needs to check if $track6-prefix-id is used on another interface */
+			if (in_array($wancfg['ipaddrv6'], array())) {
+				$input_errors[] = sprintf(gettext("You have to reassign the interface to be able to configure as %s."), $_POST['type6']);
+			}
+
+			if ($_POST['track6-prefix-id--hex'] != "" && !is_numeric("0x" . $_POST['track6-prefix-id--hex'])) {
+				$input_errors[] = gettext("You must enter a valid hexadecimal number for the IPv6 prefix ID.");
+			} else {
+				$track6_prefix_id = intval($_POST['track6-prefix-id--hex'], 16);
+				if ($track6_prefix_id < 0 || $track6_prefix_id > $_POST['ipv6-num-prefix-ids-' . $_POST['track6-interface']]) {
+					$input_errors[] = gettext("You specified an IPv6 prefix ID that is out of range.") .
+						" ({$_POST['track6-interface']}) - (0) - (" . sprintf('%x', $_POST['ipv6-num-prefix-ids-' . $_POST['track6-interface']]) . ")";
+				} else {
+					foreach ($ifdescrs as $ifent => $ifdescr) {
+						if ($if == $ifent) {
+							continue;
+						}
+						if ($config['interfaces'][$ifent]['ipaddrv6'] == 'track6' &&
+							$config['interfaces'][$ifent]['track6-interface'] == $_POST['track6-interface'] &&
+							$config['interfaces'][$ifent]['track6-prefix-id'] == $track6_prefix_id) {
+							$input_errors[] = sprintf(gettext("This track6 prefix ID is already being used in %s."), $ifdescr);
+						}
+					}
+				}
+			}
+			break;
+	}
+
+	/* normalize MAC addresses - lowercase and convert Windows-ized hyphenated MACs to colon delimited */
+	$staticroutes = get_staticroutes(true);
+	$_POST['spoofmac'] = strtolower(str_replace("-", ":", $_POST['spoofmac']));
+	if ($_POST['ipaddr']) {
+		if (!is_ipaddrv4($_POST['ipaddr'])) {
+			$input_errors[] = gettext("A valid IPv4 address must be specified.");
+		} else {
+			$where_ipaddr_configured = where_is_ipaddr_configured($_POST['ipaddr'], $if, true, true, $_POST['subnet']);
+			if (count($where_ipaddr_configured)) {
+				$subnet_conflict_text = sprintf(gettext("IPv4 address %s is being used by or overlaps with:"), $_POST['ipaddr'] . "/" . $_POST['subnet']);
+				foreach ($where_ipaddr_configured as $subnet_conflict) {
+					$subnet_conflict_text .= " " . convert_friendly_interface_to_friendly_descr($subnet_conflict['if']) . " (" . $subnet_conflict['ip_or_subnet'] . ")";
+				}
+				$input_errors[] = $subnet_conflict_text;
+			}
+
+			/* Do not accept network or broadcast address, except if subnet is 31 or 32 */
+			if ($_POST['subnet'] < 31) {
+				if ($_POST['ipaddr'] == gen_subnet($_POST['ipaddr'], $_POST['subnet'])) {
+					$input_errors[] = gettext("This IPv4 address is the network address and cannot be used");
+				} else if ($_POST['ipaddr'] == gen_subnet_max($_POST['ipaddr'], $_POST['subnet'])) {
+					$input_errors[] = gettext("This IPv4 address is the broadcast address and cannot be used");
+				}
+			}
+
+			foreach ($staticroutes as $route_subnet) {
+				list($network, $subnet) = explode("/", $route_subnet);
+				if ($_POST['subnet'] == $subnet && $network == gen_subnet($_POST['ipaddr'], $_POST['subnet'])) {
+					$input_errors[] = gettext("This IPv4 address conflicts with a Static Route.");
+					break;
+				}
+				unset($network, $subnet);
+			}
+		}
+	}
+	if ($_POST['ipaddrv6']) {
+		if (!is_ipaddrv6($_POST['ipaddrv6'])) {
+			$input_errors[] = gettext("A valid IPv6 address must be specified.");
+		} else {
+			$where_ipaddr_configured = where_is_ipaddr_configured($_POST['ipaddrv6'], $if, true, true, $_POST['subnetv6']);
+			if (count($where_ipaddr_configured)) {
+				$subnet_conflict_text = sprintf(gettext("IPv6 address %s is being used by or overlaps with:"), $_POST['ipaddrv6'] . "/" . $_POST['subnetv6']);
+				foreach ($where_ipaddr_configured as $subnet_conflict) {
+					$subnet_conflict_text .= " " . convert_friendly_interface_to_friendly_descr($subnet_conflict['if']) . " (" . $subnet_conflict['ip_or_subnet'] . ")";
+				}
+				$input_errors[] = $subnet_conflict_text;
+			}
+
+			foreach ($staticroutes as $route_subnet) {
+				list($network, $subnet) = explode("/", $route_subnet);
+				if ($_POST['subnetv6'] == $subnet && $network == gen_subnetv6($_POST['ipaddrv6'], $_POST['subnetv6'])) {
+					$input_errors[] = gettext("This IPv6 address conflicts with a Static Route.");
+					break;
+				}
+				unset($network, $subnet);
+			}
+		}
+	}
+	if (($_POST['subnet'] && !is_numeric($_POST['subnet']))) {
+		$input_errors[] = gettext("A valid subnet bit count must be specified.");
+	}
+	if (($_POST['subnetv6'] && !is_numeric($_POST['subnetv6']))) {
+		$input_errors[] = gettext("A valid subnet bit count must be specified.");
+	}
+	if (($_POST['alias-address'] && !is_ipaddrv4($_POST['alias-address']))) {
+		$input_errors[] = gettext("A valid alias IP address must be specified.");
+	}
+	if (($_POST['alias-subnet'] && !is_numeric($_POST['alias-subnet']))) {
+		$input_errors[] = gettext("A valid alias subnet bit count must be specified.");
+	}
+	if ($_POST['dhcprejectfrom'] && !is_ipaddrv4($_POST['dhcprejectfrom'])) {
+		$input_errors[] = gettext("A valid alias IP address must be specified to reject DHCP Leases from.");
+	}
+	if (($_POST['gateway'] != "none") || ($_POST['gatewayv6'] != "none")) {
+		$match = false;
+		foreach ($a_gateways as $gateway) {
+			if (in_array($_POST['gateway'], $gateway)) {
+				$match = true;
+			}
+		}
+		foreach ($a_gateways as $gateway) {
+			if (in_array($_POST['gatewayv6'], $gateway)) {
+				$match = true;
+			}
+		}
+		if (!$match) {
+			$input_errors[] = gettext("A valid gateway must be specified.");
+		}
+	}
+	if (($_POST['provider'] && !is_domain($_POST['provider']))) {
+		$input_errors[] = gettext("The service name contains invalid characters.");
+	}
+	if (($_POST['pppoe_idletimeout'] != "") && !is_numericint($_POST['pppoe_idletimeout'])) {
+		$input_errors[] = gettext("The idle timeout value must be an integer.");
+	}
+	if ($_POST['pppoe_resethour'] != "" && !is_numericint($_POST['pppoe_resethour']) &&
+		$_POST['pppoe_resethour'] >= 0 && $_POST['pppoe_resethour'] <=23) {
+			$input_errors[] = gettext("A valid PPPoE reset hour must be specified (0-23).");
+	}
+	if ($_POST['pppoe_resetminute'] != "" && !is_numericint($_POST['pppoe_resetminute']) &&
+		$_POST['pppoe_resetminute'] >= 0 && $_POST['pppoe_resetminute'] <=59) {
+			$input_errors[] = gettext("A valid PPPoE reset minute must be specified (0-59).");
+	}
+	if ($_POST['pppoe_resetdate'] != "" && !is_numeric(str_replace("/", "", $_POST['pppoe_resetdate']))) {
+		$input_errors[] = gettext("A valid PPPoE reset date must be specified (mm/dd/yyyy).");
+	}
+	if (($_POST['pptp_local'] && !is_ipaddrv4($_POST['pptp_local']))) {
+		$input_errors[] = gettext("A valid PPTP local IP address must be specified.");
+	}
+	if (($_POST['pptp_subnet'] && !is_numeric($_POST['pptp_subnet']))) {
+		$input_errors[] = gettext("A valid PPTP subnet bit count must be specified.");
+	}
+	if (($_POST['pptp_remote'] && !is_ipaddrv4($_POST['pptp_remote']) && !is_hostname($_POST['gateway'][$iface]))) {
+		$input_errors[] = gettext("A valid PPTP remote IP address must be specified.");
+	}
+	if (($_POST['pptp_idletimeout'] != "") && !is_numericint($_POST['pptp_idletimeout'])) {
+		$input_errors[] = gettext("The idle timeout value must be an integer.");
+	}
+	if (($_POST['spoofmac'] && !is_macaddr($_POST['spoofmac']))) {
+		$input_errors[] = gettext("A valid MAC address must be specified.");
+	}
+	if ($_POST['mtu']) {
+		if (!is_numericint($_POST['mtu'])) {
+			$input_errors[] = "MTU must be an integer.";
+		}
+		if (substr($wancfg['if'], 0, 3) == 'gif') {
+			$min_mtu = 1280;
+			$max_mtu = 8192;
+		} else {
+			$min_mtu = 576;
+			$max_mtu = 9000;
+		}
+
+		if ($_POST['mtu'] < $min_mtu || $_POST['mtu'] > $max_mtu) {
+			$input_errors[] = sprintf(gettext("The MTU must be between %d and %d bytes."), $min_mtu, $max_mtu);
+		}
+
+		unset($min_mtu, $max_mtu);
+
+		if (stristr($wancfg['if'], "_vlan")) {
+			$realhwif_array = get_parent_interface($wancfg['if']);
+			// Need code to handle MLPPP if we ever use $realhwif for MLPPP handling
+			$parent_realhwif = $realhwif_array[0];
+			$parent_if = convert_real_interface_to_friendly_interface_name($parent_realhwif);
+			if (!empty($parent_if) && !empty($config['interfaces'][$parent_if]['mtu'])) {
+				if ($_POST['mtu'] > intval($config['interfaces'][$parent_if]['mtu'])) {
+					$input_errors[] = gettext("The MTU of a VLAN cannot be greater than that of its parent interface.");
+				}
+			}
+		} else {
+			foreach ($config['interfaces'] as $idx => $ifdata) {
+				if (($idx == $if) || !preg_match('/_vlan[0-9]/', $ifdata['if'])) {
+					continue;
+				}
+
+				$realhwif_array = get_parent_interface($ifdata['if']);
+				// Need code to handle MLPPP if we ever use $realhwif for MLPPP handling
+				$parent_realhwif = $realhwif_array[0];
+
+				if ($parent_realhwif != $wancfg['if']) {
+					continue;
+				}
+
+				if (isset($ifdata['mtu']) && $ifdata['mtu'] > $_POST['mtu']) {
+					$input_errors[] = sprintf(gettext("Interface %s (VLAN) has MTU set to a larger value"), $ifdata['descr']);
+				}
+			}
+		}
+	}
+	if ($_POST['mss'] != '') {
+		if (!is_numericint($_POST['mss']) || ($_POST['mss'] < 576 || $_POST['mss'] > 65535)) {
+			$input_errors[] = gettext("The MSS must be an integer between 576 and 65535 bytes.");
+		}
+	}
+	/* Wireless interface? */
+	if (isset($wancfg['wireless'])) {
+		$reqdfields = array("mode");
+		$reqdfieldsn = array(gettext("Mode"));
+		if ($_POST['mode'] == 'hostap') {
+			$reqdfields[] = "ssid";
+			$reqdfieldsn[] = gettext("SSID");
+			if (isset($_POST['channel']) && $_POST['channel'] == "0") {
+				// auto channel with hostap is broken, prevent this for now.
+				$input_errors[] = gettext("A specific channel, not auto, must be selected for Access Point mode.");
+			}
+		}
+		if (stristr($_POST['standard'], '11n')) {
+			if (!($_POST['wme_enable'])) {
+				$input_errors[] = gettext("802.11n standards require enabling WME.");
+			}
+		}
+		do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
+		check_wireless_mode();
+		if (isset($_POST['wpa_group_rekey']) && (!is_numericint($_POST['wpa_group_rekey']) || $_POST['wpa_group_rekey'] < 1 || $_POST['wpa_group_rekey'] > 9999)) {
+			$input_errors[] = gettext("Key Rotation must be an integer between 1 and 9999.");
+		}
+		if (isset($_POST['wpa_gmk_rekey']) && (!is_numericint($_POST['wpa_gmk_rekey']) || $_POST['wpa_gmk_rekey'] < 1 || $_POST['wpa_gmk_rekey'] > 9999)) {
+			$input_errors[] = gettext("Master Key Regeneration must be an integer between 1 and 9999.");
+		}
+		if (isset($_POST['wpa_group_rekey']) && isset($_POST['wpa_gmk_rekey'])) {
+			if ($_POST['wpa_group_rekey'] > $_POST['wpa_gmk_rekey']) {
+				$input_errors[] = gettext("Master Key Regeneration must be greater than Key Rotation.");
+			}
+		}
+		if (!empty($_POST['auth_server_addr'])) {
+			if (!is_domain($_POST['auth_server_addr']) && !is_ipaddr($_POST['auth_server_addr'])) {
+				$input_errors[] = gettext("802.1X Authentication Server must be an IP or hostname.");
+			}
+		}
+		if (!empty($_POST['auth_server_addr2'])) {
+			if (!is_domain($_POST['auth_server_addr2']) && !is_ipaddr($_POST['auth_server_addr2'])) {
+				$input_errors[] = gettext("Secondary 802.1X Authentication Server must be an IP or hostname.");
+			}
+		}
+		if (!empty($_POST['auth_server_port'])) {
+			if (!is_port($_POST['auth_server_port'])) {
+				$input_errors[] = gettext("802.1X Authentication Server Port must be a valid port number (1-65535).");
+			}
+		}
+		if (!empty($_POST['auth_server_port2'])) {
+			if (!is_port($_POST['auth_server_port2'])) {
+				$input_errors[] = gettext("Secondary 802.1X Authentication Server Port must be a valid port number (1-65535).");
+			}
+		}
+		if (isset($_POST['channel']) && !is_numericint($_POST['channel'])) {
+			if (!is_numericint($_POST['channel'])) {
+				$input_errors[] = gettext("Invalid channel specified.");
+			} else {
+				if ($_POST['channel'] > 255 || $_POST['channel'] < 0) {
+					$input_errors[] = gettext("Channel must be between 0-255.");
+				}
+			}
+		}
+		if (!empty($_POST['distance']) && !is_numericint($_POST['distance'])) {
+			$input_errors[] = gettext("Distance must be an integer.");
+		}
+		if (isset($_POST['standard']) && (stristr($_POST['standard'], '11na') || stristr($_POST['standard'], '11a'))) {
+			if ($_POST['channel'] != 0 && $_POST['channel'] < 15) {
+				$input_errors[] = gettext("Channel selected is not valid for 802.11a or 802.11na.");
+			}
+		}
+		if (isset($_POST['standard']) && ($_POST['standard'] == "11b" || $_POST['standard'] == "11g")) {
+			if ($_POST['channel'] > 14) {
+				$input_errors[] = gettext("Channel selected is not valid for 802.11b or 802.11g.");
+			}
+		}
+		if (!empty($_POST['protmode']) && !in_array($_POST['protmode'], array("off", "cts", "rtscts"))) {
+			$input_errors[] = gettext("Invalid option chosen for OFDM Protection Mode");
+		}
+
+		if(ALLOWWEP) {
+			/* loop through keys and enforce size */
+			for ($i = 1; $i <= 4; $i++) {
+				if ($_POST['key' . $i]) {
+					/* 64 bit */
+					if (strlen($_POST['key' . $i]) == 5) {
+						continue;
+					}
+
+					if (strlen($_POST['key' . $i]) == 10) {
+						/* hex key */
+						if (stristr($_POST['key' . $i], "0x") == false) {
+							$_POST['key' . $i] = "0x" . $_POST['key' . $i];
+						}
+						continue;
+					}
+
+					if (strlen($_POST['key' . $i]) == 12) {
+						/* hex key */
+						if (stristr($_POST['key' . $i], "0x") == false) {
+							$_POST['key' . $i] = "0x" . $_POST['key' . $i];
+						}
+						continue;
+					}
+
+					/* 128 bit */
+					if (strlen($_POST['key' . $i]) == 13) {
+						continue;
+					}
+
+					if (strlen($_POST['key' . $i]) == 26) {
+						/* hex key */
+						if (stristr($_POST['key' . $i], "0x") == false) {
+							$_POST['key' . $i] = "0x" . $_POST['key' . $i];
+						}
+						continue;
+					}
+
+					if (strlen($_POST['key' . $i]) == 28) {
+						continue;
+					}
+
+					$input_errors[] = gettext("Invalid WEP key. Enter a valid 40, 64, 104 or 128 bit WEP key.");
+					break;
+				}
+			}
+		}
+
+		if ($_POST['passphrase']) {
+			$passlen = strlen($_POST['passphrase']);
+			if ($passlen < 8 || $passlen > 63) {
+				$input_errors[] = gettext("The WPA passphrase must be between 8 and 63 characters long.");
+			}
+		}
+
+		if ($_POST['wpa_enable'] == "yes") {
+			if (empty($_POST['passphrase']) && stristr($_POST['wpa_key_mgmt'], "WPA-PSK")) {
+				$input_errors[] = gettext("A WPA Passphrase must be specified when WPA PSK is enabled.");
+			}
+		}
+	}
+	if (!$input_errors) {
+		if ($wancfg['ipaddr'] != $_POST['type']) {
+			if (in_array($wancfg['ipaddr'], array("ppp", "pppoe", "pptp", "l2tp"))) {
+				$wancfg['if'] = $a_ppps[$pppid]['ports'];
+				unset($a_ppps[$pppid]);
+			} else if ($wancfg['ipaddr'] == "dhcp") {
+				kill_dhclient_process($wancfg['if']);
+			}
+			if ($wancfg['ipaddrv6'] == "dhcp6") {
+				$pid = find_dhcp6c_process($wancfg['if']);
+				if ($pid) {
+					posix_kill($pid, SIGTERM);
+				}
+			}
+		}
+		$ppp = array();
+		if ($wancfg['ipaddr'] != "ppp") {
+			unset($wancfg['ipaddr']);
+		}
+		if ($wancfg['ipaddrv6'] != "ppp") {
+			unset($wancfg['ipaddrv6']);
+		}
+		unset($wancfg['subnet']);
+		unset($wancfg['gateway']);
+		unset($wancfg['subnetv6']);
+		unset($wancfg['gatewayv6']);
+		unset($wancfg['dhcphostname']);
+		unset($wancfg['dhcprejectfrom']);
+		unset($wancfg['dhcp6-duid']);
+		unset($wancfg['dhcp6-ia-pd-len']);
+		unset($wancfg['dhcp6-ia-pd-send-hint']);
+		unset($wancfg['dhcp6prefixonly']);
+		unset($wancfg['dhcp6usev4iface']);
+		unset($wancfg['track6-interface']);
+		unset($wancfg['track6-prefix-id']);
+		unset($wancfg['prefix-6rd']);
+		unset($wancfg['prefix-6rd-v4plen']);
+		unset($wancfg['gateway-6rd']);
+
+		unset($wancfg['adv_dhcp_pt_timeout']);
+		unset($wancfg['adv_dhcp_pt_retry']);
+		unset($wancfg['adv_dhcp_pt_select_timeout']);
+		unset($wancfg['adv_dhcp_pt_reboot']);
+		unset($wancfg['adv_dhcp_pt_backoff_cutoff']);
+		unset($wancfg['adv_dhcp_pt_initial_interval']);
+
+		unset($wancfg['adv_dhcp_pt_values']);
+
+		unset($wancfg['adv_dhcp_send_options']);
+		unset($wancfg['adv_dhcp_request_options']);
+		unset($wancfg['adv_dhcp_required_options']);
+		unset($wancfg['adv_dhcp_option_modifiers']);
+
+		unset($wancfg['adv_dhcp_config_advanced']);
+		unset($wancfg['adv_dhcp_config_file_override']);
+		unset($wancfg['adv_dhcp_config_file_override_path']);
+
+		unset($wancfg['adv_dhcp6_interface_statement_send_options']);
+		unset($wancfg['adv_dhcp6_interface_statement_request_options']);
+		unset($wancfg['adv_dhcp6_interface_statement_information_only_enable']);
+		unset($wancfg['adv_dhcp6_interface_statement_script']);
+
+		unset($wancfg['adv_dhcp6_id_assoc_statement_address_enable']);
+		unset($wancfg['adv_dhcp6_id_assoc_statement_address']);
+		unset($wancfg['adv_dhcp6_id_assoc_statement_address_id']);
+		unset($wancfg['adv_dhcp6_id_assoc_statement_address_pltime']);
+		unset($wancfg['adv_dhcp6_id_assoc_statement_address_vltime']);
+
+		unset($wancfg['adv_dhcp6_id_assoc_statement_prefix_enable']);
+		unset($wancfg['adv_dhcp6_id_assoc_statement_prefix']);
+		unset($wancfg['adv_dhcp6_id_assoc_statement_prefix_id']);
+		unset($wancfg['adv_dhcp6_id_assoc_statement_prefix_pltime']);
+		unset($wancfg['adv_dhcp6_id_assoc_statement_prefix_vltime']);
+
+		unset($wancfg['adv_dhcp6_prefix_interface_statement_sla_id']);
+		unset($wancfg['adv_dhcp6_prefix_interface_statement_sla_len']);
+
+		unset($wancfg['adv_dhcp6_authentication_statement_authname']);
+		unset($wancfg['adv_dhcp6_authentication_statement_protocol']);
+		unset($wancfg['adv_dhcp6_authentication_statement_algorithm']);
+		unset($wancfg['adv_dhcp6_authentication_statement_rdm']);
+
+		unset($wancfg['adv_dhcp6_key_info_statement_keyname']);
+		unset($wancfg['adv_dhcp6_key_info_statement_realm']);
+		unset($wancfg['adv_dhcp6_key_info_statement_keyid']);
+		unset($wancfg['adv_dhcp6_key_info_statement_secret']);
+		unset($wancfg['adv_dhcp6_key_info_statement_expire']);
+
+		unset($wancfg['adv_dhcp6_config_advanced']);
+		unset($wancfg['adv_dhcp6_config_file_override']);
+		unset($wancfg['adv_dhcp6_config_file_override_path']);
+
+		unset($wancfg['pppoe_password']);
+		unset($wancfg['pptp_username']);
+		unset($wancfg['pptp_password']);
+		unset($wancfg['provider']);
+		unset($wancfg['ondemand']);
+		unset($wancfg['timeout']);
+		if (empty($wancfg['pppoe']['pppoe-reset-type'])) {
+			unset($wancfg['pppoe']['pppoe-reset-type']);
+		}
+		unset($wancfg['local']);
+
+		unset($wancfg['remote']);
+		if (is_array($a_ppps[$pppid]) && in_array($wancfg['ipaddr'], array("ppp", "pppoe", "pptp", "l2tp"))) {
+			if ($wancfg['ipaddr'] != 'ppp') {
+				unset($a_ppps[$pppid]['apn']);
+				unset($a_ppps[$pppid]['phone']);
+				unset($a_ppps[$pppid]['provider']);
+				unset($a_ppps[$pppid]['ondemand']);
+			}
+			if (in_array($wancfg['ipaddr'], array("pppoe", "pptp", "l2tp"))) {
+				unset($a_ppps[$pppid]['localip']);
+				unset($a_ppps[$pppid]['subnet']);
+				unset($a_ppps[$pppid]['gateway']);
+			}
+			if ($wancfg['ipaddr'] != 'pppoe') {
+				unset($a_ppps[$pppid]['pppoe-reset-type']);
+			}
+			if ($wancfg['type'] != $_POST['type']) {
+				unset($a_ppps[$pppid]['idletimeout']);
+			}
+		}
+
+		$wancfg['descr'] = remove_bad_chars($_POST['descr']);
+		$wancfg['enable'] = $_POST['enable'] == "yes" ? true : false;
+
+		/* let return_gateways_array() do the magic on dynamic interfaces for us */
+		switch ($_POST['type']) {
+			case "staticv4":
+				$wancfg['ipaddr'] = $_POST['ipaddr'];
+				$wancfg['subnet'] = $_POST['subnet'];
+				if ($_POST['gateway'] != "none") {
+					$wancfg['gateway'] = $_POST['gateway'];
+				}
+				break;
+			case "dhcp":
+				$wancfg['ipaddr'] = "dhcp";
+				$wancfg['dhcphostname'] = $_POST['dhcphostname'];
+				$wancfg['alias-address'] = $_POST['alias-address'];
+				$wancfg['alias-subnet'] = $_POST['alias-subnet'];
+				$wancfg['dhcprejectfrom'] = $_POST['dhcprejectfrom'];
+
+				$wancfg['adv_dhcp_pt_timeout'] = $_POST['adv_dhcp_pt_timeout'];
+				$wancfg['adv_dhcp_pt_retry'] = $_POST['adv_dhcp_pt_retry'];
+				$wancfg['adv_dhcp_pt_select_timeout'] = $_POST['adv_dhcp_pt_select_timeout'];
+				$wancfg['adv_dhcp_pt_reboot'] = $_POST['adv_dhcp_pt_reboot'];
+				$wancfg['adv_dhcp_pt_backoff_cutoff'] = $_POST['adv_dhcp_pt_backoff_cutoff'];
+				$wancfg['adv_dhcp_pt_initial_interval'] = $_POST['adv_dhcp_pt_initial_interval'];
+
+				$wancfg['adv_dhcp_pt_values'] = $_POST['adv_dhcp_pt_values'];
+
+				$wancfg['adv_dhcp_send_options'] = $_POST['adv_dhcp_send_options'];
+				$wancfg['adv_dhcp_request_options'] = $_POST['adv_dhcp_request_options'];
+				$wancfg['adv_dhcp_required_options'] = $_POST['adv_dhcp_required_options'];
+				$wancfg['adv_dhcp_option_modifiers'] = $_POST['adv_dhcp_option_modifiers'];
+
+				$wancfg['adv_dhcp_config_advanced'] = $_POST['adv_dhcp_config_advanced'];
+				$wancfg['adv_dhcp_config_file_override'] = $_POST['adv_dhcp_config_file_override'];
+				$wancfg['adv_dhcp_config_file_override_path'] = $_POST['adv_dhcp_config_file_override_path'];
+
+				$wancfg['dhcp_plus'] = $_POST['dhcp_plus'] == "yes" ? true : false;
+				if ($gateway_item) {
+					$a_gateways[] = $gateway_item;
+				}
+				break;
+			case "ppp":
+				$a_ppps[$pppid]['ptpid'] = $_POST['ptpid'];
+				$a_ppps[$pppid]['type'] = $_POST['type'];
+				$a_ppps[$pppid]['if'] = $_POST['type'].$_POST['ptpid'];
+				$a_ppps[$pppid]['ports'] = $_POST['port'];
+				$a_ppps[$pppid]['username'] = $_POST['ppp_username'];
+				$a_ppps[$pppid]['password'] = base64_encode($_POST['ppp_password']);
+				$a_ppps[$pppid]['phone'] = $_POST['phone'];
+				$a_ppps[$pppid]['apn'] = $_POST['apn'];
+				$wancfg['if'] = $_POST['type'] . $_POST['ptpid'];
+				$wancfg['ipaddr'] = $_POST['type'];
+				break;
+
+			case "pppoe":
+				$a_ppps[$pppid]['ptpid'] = $_POST['ptpid'];
+				$a_ppps[$pppid]['type'] = $_POST['type'];
+				$a_ppps[$pppid]['if'] = $_POST['type'].$_POST['ptpid'];
+				if (isset($_POST['ppp_port'])) {
+					$a_ppps[$pppid]['ports'] = $_POST['ppp_port'];
+				} else {
+					$a_ppps[$pppid]['ports'] = $wancfg['if'];
+				}
+				$a_ppps[$pppid]['username'] = $_POST['pppoe_username'];
+				$a_ppps[$pppid]['password'] = base64_encode($_POST['pppoe_password']);
+				if (!empty($_POST['provider'])) {
+					$a_ppps[$pppid]['provider'] = $_POST['provider'];
+				} else {
+					$a_ppps[$pppid]['provider'] = true;
+				}
+				$a_ppps[$pppid]['ondemand'] = $_POST['pppoe_dialondemand'] ? true : false;
+				if (!empty($_POST['pppoe_idletimeout'])) {
+					$a_ppps[$pppid]['idletimeout'] = $_POST['pppoe_idletimeout'];
+				} else {
+					unset($a_ppps[$pppid]['idletimeout']);
+				}
+
+				if (!empty($_POST['pppoe-reset-type'])) {
+					$a_ppps[$pppid]['pppoe-reset-type'] = $_POST['pppoe-reset-type'];
+				} else {
+					unset($a_ppps[$pppid]['pppoe-reset-type']);
+				}
+				$wancfg['if'] = $_POST['type'].$_POST['ptpid'];
+				$wancfg['ipaddr'] = $_POST['type'];
+				if ($gateway_item) {
+					$a_gateways[] = $gateway_item;
+				}
+
+				break;
+			case "pptp":
+			case "l2tp":
+				$a_ppps[$pppid]['ptpid'] = $_POST['ptpid'];
+				$a_ppps[$pppid]['type'] = $_POST['type'];
+				$a_ppps[$pppid]['if'] = $_POST['type'].$_POST['ptpid'];
+				if (isset($_POST['ppp_port'])) {
+					$a_ppps[$pppid]['ports'] = $_POST['ppp_port'];
+				} else {
+					$a_ppps[$pppid]['ports'] = $wancfg['if'];
+				}
+				$a_ppps[$pppid]['username'] = $_POST['pptp_username'];
+				$a_ppps[$pppid]['password'] = base64_encode($_POST['pptp_password']);
+				$a_ppps[$pppid]['localip'] = $_POST['pptp_local'];
+				$a_ppps[$pppid]['subnet'] = $_POST['pptp_subnet'];
+				$a_ppps[$pppid]['gateway'] = $_POST['pptp_remote'];
+				$a_ppps[$pppid]['ondemand'] = $_POST['pptp_dialondemand'] ? true : false;
+				if (!empty($_POST['pptp_idletimeout'])) {
+					$a_ppps[$pppid]['idletimeout'] = $_POST['pptp_idletimeout'];
+				} else {
+					unset($a_ppps[$pppid]['idletimeout']);
+				}
+				$wancfg['if'] = $_POST['type'].$_POST['ptpid'];
+				$wancfg['ipaddr'] = $_POST['type'];
+				if ($gateway_item) {
+					$a_gateways[] = $gateway_item;
+				}
+				break;
+			case "none":
+				break;
+		}
+		switch ($_POST['type6']) {
+			case "staticv6":
+				$wancfg['ipaddrv6'] = $_POST['ipaddrv6'];
+				$wancfg['subnetv6'] = $_POST['subnetv6'];
+				if ($_POST['gatewayv6'] != "none") {
+					$wancfg['gatewayv6'] = $_POST['gatewayv6'];
+				}
+				break;
+			case "slaac":
+				$wancfg['ipaddrv6'] = "slaac";
+				break;
+			case "dhcp6":
+				$wancfg['ipaddrv6'] = "dhcp6";
+				$wancfg['dhcp6-duid'] = $_POST['dhcp6-duid'];
+				$wancfg['dhcp6-ia-pd-len'] = $_POST['dhcp6-ia-pd-len'];
+				if ($_POST['dhcp6-ia-pd-send-hint'] == "yes") {
+					$wancfg['dhcp6-ia-pd-send-hint'] = true;
+				}
+				if ($_POST['dhcp6prefixonly'] == "yes") {
+					$wancfg['dhcp6prefixonly'] = true;
+				}
+				if ($_POST['dhcp6usev4iface'] == "yes") {
+					$wancfg['dhcp6usev4iface'] = true;
+				}
+
+				if (!empty($_POST['adv_dhcp6_interface_statement_send_options'])) {
+					$wancfg['adv_dhcp6_interface_statement_send_options'] = $_POST['adv_dhcp6_interface_statement_send_options'];
+				}
+				if (!empty($_POST['adv_dhcp6_interface_statement_request_options'])) {
+					$wancfg['adv_dhcp6_interface_statement_request_options'] = $_POST['adv_dhcp6_interface_statement_request_options'];
+				}
+				if (isset($_POST['adv_dhcp6_interface_statement_information_only_enable'])) {
+					$wancfg['adv_dhcp6_interface_statement_information_only_enable'] = $_POST['adv_dhcp6_interface_statement_information_only_enable'];
+				}
+				if (!empty($_POST['adv_dhcp6_interface_statement_script'])) {
+					$wancfg['adv_dhcp6_interface_statement_script'] = $_POST['adv_dhcp6_interface_statement_script'];
+				}
+
+				if (isset($_POST['adv_dhcp6_id_assoc_statement_address_enable'])) {
+					$wancfg['adv_dhcp6_id_assoc_statement_address_enable'] = $_POST['adv_dhcp6_id_assoc_statement_address_enable'];
+				}
+				if (!empty($_POST['adv_dhcp6_id_assoc_statement_address'])) {
+					$wancfg['adv_dhcp6_id_assoc_statement_address'] = $_POST['adv_dhcp6_id_assoc_statement_address'];
+				}
+				if (is_numericint($_POST['adv_dhcp6_id_assoc_statement_address_id'])) {
+					$wancfg['adv_dhcp6_id_assoc_statement_address_id'] = $_POST['adv_dhcp6_id_assoc_statement_address_id'];
+				}
+				if (!empty($_POST['adv_dhcp6_id_assoc_statement_address_pltime'])) {
+					$wancfg['adv_dhcp6_id_assoc_statement_address_pltime'] = $_POST['adv_dhcp6_id_assoc_statement_address_pltime'];
+				}
+				if (!empty($_POST['adv_dhcp6_id_assoc_statement_address_vltime'])) {
+					$wancfg['adv_dhcp6_id_assoc_statement_address_vltime'] = $_POST['adv_dhcp6_id_assoc_statement_address_vltime'];
+				}
+
+				if (isset($_POST['adv_dhcp6_id_assoc_statement_prefix_enable'])) {
+					$wancfg['adv_dhcp6_id_assoc_statement_prefix_enable'] = $_POST['adv_dhcp6_id_assoc_statement_prefix_enable'];
+				}
+				if (!empty($_POST['adv_dhcp6_id_assoc_statement_prefix'])) {
+					$wancfg['adv_dhcp6_id_assoc_statement_prefix'] = $_POST['adv_dhcp6_id_assoc_statement_prefix'];
+				}
+				if (is_numericint($_POST['adv_dhcp6_id_assoc_statement_prefix_id'])) {
+					$wancfg['adv_dhcp6_id_assoc_statement_prefix_id'] = $_POST['adv_dhcp6_id_assoc_statement_prefix_id'];
+				}
+				if (!empty($_POST['adv_dhcp6_id_assoc_statement_prefix_pltime'])) {
+					$wancfg['adv_dhcp6_id_assoc_statement_prefix_pltime'] = $_POST['adv_dhcp6_id_assoc_statement_prefix_pltime'];
+				}
+				if (!empty($_POST['adv_dhcp6_id_assoc_statement_prefix_vltime'])) {
+					$wancfg['adv_dhcp6_id_assoc_statement_prefix_vltime'] = $_POST['adv_dhcp6_id_assoc_statement_prefix_vltime'];
+				}
+
+				if (is_numericint($_POST['adv_dhcp6_prefix_interface_statement_sla_id'])) {
+					$wancfg['adv_dhcp6_prefix_interface_statement_sla_id'] = $_POST['adv_dhcp6_prefix_interface_statement_sla_id'];
+				}
+				if (is_numericint($_POST['adv_dhcp6_prefix_interface_statement_sla_len'])) {
+					$wancfg['adv_dhcp6_prefix_interface_statement_sla_len'] = $_POST['adv_dhcp6_prefix_interface_statement_sla_len'];
+				}
+
+				if (!empty($_POST['adv_dhcp6_authentication_statement_authname'])) {
+					$wancfg['adv_dhcp6_authentication_statement_authname'] = $_POST['adv_dhcp6_authentication_statement_authname'];
+				}
+				if (!empty($_POST['adv_dhcp6_authentication_statement_protocol'])) {
+					$wancfg['adv_dhcp6_authentication_statement_protocol'] = $_POST['adv_dhcp6_authentication_statement_protocol'];
+				}
+				if (!empty($_POST['adv_dhcp6_authentication_statement_algorithm'])) {
+					$wancfg['adv_dhcp6_authentication_statement_algorithm'] = $_POST['adv_dhcp6_authentication_statement_algorithm'];
+				}
+				if (!empty($_POST['adv_dhcp6_authentication_statement_rdm'])) {
+					$wancfg['adv_dhcp6_authentication_statement_rdm'] = $_POST['adv_dhcp6_authentication_statement_rdm'];
+				}
+
+				if (!empty($_POST['adv_dhcp6_key_info_statement_keyname'])) {
+					$wancfg['adv_dhcp6_key_info_statement_keyname'] = $_POST['adv_dhcp6_key_info_statement_keyname'];
+				}
+				if (!empty($_POST['adv_dhcp6_key_info_statement_realm'])) {
+					$wancfg['adv_dhcp6_key_info_statement_realm'] = $_POST['adv_dhcp6_key_info_statement_realm'];
+				}
+				if (!empty($_POST['adv_dhcp6_key_info_statement_keyid'])) {
+					$wancfg['adv_dhcp6_key_info_statement_keyid'] = $_POST['adv_dhcp6_key_info_statement_keyid'];
+				}
+				if (!empty($_POST['adv_dhcp6_key_info_statement_secret'])) {
+					$wancfg['adv_dhcp6_key_info_statement_secret'] = $_POST['adv_dhcp6_key_info_statement_secret'];
+				}
+				if (!empty($_POST['adv_dhcp6_key_info_statement_expire'])) {
+					$wancfg['adv_dhcp6_key_info_statement_expire'] = $_POST['adv_dhcp6_key_info_statement_expire'];
+				}
+
+				if (!empty($_POST['adv_dhcp6_config_advanced'])) {
+					$wancfg['adv_dhcp6_config_advanced'] = $_POST['adv_dhcp6_config_advanced'];
+				}
+				if (!empty($_POST['adv_dhcp6_config_file_override'])) {
+					$wancfg['adv_dhcp6_config_file_override'] = $_POST['adv_dhcp6_config_file_override'];
+				}
+				if (!empty($_POST['adv_dhcp6_config_file_override_path'])) {
+					$wancfg['adv_dhcp6_config_file_override_path'] = $_POST['adv_dhcp6_config_file_override_path'];
+				}
+
+				if ($gateway_item) {
+					$a_gateways[] = $gateway_item;
+				}
+				break;
+			case "6rd":
+				$wancfg['ipaddrv6'] = "6rd";
+				$wancfg['prefix-6rd'] = $_POST['prefix-6rd'];
+				$wancfg['prefix-6rd-v4plen'] = $_POST['prefix-6rd-v4plen'];
+				$wancfg['gateway-6rd'] = $_POST['gateway-6rd'];
+				if ($gateway_item) {
+					$a_gateways[] = $gateway_item;
+				}
+				break;
+			case "6to4":
+				$wancfg['ipaddrv6'] = "6to4";
+				break;
+			case "track6":
+				$wancfg['ipaddrv6'] = "track6";
+				$wancfg['track6-interface'] = $_POST['track6-interface'];
+				if ($_POST['track6-prefix-id--hex'] === "") {
+					$wancfg['track6-prefix-id'] = 0;
+				} else if (is_numeric("0x" . $_POST['track6-prefix-id--hex'])) {
+					$wancfg['track6-prefix-id'] = intval($_POST['track6-prefix-id--hex'], 16);
+				} else {
+					$wancfg['track6-prefix-id'] = 0;
+				}
+				break;
+			case "none":
+				break;
+		}
+		handle_pppoe_reset($_POST);
+
+		if ($_POST['blockpriv'] == "yes") {
+			$wancfg['blockpriv'] = true;
+		} else {
+			unset($wancfg['blockpriv']);
+		}
+		if ($_POST['blockbogons'] == "yes") {
+			$wancfg['blockbogons'] = true;
+		} else {
+			unset($wancfg['blockbogons']);
+		}
+		$wancfg['spoofmac'] = $_POST['spoofmac'];
+		if (empty($_POST['mtu'])) {
+			unset($wancfg['mtu']);
+		} else {
+			$wancfg['mtu'] = $_POST['mtu'];
+		}
+		if (empty($_POST['mss'])) {
+			unset($wancfg['mss']);
+		} else {
+			$wancfg['mss'] = $_POST['mss'];
+		}
+		if (empty($_POST['mediaopt'])) {
+			unset($wancfg['media']);
+			unset($wancfg['mediaopt']);
+		} else {
+			$mediaopts = explode(' ', $_POST['mediaopt']);
+			if ($mediaopts[0] != '') {
+				$wancfg['media'] = $mediaopts[0];
+			}
+			if ($mediaopts[1] != '') {
+				$wancfg['mediaopt'] = $mediaopts[1];
+			} else {
+				unset($wancfg['mediaopt']);
+			}
+		}
+		if (isset($wancfg['wireless'])) {
+			handle_wireless_post();
+		}
+
+		conf_mount_ro();
+		write_config();
+
+		if (file_exists("{$g['tmp_path']}/.interfaces.apply")) {
+			$toapplylist = unserialize(file_get_contents("{$g['tmp_path']}/.interfaces.apply"));
+		} else {
+			$toapplylist = array();
+		}
+		$toapplylist[$if]['ifcfg'] = $old_wancfg;
+		$toapplylist[$if]['ppps'] = $old_ppps;
+		file_put_contents("{$g['tmp_path']}/.interfaces.apply", serialize($toapplylist));
+
+		mark_subsystem_dirty('interfaces');
+
+		/* regenerate cron settings/crontab file */
+		configure_cron();
+
+		header("Location: interfaces.php?if={$if}");
+		exit;
+	}
 
 } // end if ($_POST)
 
 function handle_wireless_post() {
-    global $_POST, $config, $g, $wancfg, $if, $wl_countries_attr, $wlanbaseif;
-    if (!is_array($wancfg['wireless'])) {
-        $wancfg['wireless'] = array();
-    }
-    $wancfg['wireless']['standard'] = $_POST['standard'];
-    $wancfg['wireless']['mode'] = $_POST['mode'];
-    $wancfg['wireless']['protmode'] = $_POST['protmode'];
-    $wancfg['wireless']['ssid'] = $_POST['ssid'];
-    $wancfg['wireless']['channel'] = $_POST['channel'];
-    $wancfg['wireless']['authmode'] = $_POST['authmode'];
-    $wancfg['wireless']['txpower'] = $_POST['txpower'];
-    $wancfg['wireless']['distance'] = $_POST['distance'];
-    $wancfg['wireless']['regdomain'] = $_POST['regdomain'];
-    $wancfg['wireless']['regcountry'] = $_POST['regcountry'];
-    $wancfg['wireless']['reglocation'] = $_POST['reglocation'];
-    if (!empty($wancfg['wireless']['regdomain']) && !empty($wancfg['wireless']['regcountry'])) {
-        foreach ($wl_countries_attr as $wl_country) {
-            if ($wancfg['wireless']['regcountry'] == $wl_country['ID']) {
-                $wancfg['wireless']['regdomain'] = $wl_country['rd'][0]['REF'];
-                break;
-            }
-        }
-    }
-    if (!is_array($wancfg['wireless']['wpa'])) {
-        $wancfg['wireless']['wpa'] = array();
-    }
-    $wancfg['wireless']['wpa']['macaddr_acl'] = $_POST['macaddr_acl'];
-    $wancfg['wireless']['wpa']['auth_algs'] = $_POST['auth_algs'];
-    $wancfg['wireless']['wpa']['wpa_mode'] = $_POST['wpa_mode'];
-    $wancfg['wireless']['wpa']['wpa_key_mgmt'] = $_POST['wpa_key_mgmt'];
-    $wancfg['wireless']['wpa']['wpa_pairwise'] = $_POST['wpa_pairwise'];
-    $wancfg['wireless']['wpa']['wpa_group_rekey'] = $_POST['wpa_group_rekey'];
-    $wancfg['wireless']['wpa']['wpa_gmk_rekey'] = $_POST['wpa_gmk_rekey'];
-    $wancfg['wireless']['wpa']['passphrase'] = $_POST['passphrase'];
-    $wancfg['wireless']['wpa']['ext_wpa_sw'] = $_POST['ext_wpa_sw'];
-    $wancfg['wireless']['auth_server_addr'] = $_POST['auth_server_addr'];
-    $wancfg['wireless']['auth_server_port'] = $_POST['auth_server_port'];
-    $wancfg['wireless']['auth_server_shared_secret'] = $_POST['auth_server_shared_secret'];
-    $wancfg['wireless']['auth_server_addr2'] = $_POST['auth_server_addr2'];
-    $wancfg['wireless']['auth_server_port2'] = $_POST['auth_server_port2'];
-    $wancfg['wireless']['auth_server_shared_secret2'] = $_POST['auth_server_shared_secret2'];
-
-    if ($_POST['persistcommonwireless'] == "yes") {
-        if (!is_array($config['wireless'])) {
-            $config['wireless'] = array();
-        }
-        if (!is_array($config['wireless']['interfaces'])) {
-            $config['wireless']['interfaces'] = array();
-        }
-        if (!is_array($config['wireless']['interfaces'][$wlanbaseif])) {
-            $config['wireless']['interfaces'][$wlanbaseif] = array();
-        }
-    } else if (isset($config['wireless']['interfaces'][$wlanbaseif])) {
-        unset($config['wireless']['interfaces'][$wlanbaseif]);
-    }
-    if (isset($_POST['diversity']) && is_numeric($_POST['diversity'])) {
-        $wancfg['wireless']['diversity'] = $_POST['diversity'];
-    } else if (isset($wancfg['wireless']['diversity'])) {
-        unset($wancfg['wireless']['diversity']);
-    }
-    if (isset($_POST['txantenna']) && is_numeric($_POST['txantenna'])) {
-        $wancfg['wireless']['txantenna'] = $_POST['txantenna'];
-    } else if (isset($wancfg['wireless']['txantenna'])) {
-        unset($wancfg['wireless']['txantenna']);
-    }
-    if (isset($_POST['rxantenna']) && is_numeric($_POST['rxantenna'])) {
-        $wancfg['wireless']['rxantenna'] = $_POST['rxantenna'];
-    } else if (isset($wancfg['wireless']['rxantenna'])) {
-        unset($wancfg['wireless']['rxantenna']);
-    }
-    if ($_POST['hidessid_enable'] == "yes") {
-        $wancfg['wireless']['hidessid']['enable'] = true;
-    } else if (isset($wancfg['wireless']['hidessid']['enable'])) {
-        unset($wancfg['wireless']['hidessid']['enable']);
-    }
-    if ($_POST['mac_acl_enable'] == "yes") {
-        $wancfg['wireless']['wpa']['mac_acl_enable'] = true;
-    } else if (isset($wancfg['wireless']['wpa']['mac_acl_enable'])) {
-        unset($wancfg['wireless']['wpa']['mac_acl_enable']);
-    }
-    if ($_POST['rsn_preauth'] == "yes") {
-        $wancfg['wireless']['wpa']['rsn_preauth'] = true;
-    } else {
-        unset($wancfg['wireless']['wpa']['rsn_preauth']);
-    }
-    if ($_POST['ieee8021x'] == "yes") {
-        $wancfg['wireless']['wpa']['ieee8021x']['enable'] = true;
-    } else if (isset($wancfg['wireless']['wpa']['ieee8021x']['enable'])) {
-        unset($wancfg['wireless']['wpa']['ieee8021x']['enable']);
-    }
-    if ($_POST['wpa_strict_rekey'] == "yes") {
-        $wancfg['wireless']['wpa']['wpa_strict_rekey'] = true;
-    } else if (isset($wancfg['wireless']['wpa']['wpa_strict_rekey'])) {
-        unset($wancfg['wireless']['wpa']['wpa_strict_rekey']);
-    }
-    if ($_POST['debug_mode'] == "yes") {
-        $wancfg['wireless']['wpa']['debug_mode'] = true;
-    } else if (isset($wancfg['wireless']['wpa']['debug_mode'])) {
-        sunset($wancfg['wireless']['wpa']['debug_mode']);
-    }
-    if ($_POST['wpa_enable'] == "yes") {
-        $wancfg['wireless']['wpa']['enable'] = $_POST['wpa_enable'] = true;
-    } else if (isset($wancfg['wireless']['wpa']['enable'])) {
-        unset($wancfg['wireless']['wpa']['enable']);
-    }
-
-    if(ALLOWWEP) {
-        if ($_POST['wep_enable'] == "yes") {
-            if (!is_array($wancfg['wireless']['wep'])) {
-                $wancfg['wireless']['wep'] = array();
-            }
-            $wancfg['wireless']['wep']['enable'] = $_POST['wep_enable'] = true;
-        } else if (isset($wancfg['wireless']['wep'])) {
-            unset($wancfg['wireless']['wep']);
-        }
-    }
-
-    if ($_POST['wme_enable'] == "yes") {
-        if (!is_array($wancfg['wireless']['wme'])) {
-            $wancfg['wireless']['wme'] = array();
-        }
-        $wancfg['wireless']['wme']['enable'] = $_POST['wme_enable'] = true;
-    } else if (isset($wancfg['wireless']['wme']['enable'])) {
-        unset($wancfg['wireless']['wme']['enable']);
-    }
-    if ($_POST['puremode'] == "11g") {
-        if (!is_array($wancfg['wireless']['pureg'])) {
-            $wancfg['wireless']['pureg'] = array();
-        }
-        $wancfg['wireless']['pureg']['enable'] = true;
-    } else if ($_POST['puremode'] == "11n") {
-        if (!is_array($wancfg['wireless']['puren'])) {
-            $wancfg['wireless']['puren'] = array();
-        }
-        $wancfg['wireless']['puren']['enable'] = true;
-    } else {
-        if (isset($wancfg['wireless']['pureg'])) {
-            unset($wancfg['wireless']['pureg']);
-        }
-        if (isset($wancfg['wireless']['puren'])) {
-            unset($wancfg['wireless']['puren']);
-        }
-    }
-    if ($_POST['apbridge_enable'] == "yes") {
-        if (!is_array($wancfg['wireless']['apbridge'])) {
-            $wancfg['wireless']['apbridge'] = array();
-        }
-        $wancfg['wireless']['apbridge']['enable'] = $_POST['apbridge_enable'] = true;
-    } else if (isset($wancfg['wireless']['apbridge']['enable'])) {
-        unset($wancfg['wireless']['apbridge']['enable']);
-    }
-    if ($_POST['standard'] == "11g Turbo" || $_POST['standard'] == "11a Turbo") {
-        if (!is_array($wancfg['wireless']['turbo'])) {
-            $wancfg['wireless']['turbo'] = array();
-        }
-        $wancfg['wireless']['turbo']['enable'] = true;
-    } else if (isset($wancfg['wireless']['turbo']['enable'])) {
-        unset($wancfg['wireless']['turbo']['enable']);
-    }
-
-    if(ALLOWWEP) {
-        $wancfg['wireless']['wep']['key'] = array();
-        for ($i = 1; $i <= 4; $i++) {
-            if ($_POST['key' . $i]) {
-                $newkey = array();
-                $newkey['value'] = $_POST['key' . $i];
-                if ($_POST['txkey'] == $i) {
-                    $newkey['txkey'] = true;
-                }
-                $wancfg['wireless']['wep']['key'][] = $newkey;
-            }
-        }
-    }
-
-    interface_sync_wireless_clones($wancfg, true);
+	global $_POST, $config, $g, $wancfg, $if, $wl_countries_attr, $wlanbaseif;
+	if (!is_array($wancfg['wireless'])) {
+		$wancfg['wireless'] = array();
+	}
+	$wancfg['wireless']['standard'] = $_POST['standard'];
+	$wancfg['wireless']['mode'] = $_POST['mode'];
+	$wancfg['wireless']['protmode'] = $_POST['protmode'];
+	$wancfg['wireless']['ssid'] = $_POST['ssid'];
+	$wancfg['wireless']['channel'] = $_POST['channel'];
+	$wancfg['wireless']['authmode'] = $_POST['authmode'];
+	$wancfg['wireless']['txpower'] = $_POST['txpower'];
+	$wancfg['wireless']['distance'] = $_POST['distance'];
+	$wancfg['wireless']['regdomain'] = $_POST['regdomain'];
+	$wancfg['wireless']['regcountry'] = $_POST['regcountry'];
+	$wancfg['wireless']['reglocation'] = $_POST['reglocation'];
+	if (!empty($wancfg['wireless']['regdomain']) && !empty($wancfg['wireless']['regcountry'])) {
+		foreach ($wl_countries_attr as $wl_country) {
+			if ($wancfg['wireless']['regcountry'] == $wl_country['ID']) {
+				$wancfg['wireless']['regdomain'] = $wl_country['rd'][0]['REF'];
+				break;
+			}
+		}
+	}
+	if (!is_array($wancfg['wireless']['wpa'])) {
+		$wancfg['wireless']['wpa'] = array();
+	}
+	$wancfg['wireless']['wpa']['macaddr_acl'] = $_POST['macaddr_acl'];
+	$wancfg['wireless']['wpa']['auth_algs'] = $_POST['auth_algs'];
+	$wancfg['wireless']['wpa']['wpa_mode'] = $_POST['wpa_mode'];
+	$wancfg['wireless']['wpa']['wpa_key_mgmt'] = $_POST['wpa_key_mgmt'];
+	$wancfg['wireless']['wpa']['wpa_pairwise'] = $_POST['wpa_pairwise'];
+	$wancfg['wireless']['wpa']['wpa_group_rekey'] = $_POST['wpa_group_rekey'];
+	$wancfg['wireless']['wpa']['wpa_gmk_rekey'] = $_POST['wpa_gmk_rekey'];
+	$wancfg['wireless']['wpa']['passphrase'] = $_POST['passphrase'];
+	$wancfg['wireless']['wpa']['ext_wpa_sw'] = $_POST['ext_wpa_sw'];
+	$wancfg['wireless']['auth_server_addr'] = $_POST['auth_server_addr'];
+	$wancfg['wireless']['auth_server_port'] = $_POST['auth_server_port'];
+	$wancfg['wireless']['auth_server_shared_secret'] = $_POST['auth_server_shared_secret'];
+	$wancfg['wireless']['auth_server_addr2'] = $_POST['auth_server_addr2'];
+	$wancfg['wireless']['auth_server_port2'] = $_POST['auth_server_port2'];
+	$wancfg['wireless']['auth_server_shared_secret2'] = $_POST['auth_server_shared_secret2'];
+
+	if ($_POST['persistcommonwireless'] == "yes") {
+		if (!is_array($config['wireless'])) {
+			$config['wireless'] = array();
+		}
+		if (!is_array($config['wireless']['interfaces'])) {
+			$config['wireless']['interfaces'] = array();
+		}
+		if (!is_array($config['wireless']['interfaces'][$wlanbaseif])) {
+			$config['wireless']['interfaces'][$wlanbaseif] = array();
+		}
+	} else if (isset($config['wireless']['interfaces'][$wlanbaseif])) {
+		unset($config['wireless']['interfaces'][$wlanbaseif]);
+	}
+	if (isset($_POST['diversity']) && is_numeric($_POST['diversity'])) {
+		$wancfg['wireless']['diversity'] = $_POST['diversity'];
+	} else if (isset($wancfg['wireless']['diversity'])) {
+		unset($wancfg['wireless']['diversity']);
+	}
+	if (isset($_POST['txantenna']) && is_numeric($_POST['txantenna'])) {
+		$wancfg['wireless']['txantenna'] = $_POST['txantenna'];
+	} else if (isset($wancfg['wireless']['txantenna'])) {
+		unset($wancfg['wireless']['txantenna']);
+	}
+	if (isset($_POST['rxantenna']) && is_numeric($_POST['rxantenna'])) {
+		$wancfg['wireless']['rxantenna'] = $_POST['rxantenna'];
+	} else if (isset($wancfg['wireless']['rxantenna'])) {
+		unset($wancfg['wireless']['rxantenna']);
+	}
+	if ($_POST['hidessid_enable'] == "yes") {
+		$wancfg['wireless']['hidessid']['enable'] = true;
+	} else if (isset($wancfg['wireless']['hidessid']['enable'])) {
+		unset($wancfg['wireless']['hidessid']['enable']);
+	}
+	if ($_POST['mac_acl_enable'] == "yes") {
+		$wancfg['wireless']['wpa']['mac_acl_enable'] = true;
+	} else if (isset($wancfg['wireless']['wpa']['mac_acl_enable'])) {
+		unset($wancfg['wireless']['wpa']['mac_acl_enable']);
+	}
+	if ($_POST['rsn_preauth'] == "yes") {
+		$wancfg['wireless']['wpa']['rsn_preauth'] = true;
+	} else {
+		unset($wancfg['wireless']['wpa']['rsn_preauth']);
+	}
+	if ($_POST['ieee8021x'] == "yes") {
+		$wancfg['wireless']['wpa']['ieee8021x']['enable'] = true;
+	} else if (isset($wancfg['wireless']['wpa']['ieee8021x']['enable'])) {
+		unset($wancfg['wireless']['wpa']['ieee8021x']['enable']);
+	}
+	if ($_POST['wpa_strict_rekey'] == "yes") {
+		$wancfg['wireless']['wpa']['wpa_strict_rekey'] = true;
+	} else if (isset($wancfg['wireless']['wpa']['wpa_strict_rekey'])) {
+		unset($wancfg['wireless']['wpa']['wpa_strict_rekey']);
+	}
+	if ($_POST['debug_mode'] == "yes") {
+		$wancfg['wireless']['wpa']['debug_mode'] = true;
+	} else if (isset($wancfg['wireless']['wpa']['debug_mode'])) {
+		sunset($wancfg['wireless']['wpa']['debug_mode']);
+	}
+	if ($_POST['wpa_enable'] == "yes") {
+		$wancfg['wireless']['wpa']['enable'] = $_POST['wpa_enable'] = true;
+	} else if (isset($wancfg['wireless']['wpa']['enable'])) {
+		unset($wancfg['wireless']['wpa']['enable']);
+	}
+
+	if(ALLOWWEP) {
+		if ($_POST['wep_enable'] == "yes") {
+			if (!is_array($wancfg['wireless']['wep'])) {
+				$wancfg['wireless']['wep'] = array();
+			}
+			$wancfg['wireless']['wep']['enable'] = $_POST['wep_enable'] = true;
+		} else if (isset($wancfg['wireless']['wep'])) {
+			unset($wancfg['wireless']['wep']);
+		}
+	}
+
+	if ($_POST['wme_enable'] == "yes") {
+		if (!is_array($wancfg['wireless']['wme'])) {
+			$wancfg['wireless']['wme'] = array();
+		}
+		$wancfg['wireless']['wme']['enable'] = $_POST['wme_enable'] = true;
+	} else if (isset($wancfg['wireless']['wme']['enable'])) {
+		unset($wancfg['wireless']['wme']['enable']);
+	}
+	if ($_POST['puremode'] == "11g") {
+		if (!is_array($wancfg['wireless']['pureg'])) {
+			$wancfg['wireless']['pureg'] = array();
+		}
+		$wancfg['wireless']['pureg']['enable'] = true;
+	} else if ($_POST['puremode'] == "11n") {
+		if (!is_array($wancfg['wireless']['puren'])) {
+			$wancfg['wireless']['puren'] = array();
+		}
+		$wancfg['wireless']['puren']['enable'] = true;
+	} else {
+		if (isset($wancfg['wireless']['pureg'])) {
+			unset($wancfg['wireless']['pureg']);
+		}
+		if (isset($wancfg['wireless']['puren'])) {
+			unset($wancfg['wireless']['puren']);
+		}
+	}
+	if ($_POST['apbridge_enable'] == "yes") {
+		if (!is_array($wancfg['wireless']['apbridge'])) {
+			$wancfg['wireless']['apbridge'] = array();
+		}
+		$wancfg['wireless']['apbridge']['enable'] = $_POST['apbridge_enable'] = true;
+	} else if (isset($wancfg['wireless']['apbridge']['enable'])) {
+		unset($wancfg['wireless']['apbridge']['enable']);
+	}
+	if ($_POST['standard'] == "11g Turbo" || $_POST['standard'] == "11a Turbo") {
+		if (!is_array($wancfg['wireless']['turbo'])) {
+			$wancfg['wireless']['turbo'] = array();
+		}
+		$wancfg['wireless']['turbo']['enable'] = true;
+	} else if (isset($wancfg['wireless']['turbo']['enable'])) {
+		unset($wancfg['wireless']['turbo']['enable']);
+	}
+
+	if(ALLOWWEP) {
+		$wancfg['wireless']['wep']['key'] = array();
+		for ($i = 1; $i <= 4; $i++) {
+			if ($_POST['key' . $i]) {
+				$newkey = array();
+				$newkey['value'] = $_POST['key' . $i];
+				if ($_POST['txkey'] == $i) {
+					$newkey['txkey'] = true;
+				}
+				$wancfg['wireless']['wep']['key'][] = $newkey;
+			}
+		}
+	}
+
+	interface_sync_wireless_clones($wancfg, true);
 }
 
 function check_wireless_mode() {
-    global $_POST, $config, $g, $wlan_modes, $wancfg, $if, $wlanif, $wlanbaseif, $old_wireless_mode, $input_errors;
-
-    if ($wancfg['wireless']['mode'] == $_POST['mode']) {
-        return;
-    }
-
-    if (does_interface_exist(interface_get_wireless_clone($wlanbaseif))) {
-        $clone_count = 1;
-    } else {
-        $clone_count = 0;
-    }
-
-    if (isset($config['wireless']['clone']) && is_array($config['wireless']['clone'])) {
-        foreach ($config['wireless']['clone'] as $clone) {
-            if ($clone['if'] == $wlanbaseif) {
-                $clone_count++;
-            }
-        }
-    }
-
-    if ($clone_count > 1) {
-        $old_wireless_mode = $wancfg['wireless']['mode'];
-        $wancfg['wireless']['mode'] = $_POST['mode'];
-        if (!interface_wireless_clone("{$wlanif}_", $wancfg)) {
-            $input_errors[] = sprintf(gettext("Unable to change mode to %s.  You may already have the maximum number of wireless clones supported in this mode."), $wlan_modes[$wancfg['wireless']['mode']]);
-        } else {
-            mwexec("/sbin/ifconfig " . escapeshellarg($wlanif) . "_ destroy");
-        }
-        $wancfg['wireless']['mode'] = $old_wireless_mode;
-    }
+	global $_POST, $config, $g, $wlan_modes, $wancfg, $if, $wlanif, $wlanbaseif, $old_wireless_mode, $input_errors;
+
+	if ($wancfg['wireless']['mode'] == $_POST['mode']) {
+		return;
+	}
+
+	if (does_interface_exist(interface_get_wireless_clone($wlanbaseif))) {
+		$clone_count = 1;
+	} else {
+		$clone_count = 0;
+	}
+
+	if (isset($config['wireless']['clone']) && is_array($config['wireless']['clone'])) {
+		foreach ($config['wireless']['clone'] as $clone) {
+			if ($clone['if'] == $wlanbaseif) {
+				$clone_count++;
+			}
+		}
+	}
+
+	if ($clone_count > 1) {
+		$old_wireless_mode = $wancfg['wireless']['mode'];
+		$wancfg['wireless']['mode'] = $_POST['mode'];
+		if (!interface_wireless_clone("{$wlanif}_", $wancfg)) {
+			$input_errors[] = sprintf(gettext("Unable to change mode to %s.	 You may already have the maximum number of wireless clones supported in this mode."), $wlan_modes[$wancfg['wireless']['mode']]);
+		} else {
+			mwexec("/sbin/ifconfig " . escapeshellarg($wlanif) . "_ destroy");
+		}
+		$wancfg['wireless']['mode'] = $old_wireless_mode;
+	}
 }
 
 // Find all possible media options for the interface
@@ -1680,14 +1680,14 @@ $mediaopts_list = array();
 $intrealname = $config['interfaces'][$if]['if'];
 exec("/sbin/ifconfig -m $intrealname | grep \"media \"", $mediaopts);
 foreach ($mediaopts as $mediaopt) {
-    preg_match("/media (.*)/", $mediaopt, $matches);
-    if (preg_match("/(.*) mediaopt (.*)/", $matches[1], $matches1)) {
-        // there is media + mediaopt like "media 1000baseT mediaopt full-duplex"
-        array_push($mediaopts_list, $matches1[1] . " " . $matches1[2]);
-    } else {
-        // there is only media like "media 1000baseT"
-        array_push($mediaopts_list, $matches[1]);
-    }
+	preg_match("/media (.*)/", $mediaopt, $matches);
+	if (preg_match("/(.*) mediaopt (.*)/", $matches[1], $matches1)) {
+		// there is media + mediaopt like "media 1000baseT mediaopt full-duplex"
+		array_push($mediaopts_list, $matches1[1] . " " . $matches1[2]);
+	} else {
+		// there is only media like "media 1000baseT"
+		array_push($mediaopts_list, $matches[1]);
+	}
 }
 
 $pgtitle = array(gettext("Interfaces"), $pconfig['descr']);
@@ -1704,96 +1704,96 @@ $mymac = `/usr/sbin/arp -an | grep '('{$ip}')' | head -n 1 | cut -d" " -f4`;
 $mymac = str_replace("\n", "", $mymac);
 
 function build_mediaopts_list() {
-    global $mediaopts_list;
+	global $mediaopts_list;
 
-    $list = [""  =>  "Default (no preference, typically autoselect)",
-             " " =>  "------- Media Supported by this interface -------"
-            ];
+	$list = [""	 =>	 "Default (no preference, typically autoselect)",
+			 " " =>	 "------- Media Supported by this interface -------"
+			];
 
-    foreach ($mediaopts_list as $mediaopt) {
-        $list[$mediaopt] = $mediaopt;
-    }
+	foreach ($mediaopts_list as $mediaopt) {
+		$list[$mediaopt] = $mediaopt;
+	}
 
-    return($list);
+	return($list);
 }
 
 function build_gateway_list() {
-    global $a_gateways;
+	global $a_gateways;
 
-    $list = array("none" => "None");
-    foreach ($a_gateways as $gateway) {
-        if (($gateway['interface'] == $if) && (is_ipaddrv4($gateway['gateway']))) {
-            $list[$gateway['name']] = $gateway['name'] . " - " . $gateway['gateway'];
-        }
-    }
+	$list = array("none" => "None");
+	foreach ($a_gateways as $gateway) {
+		if (($gateway['interface'] == $if) && (is_ipaddrv4($gateway['gateway']))) {
+			$list[$gateway['name']] = $gateway['name'] . " - " . $gateway['gateway'];
+		}
+	}
 
-    return($list);
+	return($list);
 }
 
 include("head.inc");
 
 if ($input_errors)
-    print_input_errors($input_errors);
+	print_input_errors($input_errors);
 
 if (is_subsystem_dirty('interfaces'))
-    print_info_box_np(sprintf(gettext("The %s configuration has been changed."), $wancfg['descr']) . "<br />" .
-                      gettext("You must apply the changes in order for them to take effect. Don't forget to adjust the DHCP Server range if needed after applying."));
+	print_info_box_np(sprintf(gettext("The %s configuration has been changed."), $wancfg['descr']) . "<br />" .
+					  gettext("You must apply the changes in order for them to take effect. Don't forget to adjust the DHCP Server range if needed after applying."));
 
 if ($savemsg)
-    print_info_box($savemsg, 'success');
+	print_info_box($savemsg, 'success');
 
 
 require_once('classes/Form.class.php');
 require_once('classes/Modal.class.php');
 
 $form = new Form(new Form_Button(
-    'Submit',
-    gettext("Save")
+	'Submit',
+	gettext("Save")
 ));
 
 $section = new Form_Section('General configuration');
 
 $section->addInput(new Form_Checkbox(
-    'enable',
-    'Enable',
-    'Enable interface',
-    $pconfig['enable'],
-    'yes'
+	'enable',
+	'Enable',
+	'Enable interface',
+	$pconfig['enable'],
+	'yes'
 ));
 
 $section->addInput(new Form_Input(
-    'descr',
-    'Description',
-    'text',
-    $pconfig['descr']
+	'descr',
+	'Description',
+	'text',
+	$pconfig['descr']
 ))->setHelp('Enter a description (name) for the interface here.');
 
 $section->addInput(new Form_Select(
-    'type',
-    'IPv4 Configuration Type',
-    $pconfig['type'],
-    $types4
+	'type',
+	'IPv4 Configuration Type',
+	$pconfig['type'],
+	$types4
 ));
 
 $section->addInput(new Form_Select(
-    'type6',
-    'IPv6 Configuration Type',
-    $pconfig['type6'],
-    $types6
+	'type6',
+	'IPv6 Configuration Type',
+	$pconfig['type6'],
+	$types6
 ));
 
 $macaddress = new Form_Input(
-    'mac',
-    'MAC Address',
-    'text',
-    $pconfig['mac'],
-    ['placeholder' => 'xx:xx:xx:xx:xx:xx']
+	'mac',
+	'MAC Address',
+	'text',
+	$pconfig['mac'],
+	['placeholder' => 'xx:xx:xx:xx:xx:xx']
 );
 
 $btnmymac = new Form_Button(
-    'btnmymac',
-    'Copy My MAC'
-    );
+	'btnmymac',
+	'Copy My MAC'
+	);
 
 $btnmymac->removeClass('btn-primary')->addClass('btn-success btn-sm');
 
@@ -1801,33 +1801,33 @@ $group = new Form_Group('MAC controls');
 $group->add($macaddress);
 // $group->add($btnmymac);
 $group->setHelp('This field can be used to modify ("spoof") the MAC address of this interface.' . '<br />' .
-                'Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx or leave blank');
+				'Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx or leave blank');
 $section->add($group);
 
 $section->addInput(new Form_Input(
-    'mtu',
-    'MTU',
-    'number',
-    $pconfig['mtu']
+	'mtu',
+	'MTU',
+	'number',
+	$pconfig['mtu']
 ))->setHelp('If you leave this field blank, the adapter\'s default MTU will be used. ' .
-            'This is typically 1500 bytes but can vary in some circumstances.');
+			'This is typically 1500 bytes but can vary in some circumstances.');
 
 $section->addInput(new Form_Input(
-    'mss',
-    'MSS',
-    'number',
-    $pconfig['mss']
+	'mss',
+	'MSS',
+	'number',
+	$pconfig['mss']
 ))->setHelp('If you enter a value in this field, then MSS clamping for TCP connections to the value entered above minus 40 (TCP/IP ' .
-            'header size) will be in effect.');
+			'header size) will be in effect.');
 
 if (count($mediaopts_list) > 0) {
-    $section->addInput(new Form_Select(
-        'mediaopt',
-        'Speed and Duplex',
-        rtrim($mediaopt_from_config),
-        build_mediaopts_list()
-    ))->setHelp('Here you can explicitly set speed and duplex mode for this interface.' . '<br />' .
-                'WARNING: You MUST leave this set to autoselect (automatically negotiate speed) unless the port this interface connects to has its speed and duplex forced.');
+	$section->addInput(new Form_Select(
+		'mediaopt',
+		'Speed and Duplex',
+		rtrim($mediaopt_from_config),
+		build_mediaopts_list()
+	))->setHelp('Here you can explicitly set speed and duplex mode for this interface.' . '<br />' .
+				'WARNING: You MUST leave this set to autoselect (automatically negotiate speed) unless the port this interface connects to has its speed and duplex forced.');
 }
 
 $form->add($section);
@@ -1836,28 +1836,28 @@ $section = new Form_Section('Static IPv4 configuration');
 $section->addClass('staticv4');
 
 $section->addInput(new Form_IpAddress(
-    'ipaddr',
-    'IPv4 Address',
-    $pconfig['ipaddr']
+	'ipaddr',
+	'IPv4 Address',
+	$pconfig['ipaddr']
 ))->addMask('subnet', $pconfig['subnet'], 32);
 
 $group = new Form_Group('IPv4 Upstream gateway');
 
 $group->add(new Form_Select(
-    'gateway',
-    'IPv4 Upstream Gateway',
-    $pconfig['gateway'],
-    build_gateway_list()
+	'gateway',
+	'IPv4 Upstream Gateway',
+	$pconfig['gateway'],
+	build_gateway_list()
 ));
 
 $group->add(new Form_Button(
-    'addgw',
-    'Add a new gateway'
+	'addgw',
+	'Add a new gateway'
 ))->removeClass('btn-primary')->setAttribute('data-target', '#newgateway')->setAttribute('data-toggle', 'modal');
 
 $group->setHelp('If this interface is an Internet connection, select an existing Gateway from the list or add a new one using the "Add" button.' . '<br />' .
-                'On local LANs the upstream gateway should be "none".' .
-                gettext('You can manage gateways by ') . '<a target="_blank" href="system_gateways.php">' . gettext(" clicking here") . '</a>');
+				'On local LANs the upstream gateway should be "none".' .
+				gettext('You can manage gateways by ') . '<a target="_blank" href="system_gateways.php">' . gettext(" clicking here") . '</a>');
 
 $section->add($group);
 
@@ -1867,48 +1867,48 @@ $form->add($section);
 $modal = new Modal('New gateway', 'newgateway', 'large');
 
 $modal->addInput(new Form_Checkbox(
-    'defaultgw',
-    'Default',
-    'Default gateway',
-    ($if == "wan" || $if == "WAN")
+	'defaultgw',
+	'Default',
+	'Default gateway',
+	($if == "wan" || $if == "WAN")
 ));
 
 $modal->addInput(new Form_Input(
-    'name',
-    'Gateway name',
-    'text',
-    $wancfg['descr'] . "GW"
+	'name',
+	'Gateway name',
+	'text',
+	$wancfg['descr'] . "GW"
 ));
 
 $modal->addInput(new Form_IpAddress(
-    'gatewayip',
-    'Gateway IPv4',
-    null
+	'gatewayip',
+	'Gateway IPv4',
+	null
 ));
 
 $modal->addInput(new Form_Input(
-    'gatewaydescr',
-    'Description',
-    'text'
+	'gatewaydescr',
+	'Description',
+	'text'
 ));
 
 $btnaddgw = new Form_Button(
-    'add',
-    'Add'
+	'add',
+	'Add'
 );
 
 $btnaddgw->removeClass('btn-primary')->addClass('btn-success');
 
 $btncnxgw = new Form_Button(
-    'cnx',
-    'Cancel'
+	'cnx',
+	'Cancel'
 );
 
 $btncnxgw->removeClass('btn-primary')->addClass('btn-default');
 
 $modal->addInput(new Form_StaticText(
-    null,
-    $btnaddgw . $btncnxgw
+	null,
+	$btnaddgw . $btncnxgw
 ));
 
 $form->add($modal);
@@ -1917,27 +1917,27 @@ $section = new Form_Section('Static IPv6 configuration');
 $section->addClass('staticv6');
 
 $section->addInput(new Form_IpAddress(
-    'ipaddrv6',
-    'IPv6 address',
-    $pconfig['ipaddrv6']
+	'ipaddrv6',
+	'IPv6 address',
+	$pconfig['ipaddrv6']
 ))->addMask('subnetv6', $pconfig['subnetv6'], 128);
 
 $group = new Form_Group('IPv6 Upstream gateway');
 
 $group->add(new Form_Select(
-    'gatewayv6',
-    'IPv4 Upstream Gateway',
-    $pconfig['gateway'],
-    build_gateway_list()
+	'gatewayv6',
+	'IPv4 Upstream Gateway',
+	$pconfig['gateway'],
+	build_gateway_list()
 ));
 
 $group->add(new Form_Button(
-    'addgw6',
-    'Add a new gateway'
+	'addgw6',
+	'Add a new gateway'
 ))->removeClass('btn-primary')->setAttribute('data-target', '#newgateway6')->setAttribute('data-toggle', 'modal');
 
 $group->setHelp('If this interface is an Internet connection, select an existing Gateway from the list or add a new one using the "Add" button.' . '<br />' .
-                'On local LANs the upstream gateway should be "none". ');
+				'On local LANs the upstream gateway should be "none". ');
 
 $section->add($group);
 $form->add($section);
@@ -1946,48 +1946,48 @@ $form->add($section);
 $modal = new Modal('New IPv6 gateway', 'newgateway6', 'large');
 
 $modal->addInput(new Form_Checkbox(
-    'defaultgw6',
-    'Default',
-    'Default gateway',
-    ($if == "wan" || $if == "WAN")
+	'defaultgw6',
+	'Default',
+	'Default gateway',
+	($if == "wan" || $if == "WAN")
 ));
 
 $modal->addInput(new Form_Input(
-    'name6',
-    'Gateway name',
-    'text',
-    $wancfg['descr'] . "GW"
+	'name6',
+	'Gateway name',
+	'text',
+	$wancfg['descr'] . "GW"
 ));
 
 $modal->addInput(new Form_IpAddress(
-    'gatewayip6',
-    'Gateway IPv4',
-    null
+	'gatewayip6',
+	'Gateway IPv4',
+	null
 ));
 
 $modal->addInput(new Form_Input(
-    'gatewaydescr6',
-    'Description',
-    'text'
+	'gatewaydescr6',
+	'Description',
+	'text'
 ));
 
 $btnaddgw6 = new Form_Button(
-    'add6',
-    'Add'
+	'add6',
+	'Add'
 );
 
 $btnaddgw6->removeClass('btn-primary')->addClass('btn-success');
 
 $btncnxgw6 = new Form_Button(
-    'cnx6',
-    'Cancel'
+	'cnx6',
+	'Cancel'
 );
 
 $btncnxgw6->removeClass('btn-primary')->addClass('btn-default');
 
 $modal->addInput(new Form_StaticText(
-    null,
-    $btnaddgw6 . $btncnxgw6
+	null,
+	$btnaddgw6 . $btncnxgw6
 ));
 
 $form->add($modal);
@@ -1997,179 +1997,159 @@ $form->add($modal);
 $section = new Form_Section('DHCP client configuration');
 $section->addClass('dhcp');
 
-$group = new Form_Group('Options');
-
-$group->add(new Form_Checkbox(
-    'dhcpadv',
-    null,
-    'Show DHCP advanced options',
-    false
-));
-
-$group->add(new Form_Checkbox(
-    'dhcpovr',
-    null,
-    'Config file override',
-    false
-));
-
-$section->add($group);
-
 $section->addInput(new Form_Input(
-    'dhcphostname',
-    'Hostname',
-    'text',
-    $pconfig['dhcphostname']
+	'dhcphostname',
+	'Hostname',
+	'text',
+	$pconfig['dhcphostname']
 ))->setHelp('The value in this field is sent as the DHCP client identifier and hostname when requesting a DHCP lease. Some ISPs may require this (for client identification).');
 
 $section->addInput(new Form_IpAddress(
-    'alias-address',
-    'Alias IPv4 address',
-    $pconfig['alias-address']
+	'alias-address',
+	'Alias IPv4 address',
+	$pconfig['alias-address']
 ))->addMask('alias-subnet', $pconfig['alias-subnet'], 32)->setHelp('The value in this field is used as a fixed alias IPv4 address by the DHCP client.');
 
 $section->addInput(new Form_Input(
-    'dhcprejectfrom',
-    'Reject leases from',
-    'text',
-    $pconfig['dhcprejectfrom']
+	'dhcprejectfrom',
+	'Reject leases from',
+	'text',
+	$pconfig['dhcprejectfrom']
 ))->setHelp('If there is a certain upstream DHCP server that should be ignored, place the IP address or subnet of the DHCP server to be ignored here. ' .
-            'This is useful for rejecting leases from cable modems that offer private IPs when they lose upstream sync.');
+			'This is useful for rejecting leases from cable modems that offer private IPs when they lose upstream sync.');
 
 $group = new Form_Group('Protocol timing');
-$group->addClass('dhcpadvanced');
 
 $group->add(new Form_Input(
-    'adv_dhcp_pt_timeout',
-    null,
-    'number',
-    $pconfig['adv_dhcp_pt_timeout']
+	'adv_dhcp_pt_timeout',
+	null,
+	'number',
+	$pconfig['adv_dhcp_pt_timeout']
 ))->setHelp('Timeout');
 
 $group->add(new Form_Input(
-    'adv_dhcp_pt_retry',
-    null,
-    'number',
-    $pconfig['adv_dhcp_pt_retry']
+	'adv_dhcp_pt_retry',
+	null,
+	'number',
+	$pconfig['adv_dhcp_pt_retry']
 ))->setHelp('Retry');
 
 $group->add(new Form_Input(
-    'adv_dhcp_pt_select_timeout',
-    null,
-    'number',
-    $pconfig['adv_dhcp_pt_select_timeout']
+	'adv_dhcp_pt_select_timeout',
+	null,
+	'number',
+	$pconfig['adv_dhcp_pt_select_timeout']
 ))->setHelp('Select timeout');
 
 $group->add(new Form_Input(
-    'adv_dhcp_pt_reboot',
-    null,
-    'number',
-    $pconfig['adv_dhcp_pt_reboot']
+	'adv_dhcp_pt_reboot',
+	null,
+	'number',
+	$pconfig['adv_dhcp_pt_reboot']
 ))->setHelp('Reboot');
 
 $group->add(new Form_Input(
-    'adv_dhcp_pt_backoff_cutoff',
-    null,
-    'number',
-    $pconfig['adv_dhcp_pt_backoff_cutoff']
+	'adv_dhcp_pt_backoff_cutoff',
+	null,
+	'number',
+	$pconfig['adv_dhcp_pt_backoff_cutoff']
 ))->setHelp('Backoff cutoff');
 
 $group->add(new Form_Input(
-    'adv_dhcp_pt_initial_interval',
-    null,
-    'number',
-    $pconfig['adv_dhcp_pt_initial_interval']
+	'adv_dhcp_pt_initial_interval',
+	null,
+	'number',
+	$pconfig['adv_dhcp_pt_initial_interval']
 ))->setHelp('Initial interval');
 
 $section->add($group);
 
 $group = new Form_Group('Presets');
-$group->addClass('dhcpadvanced');
 
 $group->add(new Form_Checkbox(
-    'adv_dhcp_pt_values',
-    null,
-    'FreeBSD default',
-    null,
-    'DHCP'
+	'adv_dhcp_pt_values',
+	null,
+	'FreeBSD default',
+	null,
+	'DHCP'
 ))->displayAsRadio();
 
 $group->add(new Form_Checkbox(
-    'adv_dhcp_pt_values',
-    null,
-    'Clear',
-    null,
-    'Clear'
+	'adv_dhcp_pt_values',
+	null,
+	'Clear',
+	null,
+	'Clear'
 ))->displayAsRadio();
 
 $group->add(new Form_Checkbox(
-    'adv_dhcp_pt_values',
-    null,
-    'pfSense Default',
-    null,
-    'pfSense'
+	'adv_dhcp_pt_values',
+	null,
+	'pfSense Default',
+	null,
+	'pfSense'
 ))->displayAsRadio();
 
 $group->add(new Form_Checkbox(
-    'adv_dhcp_pt_values',
-    null,
-    'Saved Cfg',
-    null,
-    'SavedCfg'
+	'adv_dhcp_pt_values',
+	null,
+	'Saved Cfg',
+	null,
+	'SavedCfg'
 ))->displayAsRadio();
 
 $group->setHelp('The values in these fields are DHCP protocol timings used when requesting a lease.' . '<br />' .
-                '<a href="http://www.freebsd.org/cgi/man.cgi?query=dhclient.conf&sektion=5#PROTOCOL_TIMING">' . 'See here more information' . '</a>');
+				'<a href="http://www.freebsd.org/cgi/man.cgi?query=dhclient.conf&sektion=5#PROTOCOL_TIMING">' . 'See here more information' . '</a>');
 
 $section->add($group);
 
-$section->addInput(new Form_Input(
-    'adv_dhcp_config_file_override_path',
-    'Option modifiers',
-    'text',
-    $pconfig['adv_dhcp_config_file_override_path']
-))->sethelp('The value in this field is the full absolute path to a DHCP client configuration file.  [/[dirname/[.../]]filename[.ext]]' . '<br />' .
-            'Value Substitutions in Config File: {interface}, {hostname}, {mac_addr_asciiCD}, {mac_addr_hexCD}' . '<br />' .
-            'Where C is U(pper) or L(ower) Case, and D is ":-." Delimiter (space, colon, hyphen, or period) (omitted for none).' . '<br />' .
-            'Some ISPs may require certain options be or not be sent.');
-
 $form->add($section);
 
 $section = new Form_Section('Lease Requirements and Requests');
-$section->addClass('dhcpadvanced');
+$section->addClass('dhcp dhcpadvanced');
 
 $section->addInput(new Form_Input(
-    'adv_dhcp_send_options',
-    'Send options',
-    'text',
-    $pconfig['adv_dhcp_send_options']
-))->sethelp('The values in this field are DHCP options to be sent when requesting a DHCP lease.  [option declaration [, ...]]' . '<br />' .
-            'Value Substitutions: {interface}, {hostname}, {mac_addr_asciiCD}, {mac_addr_hexCD}' . '<br />' .
-            'Where C is U(pper) or L(ower) Case, and D is " :-." Delimiter (space, colon, hyphen, or period) (omitted for none).' . '<br />' .
-            'Some ISPs may require certain options be or not be sent.');
+	'adv_dhcp_send_options',
+	'Send options',
+	'text',
+	$pconfig['adv_dhcp_send_options']
+))->sethelp('The values in this field are DHCP options to be sent when requesting a DHCP lease.	 [option declaration [, ...]]' . '<br />' .
+			'Value Substitutions: {interface}, {hostname}, {mac_addr_asciiCD}, {mac_addr_hexCD}' . '<br />' .
+			'Where C is U(pper) or L(ower) Case, and D is " :-." Delimiter (space, colon, hyphen, or period) (omitted for none).' . '<br />' .
+			'Some ISPs may require certain options be or not be sent.');
 
 $section->addInput(new Form_Input(
-    'adv_dhcp_request_options',
-    'Request options',
-    'text',
-    $pconfig['adv_dhcp_request_options']
+	'adv_dhcp_request_options',
+	'Request options',
+	'text',
+	$pconfig['adv_dhcp_request_options']
 ))->sethelp('The values in this field are DHCP option 55 to be sent when requesting a DHCP lease.  [option [, ...]]' . '<br />' .
-            'Some ISPs may require certain options be or not be requested.');
+			'Some ISPs may require certain options be or not be requested.');
+
+$section->addInput(new Form_Input(
+	'adv_dhcp_require_options',
+	'Request options',
+	'text',
+	$pconfig['adv_dhcp_require_options']
+))->sethelp('The values in this field are DHCP options required by the client when requesting a DHCP lease.	 [option [, ...]]');
 
 $section->addInput(new Form_Input(
-    'adv_dhcp_require_options',
-    'Request options',
-    'text',
-    $pconfig['adv_dhcp_require_options']
-))->sethelp('The values in this field are DHCP options required by the client when requesting a DHCP lease.  [option [, ...]]');
+	'adv_dhcp_option_modifiers',
+	'Option modifiers',
+	'text',
+	$pconfig['adv_dhcp_option_modifiers']
+))->sethelp('The values in this field are DHCP option modifiers applied to obtained DHCP lease.	 [modifier option declaration [, ...]]' . '<br />' .
+			'modifiers: (default, supersede, prepend, append)');
 
 $section->addInput(new Form_Input(
-    'adv_dhcp_option_modifiers',
-    'Option modifiers',
-    'text',
-    $pconfig['adv_dhcp_option_modifiers']
-))->sethelp('The values in this field are DHCP option modifiers applied to obtained DHCP lease.  [modifier option declaration [, ...]]' . '<br />' .
-            'modifiers: (default, supersede, prepend, append)');
+	'adv_dhcp_config_file_override_path',
+	'Option modifiers',
+	'text',
+	$pconfig['adv_dhcp_config_file_override_path']
+))->sethelp('The value in this field is the full absolute path to a DHCP client configuration file.	 [/[dirname/[.../]]filename[.ext]]' . '<br />' .
+			'Value Substitutions in Config File: {interface}, {hostname}, {mac_addr_asciiCD}, {mac_addr_hexCD}' . '<br />' .
+			'Where C is U(pper) or L(ower) Case, and D is ":-." Delimiter (space, colon, hyphen, or period) (omitted for none).' . '<br />' .
+			'Some ISPs may require certain options be or not be sent.');
 
 $form->add($section);
 
@@ -2179,56 +2159,56 @@ $section = new Form_Section('DHCP6 client configuration');
 $section->addClass('dhcp6');
 
 $section->addInput(new Form_Checkbox(
-    'dhcp6adv',
-    'Advanced',
-    'Show DHCPv6 advanced options',
-    $pconfig['adv_dhcp6_config_advanced']
+	'dhcp6adv',
+	'Advanced',
+	'Show DHCPv6 advanced options',
+	$pconfig['adv_dhcp6_config_advanced']
 ));
 
 $section->addInput(new Form_Checkbox(
-    'adv_dhcp6_config_file_override',
-    'Config file override',
-    'Override the configuration from this file',
-    $pconfig['adv_dhcp6_config_file_override']
+	'adv_dhcp6_config_file_override',
+	'Config file override',
+	'Override the configuration from this file',
+	$pconfig['adv_dhcp6_config_file_override']
 ));
 
 $section->addInput(new Form_Checkbox(
-    'dhcp6usev4iface',
-    'Use IPv4 connectivity as parent interface',
-    'Request a IPv6 prefix/information through the IPv4 connectivity link',
-    $pconfig['dhcp6usev4iface']
+	'dhcp6usev4iface',
+	'Use IPv4 connectivity as parent interface',
+	'Request a IPv6 prefix/information through the IPv4 connectivity link',
+	$pconfig['dhcp6usev4iface']
 ));
 
 $section->addInput(new Form_Checkbox(
-    'dhcp6prefixonly',
-    'Request only an IPv6 prefix',
-    'Only request an IPv6 prefix, do not request an IPv6 address',
-    $pconfig['dhcp6prefixonly']
+	'dhcp6prefixonly',
+	'Request only an IPv6 prefix',
+	'Only request an IPv6 prefix, do not request an IPv6 address',
+	$pconfig['dhcp6prefixonly']
 ));
 
 $section->addInput(new Form_Select(
-    'dhcp6-ia-pd-len',
-    'DHCPv6 Prefix Delegation size',
-    $pconfig['dhcp6-ia-pd-len'],
-    array("none" => "None", 16 => "48", 12 => "52", 8 => "56", 4 => "60", 3 => "61",  2 => "62", 1 => "63", 0 => "64")
+	'dhcp6-ia-pd-len',
+	'DHCPv6 Prefix Delegation size',
+	$pconfig['dhcp6-ia-pd-len'],
+	array("none" => "None", 16 => "48", 12 => "52", 8 => "56", 4 => "60", 3 => "61",  2 => "62", 1 => "63", 0 => "64")
 ))->setHelp('The value in this field is the delegated prefix length provided by the DHCPv6 server. Normally specified by the ISP.');
 
 $section->addInput(new Form_Checkbox(
-    'dhcp6-ia-pd-send-hint',
-    'Send IPv6 prefix hint',
-    'Send an IPv6 prefix hint to indicate the desired prefix size for delegation',
-    $pconfig['dhcp6-ia-pd-send-hint']
+	'dhcp6-ia-pd-send-hint',
+	'Send IPv6 prefix hint',
+	'Send an IPv6 prefix hint to indicate the desired prefix size for delegation',
+	$pconfig['dhcp6-ia-pd-send-hint']
 ));
 
 $section->addInput(new Form_Input(
-    'adv_dhcp6_config_file_override_path',
-    'Configuration File Override',
-    'text',
-    $pconfig['adv_dhcp6_config_file_override_path']
-))->setHelp('The value in this field is the full absolute path to a DHCP client configuration file.  [/[dirname/[.../]]filename[.ext]]' . '<br />' .
-            'Value Substitutions in Config File: {interface}, {hostname}, {mac_addr_asciiCD}, {mac_addr_hexCD}' . '<br />' .
-            'Where C is U(pper) or L(ower) Case, and D is \" :-.\" Delimiter (space, colon, hyphen, or period) (omitted for none).' . '<br />' .
-            'Some ISPs may require certain options be or not be sent.');
+	'adv_dhcp6_config_file_override_path',
+	'Configuration File Override',
+	'text',
+	$pconfig['adv_dhcp6_config_file_override_path']
+))->setHelp('The value in this field is the full absolute path to a DHCP client configuration file.	 [/[dirname/[.../]]filename[.ext]]' . '<br />' .
+			'Value Substitutions in Config File: {interface}, {hostname}, {mac_addr_asciiCD}, {mac_addr_hexCD}' . '<br />' .
+			'Where C is U(pper) or L(ower) Case, and D is \" :-.\" Delimiter (space, colon, hyphen, or period) (omitted for none).' . '<br />' .
+			'Some ISPs may require certain options be or not be sent.');
 
 $form->add($section);
 
@@ -2238,72 +2218,72 @@ $section = new Form_Section('Advanced DHCP6 client configuration');
 $section->addClass('dhcp6advanced');
 
 $section->addInput(new Form_Checkbox(
-    'adv_dhcp6_interface_statement_information_only_enable',
-    'Information only',
-    null,
-    $pconfig['adv_dhcp6_interface_statement_information_only_enable']
+	'adv_dhcp6_interface_statement_information_only_enable',
+	'Information only',
+	null,
+	$pconfig['adv_dhcp6_interface_statement_information_only_enable']
 ));
 
 $section->addInput(new Form_Input(
-    'adv_dhcp6_interface_statement_send_options',
-    'Send options',
-    'text',
-    $pconfig['adv_dhcp6_interface_statement_send_options']
-))->sethelp('DHCP send options to be sent when requesting a DHCP lease.  [option declaration [, ...]]' . '<br />' .
-            'Value Substitutions: {interface}, {hostname}, {mac_addr_asciiCD}, {mac_addr_hexCD}' . '<br />' .
-            'Where C is U(pper) or L(ower) Case, and D is \" :-.\" Delimiter (space, colon, hyphen, or period) (omitted for none).' . '<br />' .
-            'Some DHCP services may require certain options be or not be sent.');
+	'adv_dhcp6_interface_statement_send_options',
+	'Send options',
+	'text',
+	$pconfig['adv_dhcp6_interface_statement_send_options']
+))->sethelp('DHCP send options to be sent when requesting a DHCP lease.	 [option declaration [, ...]]' . '<br />' .
+			'Value Substitutions: {interface}, {hostname}, {mac_addr_asciiCD}, {mac_addr_hexCD}' . '<br />' .
+			'Where C is U(pper) or L(ower) Case, and D is \" :-.\" Delimiter (space, colon, hyphen, or period) (omitted for none).' . '<br />' .
+			'Some DHCP services may require certain options be or not be sent.');
 
 $section->addInput(new Form_Input(
-    'adv_dhcp6_interface_statement_request_options',
-    'Request Options',
-    'text',
-    $pconfig['adv_dhcp6_interface_statement_request_options']
-))->sethelp('DHCP request options to be sent when requesting a DHCP lease.  [option [, ...]]' . '<br />' .
-            'Some DHCP services may require certain options be or not be requested.');
+	'adv_dhcp6_interface_statement_request_options',
+	'Request Options',
+	'text',
+	$pconfig['adv_dhcp6_interface_statement_request_options']
+))->sethelp('DHCP request options to be sent when requesting a DHCP lease.	[option [, ...]]' . '<br />' .
+			'Some DHCP services may require certain options be or not be requested.');
 
 $section->addInput(new Form_Input(
-    'adv_dhcp6_interface_statement_script',
-    'Scripts',
-    'text',
-    $pconfig['adv_dhcp6_interface_statement_script']
+	'adv_dhcp6_interface_statement_script',
+	'Scripts',
+	'text',
+	$pconfig['adv_dhcp6_interface_statement_script']
 ))->sethelp('Absolute path to a script invoked on certain conditions including when a reply message is received.' . '<br />' .
-            '[/[dirname/[.../]]filename[.ext]].');
+			'[/[dirname/[.../]]filename[.ext]].');
 
 $group = new Form_Group('Identity Association Statement');
 
 $group->add(new Form_Checkbox(
-    'adv_dhcp6_id_assoc_statement_address_enable',
-    null,
-    'Non-Temporary Address Allocation',
-    $pconfig['adv_dhcp6_id_assoc_statement_address_enable']
+	'adv_dhcp6_id_assoc_statement_address_enable',
+	null,
+	'Non-Temporary Address Allocation',
+	$pconfig['adv_dhcp6_id_assoc_statement_address_enable']
 ));
 
 $group->add(new Form_Input(
-    'adv_dhcp6_id_assoc_statement_address_id',
-    null,
-    'text',
-    $pconfig['adv_dhcp6_id_assoc_statement_address_id']
+	'adv_dhcp6_id_assoc_statement_address_id',
+	null,
+	'text',
+	$pconfig['adv_dhcp6_id_assoc_statement_address_id']
 ))->sethelp('id-assoc na ID');
 
 $group->add(new Form_IpAddress(
-    'adv_dhcp6_id_assoc_statement_address',
-    null,
-    $pconfig['adv_dhcp6_id_assoc_statement_address']
+	'adv_dhcp6_id_assoc_statement_address',
+	null,
+	$pconfig['adv_dhcp6_id_assoc_statement_address']
 ))->sethelp('IPv6 address');
 
 $group->add(new Form_Input(
-    'adv_dhcp6_id_assoc_statement_address_pltime',
-    null,
-    'text',
-    $pconfig['adv_dhcp6_id_assoc_statement_address_pltime']
+	'adv_dhcp6_id_assoc_statement_address_pltime',
+	null,
+	'text',
+	$pconfig['adv_dhcp6_id_assoc_statement_address_pltime']
 ))->sethelp('pltime');
 
 $group->add(new Form_Input(
-    'adv_dhcp6_id_assoc_statement_address_vltime',
-    null,
-    'text',
-    $pconfig['adv_dhcp6_id_assoc_statement_address_vltime']
+	'adv_dhcp6_id_assoc_statement_address_vltime',
+	null,
+	'text',
+	$pconfig['adv_dhcp6_id_assoc_statement_address_vltime']
 ))->sethelp('vltime');
 
 $section->add($group);
@@ -2312,37 +2292,37 @@ $section->add($group);
 $group = new Form_Group('');
 
 $group->add(new Form_Checkbox(
-    'adv_dhcp6_id_assoc_statement_prefix_enable',
-    null,
-    'Prefix Delegation ',
-    $pconfig['adv_dhcp6_id_assoc_statement_prefix_enable']
+	'adv_dhcp6_id_assoc_statement_prefix_enable',
+	null,
+	'Prefix Delegation ',
+	$pconfig['adv_dhcp6_id_assoc_statement_prefix_enable']
 ));
 
 $group->add(new Form_Input(
-    'adv_dhcp6_id_assoc_statement_prefix_id',
-    null,
-    'text',
-    $pconfig['adv_dhcp6_id_assoc_statement_prefix_id']
+	'adv_dhcp6_id_assoc_statement_prefix_id',
+	null,
+	'text',
+	$pconfig['adv_dhcp6_id_assoc_statement_prefix_id']
 ))->sethelp('id-assoc pd ID');
 
 $group->add(new Form_IpAddress(
-    'adv_dhcp6_id_assoc_statement_prefix',
-    null,
-    $pconfig['adv_dhcp6_id_assoc_statement_prefix']
+	'adv_dhcp6_id_assoc_statement_prefix',
+	null,
+	$pconfig['adv_dhcp6_id_assoc_statement_prefix']
 ))->sethelp('IPv6 prefix');
 
 $group->add(new Form_Input(
-    'adv_dhcp6_id_assoc_statement_prefix_pltime',
-    null,
-    'text',
-    $pconfig['adv_dhcp6_id_assoc_statement_prefix_pltime']
+	'adv_dhcp6_id_assoc_statement_prefix_pltime',
+	null,
+	'text',
+	$pconfig['adv_dhcp6_id_assoc_statement_prefix_pltime']
 ))->sethelp('pltime');
 
 $group->add(new Form_Input(
-    'adv_dhcp6_id_assoc_statement_prefix_vltime',
-    null,
-    'text',
-    $pconfig['adv_dhcp6_id_assoc_statement_prefix_vltime']
+	'adv_dhcp6_id_assoc_statement_prefix_vltime',
+	null,
+	'text',
+	$pconfig['adv_dhcp6_id_assoc_statement_prefix_vltime']
 ))->sethelp('vltime');
 
 $section->add($group);
@@ -2350,17 +2330,17 @@ $section->add($group);
 $group = new Form_Group('Prefix interface statement');
 
 $group->add(new Form_Input(
-    'adv_dhcp6_prefix_interface_statement_sla_id',
-    null,
-    'text',
-    $pconfig['adv_dhcp6_prefix_interface_statement_sla_id']
+	'adv_dhcp6_prefix_interface_statement_sla_id',
+	null,
+	'text',
+	$pconfig['adv_dhcp6_prefix_interface_statement_sla_id']
 ))->sethelp('Prefix Interface sla-id');
 
 $group->add(new Form_Input(
-    'adv_dhcp6_prefix_interface_statement_sla_len',
-    null,
-    'text',
-    $pconfig['adv_dhcp6_prefix_interface_statement_sla_len']
+	'adv_dhcp6_prefix_interface_statement_sla_len',
+	null,
+	'text',
+	$pconfig['adv_dhcp6_prefix_interface_statement_sla_len']
 ))->sethelp('sla-len');
 
 $section->add($group);
@@ -2368,31 +2348,31 @@ $section->add($group);
 $group = new Form_Group('Authentication statement');
 
 $group->add(new Form_Input(
-    'adv_dhcp6_authentication_statement_authname',
-    null,
-    'text',
-    $pconfig['adv_dhcp6_authentication_statement_authname']
+	'adv_dhcp6_authentication_statement_authname',
+	null,
+	'text',
+	$pconfig['adv_dhcp6_authentication_statement_authname']
 ))->sethelp('Authname');
 
 $group->add(new Form_Input(
-    'adv_dhcp6_authentication_statement_protocol',
-    null,
-    'text',
-    $pconfig['adv_dhcp6_authentication_statement_protocol']
+	'adv_dhcp6_authentication_statement_protocol',
+	null,
+	'text',
+	$pconfig['adv_dhcp6_authentication_statement_protocol']
 ))->sethelp('Protocol');
 
 $group->add(new Form_Input(
-    'adv_dhcp6_authentication_statement_algorithm',
-    null,
-    'text',
-    $pconfig['adv_dhcp6_authentication_statement_algorithm']
+	'adv_dhcp6_authentication_statement_algorithm',
+	null,
+	'text',
+	$pconfig['adv_dhcp6_authentication_statement_algorithm']
 ))->sethelp('Algorithm');
 
 $group->add(new Form_Input(
-    'adv_dhcp6_authentication_statement_rdm',
-    null,
-    'text',
-    $pconfig['adv_dhcp6_authentication_statement_rdm']
+	'adv_dhcp6_authentication_statement_rdm',
+	null,
+	'text',
+	$pconfig['adv_dhcp6_authentication_statement_rdm']
 ))->sethelp('RDM');
 
 $section->add($group);
@@ -2400,17 +2380,17 @@ $section->add($group);
 $group = new Form_Group('Keyinfo statement');
 
 $group->add(new Form_Input(
-    'adv_dhcp6_key_info_statement_keyname',
-    null,
-    'text',
-    $pconfig['adv_dhcp6_key_info_statement_keyname']
+	'adv_dhcp6_key_info_statement_keyname',
+	null,
+	'text',
+	$pconfig['adv_dhcp6_key_info_statement_keyname']
 ))->sethelp('Keyname');
 
 $group->add(new Form_Input(
-    'adv_dhcp6_key_info_statement_realm',
-    null,
-    'text',
-    $pconfig['adv_dhcp6_key_info_statement_realm']
+	'adv_dhcp6_key_info_statement_realm',
+	null,
+	'text',
+	$pconfig['adv_dhcp6_key_info_statement_realm']
 ))->sethelp('Realm');
 
 $section->add($group);
@@ -2418,24 +2398,24 @@ $section->add($group);
 $group = new Form_Group('');
 
 $group->add(new Form_Input(
-    'adv_dhcp6_key_info_statement_keyid',
-    null,
-    'text',
-    $pconfig['adv_dhcp6_key_info_statement_keyid']
+	'adv_dhcp6_key_info_statement_keyid',
+	null,
+	'text',
+	$pconfig['adv_dhcp6_key_info_statement_keyid']
 ))->sethelp('KeyID');
 
 $group->add(new Form_Input(
-    'adv_dhcp6_key_info_statement_secret',
-    null,
-    'text',
-    $pconfig['adv_dhcp6_key_info_statement_secret']
+	'adv_dhcp6_key_info_statement_secret',
+	null,
+	'text',
+	$pconfig['adv_dhcp6_key_info_statement_secret']
 ))->sethelp('Secret');
 
 $group->add(new Form_Input(
-    'adv_dhcp6_key_info_statement_expire',
-    null,
-    'text',
-    $pconfig['adv_dhcp6_key_info_statement_expire']
+	'adv_dhcp6_key_info_statement_expire',
+	null,
+	'text',
+	$pconfig['adv_dhcp6_key_info_statement_expire']
 ))->sethelp('Expire');
 
 $section->add($group);
@@ -2446,24 +2426,24 @@ $section = new Form_Section('6RD Configuration');
 $section->addClass('6rd');
 
 $section->addInput(new Form_Input(
-    'prefix-6rd',
-    '6RD Prefix',
-    'text',
-    $pconfig['prefix-6rd']
+	'prefix-6rd',
+	'6RD Prefix',
+	'text',
+	$pconfig['prefix-6rd']
 ))->sethelp('6RD IPv6 prefix assigned by your ISP. e.g. "2001:db8::/32"');
 
 $section->addInput(new Form_Input(
-    'gateway-6rd',
-    '6RD Border relay',
-    'text',
-    $pconfig['gateway-6rd']
+	'gateway-6rd',
+	'6RD Border relay',
+	'text',
+	$pconfig['gateway-6rd']
 ))->sethelp('6RD IPv4 gateway address assigned by your ISP');
 
 $section->addInput(new Form_Select(
-    'prefix-6rd-v4plen',
-    'DHCPv6 Prefix Delegation size',
-    $pconfig['prefix-6rd-v4plen'],
-    array_combine(range(0, 32), range(0, 32))
+	'prefix-6rd-v4plen',
+	'DHCPv6 Prefix Delegation size',
+	$pconfig['prefix-6rd-v4plen'],
+	array_combine(range(0, 32), range(0, 32))
 ))->setHelp('6RD IPv4 prefix length. Normally specified by the ISP. A value of 0 means we embed the entire IPv4 address in the 6RD prefix..');
 
 $form->add($section);
@@ -2473,63 +2453,63 @@ $section = new Form_Section('Track IPv6 Interface');
 $section->addClass('track6');
 
 function build_ipv6interface_list() {
-    $list = array('' => '');
-
-    $interfaces = get_configured_interface_with_descr(false, true);
-    $dynv6ifs = array();
-
-    foreach ($interfaces as $iface => $ifacename) {
-        switch ($config['interfaces'][$iface]['ipaddrv6']) {
-            case "6to4":
-            case "6rd":
-            case "dhcp6":
-                $dynv6ifs[$iface] = array(
-                    'name' => $ifacename,
-                    'ipv6_num_prefix_ids' => pow(2, calculate_ipv6_delegation_length($iface)) - 1
-                );
-                break;
-            default:
-                continue;
-        }
-    }
-
-    foreach ($dynv6ifs as $iface => $ifacedata) {
-        $list[$iface] = $ifacedata['name'];
-
-        $section->addInput(new Form_Input(
-            'ipv6-num-prefix-ids-' . $iface,
-            null,
-            'hidden',
-            $ifacedata['ipv6_num_prefix_ids']
-        ));
-    }
-
-    return($list);
+	$list = array('' => '');
+
+	$interfaces = get_configured_interface_with_descr(false, true);
+	$dynv6ifs = array();
+
+	foreach ($interfaces as $iface => $ifacename) {
+		switch ($config['interfaces'][$iface]['ipaddrv6']) {
+			case "6to4":
+			case "6rd":
+			case "dhcp6":
+				$dynv6ifs[$iface] = array(
+					'name' => $ifacename,
+					'ipv6_num_prefix_ids' => pow(2, calculate_ipv6_delegation_length($iface)) - 1
+				);
+				break;
+			default:
+				continue;
+		}
+	}
+
+	foreach ($dynv6ifs as $iface => $ifacedata) {
+		$list[$iface] = $ifacedata['name'];
+
+		$section->addInput(new Form_Input(
+			'ipv6-num-prefix-ids-' . $iface,
+			null,
+			'hidden',
+			$ifacedata['ipv6_num_prefix_ids']
+		));
+	}
+
+	return($list);
 }
 
 $section->addInput(new Form_Select(
-    'track6-interface',
-    'IPv6 Interface',
-    $pconfig['track6-interface'],
-    build_ipv6interface_list()
+	'track6-interface',
+	'IPv6 Interface',
+	$pconfig['track6-interface'],
+	build_ipv6interface_list()
 ))->setHelp('selects the dynamic IPv6 WAN interface to track for configuration');
 
 if ($pconfig['track6-prefix-id'] == "") {
-    $pconfig['track6-prefix-id'] = 0;
+	$pconfig['track6-prefix-id'] = 0;
 }
 
 $section->addInput(new Form_Input(
-    'track6-prefix-id--hex' . $iface,
-    'IPv6 Prefix ID',
-    'text',
-    sprintf("%x", $pconfig['track6-prefix-id'])
+	'track6-prefix-id--hex' . $iface,
+	'IPv6 Prefix ID',
+	'text',
+	sprintf("%x", $pconfig['track6-prefix-id'])
 ))->setHelp('<span id="track6-prefix-id-range"></span>The value in this field is the (Delegated) IPv6 prefix ID. This determines the configurable network ID based on the dynamic IPv6 connection. The default value is 0.');
 
 $section->addInput(new Form_Input(
-    'track6-prefix-id-max' . $iface,
-    null,
-    'hidden',
-    0
+	'track6-prefix-id-max' . $iface,
+	null,
+	'hidden',
+	0
 ));
 
 $form->add($section);
@@ -2540,84 +2520,84 @@ $section = new Form_Section('PPP Configuration');
 $section->addClass('ppp');
 
 $section->addInput(new Form_Select(
-    'country',
-    'Country',
-    $pconfig['country'],
-    []
+	'country',
+	'Country',
+	$pconfig['country'],
+	[]
 ));
 
 $section->addInput(new Form_Select(
-    'provider_list',
-    'Provider',
-    $pconfig['provider_list'],
-    []
+	'provider_list',
+	'Provider',
+	$pconfig['provider_list'],
+	[]
 ));
 
 $section->addInput(new Form_Select(
-    'providerplan',
-    'Plan',
-    $pconfig['providerplan'],
-    []
+	'providerplan',
+	'Plan',
+	$pconfig['providerplan'],
+	[]
 ))->setHelp('Select to fill in data for your service provider.');
 
 $section->addInput(new Form_Input(
-    'ppp_username',
-    'Username',
-    'text',
-    $pconfig['ppp_username']
+	'ppp_username',
+	'Username',
+	'text',
+	$pconfig['ppp_username']
 ));
 
 $section->addInput(new Form_Input(
-    'ppp_password',
-    'Password',
-    'password',
-    $pconfig['ppp_password']
+	'ppp_password',
+	'Password',
+	'password',
+	$pconfig['ppp_password']
 ));
 
 $section->addInput(new Form_Input(
-    'phone',
-    'Phone number',
-    'text',
-    $pconfig['phone']
+	'phone',
+	'Phone number',
+	'text',
+	$pconfig['phone']
 ))->setHelp('Typically *99# for GSM networks and #777 for CDMA networks');
 
 $section->addInput(new Form_Input(
-    'apn',
-    'Access Point Name',
-    'text',
-    $pconfig['apn']
+	'apn',
+	'Access Point Name',
+	'text',
+	$pconfig['apn']
 ));
 
 
 function build_port_list() {
-    $list = array("" => "None");
+	$list = array("" => "None");
 
-    $portlist = glob("/dev/cua*");
-    $modems   = glob("/dev/modem*");
-    $portlist = array_merge($portlist, $modems);
+	$portlist = glob("/dev/cua*");
+	$modems	  = glob("/dev/modem*");
+	$portlist = array_merge($portlist, $modems);
 
-    foreach ($portlist as $port) {
-        if (preg_match("/\.(lock|init)$/", $port)) {
-            continue;
-        }
+	foreach ($portlist as $port) {
+		if (preg_match("/\.(lock|init)$/", $port)) {
+			continue;
+		}
 
-    $list[trim($port)] = $port;
-    }
+	$list[trim($port)] = $port;
+	}
 
-    return($list);
+	return($list);
 }
 
 $section->addInput(new Form_Select(
-    'port',
-    "Modem port",
-    $pconfig['port'],
-    build_port_list()
+	'port',
+	"Modem port",
+	$pconfig['port'],
+	build_port_list()
 ));
 
 $section->addInput(new Form_Button(
-    'btnadvppp',
-    'Advanced PPP',
-    isset($pconfig['pppid']) ? 'interfaces_ppps_edit.php?id=' . htmlspecialchars($pconfig['pppid']) : 'interfaces_ppps_edit.php'
+	'btnadvppp',
+	'Advanced PPP',
+	isset($pconfig['pppid']) ? 'interfaces_ppps_edit.php?id=' . htmlspecialchars($pconfig['pppid']) : 'interfaces_ppps_edit.php'
 ))->setHelp('Create a new PPP configuration');
 
 $form->add($section);
@@ -2627,75 +2607,75 @@ $section = new Form_Section('PPPoE Configuration');
 $section->addClass('pppoe');
 
 $section->addInput(new Form_Input(
-    'pppoe_username',
-    'Username',
-    'text',
-    $pconfig['pppoe_username']
+	'pppoe_username',
+	'Username',
+	'text',
+	$pconfig['pppoe_username']
 ));
 
 $section->addInput(new Form_Input(
-    'pppoe_password',
-    'Password',
-    'password',
-    $pconfig['pppoe_password']
+	'pppoe_password',
+	'Password',
+	'password',
+	$pconfig['pppoe_password']
 ));
 
 $section->addInput(new Form_Input(
-    'provider',
-    'Service name',
-    'text',
-    $pconfig['provider']
+	'provider',
+	'Service name',
+	'text',
+	$pconfig['provider']
 ))->setHelp('This field can usually be left empty');
 
 $section->addInput(new Form_Checkbox(
-    'pppoe_dialondemand',
-    'Dial on demand',
-    'Enable Dial-On-Demand mode ',
-    $pconfig['pppoe_dialondemand'],
-    'enable'
+	'pppoe_dialondemand',
+	'Dial on demand',
+	'Enable Dial-On-Demand mode ',
+	$pconfig['pppoe_dialondemand'],
+	'enable'
 ));
 
 $section->addInput(new Form_Input(
-    'pppoe_idletimeout',
-    'Idle timeout',
-    'number',
-    $pconfig['pppoe_idletimeout'],
-    [min => 0]
+	'pppoe_idletimeout',
+	'Idle timeout',
+	'number',
+	$pconfig['pppoe_idletimeout'],
+	[min => 0]
 ))->setHelp('If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. ' .
-            'An idle timeout of zero disables this feature.');
+			'An idle timeout of zero disables this feature.');
 
 $section->addInput(new Form_Select(
-    'pppoe-reset-type',
-    'Periodic reset',
-    $pconfig['pppoe-reset-type'],
-    ['' => 'Disabled', 'custom' => 'Custom', 'preset' => 'Pre-set']
+	'pppoe-reset-type',
+	'Periodic reset',
+	$pconfig['pppoe-reset-type'],
+	['' => 'Disabled', 'custom' => 'Custom', 'preset' => 'Pre-set']
 ))->setHelp('Select a reset timing type');
 
 $group = new Form_Group('Custom reset');
 $group->addClass('pppoecustom');
 
 $group->add(new Form_Input(
-    'pppoe_resethour',
-    null,
-    'number',
-    $pconfig['pppoe_resethour'],
-    [min => 0, max => 23]
+	'pppoe_resethour',
+	null,
+	'number',
+	$pconfig['pppoe_resethour'],
+	[min => 0, max => 23]
 ))->setHelp('Hour (0-23)');
 
 $group->add(new Form_Input(
-    'pppoe_resetminute',
-    null,
-    'number',
-    $pconfig['pppoe_resetminute'],
-    [min => 0, max => 59]
+	'pppoe_resetminute',
+	null,
+	'number',
+	$pconfig['pppoe_resetminute'],
+	[min => 0, max => 59]
 ))->setHelp('Minutes (0-59)');
 
 // ToDo: Need a date-picker here
 $group->add(new Form_Input(
-    'pppoe_resetdate',
-    null,
-    'text',
-    $pconfig['pppoe_resetdate']
+	'pppoe_resetdate',
+	null,
+	'text',
+	$pconfig['pppoe_resetdate']
 ))->setHelp('Specific date (mm/dd/yyyy)');
 
 $group->setHelp('If you leave the date field empty, the reset will be executed each day at the time you specified using the minutes and hour field');
@@ -2706,49 +2686,49 @@ $group = new Form_MultiCheckboxGroup('cron based reset');
 $group->addClass('pppoepreset');
 
 $group->add(new Form_MultiCheckbox(
-    'pppoe_pr_preset_val',
-    null,
-    'Reset at each month ("0 0 1 * *")',
-    $pconfig['pppoe_monthly'],
-    'monthly'
+	'pppoe_pr_preset_val',
+	null,
+	'Reset at each month ("0 0 1 * *")',
+	$pconfig['pppoe_monthly'],
+	'monthly'
 ))->displayAsRadio();
 
 $group->add(new Form_MultiCheckbox(
-    'pppoe_pr_preset_val',
-    null,
-    'Reset at each week ("0 0 * * 0")',
-    $pconfig['pppoe_weekly'],
-    'weekly'
+	'pppoe_pr_preset_val',
+	null,
+	'Reset at each week ("0 0 * * 0")',
+	$pconfig['pppoe_weekly'],
+	'weekly'
 ))->displayAsRadio();
 
 $group->add(new Form_MultiCheckbox(
-    'pppoe_pr_preset_val',
-    null,
-    'Reset at each day ("0 0 * * *")',
-    $pconfig['pppoe_daily'],
-    'daily'
+	'pppoe_pr_preset_val',
+	null,
+	'Reset at each day ("0 0 * * *")',
+	$pconfig['pppoe_daily'],
+	'daily'
 ))->displayAsRadio();
 
 $group->add(new Form_MultiCheckbox(
-    'pppoe_pr_preset_val',
-    null,
-    'Reset at each hour ("0 * * * *")',
-    $pconfig['pppoe_hourly'],
-    'hourly'
+	'pppoe_pr_preset_val',
+	null,
+	'Reset at each hour ("0 * * * *")',
+	$pconfig['pppoe_hourly'],
+	'hourly'
 ))->displayAsRadio();
 
 $section->add($group);
 
 if (isset($pconfig['pppid'])) {
-    $section->addInput(new Form_StaticText(
-        'Advanced and MLPPP',
-        '<a href="/interfaces_ppps_edit.php?id=' . htmlspecialchars($pconfig['pppid']) . '" class="navlnk">Click here for additional PPPoE configuration options. Save first if you made changes.</a>'
-    ));
+	$section->addInput(new Form_StaticText(
+		'Advanced and MLPPP',
+		'<a href="/interfaces_ppps_edit.php?id=' . htmlspecialchars($pconfig['pppid']) . '" class="navlnk">Click here for additional PPPoE configuration options. Save first if you made changes.</a>'
+	));
 } else {
-    $section->addInput(new Form_StaticText(
-        'Advanced and MLPPP',
-        '<a href="/interfaces_ppps_edit.php" class="navlnk">Click here for additional PPPoE configuration options and for MLPPP configuration.</a>'
-    ));
+	$section->addInput(new Form_StaticText(
+		'Advanced and MLPPP',
+		'<a href="/interfaces_ppps_edit.php" class="navlnk">Click here for additional PPPoE configuration options and for MLPPP configuration.</a>'
+	));
 }
 
 $form->add($section);
@@ -2758,59 +2738,59 @@ $section = new Form_Section('PPTP/L2TP Configuration');
 $section->addClass('pptp');
 
 $section->addInput(new Form_Input(
-    'pptp_username',
-    'Username',
-    'text',
-    $pconfig['pptp_username']
+	'pptp_username',
+	'Username',
+	'text',
+	$pconfig['pptp_username']
 ));
 
 $section->addInput(new Form_Input(
-    'pptp_password',
-    'Password',
-    'password',
-    $pconfig['pptp_password']
+	'pptp_password',
+	'Password',
+	'password',
+	$pconfig['pptp_password']
 ));
 
 $section->addInput(new Form_IpAddress(
-    'pptp_local',
-    'Local IP address',
-    $pconfig['pptp_local'][0]
+	'pptp_local',
+	'Local IP address',
+	$pconfig['pptp_local'][0]
 ))->addMask('pptp_subnet', $pconfig['pptp_subnet'][0]);
 
 $section->addInput(new Form_IpAddress(
-    'pptp_remote',
-    'Remote IP address',
-    $pconfig['pptp_remote'][0]
+	'pptp_remote',
+	'Remote IP address',
+	$pconfig['pptp_remote'][0]
 ));
 
 $section->addInput(new Form_Checkbox(
-    'pptp_dialondemand',
-    'Dial on demand',
-    'Enable Dial-On-Demand mode ',
-    $pconfig['pptp_dialondemand'],
-    'enable'
+	'pptp_dialondemand',
+	'Dial on demand',
+	'Enable Dial-On-Demand mode ',
+	$pconfig['pptp_dialondemand'],
+	'enable'
 ))->setHelp('This option causes the interface to operate in dial-on-demand mode, allowing you to have a virtual full time connection. ' .
-            'The interface is configured, but the actual connection of the link is delayed until qualifying outgoing traffic is detected.');
+			'The interface is configured, but the actual connection of the link is delayed until qualifying outgoing traffic is detected.');
 
 $section->addInput(new Form_Input(
-    'pptp_idletimeout',
-    'Idle timeout (seconds)',
-    'number',
-    $pconfig['pptp_idletimeout'],
-    [min => 0]
+	'pptp_idletimeout',
+	'Idle timeout (seconds)',
+	'number',
+	$pconfig['pptp_idletimeout'],
+	[min => 0]
 ))->setHelp('If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. ' .
-            'An idle timeout of zero disables this feature.');
+			'An idle timeout of zero disables this feature.');
 
 if (isset($pconfig['pppid'])) {
-    $section->addInput(new Form_StaticText(
-        'Advanced and MLPPP',
-        '<a href="/interfaces_ppps_edit.php?id=' . htmlspecialchars($pconfig['pppid']) . '" class="navlnk">Click here for additional PPTP and L2TP configuration options. Save first if you made changes.</a>'
-    ));
+	$section->addInput(new Form_StaticText(
+		'Advanced and MLPPP',
+		'<a href="/interfaces_ppps_edit.php?id=' . htmlspecialchars($pconfig['pppid']) . '" class="navlnk">Click here for additional PPTP and L2TP configuration options. Save first if you made changes.</a>'
+	));
 } else {
-    $section->addInput(new Form_StaticText(
-        'Advanced and MLPPP',
-        '<a href="/interfaces_ppps_edit.php" class="navlnk">Click here for additional PPTP and L2TP configuration options.</a>'
-    ));
+	$section->addInput(new Form_StaticText(
+		'Advanced and MLPPP',
+		'<a href="/interfaces_ppps_edit.php" class="navlnk">Click here for additional PPTP and L2TP configuration options.</a>'
+	));
 }
 
 $form->add($section);
@@ -2818,468 +2798,468 @@ $form->add($section);
 // Wireless interface
 if (isset($wancfg['wireless'])) {
 
-    $section = new Form_Section('Common wireless configuration - Settings apply to all wireless networks on ' . $wlanbaseif . '.');
-
-    $section->addInput(new Form_Checkbox(
-        'persistcommonwireless',
-        'Persist common settings',
-        'Preserve common wireless configuration through interface deletions and reassignments.',
-        $pconfig['persistcommonwireless'],
-        'yes'
-    ));
-
-    $mode_list = ['auto' => 'Auto'];
-
-    if (is_array($wl_modes)) {
-        foreach ($wl_modes as $wl_standard => $wl_channels) {
-            $mode_list[$wl_standard] = '802.' . $wl_standard;
-        }
-    }
-
-    if (count($mode_list) == 1)
-        $mode_list[''] = '';
-
-    $section->addInput(new Form_Select(
-        'standard',
-        'Standard',
-        ($pconfig['standard'] == "") ? "11ng":$pconfig['standard'],
-        $mode_list
-    ));
-
-    if (isset($wl_modes['11g'])) {
-        $section->addInput(new Form_Select(
-            'protmode',
-            '802.11g OFDM Protection Mode',
-            $pconfig['protmode'],
-            ['off' => 'Off', 'cts' => 'CTS to self', 'rtscts' => 'RTS and CTS']
-        ))->setHelp('For IEEE 802.11g, use the specified technique for protecting OFDM frames in a mixed 11b/11g network.');
-    }
-    else
-    {
-        $section->addInput(new Form_Input(
-            'protmode',
-            null,
-            'hidden',
-            'off'
-        ));
-    }
-
-    $mode_list = ['0' => 'Auto'];
-
-    if (is_array($wl_modes)) {
-        foreach ($wl_modes as $wl_standard => $wl_channels) {
-            if ($wl_standard == "11g") {
-                $wl_standard = "11b/g";
-            } else if ($wl_standard == "11ng") {
-                $wl_standard = "11b/g/n";
-            } else if ($wl_standard == "11na") {
-                $wl_standard = "11a/n";
-            }
-
-            foreach ($wl_channels as $wl_channel) {
-                if (isset($wl_chaninfo[$wl_channel])) {
-                    $mode_list[ $wl_channel] = $wl_standard . ' - ' . $wl_channel;
-                } else {
-                    $mode_list[ $wl_channel] = $wl_standard . ' - ' . $wl_channel . ' (' . $wl_chaninfo[$wl_channel][1] . ' @ ' . $wl_chaninfo[$wl_channel][2] . ' / ' . $wl_chaninfo[$wl_channel][3] . ')';
-                }
-            }
-        }
-    }
-
-    $section->addInput(new Form_Select(
-        'channel',
-        'Channel',
-        $pconfig['channel'],
-        $mode_list
-    ))->setHelp('Legend: wireless standards - channel # (frequency @ max TX power / TX power allowed in reg. domain)' . '<br />' .
-                'Not all channels may be supported by your card.  Auto may override the wireless standard selected above.');
-
-    if (isset($wl_sysctl["{$wl_sysctl_prefix}.diversity"]) || isset($wl_sysctl["{$wl_sysctl_prefix}.txantenna"]) || isset($wl_sysctl["{$wl_sysctl_prefix}.rxantenna"])) {
-        $group = new Form_Group('Antenna Settings');
-
-        if (isset($wl_sysctl["{$wl_sysctl_prefix}.diversity"])) {
-            $group->add(new Form_Select(
-                'diversity',
-                null,
-                (isset($pconfig['diversity'])) ? $pconfig['diversity']:'',
-                ['' => 'Default', '0' => 'Off', '1' => 'On']
-            ))->setHelp('Diversity');
-        }
-
-        if (isset($wl_sysctl["{$wl_sysctl_prefix}.txantenna"])) {
-            $group->add(new Form_Select(
-                'txantenna',
-                null,
-                (isset($pconfig['txantenna'])) ? $pconfig['txantenna']:'',
-                ['' => 'Default', '0' => 'Auto', '1' => '#1', '2' => '#2']
-            ))->setHelp('Transmit antenna');
-        }
-
-        if (isset($wl_sysctl["{$wl_sysctl_prefix}.rxantenna"])) {
-            $group->add(new Form_Select(
-                'rxantenna',
-                null,
-                (isset($pconfig['rxantenna'])) ? $pconfig['rxantenna']:'',
-                ['' => 'Default', '0' => 'Auto', '1' => '#1', '2' => '#2']
-            ))->setHelp('Receive antenna');
-        }
-
-        $group->setHelp('Note: The antenna numbers do not always match up with the labels on the card.');
-
-        $section->add($group);
-    }
-
-    if (isset($wl_sysctl["{$wl_sysctl_prefix}.slottime"]) && isset($wl_sysctl["{$wl_sysctl_prefix}.acktimeout"]) && isset($wl_sysctl["{$wl_sysctl_prefix}.ctstimeout"])) {
-            $section->addInput(new Form_Input(
-                'distance',
-                'Distance setting (meters)',
-                'test',
-                $pconfig['distance']
-            ))->setHelp('This field can be used to tune ACK/CTS timers to fit the distance between AP and Client');
-    }
-
-    $form->add($section);
-
-    // Regulatory settings
-    $section = new Form_Section('Regulatory settings');
-
-    $domain_list = array("" => 'Default');
-
-    if (is_array($wl_regdomains)) {
-        foreach ($wl_regdomains as $wl_regdomain_key => $wl_regdomain) {
-            $domain_list[$wl_regdomains_attr[$wl_regdomain_key]['ID']] = $wl_regdomain['name'];
-        }
-    }
-
-    $section->addInput(new Form_Select(
-        'regdomain',
-        'Regulatory domain',
-        $pconfig['regdomain'],
-        $domain_list
-    ))->setHelp('Some cards have a default that is not recognized and require changing the regulatory domain to one in this list for the changes to other regulatory settings to work');
-
-    $country_list = array('' => 'Default');
-
-    if (is_array($wl_countries)) {
-        foreach ($wl_countries as $wl_country_key => $wl_country) {
-            $country_list[  $wl_countries_attr[$wl_country_key]['ID']  ] = $wl_country['name'] ; //. ' -- (' . $wl_countries_attr[$wl_country_key]['ID'] . ', ' . strtoupper($wl_countries_attr[$wl_country_key]['rd'][0]['REF']);
-        }
-    }
-
-    $section->addInput(new Form_Select(
-        'regcountry',
-        'Country',
-        $pconfig['regcountry'],
-        $country_list
-    ))->setHelp('Any country setting other than "Default" will override the regulatory domain setting');
-
-    $section->addInput(new Form_Select(
-        'reglocation',
-        'Location',
-        $pconfig['reglocation'],
-        ['' => 'Default', 'indoor' => 'Indoor', 'outdoor' => 'Outdoor', 'anywhere' => 'Anywhere']
-    ))->setHelp('These settings may affect which channels are available and the maximum transmit power allowed on those channels. ' .
-                'Using the correct settings to comply with local regulatory requirements is recommended.' . '<br />' .
-                'All wireless networks on this interface will be temporarily brought down when changing regulatory settings.  ' .
-                'Some of the regulatory domains or country codes may not be allowed by some cards.  ' .
-                'These settings may not be able to add additional channels that are not already supported.');
-
-    $form->add($section);
-
-    $section = new Form_Section('Network-specific wireless configuration');
-
-    $section->addInput(new Form_Select(
-        'mode',
-        'Mode',
-        $pconfig['mode'],
-        ['bss' => 'Infrastructure (BSS)', 'adhoc' => 'Ad-hoc (IBSS)', 'hostap' => 'Access Point']
-    ));
-
-    $section->addInput(new Form_Input(
-        'ssid',
-        'SSID',
-        'text',
-        $pconfig['ssid']
-    ));
-
-    if (isset($wl_modes['11ng']) || isset($wl_modes['11na'])) {
-        $section->addInput(new Form_Select(
-            'puremode',
-            'Minimum wireless standard',
-            $pconfig['puremode'],
-            ['any' => 'Any', '11g' => '802.11g', '11n' => '802.11n']
-        ))->setHelp('When operating as an access point, allow only stations capable of the selected wireless standard to associate (stations not capable are not permitted to associate)');
-    } elseif (isset($wl_modes['11g'])) {
-        $section->addInput(new Form_Checkbox(
-            'puremode',
-            '802.11g only',
-            'Preserve common wireless configuration through interface deletions and reassignments.',
-            $pconfig['puremode'],
-            '11g'
-        ))->setHelp('When operating as an access point in 802.11g mode, allow only 11g-capable stations to associate (11b-only stations are not permitted to associate)');
-    }
-
-    $section->addInput(new Form_Checkbox(
-        'apbridge_enable',
-        'Allow intra-BSS communication',
-        'Allow packets to pass between wireless clients directly when operating as an access point',
-        $pconfig['apbridge_enable'],
-        'yes'
-    ))->setHelp('Disabling the internal bridging is useful when traffic is to be processed with packet filtering');
-
-    $section->addInput(new Form_Checkbox(
-        'wme_enable',
-        'Enable WME',
-        'Force the card to use WME (wireless QoS)',
-        $pconfig['wme_enable'],
-        'yes'
-    ));
-
-    $section->addInput(new Form_Checkbox(
-        'hidessid_enable',
-        'Hide SSID',
-        'Force the card to NOT broadcast its SSID (This may cause problems for some clients)',
-        $pconfig['hidessid_enable'],
-        'yes'
-    ));
-
-    $form->add($section);
-
-    if(ALLOWWEP) {
-        // WEP Section
-        $section = new Form_Section('WEP');
-
-        $section->addInput(new Form_Checkbox(
-            'wep_enable',
-            'Enable',
-            'Enable WEP',
-            $pconfig['wep_enable'],
-            'yes'
-        ));
-
-        for($idx=1; $idx <= 4; $idx++) {
-            $group = new Form_Group('Key' . $idx);
-
-            $group->add(new Form_Input(
-                'key' . $idx,
-                null,
-                'text',
-                $pconfig['key' . $idx]
-            ));
-
-            $group->add(new Form_Checkbox(
-                'txkey',
-                null,
-                null,
-                $pconfig['txkey'],
-                $idx
-            ))->displayAsRadio()->setHelp($idx == 4 ? 'Tx key':'');
-
-            $section->add($group);
-        }
-
-        $section->addInput(new Form_StaticText(
-            null,
-            '<span class="help-block">' .
-            gettext('40 (64) bit keys may be entered as 5 ASCII characters or 10 hex digits preceded by "0x"') . '<br />' .
-            gettext('104 (128) bit keys may be entered as 13 ASCII characters or 26 hex digits preceded by "0x"') .
-            '</span>'
-        ));
-
-        $form->add($section);
-    }
-
-    // WPA Section
-    $section = new Form_Section('WPA');
-
-    $section->addInput(new Form_Checkbox(
-        'wpa_enable',
-        'Enable',
-        'Enable WPA',
-        $pconfig['wpa_enable'],
-        'yes'
-    ));
-
-    $section->addInput(new Form_Input(
-        'passphrase',
-        'WPA Pre-Shared Key',
-        'text',
-        $pconfig['passphrase']
-    ))->setHelp('WPA Passphrase must be between 8 and 63 characters long');
-
-    $section->addInput(new Form_Select(
-        'wpa_mode',
-        'WPA mode',
-        (isset($pconfig['wpa_mode'])) ? $pconfig['wpa_mode']: '2',
-        ['1' => 'WPA', '2' => 'WPA2', '3' => 'Both']
-    ));
-
-    $section->addInput(new Form_Select(
-        'wpa_key_mgmt',
-        'WPA Key Management Mode',
-        $pconfig['wpa_key_mgmt'],
-        ['WPA-PSK' => 'Pre-Shared Key', 'WPA-EAP' => 'Extensible Authentication Protocol', 'WPA-PSK WPA-EAP' => 'Both']
-    ));
-
-    if(ALLOWWEP) {
-        $section->addInput(new Form_Select(
-            'auth_algs',
-            'Authentication',
-            $pconfig['auth_algs'],
-            ['1' => 'Open System Authentication', '2' => 'Shared Key Authentication', '3' => 'Both']
-        ))->setHelp('Shared Key Authentication requires WEP');
-    } else {
-        $section->addInput(new Form_Input(
-            'auth_algs',
-            null,
-            'hidden',
-            '1'
-        ));;
-    }
-
-    $section->addInput(new Form_Select(
-        'wpa_pairwise',
-        'WPA Pairwise',
-        (isset($pconfig['wpa_pairwise'])) ? $pconfig['wpa_pairwise']:'CCMP',
-        ['CCMP TKIP' => 'Both', 'CCMP' => 'AES (recommended)', 'TKIP' => 'TKIP']
-    ));
-
-    $section->addInput(new Form_Input(
-        'wpa_group_rekey',
-        'WPA Pre-Shared Key',
-        'number',
-        $pconfig['wpa_group_rekey'] ? $pconfig['wpa_group_rekey'] : "60",
-        ['min' => '1', 'max' => 9999]
-    ))->setHelp('Specified in seconds. Allowed values are 1-9999. Must be shorter than Master Key Regeneration time');
-
-    $section->addInput(new Form_Input(
-        'wpa_gmk_rekey',
-        'Master Key Regeneration',
-        'number',
-        $pconfig['wpa_gmk_rekey'] ? $pconfig['wpa_gmk_rekey'] : "3600",
-        ['min' => '1', 'max' => 9999]
-    ))->setHelp('Specified in seconds. Allowed values are 1-9999. Must be longer than Key Rotation time');
-
-    $section->addInput(new Form_Checkbox(
-        'wpa_strict_rekey',
-        'Strict Key Regeneration',
-        'Force the AP to rekey whenever a client disassociates',
-        $pconfig['wpa_strict_rekey'],
-        'yes'
-    ));
-
-    $section->addInput(new Form_Checkbox(
-        'ieee8021x',
-        'IEEE802.1X',
-        'Enable 802.1X authentication',
-        $pconfig['ieee8021x'],
-        'yes'
-    ))->setHelp('This option requires that the "Enable WPA box" is checked');
-
-    $group = new Form_Group('Primary 802.1X server');
-
-    $group->add(new Form_IpAddress(
-        'auth_server_addr',
-        'IP Address',
-        $pconfig['auth_server_addr']
-    ))->setHelp('IP address.  (Commonly a Radius server (FreeRadius, Internet Authentication Services, etc.)');
-
-    $group->add(new Form_Input(
-        'auth_server_port',
-        'Port',
-        'number',
-        $pconfig['auth_server_port']
-    ))->setHelp('Server port. Leave blank for the default port 1812');
-
-    $group->add(new Form_Input(
-        'auth_server_shared_secret',
-        'Shared secret',
-        'number',
-        $pconfig['auth_server_shared_secret']
-    ))->setHelp('Shared secret');
-
-    $section->add($group);
-
-    $group = new Form_Group('Secondary 802.1X server');
-
-    $group->add(new Form_IpAddress(
-        'auth_server_addr2',
-        'IP Address',
-        $pconfig['auth_server_addr2']
-    ))->setHelp('IP address.  (Commonly a Radius server (FreeRadius, Internet Authentication Services, etc.)');
-
-    $group->add(new Form_Input(
-        'auth_server_port2',
-        'Port',
-        'number',
-        $pconfig['auth_server_port2']
-    ))->setHelp('Server port. Leave blank for the default port 1812');
-
-    $group->add(new Form_Input(
-        'auth_server_shared_secret2',
-        'Shared secret',
-        'number',
-        $pconfig['auth_server_shared_secret2']
-    ))->setHelp('Shared secret');
-
-    $section->add($group);
-
-    $section->addInput(new Form_Checkbox(
-        'rsn_preauth',
-        'Authentication Roaming Preauth',
-        null,
-        $pconfig['rsn_preauth'],
-        'yes'
-    ));
-
-    $form->add($section);
+	$section = new Form_Section('Common wireless configuration - Settings apply to all wireless networks on ' . $wlanbaseif . '.');
+
+	$section->addInput(new Form_Checkbox(
+		'persistcommonwireless',
+		'Persist common settings',
+		'Preserve common wireless configuration through interface deletions and reassignments.',
+		$pconfig['persistcommonwireless'],
+		'yes'
+	));
+
+	$mode_list = ['auto' => 'Auto'];
+
+	if (is_array($wl_modes)) {
+		foreach ($wl_modes as $wl_standard => $wl_channels) {
+			$mode_list[$wl_standard] = '802.' . $wl_standard;
+		}
+	}
+
+	if (count($mode_list) == 1)
+		$mode_list[''] = '';
+
+	$section->addInput(new Form_Select(
+		'standard',
+		'Standard',
+		($pconfig['standard'] == "") ? "11ng":$pconfig['standard'],
+		$mode_list
+	));
+
+	if (isset($wl_modes['11g'])) {
+		$section->addInput(new Form_Select(
+			'protmode',
+			'802.11g OFDM Protection Mode',
+			$pconfig['protmode'],
+			['off' => 'Off', 'cts' => 'CTS to self', 'rtscts' => 'RTS and CTS']
+		))->setHelp('For IEEE 802.11g, use the specified technique for protecting OFDM frames in a mixed 11b/11g network.');
+	}
+	else
+	{
+		$section->addInput(new Form_Input(
+			'protmode',
+			null,
+			'hidden',
+			'off'
+		));
+	}
+
+	$mode_list = ['0' => 'Auto'];
+
+	if (is_array($wl_modes)) {
+		foreach ($wl_modes as $wl_standard => $wl_channels) {
+			if ($wl_standard == "11g") {
+				$wl_standard = "11b/g";
+			} else if ($wl_standard == "11ng") {
+				$wl_standard = "11b/g/n";
+			} else if ($wl_standard == "11na") {
+				$wl_standard = "11a/n";
+			}
+
+			foreach ($wl_channels as $wl_channel) {
+				if (isset($wl_chaninfo[$wl_channel])) {
+					$mode_list[ $wl_channel] = $wl_standard . ' - ' . $wl_channel;
+				} else {
+					$mode_list[ $wl_channel] = $wl_standard . ' - ' . $wl_channel . ' (' . $wl_chaninfo[$wl_channel][1] . ' @ ' . $wl_chaninfo[$wl_channel][2] . ' / ' . $wl_chaninfo[$wl_channel][3] . ')';
+				}
+			}
+		}
+	}
+
+	$section->addInput(new Form_Select(
+		'channel',
+		'Channel',
+		$pconfig['channel'],
+		$mode_list
+	))->setHelp('Legend: wireless standards - channel # (frequency @ max TX power / TX power allowed in reg. domain)' . '<br />' .
+				'Not all channels may be supported by your card.  Auto may override the wireless standard selected above.');
+
+	if (isset($wl_sysctl["{$wl_sysctl_prefix}.diversity"]) || isset($wl_sysctl["{$wl_sysctl_prefix}.txantenna"]) || isset($wl_sysctl["{$wl_sysctl_prefix}.rxantenna"])) {
+		$group = new Form_Group('Antenna Settings');
+
+		if (isset($wl_sysctl["{$wl_sysctl_prefix}.diversity"])) {
+			$group->add(new Form_Select(
+				'diversity',
+				null,
+				(isset($pconfig['diversity'])) ? $pconfig['diversity']:'',
+				['' => 'Default', '0' => 'Off', '1' => 'On']
+			))->setHelp('Diversity');
+		}
+
+		if (isset($wl_sysctl["{$wl_sysctl_prefix}.txantenna"])) {
+			$group->add(new Form_Select(
+				'txantenna',
+				null,
+				(isset($pconfig['txantenna'])) ? $pconfig['txantenna']:'',
+				['' => 'Default', '0' => 'Auto', '1' => '#1', '2' => '#2']
+			))->setHelp('Transmit antenna');
+		}
+
+		if (isset($wl_sysctl["{$wl_sysctl_prefix}.rxantenna"])) {
+			$group->add(new Form_Select(
+				'rxantenna',
+				null,
+				(isset($pconfig['rxantenna'])) ? $pconfig['rxantenna']:'',
+				['' => 'Default', '0' => 'Auto', '1' => '#1', '2' => '#2']
+			))->setHelp('Receive antenna');
+		}
+
+		$group->setHelp('Note: The antenna numbers do not always match up with the labels on the card.');
+
+		$section->add($group);
+	}
+
+	if (isset($wl_sysctl["{$wl_sysctl_prefix}.slottime"]) && isset($wl_sysctl["{$wl_sysctl_prefix}.acktimeout"]) && isset($wl_sysctl["{$wl_sysctl_prefix}.ctstimeout"])) {
+			$section->addInput(new Form_Input(
+				'distance',
+				'Distance setting (meters)',
+				'test',
+				$pconfig['distance']
+			))->setHelp('This field can be used to tune ACK/CTS timers to fit the distance between AP and Client');
+	}
+
+	$form->add($section);
+
+	// Regulatory settings
+	$section = new Form_Section('Regulatory settings');
+
+	$domain_list = array("" => 'Default');
+
+	if (is_array($wl_regdomains)) {
+		foreach ($wl_regdomains as $wl_regdomain_key => $wl_regdomain) {
+			$domain_list[$wl_regdomains_attr[$wl_regdomain_key]['ID']] = $wl_regdomain['name'];
+		}
+	}
+
+	$section->addInput(new Form_Select(
+		'regdomain',
+		'Regulatory domain',
+		$pconfig['regdomain'],
+		$domain_list
+	))->setHelp('Some cards have a default that is not recognized and require changing the regulatory domain to one in this list for the changes to other regulatory settings to work');
+
+	$country_list = array('' => 'Default');
+
+	if (is_array($wl_countries)) {
+		foreach ($wl_countries as $wl_country_key => $wl_country) {
+			$country_list[	$wl_countries_attr[$wl_country_key]['ID']  ] = $wl_country['name'] ; //. ' -- (' . $wl_countries_attr[$wl_country_key]['ID'] . ', ' . strtoupper($wl_countries_attr[$wl_country_key]['rd'][0]['REF']);
+		}
+	}
+
+	$section->addInput(new Form_Select(
+		'regcountry',
+		'Country',
+		$pconfig['regcountry'],
+		$country_list
+	))->setHelp('Any country setting other than "Default" will override the regulatory domain setting');
+
+	$section->addInput(new Form_Select(
+		'reglocation',
+		'Location',
+		$pconfig['reglocation'],
+		['' => 'Default', 'indoor' => 'Indoor', 'outdoor' => 'Outdoor', 'anywhere' => 'Anywhere']
+	))->setHelp('These settings may affect which channels are available and the maximum transmit power allowed on those channels. ' .
+				'Using the correct settings to comply with local regulatory requirements is recommended.' . '<br />' .
+				'All wireless networks on this interface will be temporarily brought down when changing regulatory settings.  ' .
+				'Some of the regulatory domains or country codes may not be allowed by some cards.	' .
+				'These settings may not be able to add additional channels that are not already supported.');
+
+	$form->add($section);
+
+	$section = new Form_Section('Network-specific wireless configuration');
+
+	$section->addInput(new Form_Select(
+		'mode',
+		'Mode',
+		$pconfig['mode'],
+		['bss' => 'Infrastructure (BSS)', 'adhoc' => 'Ad-hoc (IBSS)', 'hostap' => 'Access Point']
+	));
+
+	$section->addInput(new Form_Input(
+		'ssid',
+		'SSID',
+		'text',
+		$pconfig['ssid']
+	));
+
+	if (isset($wl_modes['11ng']) || isset($wl_modes['11na'])) {
+		$section->addInput(new Form_Select(
+			'puremode',
+			'Minimum wireless standard',
+			$pconfig['puremode'],
+			['any' => 'Any', '11g' => '802.11g', '11n' => '802.11n']
+		))->setHelp('When operating as an access point, allow only stations capable of the selected wireless standard to associate (stations not capable are not permitted to associate)');
+	} elseif (isset($wl_modes['11g'])) {
+		$section->addInput(new Form_Checkbox(
+			'puremode',
+			'802.11g only',
+			'Preserve common wireless configuration through interface deletions and reassignments.',
+			$pconfig['puremode'],
+			'11g'
+		))->setHelp('When operating as an access point in 802.11g mode, allow only 11g-capable stations to associate (11b-only stations are not permitted to associate)');
+	}
+
+	$section->addInput(new Form_Checkbox(
+		'apbridge_enable',
+		'Allow intra-BSS communication',
+		'Allow packets to pass between wireless clients directly when operating as an access point',
+		$pconfig['apbridge_enable'],
+		'yes'
+	))->setHelp('Disabling the internal bridging is useful when traffic is to be processed with packet filtering');
+
+	$section->addInput(new Form_Checkbox(
+		'wme_enable',
+		'Enable WME',
+		'Force the card to use WME (wireless QoS)',
+		$pconfig['wme_enable'],
+		'yes'
+	));
+
+	$section->addInput(new Form_Checkbox(
+		'hidessid_enable',
+		'Hide SSID',
+		'Force the card to NOT broadcast its SSID (This may cause problems for some clients)',
+		$pconfig['hidessid_enable'],
+		'yes'
+	));
+
+	$form->add($section);
+
+	if(ALLOWWEP) {
+		// WEP Section
+		$section = new Form_Section('WEP');
+
+		$section->addInput(new Form_Checkbox(
+			'wep_enable',
+			'Enable',
+			'Enable WEP',
+			$pconfig['wep_enable'],
+			'yes'
+		));
+
+		for($idx=1; $idx <= 4; $idx++) {
+			$group = new Form_Group('Key' . $idx);
+
+			$group->add(new Form_Input(
+				'key' . $idx,
+				null,
+				'text',
+				$pconfig['key' . $idx]
+			));
+
+			$group->add(new Form_Checkbox(
+				'txkey',
+				null,
+				null,
+				$pconfig['txkey'],
+				$idx
+			))->displayAsRadio()->setHelp($idx == 4 ? 'Tx key':'');
+
+			$section->add($group);
+		}
+
+		$section->addInput(new Form_StaticText(
+			null,
+			'<span class="help-block">' .
+			gettext('40 (64) bit keys may be entered as 5 ASCII characters or 10 hex digits preceded by "0x"') . '<br />' .
+			gettext('104 (128) bit keys may be entered as 13 ASCII characters or 26 hex digits preceded by "0x"') .
+			'</span>'
+		));
+
+		$form->add($section);
+	}
+
+	// WPA Section
+	$section = new Form_Section('WPA');
+
+	$section->addInput(new Form_Checkbox(
+		'wpa_enable',
+		'Enable',
+		'Enable WPA',
+		$pconfig['wpa_enable'],
+		'yes'
+	));
+
+	$section->addInput(new Form_Input(
+		'passphrase',
+		'WPA Pre-Shared Key',
+		'text',
+		$pconfig['passphrase']
+	))->setHelp('WPA Passphrase must be between 8 and 63 characters long');
+
+	$section->addInput(new Form_Select(
+		'wpa_mode',
+		'WPA mode',
+		(isset($pconfig['wpa_mode'])) ? $pconfig['wpa_mode']: '2',
+		['1' => 'WPA', '2' => 'WPA2', '3' => 'Both']
+	));
+
+	$section->addInput(new Form_Select(
+		'wpa_key_mgmt',
+		'WPA Key Management Mode',
+		$pconfig['wpa_key_mgmt'],
+		['WPA-PSK' => 'Pre-Shared Key', 'WPA-EAP' => 'Extensible Authentication Protocol', 'WPA-PSK WPA-EAP' => 'Both']
+	));
+
+	if(ALLOWWEP) {
+		$section->addInput(new Form_Select(
+			'auth_algs',
+			'Authentication',
+			$pconfig['auth_algs'],
+			['1' => 'Open System Authentication', '2' => 'Shared Key Authentication', '3' => 'Both']
+		))->setHelp('Shared Key Authentication requires WEP');
+	} else {
+		$section->addInput(new Form_Input(
+			'auth_algs',
+			null,
+			'hidden',
+			'1'
+		));;
+	}
+
+	$section->addInput(new Form_Select(
+		'wpa_pairwise',
+		'WPA Pairwise',
+		(isset($pconfig['wpa_pairwise'])) ? $pconfig['wpa_pairwise']:'CCMP',
+		['CCMP TKIP' => 'Both', 'CCMP' => 'AES (recommended)', 'TKIP' => 'TKIP']
+	));
+
+	$section->addInput(new Form_Input(
+		'wpa_group_rekey',
+		'WPA Pre-Shared Key',
+		'number',
+		$pconfig['wpa_group_rekey'] ? $pconfig['wpa_group_rekey'] : "60",
+		['min' => '1', 'max' => 9999]
+	))->setHelp('Specified in seconds. Allowed values are 1-9999. Must be shorter than Master Key Regeneration time');
+
+	$section->addInput(new Form_Input(
+		'wpa_gmk_rekey',
+		'Master Key Regeneration',
+		'number',
+		$pconfig['wpa_gmk_rekey'] ? $pconfig['wpa_gmk_rekey'] : "3600",
+		['min' => '1', 'max' => 9999]
+	))->setHelp('Specified in seconds. Allowed values are 1-9999. Must be longer than Key Rotation time');
+
+	$section->addInput(new Form_Checkbox(
+		'wpa_strict_rekey',
+		'Strict Key Regeneration',
+		'Force the AP to rekey whenever a client disassociates',
+		$pconfig['wpa_strict_rekey'],
+		'yes'
+	));
+
+	$section->addInput(new Form_Checkbox(
+		'ieee8021x',
+		'IEEE802.1X',
+		'Enable 802.1X authentication',
+		$pconfig['ieee8021x'],
+		'yes'
+	))->setHelp('This option requires that the "Enable WPA box" is checked');
+
+	$group = new Form_Group('Primary 802.1X server');
+
+	$group->add(new Form_IpAddress(
+		'auth_server_addr',
+		'IP Address',
+		$pconfig['auth_server_addr']
+	))->setHelp('IP address.  (Commonly a Radius server (FreeRadius, Internet Authentication Services, etc.)');
+
+	$group->add(new Form_Input(
+		'auth_server_port',
+		'Port',
+		'number',
+		$pconfig['auth_server_port']
+	))->setHelp('Server port. Leave blank for the default port 1812');
+
+	$group->add(new Form_Input(
+		'auth_server_shared_secret',
+		'Shared secret',
+		'number',
+		$pconfig['auth_server_shared_secret']
+	))->setHelp('Shared secret');
+
+	$section->add($group);
+
+	$group = new Form_Group('Secondary 802.1X server');
+
+	$group->add(new Form_IpAddress(
+		'auth_server_addr2',
+		'IP Address',
+		$pconfig['auth_server_addr2']
+	))->setHelp('IP address.  (Commonly a Radius server (FreeRadius, Internet Authentication Services, etc.)');
+
+	$group->add(new Form_Input(
+		'auth_server_port2',
+		'Port',
+		'number',
+		$pconfig['auth_server_port2']
+	))->setHelp('Server port. Leave blank for the default port 1812');
+
+	$group->add(new Form_Input(
+		'auth_server_shared_secret2',
+		'Shared secret',
+		'number',
+		$pconfig['auth_server_shared_secret2']
+	))->setHelp('Shared secret');
+
+	$section->add($group);
+
+	$section->addInput(new Form_Checkbox(
+		'rsn_preauth',
+		'Authentication Roaming Preauth',
+		null,
+		$pconfig['rsn_preauth'],
+		'yes'
+	));
+
+	$form->add($section);
 }
 
 $section = new Form_Section('Private networks');
 
 $section->addInput(new Form_Checkbox(
-    'blockpriv',
-    'Block private networks',
-    '',
-    $pconfig['blockpriv'],
-    'yes'
+	'blockpriv',
+	'Block private networks',
+	'',
+	$pconfig['blockpriv'],
+	'yes'
 ))->setHelp('Blocks traffic from IP addresses that are reserved for private networks per RFC 1918 (10/8, 172.16/12, 192.168/16) ' .
-            ' as well as loopback addresses (127/8). You should generally leave this option turned on, unless your WAN network ' .
-            'lies in such a private address space, too.');
-
-    $section->addInput(new Form_Checkbox(
-    'blockbogons',
-    'Block bogon networks',
-    '',
-    $pconfig['blockbogons'],
-    'yes'
+			' as well as loopback addresses (127/8). You should generally leave this option turned on, unless your WAN network ' .
+			'lies in such a private address space, too.');
+
+	$section->addInput(new Form_Checkbox(
+	'blockbogons',
+	'Block bogon networks',
+	'',
+	$pconfig['blockbogons'],
+	'yes'
 ))->setHelp('Blocks traffic from reserved IP addresses (but not RFC 1918) or not yet assigned by IANA. Bogons are prefixes that should ' .
-            'never appear in the Internet routing table, and so should not appear as the source address in any packets you receive.' . '<br />' .
-            'Note: The update frequency can be changed under System->Advanced Firewall/NAT settings');
+			'never appear in the Internet routing table, and so should not appear as the source address in any packets you receive.' . '<br />' .
+			'Note: The update frequency can be changed under System->Advanced Firewall/NAT settings');
 
 $form->add($section);
 
 $form->addGlobal(new Form_Input(
-    'if',
-    null,
-    'hidden',
-    $if
+	'if',
+	null,
+	'hidden',
+	$if
 ));
 
 if ($wancfg['if'] == $a_ppps[$pppid]['if']) {
-    $form->addGlobal(new Form_Input(
-        'ppp_port',
-        null,
-        'hidden',
-        $pconfig['port']
-    ));
+	$form->addGlobal(new Form_Input(
+		'ppp_port',
+		null,
+		'hidden',
+		$pconfig['port']
+	));
 }
 
 $form->addGlobal(new Form_Input(
-    'ptpid',
-    null,
-    'hidden',
-    $pconfig['ptpid']
+	'ptpid',
+	null,
+	'hidden',
+	$pconfig['ptpid']
 ));
 
 print($form);
@@ -3289,475 +3269,442 @@ print($form);
 //<![CDATA[
 events.push(function(){
 
-    function updateType(t) {
-        switch (t) {
-            case "none": {
-                $('.dhcpadvanced, .staticv4, .dhcp, .pppoe, .pptp, .ppp').hide();
-                break;
-            }
-            case "staticv4": {
-                $('.dhcpadvanced, .none, .dhcp, .pppoe, .pptp, .ppp').hide();
-                break;
-            }
-            case "dhcp": {
-                $('.dhcpadvanced, .none, .staticv4, .pppoe, .pptp, .ppp').hide();
-                break;
-            }
-            case "ppp": {
-                $('.dhcpadvanced, .none, .staticv4, .dhcp, .pptp, .pppoe').hide();
-                country_list();
-                break;
-            }
-            case "pppoe": {
-                $('.dhcpadvanced, .none, .staticv4, .dhcp, .pptp, .ppp').hide();
-                break;
-            }
-            case "l2tp":
-            case "pptp": {
-                $('.dhcpadvanced, .none, .staticv4, .dhcp, .pppoe, .ppp').hide();
-                $('.pptp').show();
-                break;
-            }
-        }
-
-        if (t != "l2tp" && t != "pptp") {
-            $('.'+t).show();
-        }
-    }
-
-    function updateTypeSix(t) {
-        if (!isNaN(t[0]))
-            t = '_' + t;
-
-        switch (t) {
-            case "none": {
-                $('.dhcp6advanced, .staticv6, .dhcp6, .6rd, ._6to4, .track6, .slaac').hide();
-                break;
-            }
-            case "staticv6": {
-                $('.dhcp6advanced, .none, .dhcp6, .6rd, ._6to4, .track6, .slaac').hide();
-                break;
-            }
-            case "slaac": {
-                $('.dhcp6advanced, .none, .staticv6, .6rd, ._6to4, .track6, .dhcp6').hide();
-                break;
-            }
-            case "dhcp6": {
-                $('.dhcp6advanced, .none, .staticv6, .6rd, ._6to4, .track6, .slaac').hide();
-                break;
-            }
-            case "_6rd": {
-                $('.dhcp6advanced, .none, .dhcp6, .staticv6, .6to4, .track6, .slaac').hide();
-                break;
-            }
-            case "_6to4": {
-                $('.dhcp6advanced, .none, .dhcp6, .staticv6, .6rd, .track6, .slaac').hide();
-                break;
-            }
-            case "track6": {
-                $('.dhcp6advanced, .none, .dhcp6, .staticv6, .6rd, .6to4, .slaac').hide();
-                update_track6_prefix();
-                break;
-            }
-        }
-
-        if (t != "l2tp" && t != "pptp") {
-            $('.'+t).show();
-        }
-    }
-
-    function show_reset_settings(reset_type) {
-        if (reset_type == 'preset') {
-            $('.pppoepreset').show();
-            $('.pppoecustom').hide();
-        } else if (reset_type == 'custom') {
-            $('.pppoecustom').show();
-            $('.pppoepreset').hide();
-        } else {
-            $('.pppoecustom').hide();
-            $('.pppoepreset').hide();
-        }
-    }
-
-    function update_track6_prefix() {
-        var iface = $("#track6-interface").val();
-        if (iface == null) {
-            return;
-        }
-
-        var track6_prefix_ids = $('#ipv6-num-prefix-ids-' + iface).val();
-        if (track6_prefix_ids == null) {
-            return;
-        }
-
-        track6_prefix_ids = parseInt(track6_prefix_ids).toString(16);
-        $('#track6-prefix-id-range').html('(<b>hexadecimal</b> from 0 to ' + track6_prefix_ids + ')');
-    }
-
-    // Create the new gateway from the data entered in the modal pop-up
-    function hide_add_gatewaysave() {
-        var iface = $('#if').val();
-        name = $('#name').val();
-        var descr = $('#gatewaydescr').val();
-        gatewayip = $('#gatewayip').val();
-
-        var defaultgw = '';
-        if ($('#defaultgw').is(':checked')) {
-            defaultgw = '&defaultgw=on';
-        }
-
-        var url = "system_gateways_edit.php";
-        var pars = 'isAjax=true&ipprotocol=inet' + defaultgw + '&interface=' + escape(iface) + '&name=' + escape(name) + '&descr=' + escape(descr) + '&gateway=' + escape(gatewayip);
-        $.ajax(
-            url,
-            {
-                type: 'post',
-                data: pars,
-                error: report_failure,
-                complete: save_callback
-            });
-        }
-
-    function save_callback(response) {
-        if (response) {
-            var gwtext = escape(name) + " - " + gatewayip;
-            addOption($('#gateway'), gwtext, name);
-        } else {
-            report_failure();
-        }
-
-        $("#newgateway").modal('hide');
-    }
-
-    function report_failure(request, textStatus, errorThrown) {
-        if (textStatus === "error" && request.getResponseHeader("Content-Type") === "text/plain") {
-            alert(request.responseText);
-        } else {
-            alert("Sorry, we could not create your IPv4 gateway at this time.");
-        }
-
-        $("#newgateway").modal('hide');
-    }
-
-    function addOption(selectbox, text, value)
-    {
-        var optn = document.createElement("OPTION");
-        optn.text = text;
-        optn.value = value;
-        selectbox.append(optn);
-        selectbox.prop('selectedIndex', selectbox.children().length - 1);
-    }
-
-    function hide_add_gatewaysave_v6() {
-
-        var iface = $('#if').val();
-        name = $('#namev6').val();
-        var descr = $('#gatewaydescrv6').val();
-        gatewayip = $('#gatewayipv6').val();
-        var defaultgw = '';
-        if ($('#defaultgwv6').is(':checked')) {
-            defaultgw = '&defaultgw=on';
-        }
-        var url_v6 = "system_gateways_edit.php";
-        var pars_v6 = 'isAjax=true&ipprotocol=inet6' + defaultgw + '&interface=' + escape(iface) + '&name=' + escape(name) + '&descr=' + escape(descr) + '&gateway=' + escape(gatewayip);
-        $.ajax(
-            url_v6,
-            {
-                type: 'post',
-                data: pars_v6,
-                error: report_failure_v6,
-                success: save_callback_v6
-            });
-    }
-
-
-    function addOption_v6(selectbox, text, value)
-    {
-        var optn = document.createElement("OPTION");
-        optn.text = text;
-        optn.value = value;
-        selectbox.append(optn);
-        selectbox.prop('selectedIndex', selectbox.children().length - 1);
-    }
-
-    function report_failure_v6(request, textStatus, errorThrown) {
-        if (textStatus === "error" && request.getResponseHeader("Content-Type") === "text/plain") {
-            alert(request.responseText);
-        } else {
-            alert("Sorry, we could not create your IPv6 gateway at this time.");
-        }
-
-        $("#newgateway6").modal('hide');
-    }
-
-    function save_callback_v6(response_v6) {
-        if (response_v6) {
-
-            var gwtext_v6 = escape(name) + " - " + gatewayip;
-            addOption_v6($('#gatewayv6'), gwtext_v6, name);
-        } else {
-            report_failure_v6();
-        }
-
-        $("#newgateway6").modal('hide');
-    }
-
-    function country_list() {
-
-        $('#country').children().remove();
-        $('#provider_list').children().remove();
-        $('#providerplan').children().remove();
-        $.ajax("getserviceproviders.php",{
-            success: function(response) {
-
-                var responseTextArr = response.split("\n");
-                responseTextArr.sort();
-
-                responseTextArr.forEach( function(value) {
-                    country = value.split(":");
-                    $('#country').append($('<option>', {
-                        value: country[1],
-                        text : country[0]
-                    }));
-                });
-            }
-        });
-    }
-
-    function providers_list() {
-        $('#provider_list').children().remove();
-        $('#providerplan').children().remove();
-        $.ajax("getserviceproviders.php",{
-            type: 'post',
-            data: {country : $('#country').val()},
-            success: function(response) {
-                var responseTextArr = response.split("\n");
-                responseTextArr.sort();
-                responseTextArr.forEach( function(value) {
-                    $('#provider_list').append($('<option>', {
-                            value: value,
-                            text : value
-                    }));
-                });
-            }
-        });
-    }
-
-    function providerplan_list() {
-        $('#providerplan').children().remove();
-        $.ajax("getserviceproviders.php",{
-            type: 'post',
-            data: {country : $('#country').val(), provider : $('#provider_list').val()},
-            success: function(response) {
-                var responseTextArr = response.split("\n");
-                responseTextArr.sort();
-
-                $('#providerplan').append($('<option>', {
-                    value: '',
-                    text : ''
-                }));
-
-                responseTextArr.forEach( function(value) {
-                    if (value != "") {
-                        providerplan = value.split(":");
-
-                        $('#providerplan').append($('<option>', {
-                            value: providerplan[1],
-                            text : providerplan[0] + " - " + providerplan[1]
-                        }));
-                    }
-                });
-            }
-        });
-    }
-
-    function prefill_provider() {
-        $.ajax("getserviceproviders.php",{
-            type: 'post',
-            data: {country : $('#country').val(), provider : $('#provider_list').val(), plan : $('#providerplan').val()},
-            success: function(data, textStatus, response) {
-                var xmldoc = response.responseXML;
-                var provider = xmldoc.getElementsByTagName('connection')[0];
-                $('#ppp_username').val('');
-                $('#ppp_password').val('');
-                if (provider.getElementsByTagName('apn')[0].firstChild.data == "CDMA") {
-                    $('#phone').val('#777');
-                    $('#apn').val('');
-                } else {
-                    $('#phone').val('*99#');
-                    $('#apn').val(provider.getElementsByTagName('apn')[0].firstChild.data);
-                }
-                ppp_username = provider.getElementsByTagName('ppp_username')[0].firstChild.data;
-                ppp_password = provider.getElementsByTagName('ppp_password')[0].firstChild.data;
-                $('#ppp_username').val(ppp_username);
-                $('#ppp_password').val(ppp_password);
-            }
-        });
-    }
-
-    // Hides all elements of the specified class. This will usually be a section
-    function hideClass(s_class, hide) {
-        if(hide)
-            $('.' + s_class).hide();
-        else
-            $('.' + s_class).show();
-    }
-
-    // Hides the <div> in which the specified input element lives so that the input, its label and help text are hidden
-    function hideInput(id, hide) {
-        if(hide)
-            $('#' + id).parent().parent('div').addClass('hidden');
-        else
-            $('#' + id).parent().parent('div').removeClass('hidden');
-    }
-
-    // Hides the <div> in which the specified IP address element lives so that the input, its label and help text are hidden
-    function hideIpAddress(id, hide) {
-        if(hide)
-            $('#' + id).parent().parent().parent('div').addClass('hidden');
-        else
-            $('#' + id).parent().parent().parent('div').removeClass('hidden');
-    }
-
-    // Hides the <div> in which the specified checkbox lives so that the checkbox, its label and help text are hidden
-    function hideCheckbox(id, hide) {
-        if(hide)
-            $('#' + id).parent().parent().parent('div').addClass('hidden');
-        else
-            $('#' + id).parent().parent().parent('div').removeClass('hidden');
-    }
-
-    function show_dhcp6adv() {
-        var ovr = $('#adv_dhcp6_config_file_override').prop('checked');
-        var adv = $('#dhcp6adv').prop('checked');
-
-        hideCheckbox('dhcp6usev4iface', ovr);
-        hideCheckbox('dhcp6prefixonly', ovr);
-        hideInput('dhcp6-ia-pd-len', ovr);
-        hideCheckbox('dhcp6-ia-pd-send-hint', ovr);
-        hideInput('adv_dhcp6_config_file_override_path', !ovr);
-
-        hideClass('dhcp6advanced', !adv || ovr);
-    }
-
-    function setDHCPoptions() {
-        var adv = $('#dhcpadv').prop('checked');
-        var ovr = $('#dhcpovr').prop('checked');
-
-        if(ovr) {
-            hideInput('dhcphostname', true);
-            hideIpAddress('alias-address', true);
-            hideInput('dhcprejectfrom', true);
-            hideInput('adv_dhcp_config_file_override_path', false);
-            hideClass('dhcpadvanced', true);
-        } else {
-            hideInput('dhcphostname', false);
-            hideIpAddress('alias-address', false);
-            hideInput('dhcprejectfrom', false);
-            hideInput('adv_dhcp_config_file_override_path', true);
-            hideClass('dhcpadvanced', !adv);
-        }
-    }
-
-    // On page load . .
-    updateType($('#type').val());
-    updateTypeSix($('#type6').val());
-    show_reset_settings($('#pppoe-reset-type').val());
-    $("#add").prop('type' ,'button');
-    $("#cnx").prop('type' ,'button');
-    $("#addgw").prop('type' ,'button');
-    $("#add6").prop('type' ,'button');
-    $("#cnx6").prop('type' ,'button');
-    $("#addgw6").prop('type' ,'button');
-    hideClass('dhcp6advanced', true);
-    hideClass('dhcpadvanced', true);
-    show_dhcp6adv();
-    setDHCPoptions()
-
-    // On click . .
+	function updateType(t) {
+		switch (t) {
+			case "none": {
+				$('.staticv4, .dhcp, .pppoe, .pptp, .ppp').hide();
+				break;
+			}
+			case "staticv4": {
+				$('.none, .dhcp, .pppoe, .pptp, .ppp').hide();
+				break;
+			}
+			case "dhcp": {
+				$('.none, .staticv4, .pppoe, .pptp, .ppp').hide();
+				break;
+			}
+			case "ppp": {
+				$('.none, .staticv4, .dhcp, .pptp, .pppoe').hide();
+				country_list();
+				break;
+			}
+			case "pppoe": {
+				$('.none, .staticv4, .dhcp, .pptp, .ppp').hide();
+				break;
+			}
+			case "l2tp":
+			case "pptp": {
+				$('.none, .staticv4, .dhcp, .pppoe, .ppp').hide();
+				$('.pptp').show();
+				break;
+			}
+		}
+
+		if (t != "l2tp" && t != "pptp") {
+			$('.'+t).show();
+		}
+	}
+
+	function updateTypeSix(t) {
+		if (!isNaN(t[0]))
+			t = '_' + t;
+
+		switch (t) {
+			case "none": {
+				$('.dhcp6advanced, .staticv6, .dhcp6, .6rd, ._6to4, .track6, .slaac').hide();
+				break;
+			}
+			case "staticv6": {
+				$('.dhcp6advanced, .none, .dhcp6, .6rd, ._6to4, .track6, .slaac').hide();
+				break;
+			}
+			case "slaac": {
+				$('.dhcp6advanced, .none, .staticv6, .6rd, ._6to4, .track6, .dhcp6').hide();
+				break;
+			}
+			case "dhcp6": {
+				$('.dhcp6advanced, .none, .staticv6, .6rd, ._6to4, .track6, .slaac').hide();
+				break;
+			}
+			case "_6rd": {
+				$('.dhcp6advanced, .none, .dhcp6, .staticv6, .6to4, .track6, .slaac').hide();
+				break;
+			}
+			case "_6to4": {
+				$('.dhcp6advanced, .none, .dhcp6, .staticv6, .6rd, .track6, .slaac').hide();
+				break;
+			}
+			case "track6": {
+				$('.dhcp6advanced, .none, .dhcp6, .staticv6, .6rd, .6to4, .slaac').hide();
+				update_track6_prefix();
+				break;
+			}
+		}
+
+		if (t != "l2tp" && t != "pptp") {
+			$('.'+t).show();
+		}
+	}
+
+	function show_reset_settings(reset_type) {
+		if (reset_type == 'preset') {
+			$('.pppoepreset').show();
+			$('.pppoecustom').hide();
+		} else if (reset_type == 'custom') {
+			$('.pppoecustom').show();
+			$('.pppoepreset').hide();
+		} else {
+			$('.pppoecustom').hide();
+			$('.pppoepreset').hide();
+		}
+	}
+
+	function update_track6_prefix() {
+		var iface = $("#track6-interface").val();
+		if (iface == null) {
+			return;
+		}
+
+		var track6_prefix_ids = $('#ipv6-num-prefix-ids-' + iface).val();
+		if (track6_prefix_ids == null) {
+			return;
+		}
+
+		track6_prefix_ids = parseInt(track6_prefix_ids).toString(16);
+		$('#track6-prefix-id-range').html('(<b>hexadecimal</b> from 0 to ' + track6_prefix_ids + ')');
+	}
+
+	// Create the new gateway from the data entered in the modal pop-up
+	function hide_add_gatewaysave() {
+		var iface = $('#if').val();
+		name = $('#name').val();
+		var descr = $('#gatewaydescr').val();
+		gatewayip = $('#gatewayip').val();
+
+		var defaultgw = '';
+		if ($('#defaultgw').is(':checked')) {
+			defaultgw = '&defaultgw=on';
+		}
+
+		var url = "system_gateways_edit.php";
+		var pars = 'isAjax=true&ipprotocol=inet' + defaultgw + '&interface=' + escape(iface) + '&name=' + escape(name) + '&descr=' + escape(descr) + '&gateway=' + escape(gatewayip);
+		$.ajax(
+			url,
+			{
+				type: 'post',
+				data: pars,
+				error: report_failure,
+				complete: save_callback
+			});
+		}
+
+	function save_callback(response) {
+		if (response) {
+			var gwtext = escape(name) + " - " + gatewayip;
+			addOption($('#gateway'), gwtext, name);
+		} else {
+			report_failure();
+		}
+
+		$("#newgateway").modal('hide');
+	}
+
+	function report_failure(request, textStatus, errorThrown) {
+		if (textStatus === "error" && request.getResponseHeader("Content-Type") === "text/plain") {
+			alert(request.responseText);
+		} else {
+			alert("Sorry, we could not create your IPv4 gateway at this time.");
+		}
+
+		$("#newgateway").modal('hide');
+	}
+
+	function addOption(selectbox, text, value)
+	{
+		var optn = document.createElement("OPTION");
+		optn.text = text;
+		optn.value = value;
+		selectbox.append(optn);
+		selectbox.prop('selectedIndex', selectbox.children().length - 1);
+	}
+
+	function hide_add_gatewaysave_v6() {
+
+		var iface = $('#if').val();
+		name = $('#namev6').val();
+		var descr = $('#gatewaydescrv6').val();
+		gatewayip = $('#gatewayipv6').val();
+		var defaultgw = '';
+		if ($('#defaultgwv6').is(':checked')) {
+			defaultgw = '&defaultgw=on';
+		}
+		var url_v6 = "system_gateways_edit.php";
+		var pars_v6 = 'isAjax=true&ipprotocol=inet6' + defaultgw + '&interface=' + escape(iface) + '&name=' + escape(name) + '&descr=' + escape(descr) + '&gateway=' + escape(gatewayip);
+		$.ajax(
+			url_v6,
+			{
+				type: 'post',
+				data: pars_v6,
+				error: report_failure_v6,
+				success: save_callback_v6
+			});
+	}
+
+
+	function addOption_v6(selectbox, text, value)
+	{
+		var optn = document.createElement("OPTION");
+		optn.text = text;
+		optn.value = value;
+		selectbox.append(optn);
+		selectbox.prop('selectedIndex', selectbox.children().length - 1);
+	}
+
+	function report_failure_v6(request, textStatus, errorThrown) {
+		if (textStatus === "error" && request.getResponseHeader("Content-Type") === "text/plain") {
+			alert(request.responseText);
+		} else {
+			alert("Sorry, we could not create your IPv6 gateway at this time.");
+		}
+
+		$("#newgateway6").modal('hide');
+	}
+
+	function save_callback_v6(response_v6) {
+		if (response_v6) {
+
+			var gwtext_v6 = escape(name) + " - " + gatewayip;
+			addOption_v6($('#gatewayv6'), gwtext_v6, name);
+		} else {
+			report_failure_v6();
+		}
+
+		$("#newgateway6").modal('hide');
+	}
+
+	function country_list() {
+
+		$('#country').children().remove();
+		$('#provider_list').children().remove();
+		$('#providerplan').children().remove();
+		$.ajax("getserviceproviders.php",{
+			success: function(response) {
+
+				var responseTextArr = response.split("\n");
+				responseTextArr.sort();
+
+				responseTextArr.forEach( function(value) {
+					country = value.split(":");
+					$('#country').append($('<option>', {
+						value: country[1],
+						text : country[0]
+					}));
+				});
+			}
+		});
+	}
+
+	function providers_list() {
+		$('#provider_list').children().remove();
+		$('#providerplan').children().remove();
+		$.ajax("getserviceproviders.php",{
+			type: 'post',
+			data: {country : $('#country').val()},
+			success: function(response) {
+				var responseTextArr = response.split("\n");
+				responseTextArr.sort();
+				responseTextArr.forEach( function(value) {
+					$('#provider_list').append($('<option>', {
+							value: value,
+							text : value
+					}));
+				});
+			}
+		});
+	}
+
+	function providerplan_list() {
+		$('#providerplan').children().remove();
+		$.ajax("getserviceproviders.php",{
+			type: 'post',
+			data: {country : $('#country').val(), provider : $('#provider_list').val()},
+			success: function(response) {
+				var responseTextArr = response.split("\n");
+				responseTextArr.sort();
+
+				$('#providerplan').append($('<option>', {
+					value: '',
+					text : ''
+				}));
+
+				responseTextArr.forEach( function(value) {
+					if (value != "") {
+						providerplan = value.split(":");
+
+						$('#providerplan').append($('<option>', {
+							value: providerplan[1],
+							text : providerplan[0] + " - " + providerplan[1]
+						}));
+					}
+				});
+			}
+		});
+	}
+
+	function prefill_provider() {
+		$.ajax("getserviceproviders.php",{
+			type: 'post',
+			data: {country : $('#country').val(), provider : $('#provider_list').val(), plan : $('#providerplan').val()},
+			success: function(data, textStatus, response) {
+				var xmldoc = response.responseXML;
+				var provider = xmldoc.getElementsByTagName('connection')[0];
+				$('#ppp_username').val('');
+				$('#ppp_password').val('');
+				if (provider.getElementsByTagName('apn')[0].firstChild.data == "CDMA") {
+					$('#phone').val('#777');
+					$('#apn').val('');
+				} else {
+					$('#phone').val('*99#');
+					$('#apn').val(provider.getElementsByTagName('apn')[0].firstChild.data);
+				}
+				ppp_username = provider.getElementsByTagName('ppp_username')[0].firstChild.data;
+				ppp_password = provider.getElementsByTagName('ppp_password')[0].firstChild.data;
+				$('#ppp_username').val(ppp_username);
+				$('#ppp_password').val(ppp_password);
+			}
+		});
+	}
+
+	// Hides all elements of the specified class. This will usually be a section
+	function hideClass(s_class, hide) {
+		if(hide)
+			$('.' + s_class).hide();
+		else
+			$('.' + s_class).show();
+	}
+
+	// Hides the <div> in which the specified input element lives so that the input, its label and help text are hidden
+	function hideInput(id, hide) {
+		if(hide)
+			$('#' + id).parent().parent('div').addClass('hidden');
+		else
+			$('#' + id).parent().parent('div').removeClass('hidden');
+	}
+
+	// Hides the <div> in which the specified checkbox lives so that the checkbox, its label and help text are hidden
+	function hideCheckbox(id, hide) {
+		if(hide)
+			$('#' + id).parent().parent().parent('div').addClass('hidden');
+		else
+			$('#' + id).parent().parent().parent('div').removeClass('hidden');
+	}
+
+	function show_dhcp6adv() {
+		var ovr = $('#adv_dhcp6_config_file_override').prop('checked');
+		var adv = $('#dhcp6adv').prop('checked');
+
+		hideCheckbox('dhcp6usev4iface', ovr);
+		hideCheckbox('dhcp6prefixonly', ovr);
+		hideInput('dhcp6-ia-pd-len', ovr);
+		hideCheckbox('dhcp6-ia-pd-send-hint', ovr);
+		hideInput('adv_dhcp6_config_file_override_path', !ovr);
+
+		hideClass('dhcp6advanced', !adv || ovr);
+	}
+
+	// On page load . .
+	updateType($('#type').val());
+	updateTypeSix($('#type6').val());
+	show_reset_settings($('#pppoe-reset-type').val());
+	$("#add").prop('type' ,'button');
+	$("#cnx").prop('type' ,'button');
+	$("#addgw").prop('type' ,'button');
+	$("#add6").prop('type' ,'button');
+	$("#cnx6").prop('type' ,'button');
+	$("#addgw6").prop('type' ,'button');
+	hideClass('dhcp6advanced', true);
+	show_dhcp6adv();
+
+	// On click . .
    $('#type').on('change', function() {
-        updateType( this.value );
-    });
+		updateType( this.value );
+	});
 
    $('#type6').on('change', function() {
-        updateTypeSix( this.value );
-    });
+		updateTypeSix( this.value );
+	});
 
    $('#pppoe-reset-type').on('change', function() {
-        show_reset_settings( this.value );
-    });
-
-    $("#add").click(function() {
-        hide_add_gatewaysave();
-    });
-
-    $("#cnx").click(function() {
-        $("#newgateway").modal('hide');
-    });
-
-    $("#add6").click(function() {
-        hide_add_gatewaysave_v6();
-    });
-
-    $("#cnx6").click(function() {
-        $("#newgateway6").modal('hide');
-    });
-
-    $('#country').on('change', function() {
-        providers_list();
-    });
-
-    $('#provider_list').on('change', function() {
-        providerplan_list();
-    });
-
-    $('#providerplan').on('change', function() {
-        prefill_provider();
-    });
-
-    $('#dhcpadv, #dhcpovr').click(function () {
-        setDHCPoptions();
-    });
-
-    $('#dhcp6adv').click(function () {
-        show_dhcp6adv();
-    });
-
-    $('#adv_dhcp6_config_file_override').click(function () {
-        show_dhcp6adv();
-    });
-
-    // DHCP preset actions
-    // Set presets from value of radio buttons
-    function setPresets(val) {
-        // timeout, retry, select-timeout, reboot, backoff-cutoff, initial-interval
-        if (val == "DHCP")      setPresetsnow("60", "300", "0", "10", "120", "10");
-        if (val == "pfSense")   setPresetsnow("60", "15", "0", "", "", "1");
-        if (val == "SavedCfg")  setPresetsnow("<?=htmlspecialchars($pconfig['adv_dhcp_pt_timeout']);?>", "<?=htmlspecialchars($pconfig['adv_dhcp_pt_retry']);?>", "<?=htmlspecialchars($pconfig['adv_dhcp_pt_select_timeout']);?>", "<?=htmlspecialchars($pconfig['adv_dhcp_pt_reboot']);?>", "<?=htmlspecialchars($pconfig['adv_dhcp_pt_backoff_cutoff']);?>", "<?=htmlspecialchars($pconfig['adv_dhcp_pt_initial_interval']);?>");
-        if (val == "Clear")     setPresetsnow("", "", "", "", "", "");
-    }
-
-    function setPresetsnow(timeout, retry, selecttimeout, reboot, backoffcutoff, initialinterval) {
-        $('#adv_dhcp_pt_timeout').val(timeout);
-        $('#adv_dhcp_pt_retry').val(retry);
-        $('#adv_dhcp_pt_select_timeout').val(selecttimeout);
-        $('#adv_dhcp_pt_reboot').val(reboot);
-        $('#adv_dhcp_pt_backoff_cutoff').val(backoffcutoff);
-        $('#adv_dhcp_pt_initial_interval').val(initialinterval);
-    }
-
-    // Set preset buttons on page load
-    var sv = "<?=htmlspecialchars($pconfig['adv_dhcp_pt_values']);?>";
-    if(sv == "")
-        $("input[name=adv_dhcp_pt_values][value='SavedCfg']").prop('checked', true);
-
-    // Set preset from value
-    setPresets(sv);
-
-    // On click . .
-    $('[id=adv_dhcp_pt_values]').click(function () {
-       setPresets($('input[name=adv_dhcp_pt_values]:checked').val());
-    });
+		show_reset_settings( this.value );
+	});
+
+	$("#add").click(function() {
+		hide_add_gatewaysave();
+	});
+
+	$("#cnx").click(function() {
+		$("#newgateway").modal('hide');
+	});
+
+	$("#add6").click(function() {
+		hide_add_gatewaysave_v6();
+	});
+
+	$("#cnx6").click(function() {
+		$("#newgateway6").modal('hide');
+	});
+
+	$('#country').on('change', function() {
+		providers_list();
+	});
+
+	$('#provider_list').on('change', function() {
+		providerplan_list();
+	});
+
+	$('#providerplan').on('change', function() {
+		prefill_provider();
+	});
+
+	$('#dhcp6adv').click(function () {
+		show_dhcp6adv();
+	});
+
+	$('#adv_dhcp6_config_file_override').click(function () {
+		show_dhcp6adv();
+	});
+
+	// DHCP preset actions
+	// Set presets from value of radio buttons
+	function setPresets(val) {
+		// timeout, retry, select-timeout, reboot, backoff-cutoff, initial-interval
+		if (val == "DHCP")		setPresetsnow("60", "300", "0", "10", "120", "10");
+		if (val == "pfSense")	setPresetsnow("60", "15", "0", "", "", "1");
+		if (val == "SavedCfg")	setPresetsnow("<?=htmlspecialchars($pconfig['adv_dhcp_pt_timeout']);?>", "<?=htmlspecialchars($pconfig['adv_dhcp_pt_retry']);?>", "<?=htmlspecialchars($pconfig['adv_dhcp_pt_select_timeout']);?>", "<?=htmlspecialchars($pconfig['adv_dhcp_pt_reboot']);?>", "<?=htmlspecialchars($pconfig['adv_dhcp_pt_backoff_cutoff']);?>", "<?=htmlspecialchars($pconfig['adv_dhcp_pt_initial_interval']);?>");
+		if (val == "Clear")		setPresetsnow("", "", "", "", "", "");
+	}
+
+	function setPresetsnow(timeout, retry, selecttimeout, reboot, backoffcutoff, initialinterval) {
+		$('#adv_dhcp_pt_timeout').val(timeout);
+		$('#adv_dhcp_pt_retry').val(retry);
+		$('#adv_dhcp_pt_select_timeout').val(selecttimeout);
+		$('#adv_dhcp_pt_reboot').val(reboot);
+		$('#adv_dhcp_pt_backoff_cutoff').val(backoffcutoff);
+		$('#adv_dhcp_pt_initial_interval').val(initialinterval);
+	}
+
+	// Set preset buttons on page load
+	var sv = "<?=htmlspecialchars($pconfig['adv_dhcp_pt_values']);?>";
+	if(sv == "")
+		$("input[name=adv_dhcp_pt_values][value='SavedCfg']").prop('checked', true);
+
+	// Set preset from value
+	setPresets(sv);
+
+	// On click . .
+	$('[id=adv_dhcp_pt_values]').click(function () {
+	   setPresets($('input[name=adv_dhcp_pt_values]:checked').val());
+	});
 });
 //]]>
 </script>