From d9720602816c8abce528ef6a8b6456bad7f41fbf Mon Sep 17 00:00:00 2001
From: Seth Mos <seth.mos@xs4all.nl>
Date: Sat, 20 Oct 2007 00:56:32 +0000
Subject: List the available Gateways on the rules edit screen

---
 usr/local/www/firewall_rules_edit.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'usr')

diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index 69e1ae4..149df43 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -760,9 +760,9 @@ include("head.inc");
 			/* build a list of gateways */
 			$gateways = array();
 			$gateways[] = "default"; // default to don't use this feature :)
-			foreach($config['interfaces'] as $int) {
-				if($int['gateway'] <> "")
-					$gateways[]=$int['gateway'];
+			foreach($config['gateways']['gateway_item'] as $gw_item) {
+			if($gw_item['gateway'] <> "")
+				$gateways[] = $gw_item['name'];
 			}
 ?>
 		<tr>
@@ -781,7 +781,8 @@ include("head.inc");
 					if ($gw == "default") {
 						echo "<option value=\"\" {$selected}>{$gw}</option>\n";
 					} else {
-						echo "<option value=\"{$gw}\" {$selected}>{$gw}</option>\n";
+						$gwip = lookup_gateway_ip_by_name($gw);
+						echo "<option value=\"{$gw}\" {$selected}>{$gw} - {$gwip}</option>\n";
 					}
 				}
 				if(is_array($config['load_balancer']['lbpool'])) {
-- 
cgit v1.1