diff options
Diffstat (limited to 'src/usr/local/www/firewall_nat.php')
| -rw-r--r-- | src/usr/local/www/firewall_nat.php | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/src/usr/local/www/firewall_nat.php b/src/usr/local/www/firewall_nat.php index 4bf2316..c443e6a 100644 --- a/src/usr/local/www/firewall_nat.php +++ b/src/usr/local/www/firewall_nat.php @@ -43,8 +43,8 @@ if (!is_array($config['nat']['rule'])) { $a_nat = &$config['nat']['rule']; /* update rule order, POST[rule] is an array of ordered IDs */ -if (array_key_exists('order-store', $_POST)) { - if (is_array($_POST['rule']) && !empty($_POST['rule'])) { +if (array_key_exists('order-store', $_REQUEST)) { + if (is_array($_REQUEST['rule']) && !empty($_REQUEST['rule'])) { $a_nat_new = array(); // if a rule is not in POST[rule], it has been deleted by the user @@ -74,12 +74,8 @@ if (array_key_exists('order-store', $_POST)) { } /* if a custom message has been passed along, lets process it */ -if ($_POST['savemsg']) { - $savemsg = $_POST['savemsg']; -} - -if ($_POST) { - $pconfig = $_POST; +if ($_REQUEST['savemsg']) { + $savemsg = $_REQUEST['savemsg']; } if ($_POST['apply']) { @@ -104,6 +100,7 @@ if ($_POST['act'] == "del") { delete_id($a_nat[$_POST['id']]['associated-rule-id'], $config['filter']['rule']); $want_dirty_filter = true; } + unset($a_nat[$_POST['id']]); // Update the separators @@ -125,6 +122,7 @@ if ($_POST['act'] == "del") { } if (isset($_POST['del_x'])) { + /* delete selected rules */ if (is_array($_POST['rule']) && count($_POST['rule'])) { $a_separators = &$config['nat']['separator']; @@ -331,7 +329,7 @@ foreach ($a_nat as $natent): <?php if (isset($alias['src'])): ?> - <a href="/firewall_aliases_edit.php?id=<?=$alias['src']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['src'])?>" data-html="true" usepost> + <a href="/firewall_aliases_edit.php?id=<?=$alias['src']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['src'])?>" data-html="true"> <?php endif; ?> @@ -348,7 +346,7 @@ foreach ($a_nat as $natent): <?php if (isset($alias['srcport'])): ?> - <a href="/firewall_aliases_edit.php?id=<?=$alias['srcport']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['srcport'])?>" data-html="true" usepost> + <a href="/firewall_aliases_edit.php?id=<?=$alias['srcport']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['srcport'])?>" data-html="true"> <?php endif; ?> @@ -366,7 +364,7 @@ foreach ($a_nat as $natent): <?php if (isset($alias['dst'])): ?> - <a href="/firewall_aliases_edit.php?id=<?=$alias['dst']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['dst'])?>" data-html="true" usepost> + <a href="/firewall_aliases_edit.php?id=<?=$alias['dst']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['dst'])?>" data-html="true"> <?php endif; ?> @@ -383,7 +381,7 @@ foreach ($a_nat as $natent): <?php if (isset($alias['dstport'])): ?> - <a href="/firewall_aliases_edit.php?id=<?=$alias['dstport']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['dstport'])?>" data-html="true" usepost> + <a href="/firewall_aliases_edit.php?id=<?=$alias['dstport']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['dstport'])?>" data-html="true"> <?php endif; ?> @@ -400,7 +398,7 @@ foreach ($a_nat as $natent): <?php if (isset($alias['target'])): ?> - <a href="/firewall_aliases_edit.php?id=<?=$alias['target']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['target'])?>" data-html="true" usepost> + <a href="/firewall_aliases_edit.php?id=<?=$alias['target']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['target'])?>" data-html="true" > <?php endif; ?> @@ -418,7 +416,7 @@ foreach ($a_nat as $natent): <?php if (isset($alias['targetport'])): ?> - <a href="/firewall_aliases_edit.php?id=<?=$alias['targetport']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['targetport'])?>" data-html="true" usepost> + <a href="/firewall_aliases_edit.php?id=<?=$alias['targetport']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['targetport'])?>" data-html="true"> <?php endif; ?> @@ -436,8 +434,8 @@ foreach ($a_nat as $natent): <?=htmlspecialchars($natent['descr'])?> </td> <td> - <a class="fa fa-pencil" title="<?=gettext("Edit rule"); ?>" href="firewall_nat_edit.php?id=<?=$i?>" usepost></a> - <a class="fa fa-clone" title="<?=gettext("Add a new NAT based on this one")?>" href="firewall_nat_edit.php?dup=<?=$i?>" usepost></a> + <a class="fa fa-pencil" title="<?=gettext("Edit rule"); ?>" href="firewall_nat_edit.php?id=<?=$i?>"></a> + <a class="fa fa-clone" title="<?=gettext("Add a new NAT based on this one")?>" href="firewall_nat_edit.php?dup=<?=$i?>"></a> <a class="fa fa-trash" title="<?=gettext("Delete rule")?>" href="firewall_nat.php?act=del&id=<?=$i?>" usepost></a> </td> </tr> @@ -458,11 +456,11 @@ if ($seprows[$nnats]) { </div> <nav class="action-buttons"> - <a href="firewall_nat_edit.php?after=-1" class="btn btn-sm btn-success" title="<?=gettext('Add rule to the top of the list')?>" usepost> + <a href="firewall_nat_edit.php?after=-1" class="btn btn-sm btn-success" title="<?=gettext('Add rule to the top of the list')?>"> <i class="fa fa-level-up icon-embed-btn"></i> <?=gettext('Add')?> </a> - <a href="firewall_nat_edit.php" class="btn btn-sm btn-success" title="<?=gettext('Add rule to the end of the list')?>" usepost> + <a href="firewall_nat_edit.php" class="btn btn-sm btn-success" title="<?=gettext('Add rule to the end of the list')?>"> <i class="fa fa-level-down icon-embed-btn"></i> <?=gettext('Add')?> </a> |
