From 2648fa63b8c0a56a5b1e069f0349da915b01fcc5 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato.botelho@bluepex.com>
Date: Tue, 27 Apr 2010 09:03:23 -0300
Subject: Automatically select destination as $Interface address when Interface
 is changed just for new rules, or, if previous rule has already the
 combination interface + interface address selected

---
 usr/local/www/firewall_nat_edit.php                             | 4 ++--
 usr/local/www/javascript/firewall_nat_edit/firewall_nat_edit.js | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'usr')

diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php
index c7d5a92..3466ea4 100755
--- a/usr/local/www/firewall_nat_edit.php
+++ b/usr/local/www/firewall_nat_edit.php
@@ -448,7 +448,7 @@ include("fbegin.inc"); ?>
 		<tr>
                   <td width="22%" valign="top" class="vncellreq">Interface</td>
                   <td width="78%" class="vtable">
-					<select name="interface" class="formselect" onChange="dst_change(this.value);typesel_change();">
+					<select name="interface" class="formselect" onChange="dst_change(this.value,'<?=$pconfig['interface']?>','<?=$pconfig['dst']?>');typesel_change();">
 						<?php
 
 						$iflist = get_configured_interface_with_descr(false, true);
@@ -802,7 +802,7 @@ include("fbegin.inc"); ?>
 <script language="JavaScript">
 <!--
 	ext_change();
-	dst_change(document.iform.interface.value);
+	dst_change(document.iform.interface.value,'<?=$pconfig['interface']?>','<?=$pconfig['dst']?>');
 	typesel_change();
 	proto_change();
 //-->
diff --git a/usr/local/www/javascript/firewall_nat_edit/firewall_nat_edit.js b/usr/local/www/javascript/firewall_nat_edit/firewall_nat_edit.js
index 2cc7d7f..9f21c2b 100644
--- a/usr/local/www/javascript/firewall_nat_edit/firewall_nat_edit.js
+++ b/usr/local/www/javascript/firewall_nat_edit/firewall_nat_edit.js
@@ -177,7 +177,9 @@ function dst_rep_change() {
 	document.iform.dstendport.selectedIndex = document.iform.dstbeginport.selectedIndex;
 }
 
-function dst_change( iface ) {
-	document.iform.dsttype.value = iface.concat("ip");
+function dst_change( iface, old_iface, old_dst ) {
+	if ( ( old_dst == "" ) || ( old_iface.concat("ip") == old_dst ) ) {
+		document.iform.dsttype.value = iface.concat("ip");
+	}
 }
 //-->
-- 
cgit v1.1