Merge branch 'master' of rcs.pfsense.org:pfsense/mainline

7 files changed, 18 insertions, 25 deletions

diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php
index 1d2e634..f4b4567 100755
--- a/usr/local/www/firewall_virtual_ip.php
+++ b/usr/local/www/firewall_virtual_ip.php
@@ -72,7 +72,7 @@ if ($_POST) {
                         		interface_ipalias_configure($a_vip[$vid]);
                         		break;
                 		case "proxyarp":
-                        		interface_proxyarp_configure();
+                        		interface_proxyarp_configure($a_vip[$vid]['interface']);
                         		break;
                 		case "carp":
                         		interface_carp_configure($a_vip[$vid]);
@@ -85,6 +85,7 @@ if ($_POST) {
 				}
                 	}
         	}
+		@unlink("{$g['tmp_path']}/firewall_virtual_ip.apply");
 		$retval = 0;
 		$retval |= filter_configure();
 		$savemsg = get_std_save_message($retval);
diff --git a/usr/local/www/services_snmp.php b/usr/local/www/services_snmp.php
index 29ae1b0..9540d98 100755
--- a/usr/local/www/services_snmp.php
+++ b/usr/local/www/services_snmp.php
@@ -194,7 +194,7 @@ function enable_change(whichone) {
 	    document.iform.syscontact.disabled = false;
 	    document.iform.rocommunity.disabled = false;
 	    document.iform.trapenable.disabled = false;
-	    document.iform.bindlan.disabled = false;
+	    //document.iform.bindlan.disabled = false;
 	    /* disabled until some docs show up on what this does.
 	    document.iform.rwenable.disabled = false;
 	    if( document.iform.rwenable.checked == true )
@@ -222,7 +222,7 @@ function enable_change(whichone) {
 	    document.iform.netgraph.disabled = false;
 	    document.iform.pf.disabled = false;
 	    document.iform.hostres.disabled = false;
-	    document.iform.bridge.disabled = false;
+	    //document.iform.bridge.disabled = false;
 	}
 	else
 	{
@@ -243,9 +243,8 @@ function enable_change(whichone) {
             document.iform.netgraph.disabled = true;
             document.iform.pf.disabled = true;
             document.iform.hostres.disabled = true;
-            document.iform.bridge.disabled = true;
-	    
-	    document.iform.bindlan.disabled = true;
+            //document.iform.bridge.disabled = true;
+	    //document.iform.bindlan.disabled = true;
 	}
 }
 //-->
@@ -261,7 +260,7 @@ function enable_change(whichone) {
   		  <td colspan="2" valign="top" class="optsect_t">
   			<table border="0" cellspacing="0" cellpadding="0" width="100%">
   			<tr><td class="optsect_s"><strong>SNMP Daemon</strong></td>
-			<td align="right" class="optsect_s"><input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked"; ?> onClick="enable_change(this)"> <strong>Enable</strong></td></tr>
+			<td align="right" class="optsect_s"><input name="enable" id="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked"; ?> onClick="enable_change(this)"> <strong>Enable</strong></td></tr>
   			</table></td>
                 </tr>
 
@@ -300,7 +299,7 @@ function enable_change(whichone) {
                 <tr>
                   <td width="22%" valign="top" class="vtable">&nbsp;</td>
                   <td width="78%" class="vtable">
-	 	   <input name="rwenable" type="checkbox" value="yes" <?php if ($pconfig['rwenable']) echo "checked"; ?> onClick="enable_change(this)">
+	 	   <input name="rwenable" id="rwenable" type="checkbox" value="yes" <?php if ($pconfig['rwenable']) echo "checked"; ?> onClick="enable_change(this)">
                     <strong>Enable Write Community String</strong>
 		  </td>
                 </tr>
@@ -321,7 +320,7 @@ function enable_change(whichone) {
   		  <td colspan="2" valign="top" class="optsect_t">
   			<table border="0" cellspacing="0" cellpadding="0" width="100%">
   			<tr><td class="optsect_s"><strong>SNMP Traps</strong></td>
-			<td align="right" class="optsect_s"><input name="trapenable" type="checkbox" value="yes" <?php if ($pconfig['trapenable']) echo "checked"; ?> onClick="enable_change(this)"> <strong>Enable</strong></td></tr>
+			<td align="right" class="optsect_s"><input name="trapenable" id="trapenable" type="checkbox" value="yes" <?php if ($pconfig['trapenable']) echo "checked"; ?> onClick="enable_change(this)"> <strong>Enable</strong></td></tr>
   			</table></td>
                 </tr>
 
diff --git a/usr/local/www/status_gateway_groups.php b/usr/local/www/status_gateway_groups.php
index d4f0d85..5ed4aa9 100755
--- a/usr/local/www/status_gateway_groups.php
+++ b/usr/local/www/status_gateway_groups.php
@@ -128,7 +128,7 @@ include("head.inc");
                                 			} elseif (stristr($status, "delay")) {
                                         			$online = "Warning, Latency";
                                         			$bgcolor = "khaki";
-                                			} elseif (stristr($status, "none")) {
+                                			} elseif ($status == "none") {
                                         			$online = "Online";
                                         			$bgcolor = "lightgreen";
                                 			} else {
diff --git a/usr/local/www/status_gateways.php b/usr/local/www/status_gateways.php
index 125100b..4d85a42 100755
--- a/usr/local/www/status_gateways.php
+++ b/usr/local/www/status_gateways.php
@@ -99,7 +99,7 @@ include("head.inc");
 				} elseif (stristr($gateway['status'], "delay")) {
 					$online = "Warning, Latency";
 					$bgcolor = "khaki";
-				} elseif (stristr($gateway['status'], "none")) {
+				} elseif ($gateway['status'] == "none") {
 					$online = "Online";
 					$bgcolor = "lightgreen";
 				}
@@ -110,9 +110,9 @@ include("head.inc");
 					array_shift($lastchange);
 					array_shift($lastchange);
 					$lastchange = implode(" ", $lastchange);
-					PRINT "Last check $lastchange";
+					echo "Last check $lastchange";
 				} else {
-					print "Gathering data";
+					echo "Gathering data";
 				}
 				echo "</td></tr>";
                         ?>
diff --git a/usr/local/www/status_wireless.php b/usr/local/www/status_wireless.php
index e8c96a9..37ef825 100755
--- a/usr/local/www/status_wireless.php
+++ b/usr/local/www/status_wireless.php
@@ -111,7 +111,6 @@ display_top_tabs($tab_array);
 		$bssid = $bssid[0];
 		/* Split the rest by using spaces for this line using the 2nd part */
 		$split = preg_split("/[ ]+/i", $split[1]);
-		$bssid = $split[0];
 		$channel = $split[1];
 		$rate = $split[2];
 		$rssi = $split[3];
diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php
index 0fdecc8..2c34085 100755
--- a/usr/local/www/vpn_ipsec.php
+++ b/usr/local/www/vpn_ipsec.php
@@ -74,13 +74,7 @@ if ($_POST) {
 
 		$config['ipsec']['enable'] = $_POST['enable'] ? true : false;
 
-		if(!$config['ipsec']['enable']) {
-			if(is_process_running("racoon")) 
-				mwexec("killall racoon");
-		} else {
-			$retval = vpn_ipsec_configure();
-		}
-
+		$retval = vpn_ipsec_configure();
 		write_config();
 	}
 }
diff --git a/usr/local/www/widgets/widgets/gateways.widget.php b/usr/local/www/widgets/widgets/gateways.widget.php
index b8bca28..a744d5b 100644
--- a/usr/local/www/widgets/widgets/gateways.widget.php
+++ b/usr/local/www/widgets/widgets/gateways.widget.php
@@ -54,11 +54,11 @@ $counter = 1;
                 <tr>
                   <td class="listlr" id="gateway<?= $counter; ?>">
                                 <?=$gateway['name'];?>
-								<?php $counter++; ?>
+				<?php $counter++; ?>
                   </td>
                   <td class="listr" align="center" id="gateway<?= $counter; ?>">
-                                <?php echo lookup_gateway_ip_by_name($gateway['name']);?>
-								<?php $counter++; ?>
+                              <?php echo lookup_gateway_ip_by_name($gateway['name']);?>
+				<?php $counter++; ?>
                   </td>
                   <td class="listr" align="center" id="gateway<?= $counter; ?>">
 								<?=$gateway['delay'];?>
@@ -80,7 +80,7 @@ $counter = 1;
                                 } elseif (stristr($gateway['status'], "delay")) {
                                         $online = "Warning, Latency";
                                         $bgcolor = "khaki";
-                                } elseif (stristr($gateway['status'], "none")) {
+                                } elseif ($gateway['status'] == "none") {
                                         $online = "Online";
                                         $bgcolor = "lightgreen";
                                 } else