diff options
author | Steve Beaver <sbeaver@netgate.com> | 2017-02-10 14:40:13 -0500 |
---|---|---|
committer | Steve Beaver <sbeaver@netgate.com> | 2017-02-10 14:40:13 -0500 |
commit | a13715575daa1fd79d24e05b51a3d4988b8f23ec (patch) | |
tree | d7bf5051a788b9030d9c6635089845c4cca983d6 /src/usr | |
parent | 01b30fa7eeda901f2856b02fd3614513c421b68b (diff) | |
download | pfsense-a13715575daa1fd79d24e05b51a3d4988b8f23ec.zip pfsense-a13715575daa1fd79d24e05b51a3d4988b8f23ec.tar.gz |
GET/POST conversion firewall_nat_out*
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/local/www/firewall_nat_out.php | 36 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_out_edit.php | 18 |
2 files changed, 23 insertions, 31 deletions
diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php index 2ee8824..7166fc1 100644 --- a/src/usr/local/www/firewall_nat_out.php +++ b/src/usr/local/www/firewall_nat_out.php @@ -148,10 +148,10 @@ if ($_POST['save']) { } // Delete a single rule/map -if ($_GET['act'] == "del") { +if ($_POST['act'] == "del") { - if ($a_out[$_GET['id']]) { - unset($a_out[$_GET['id']]); + if ($a_out[$_POST['id']]) { + unset($a_out[$_POST['id']]); if (write_config()) { mark_subsystem_dirty('natconf'); } @@ -181,12 +181,12 @@ if (isset($_POST['del_x'])) { exit; } -} else if ($_GET['act'] == "toggle") { - if ($a_out[$_GET['id']]) { - if (isset($a_out[$_GET['id']]['disabled'])) { - unset($a_out[$_GET['id']]['disabled']); +} else if ($_POST['act'] == "toggle") { + if ($a_out[$_POST['id']]) { + if (isset($a_out[$_POST['id']]['disabled'])) { + unset($a_out[$_POST['id']]['disabled']); } else { - $a_out[$_GET['id']]['disabled'] = true; + $a_out[$_POST['id']]['disabled'] = true; } if (write_config("Firewall: NAT: Outbound, enable/disable NAT rule")) { mark_subsystem_dirty('natconf'); @@ -323,7 +323,7 @@ print($form); <?php else: ?> - <a href="?act=toggle&id=<?=$i?>"> + <a href="?act=toggle&id=<?=$i?>" usepost> <i class="fa <?= ($iconfn == "pass") ? "fa-check":"fa-times"?>" title="<?=gettext("Click to toggle enabled/disabled status")?>"></i> </a> @@ -346,7 +346,7 @@ print($form); if (isset($alias['src'])): ?> - <a href="/firewall_aliases_edit.php?id=<?=$alias['src']?>" data-toggle="popover" data-trigger="hover focus" title="Alias details" data-content="<?=alias_info_popup($alias['src'])?>" data-html="true"> + <a href="/firewall_aliases_edit.php?id=<?=$alias['src']?>" data-toggle="popover" data-trigger="hover focus" title="Alias details" data-content="<?=alias_info_popup($alias['src'])?>" data-html="true" usepost> <?php endif; ?> @@ -369,7 +369,7 @@ print($form); if (isset($alias['srcport'])): ?> - <a href="/firewall_aliases_edit.php?id=<?=$alias['srcport']?>" data-toggle="popover" data-trigger="hover focus" title="Alias details" data-content="<?=alias_info_popup($alias['srcport'])?>" data-html="true"> + <a href="/firewall_aliases_edit.php?id=<?=$alias['srcport']?>" data-toggle="popover" data-trigger="hover focus" title="Alias details" data-content="<?=alias_info_popup($alias['srcport'])?>" data-html="true" usepost> <?php endif; ?> @@ -396,7 +396,7 @@ print($form); if (isset($alias['dst'])): ?> - <a href="/firewall_aliases_edit.php?id=<?=$alias['dst']?>" data-toggle="popover" data-trigger="hover focus" title="Alias details" data-content="<?=alias_info_popup($alias['dst'])?>" data-html="true"> + <a href="/firewall_aliases_edit.php?id=<?=$alias['dst']?>" data-toggle="popover" data-trigger="hover focus" title="Alias details" data-content="<?=alias_info_popup($alias['dst'])?>" data-html="true" usepost> <?php endif; ?> @@ -420,7 +420,7 @@ print($form); } else { if (isset($alias['dstport'])): ?> - <a href="/firewall_aliases_edit.php?id=<?=$alias['dstport']?>" data-toggle="popover" data-trigger="hover focus" title="Alias details" data-content="<?=alias_info_popup($alias['dstport'])?>" data-html="true"> + <a href="/firewall_aliases_edit.php?id=<?=$alias['dstport']?>" data-toggle="popover" data-trigger="hover focus" title="Alias details" data-content="<?=alias_info_popup($alias['dstport'])?>" data-html="true" usepost> <?php endif; ?> @@ -474,9 +474,9 @@ print($form); <!-- Action icons --> <td> - <a class="fa fa-pencil" title="<?=gettext("Edit mapping")?>" href="firewall_nat_out_edit.php?id=<?=$i?>"></a> - <a class="fa fa-clone" title="<?=gettext("Add a new mapping based on this one")?>" href="firewall_nat_out_edit.php?dup=<?=$i?>"></a> - <a class="fa fa-trash" title="<?=gettext("Delete mapping")?>" href="firewall_nat_out.php?act=del&id=<?=$i?>"></a> + <a class="fa fa-pencil" title="<?=gettext("Edit mapping")?>" href="firewall_nat_out_edit.php?id=<?=$i?>" usepost></a> + <a class="fa fa-clone" title="<?=gettext("Add a new mapping based on this one")?>" href="firewall_nat_out_edit.php?dup=<?=$i?>" usepost></a> + <a class="fa fa-trash" title="<?=gettext("Delete mapping")?>" href="firewall_nat_out.php?act=del&id=<?=$i?>" usepost></a> </td> </tr> <?php @@ -489,11 +489,11 @@ print($form); </div> <nav class="action-buttons"> - <a href="firewall_nat_out_edit.php?after=-1" class="btn btn-sm btn-success" title="<?=gettext('Add new mapping to the top of the list')?>"> + <a href="firewall_nat_out_edit.php?after=-1" class="btn btn-sm btn-success" title="<?=gettext('Add new mapping to the top of the list')?>" usepost> <i class="fa fa-level-up icon-embed-btn"></i> <?=gettext('Add')?> </a> - <a href="firewall_nat_out_edit.php" class="btn btn-sm btn-success" title="<?=gettext('Add new mapping to the end of the list')?>"> + <a href="firewall_nat_out_edit.php" class="btn btn-sm btn-success" title="<?=gettext('Add new mapping to the end of the list')?>" usepost> <i class="fa fa-level-down icon-embed-btn"></i> <?=gettext('Add')?> </a> diff --git a/src/usr/local/www/firewall_nat_out_edit.php b/src/usr/local/www/firewall_nat_out_edit.php index b6b7442..3f182ca 100644 --- a/src/usr/local/www/firewall_nat_out_edit.php +++ b/src/usr/local/www/firewall_nat_out_edit.php @@ -51,25 +51,17 @@ if (!is_array($config['aliases']['alias'])) { $a_aliases = &$config['aliases']['alias']; -if (is_numericint($_GET['id'])) { - $id = $_GET['id']; -} - if (isset($_POST['id']) && is_numericint($_POST['id'])) { $id = $_POST['id']; } -if (is_numericint($_GET['after']) || $_GET['after'] == "-1") { - $after = $_GET['after']; -} - if (isset($_POST['after']) && (is_numericint($_POST['after']) || $_POST['after'] == "-1")) { $after = $_POST['after']; } -if (isset($_GET['dup']) && is_numericint($_GET['dup'])) { - $id = $_GET['dup']; - $after = $_GET['dup']; +if (isset($_POST['dup']) && is_numericint($_POST['dup'])) { + $id = $_POST['dup']; + $after = $_POST['dup']; } if (isset($id) && $a_out[$id]) { @@ -130,11 +122,11 @@ if (isset($id) && $a_out[$id]) { $pconfig['interface'] = "wan"; } -if (isset($_GET['dup']) && is_numericint($_GET['dup'])) { +if (isset($_POST['dup']) && is_numericint($_POST['dup'])) { unset($id); } -if ($_POST) { +if ($_POST['save']) { if ($_POST['destination_type'] == "any") { $_POST['destination'] = "any"; $_POST['destination_subnet'] = 24; |