Merge remote branch 'origin/master'

5 files changed, 25 insertions, 6 deletions

diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index daf577a..82d0323 100755
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -126,12 +126,12 @@ if($_REQUEST['dragdroporder']) {
 
 $icmptypes = array(
 	"" => gettext("any"),
+	"echoreq" => gettext("Echo request"),
 	"echorep" => gettext("Echo reply"),
 	"unreach" => gettext("Destination unreachable"),
 	"squench" => gettext("Source quench"),
 	"redir" => gettext("Redirect"),
 	"althost" => gettext("Alternate Host"),
-	"echoreq" => gettext("Echo"),
 	"routeradv" => gettext("Router advertisement"),
 	"routersol" => gettext("Router solicitation"),
 	"timex" => gettext("Time exceeded"),
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index bd8f48d..acebe3c 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -746,12 +746,12 @@ include("head.inc");
 <?php
 				$icmptypes = array(
 				"" => gettext("any"),
+				"echoreq" => gettext("Echo request"),
 				"echorep" => gettext("Echo reply"),
 				"unreach" => gettext("Destination unreachable"),
 				"squench" => gettext("Source quench"),
 				"redir" => gettext("Redirect"),
 				"althost" => gettext("Alternate Host"),
-				"echoreq" => gettext("Echo"),
 				"routeradv" => gettext("Router advertisement"),
 				"routersol" => gettext("Router solicitation"),
 				"timex" => gettext("Time exceeded"),
diff --git a/usr/local/www/interfaces_vlan_edit.php b/usr/local/www/interfaces_vlan_edit.php
index 145fe0a..08f1a53 100755
--- a/usr/local/www/interfaces_vlan_edit.php
+++ b/usr/local/www/interfaces_vlan_edit.php
@@ -97,9 +97,13 @@ if ($_POST) {
 
 	if (!$input_errors) {
 		if (isset($id) && $a_vlans[$id]) {
-			if ($a_vlans[$id]['if'] != $_POST['if'])
-				// Destroy previous vlan
-				pfSense_interface_destroy($a_vlans[$id]['if']);
+			if (($a_vlans[$id]['if'] != $_POST['if']) || ($a_vlans[$id]['tag'] != $_POST['tag'])) {
+				if (!empty($a_vlans[$id]['vlanif']))
+					// Destroy previous vlan
+					pfSense_interface_destroy($a_vlans[$id]['vlanif']);
+				else
+					pfSense_interface_destroy("{$a_vlans[$id]['if']}_vlan{$a_vlans[$id]['tag']}");
+			}
 		}
 		$vlan = array();
 		$vlan['if'] = $_POST['if'];
diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php
index 51857ab..21bff54 100644
--- a/usr/local/www/system_advanced_misc.php
+++ b/usr/local/www/system_advanced_misc.php
@@ -56,6 +56,7 @@ $pconfig['proxyuser'] = $config['system']['proxyuser'];
 $pconfig['proxypass'] = $config['system']['proxypass'];
 $pconfig['harddiskstandby'] = $config['system']['harddiskstandby'];
 $pconfig['lb_use_sticky'] = isset($config['system']['lb_use_sticky']);
+$pconfig['gw_switch_default'] = isset($config['system']['gw_switch_default']);
 $pconfig['preferoldsa_enable'] = isset($config['ipsec']['preferoldsa']);
 $pconfig['racoondebug_enable'] = isset($config['ipsec']['racoondebug']);
 $pconfig['maxmss_enable'] = isset($config['system']['maxmss_enable']);
@@ -106,6 +107,11 @@ if ($_POST) {
 		else
 			unset($config['system']['lb_use_sticky']);
 
+		if($_POST['gw_switch_default'] == "yes")
+			$config['system']['gw_switch_default'] = true;
+		else
+			unset($config['system']['gw_switch_default']);
+
 		if($_POST['preferoldsa_enable'] == "yes")
 			$config['ipsec']['preferoldsa'] = true;
 		else
@@ -272,6 +278,15 @@ function maxmss_checked(obj) {
 								</td>
 							</tr>
 							<tr>
+								<td width="22%" valign="top" class="vncell"><?=gettext("Load Balancing"); ?></td>
+								<td width="78%" class="vtable">
+									<input name="lb_use_sticky" type="checkbox" id="gw_switch_default" value="yes" <?php if ($pconfig['gw_switch_default']) echo "checked=\"checked\""; ?> />
+									<strong><?=gettext("Allow default gateway switching"); ?></strong><br/>
+									<?=gettext("If the link where the default gateway resides fails " .
+									"switch the default gateway to another available one."); ?>
+								</td>
+							</tr>
+							<tr>
 								<td colspan="2" class="list" height="12">&nbsp;</td>
 							</tr>
 							<tr>
diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php
index d810cb9..cc6c4f1 100644
--- a/usr/local/www/system_usermanager.php
+++ b/usr/local/www/system_usermanager.php
@@ -49,7 +49,7 @@
 require("certs.inc");
 require("guiconfig.inc");
 
-if (isAllowedPage("system_usermanager")) {
+if (isAllowedPage("system_usermanager.php*")) {
 
 	// start admin user code
 	$pgtitle = array(gettext("System"),gettext("User Manager"));