summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorRenato Botelho <renato.botelho@bluepex.com>2010-04-27 09:03:23 -0300
committerRenato Botelho <renato.botelho@bluepex.com>2010-04-27 09:03:23 -0300
commit2648fa63b8c0a56a5b1e069f0349da915b01fcc5 (patch)
treebbf53ac721a5acba7d629a164107735f8f0d9449 /usr
parentbe28a8c001ea693d491a98190445fdf6890d49f8 (diff)
downloadpfsense-2648fa63b8c0a56a5b1e069f0349da915b01fcc5.zip
pfsense-2648fa63b8c0a56a5b1e069f0349da915b01fcc5.tar.gz
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
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/firewall_nat_edit.php4
-rw-r--r--usr/local/www/javascript/firewall_nat_edit/firewall_nat_edit.js6
2 files changed, 6 insertions, 4 deletions
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");
+ }
}
//-->
OpenPOWER on IntegriCloud