diff options
author | jim-p <jimp@pfsense.org> | 2014-05-23 13:59:41 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2014-05-23 14:00:07 -0400 |
commit | 67eec08539c8deeca86c0c450a9c8a9c709e5b21 (patch) | |
tree | 8830c292a6c976c579143d4eb1e8ca635f991e2a /usr/local | |
parent | b7988b29d0626740ccd5b11335e8665aa59b2421 (diff) | |
download | pfsense-67eec08539c8deeca86c0c450a9c8a9c709e5b21.zip pfsense-67eec08539c8deeca86c0c450a9c8a9c709e5b21.tar.gz |
Add (self) for an outbound NAT source as well
Diffstat (limited to 'usr/local')
-rw-r--r-- | usr/local/www/firewall_nat_out.php | 1 | ||||
-rw-r--r-- | usr/local/www/firewall_nat_out_edit.php | 12 |
2 files changed, 10 insertions, 3 deletions
diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php index 1d993b8..5f4c66b 100644 --- a/usr/local/www/firewall_nat_out.php +++ b/usr/local/www/firewall_nat_out.php @@ -378,6 +378,7 @@ if (is_subsystem_dirty('natconf')) </td> <td class="listr" onclick="fr_toggle(<?=$i;?>)" id="frd<?=$i;?>" ondblclick="document.location='firewall_nat_out_edit.php?id=<?=$i;?>';"> + <?PHP $natent['source']['network'] = ($natent['source']['network'] == "(self)") ? "This Firewall" : $natent['source']['network']; ?> <?php echo $textss . $alias_src_span_begin . $natent['source']['network'] . $alias_src_span_end . $textse;?> </td> <td class="listr" onclick="fr_toggle(<?=$i;?>)" id="frd<?=$i;?>" ondblclick="document.location='firewall_nat_out_edit.php?id=<?=$i;?>';"> diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php index ffc41a3..d22fc8e 100644 --- a/usr/local/www/firewall_nat_out_edit.php +++ b/usr/local/www/firewall_nat_out_edit.php @@ -121,6 +121,9 @@ if ($_POST) { if ($_POST['source_type'] == "any") { $_POST['source'] = "any"; $_POST['source_subnet'] = 24; + } elseif ($_POST['source_type'] == "(self)") { + $_POST['source'] = "(self)"; + $_POST['source_subnet'] = 24; } unset($input_errors); @@ -165,7 +168,7 @@ if ($_POST) { if($protocol_uses_ports && $_POST['natport'] <> "" && !is_port($_POST['natport']) && !isset($_POST['nonat'])) $input_errors[] = gettext("You must supply a valid port for the NAT port entry."); - if ($_POST['source_type'] != "any") { + if (($_POST['source_type'] != "any") && ($_POST['source_type'] != "(self)")) { if ($_POST['source'] && !is_ipaddroralias($_POST['source']) && $_POST['source'] <> "any") { $input_errors[] = gettext("A valid source must be specified."); } @@ -216,6 +219,8 @@ if ($_POST) { /* if user has selected any as source, set it here */ if($_POST['source_type'] == "any") { $osn = "any"; + } else if($_POST['source_type'] == "(self)") { + $osn = "(self)"; } else if(is_alias($_POST['source'])) { $osn = $_POST['source']; } else { @@ -367,7 +372,7 @@ function typesel_change() { } function sourcesel_change() { switch (document.iform.source_type.selectedIndex) { - case 1: // network + case 2: // network document.iform.source.disabled = 0; document.iform.source_subnet.disabled = 0; break; @@ -530,7 +535,8 @@ function poolopts_change() { <td> <select name="source_type" class="formselect" onchange="sourcesel_change()"> <option value="any" <?php if ($pconfig['source'] == "any") echo "selected=\"selected\""; ?>><?=gettext("any");?></option> - <option value="network" <?php if ($pconfig['source'] != "any") echo "selected=\"selected\""; ?>><?=gettext("Network");?></option> + <option value="(self)" <?PHP if ($pconfig['source'] == "(self)") echo "selected=\"selected\""; ?>><?=gettext("This Firewall (self)");?></option> + <option value="network" <?php if (($pconfig['source'] != "any") && ($pconfig['source'] != "(self)")) echo "selected=\"selected\""; ?>><?=gettext("Network");?></option> </select> </td> </tr> |