Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp

5 files changed, 68 insertions, 100 deletions

diff --git a/usr/local/www/status_gateway_groups.php b/usr/local/www/status_gateway_groups.php
index 353f025..d4f0d85 100755
--- a/usr/local/www/status_gateway_groups.php
+++ b/usr/local/www/status_gateway_groups.php
@@ -116,29 +116,24 @@ include("head.inc");
 					echo "<tr>";
 					$c = 1;
 					while($c <= $priority_count) {
+						$monitor = lookup_gateway_monitor_ip_by_name($member);
 						if($p == $c) {
-							$monitor = lookup_gateway_monitor_ip_by_name($member);
-							switch($gateways_status[$monitor]['status']) {
-							        case "None":
-							                $online = "Online";
-							                $bgcolor = "lightgreen";
-							                break;
-							        case "\"down\"":
-							                $online = "Offline";
-							                $bgcolor = "lightcoral";
-							                break;
-							        case "\"delay\"":
-							                $online = "Latency";
-							                $bgcolor = "khaki";
-							                break;
-							        case "\"loss\"":
-							                $online = "Packetloss";
-							                $bgcolor = "khaki";
-							                break;
-								default:
-							                $online = "Unknown";
-							                $bgcolor = "lightblue";
-							                break;
+							$status = $gateways_status[$monitor]['status'];
+							if (stristr($status, "down")) {
+                                        			$online = "Offline";
+                                        			$bgcolor = "lightcoral";
+                                			} elseif (stristr($status, "loss")) {
+                                        			$online = "Warning, Packetloss";
+                                        			$bgcolor = "khaki";
+                                			} elseif (stristr($status, "delay")) {
+                                        			$online = "Warning, Latency";
+                                        			$bgcolor = "khaki";
+                                			} elseif (stristr($status, "none")) {
+                                        			$online = "Online";
+                                        			$bgcolor = "lightgreen";
+                                			} else {
+								$online = "Unknown";
+								$bgcolor = "lightblue";
 							}
 							echo "<td bgcolor='$bgcolor'>". htmlspecialchars($member) .", $online</td>";
 						} else {
diff --git a/usr/local/www/status_gateways.php b/usr/local/www/status_gateways.php
index fa9aa72..125100b 100755
--- a/usr/local/www/status_gateways.php
+++ b/usr/local/www/status_gateways.php
@@ -42,7 +42,6 @@
 require("guiconfig.inc");
 
 $a_gateways = return_gateways_array();
-
 $gateways_status = array();
 $gateways_status = return_gateways_status();
 
@@ -76,51 +75,36 @@ include("head.inc");
                   <td width="30%" class="listhdrr">Status</td>
                   <td width="30%" class="listhdr">Description</td>
 				</tr>
-			  <?php foreach ($a_gateways as $gateway) {
-				$i = 2;
+			  <?php foreach ($gateways_status as $target => $gateway) {
 			?>
                 <tr>
                   <td class="listlr">
 				<?=strtoupper($gateway['name']);?>
                   </td>
                   <td class="listr" align="center" >
-                                <?=$gateway['gateway'];?>
+                                <?php echo lookup_gateway_ip_by_name($gateway['name']);?>
                   </td>
                   <td class="listr" align="center" >
-                                <?=$gateway['monitor'];?>
+                                <?=$target;?>
                   </td>
                   <td class="listr" >
 			<table border="0" cellpadding="0" cellspacing="2">
                         <?php
-				if($gateway['gateway'] == "dynamic") {
-					$gateway['monitor'] = "127.0.0.{$i}";
-					$i++;
-				}
-				$monitor = $gateway['monitor'];
-				if(empty($monitor)) {
-					$monitor = $gateway['gateway'];
-				}
-				switch($gateways_status[$monitor]['status']) {
-					case "None":
-						$online = "Online";
-						$bgcolor = "lightgreen";
-						break;
-					case "\"down\"":
-						$online = "Offline";
-						$bgcolor = "lightcoral";
-						break;
-					case "\"delay\"":
-						$online = "Warning, Latency";
-						$bgcolor = "khaki";
-						break;
-					case "\"loss\"":
-						$online = "Warning, Packetloss";
-						$bgcolor = "khaki";
-						break;
+				if (stristr($gateway['status'], "down")) {
+					$online = "Offline";
+					$bgcolor = "lightcoral";
+				} elseif (stristr($gateway['status'], "loss")) {
+					$online = "Warning, Packetloss";
+					$bgcolor = "khaki";
+				} elseif (stristr($gateway['status'], "delay")) {
+					$online = "Warning, Latency";
+					$bgcolor = "khaki";
+				} elseif (stristr($gateway['status'], "none")) {
+					$online = "Online";
+					$bgcolor = "lightgreen";
 				}
-
-				PRINT "<tr><td bgcolor=\"$bgcolor\" > $online </td><td>";
-				$lastchange = $gateways_status[$monitor]['lastcheck'];
+				echo "<tr><td bgcolor=\"$bgcolor\" > $online </td><td>";
+				$lastchange = $gateway['lastcheck'];
 				if(!empty($lastchange)) {
 					$lastchange = explode(" ", $lastchange);
 					array_shift($lastchange);
@@ -130,13 +114,11 @@ include("head.inc");
 				} else {
 					print "Gathering data";
 				}
-				PRINT "</td></tr>";
+				echo "</td></tr>";
                         ?>
 			</table>
                   </td>
-                  <td class="listbg" >
-						<?=$gateway['descr'];?></font>
-                  </td>
+		  <td class="listbg"> <?=$a_gateway[$gateway['name']]['descr']; ?></td>
                 </tr>
 		<?php } ?>
               </table>
diff --git a/usr/local/www/system_gateways_edit.php b/usr/local/www/system_gateways_edit.php
index 69cc405..700ba41 100755
--- a/usr/local/www/system_gateways_edit.php
+++ b/usr/local/www/system_gateways_edit.php
@@ -193,8 +193,12 @@ if ($_POST) {
 
 	if (!$input_errors) {
 		$reloadif = false;
+		$save = false;
+		if ($_POST['weight'] > 1 || $_POST['latencylow'] || $_POST['latencyhigh'] || $_POST['losslow'] || $_POST['losshigh'] || $_POST['down'] ||
+		    $_POST['defaultgw'])
+			$save = true;
 		/* if we are processing a system gateway only save the monitorip */
-		if ($_POST['weight'] == 1 && (($_POST['attribute'] == "system" && empty($_POST['defaultgw'])) || (empty($_POST['interface']) && empty($_POST['gateway']) && empty($_POST['defaultgw'])))) {
+		if (!$save && empty($_POST['interface']) && empty($_POST['gateway'])) {
 			if (is_ipaddr($_POST['monitor'])) {
 				if (empty($_POST['interface']))
 					$interface = $pconfig['friendlyiface'];
diff --git a/usr/local/www/vpn_pppoe.php b/usr/local/www/vpn_pppoe.php
index d95302e..931d15d 100755
--- a/usr/local/www/vpn_pppoe.php
+++ b/usr/local/www/vpn_pppoe.php
@@ -214,7 +214,7 @@ function enable_change(enable_over) {
 			document.iform.radius_nasip.disabled = 0;
 			document.iform.radiusissueips.disabled = 0;
 			document.iform.radius_nasip.disabled = 0;
-			document.iform.radius_acct_update = 0;
+			document.iform.radius_acct_update.disabled = 0;
 			document.iform.radiussecenable.disabled = 0;
 			if (document.iform.radiussecenable.checked || enable_over) {
 				document.iform.radiusserver2.disabled = 0;
@@ -236,7 +236,7 @@ function enable_change(enable_over) {
 			document.iform.radiusserveracctport.disabled = 1;
 			document.iform.radiusissueips.disabled = 1;
 			document.iform.radius_nasip.disabled = 1;
-			document.iform.radius_acct_update = 1;
+			document.iform.radius_acct_update.disabled = 1;
 			document.iform.radiussecenable.disabled = 1;
 		}
 	} else {
@@ -260,7 +260,7 @@ function enable_change(enable_over) {
 		document.iform.radiusserver2acctport.disabled = 1;
 		document.iform.radiusissueips.disabled = 1;
 		document.iform.radius_nasip.disabled = 1;
-		document.iform.radius_acct_update = 1;
+		document.iform.radius_acct_update.disabled = 1;
 	}
 }
 //-->
@@ -366,7 +366,7 @@ function enable_change(enable_over) {
                 <tr> 
                   <td width="22%" valign="top" class="vncellreq">DNS servers</td>
                   <td width="78%" class="vtable"> 
-                    <?=$mandfldhtml;?><input name="pppoe_dns1" type="text" class="formfld unkown" id="pppoe_dns1" size="20" value="<?=htmlspecialchars($pconfig['pppoe_dns1']);?>">
+                    <?=$mandfldhtml;?><input name="pppoe_dns1" type="text" class="formfld unknown" id="pppoe_dns1" size="20" value="<?=htmlspecialchars($pconfig['pppoe_dns1']);?>">
                     <br>
 			<input name="pppoe_dns2" type="text" class="formfld unknown" id="pppoe_dns2" size="20" value="<?=htmlspecialchars($pconfig['pppoe_dns2']);?>">
                     <br>
diff --git a/usr/local/www/widgets/widgets/gateways.widget.php b/usr/local/www/widgets/widgets/gateways.widget.php
index 7d67570..b8bca28 100644
--- a/usr/local/www/widgets/widgets/gateways.widget.php
+++ b/usr/local/www/widgets/widgets/gateways.widget.php
@@ -30,8 +30,6 @@ require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
 require_once("functions.inc");
 
-$a_gateways = return_gateways_array();
-
 $gateways_status = array();
 $gateways_status = return_gateways_status();
 
@@ -46,57 +44,47 @@ $counter = 1;
                   <td width="10%" class="listhdrr">Loss</td>
                   <td width="30%" class="listhdrr">Status</td>
                                 </tr>
-         <?php foreach ($a_gateways as $gateway) { ?>
+         <?php foreach ($gateways_status as $target => $gateway) { ?>
              <?php
-                     $monitor = $gateway['monitor'];
-						if(empty($monitor)) {
-							$monitor = $gateway['gateway'];
-						}
-			 ?>
+                     $monitor = $target;
+			if(empty($monitor)) {
+				$monitor = $gateway['gateway'];
+			}
+	 ?>
                 <tr>
                   <td class="listlr" id="gateway<?= $counter; ?>">
                                 <?=$gateway['name'];?>
 								<?php $counter++; ?>
                   </td>
                   <td class="listr" align="center" id="gateway<?= $counter; ?>">
-                                <?=$gateway['gateway'];?>
+                                <?php echo lookup_gateway_ip_by_name($gateway['name']);?>
 								<?php $counter++; ?>
                   </td>
                   <td class="listr" align="center" id="gateway<?= $counter; ?>">
-								<?=$gateways_status[$monitor]['delay'];?>
+								<?=$gateway['delay'];?>
 								<?php $counter++; ?>
 				  </td>
                   <td class="listr" align="center" id="gateway<?= $counter; ?>">
-								<?=$gateways_status[$monitor]['loss'];?>
+								<?=$gateway['loss'];?>
 								<?php $counter++; ?>
 				  </td>
                   <td class="listr" id=\"gateway<?=$counter?>\" >
                         <table border="0" cellpadding="0" cellspacing="2">
                         <?php
-                                $monitor = $gateway['monitor'];
-				if(empty($monitor)) {
-					$monitor = $gateway['gateway'];
-				}
-                                switch($gateways_status[$monitor]['status']) {
-                                        case "None":
-                                                $online = "Online";
-                                                $bgcolor = "lightgreen";
-                                                break;
-                                        case "\"down\"":
-                                                $online = "Offline";
-                                                $bgcolor = "lightcoral";
-                                                break;
-                                        case "\"delay\"":
-                                                $online = "Warning, Latency";
-                                                $bgcolor = "khaki";
-                                                break;
-                                        case "\"loss\"":
-                                               $online = "Warning, Packetloss";
-                                                $bgcolor = "khaki";
-                                                break;
-					default:
-						$online = "Gathering data";
-				}
+				if (stristr($gateway['status'], "down")) {
+                                        $online = "Offline";
+                                        $bgcolor = "lightcoral";
+                                } elseif (stristr($gateway['status'], "loss")) {
+                                        $online = "Warning, Packetloss";
+                                        $bgcolor = "khaki";
+                                } elseif (stristr($gateway['status'], "delay")) {
+                                        $online = "Warning, Latency";
+                                        $bgcolor = "khaki";
+                                } elseif (stristr($gateway['status'], "none")) {
+                                        $online = "Online";
+                                        $bgcolor = "lightgreen";
+                                } else
+					$online = "Gathering data";
 				echo "<tr><td bgcolor=\"$bgcolor\" > $online </td>";
 				$counter++;
                         ?>
@@ -104,7 +92,6 @@ $counter = 1;
                   </td>
                 </tr>
         <?php
-        	$i++;
        		}
         ?>
           </table>