GET/POST conversion firewall_aliases*

3 files changed, 20 insertions, 25 deletions

diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php
index bdc0d1b..21b12cb 100644
--- a/src/usr/local/www/firewall_aliases.php
+++ b/src/usr/local/www/firewall_aliases.php
@@ -42,26 +42,24 @@ $a_aliases = &$config['aliases']['alias'];
 
 $tab = ($_REQUEST['tab'] == "" ? "ip" : preg_replace("/\W/", "", $_REQUEST['tab']));
 
-if ($_POST) {
-
-	if ($_POST['apply']) {
-		$retval = 0;
+if ($_POST['apply']) {
+	$retval = 0;
 
-		/* reload all components that use aliases */
-		$retval |= filter_configure();
+	/* reload all components that use aliases */
+	$retval |= filter_configure();
 
-		if ($retval == 0) {
-			clear_subsystem_dirty('aliases');
-		}
+	if ($retval == 0) {
+		clear_subsystem_dirty('aliases');
 	}
 }
 
-if ($_GET['act'] == "del") {
-	if ($a_aliases[$_GET['id']]) {
+
+if ($_POST['act'] == "del") {
+	if ($a_aliases[$_POST['id']]) {
 		/* make sure rule is not being referenced by any nat or filter rules */
 		$is_alias_referenced = false;
 		$referenced_by = false;
-		$alias_name = $a_aliases[$_GET['id']]['name'];
+		$alias_name = $a_aliases[$_POST['id']]['name'];
 		// Firewall rules
 		find_alias_reference(array('filter', 'rule'), array('source', 'address'), $alias_name, $is_alias_referenced, $referenced_by);
 		find_alias_reference(array('filter', 'rule'), array('destination', 'address'), $alias_name, $is_alias_referenced, $referenced_by);
@@ -94,11 +92,11 @@ if ($_GET['act'] == "del") {
 		if ($is_alias_referenced == true) {
 			$delete_error = sprintf(gettext("Cannot delete alias. Currently in use by %s."), htmlspecialchars($referenced_by));
 		} else {
-			if (preg_match("/urltable/i", $a_aliases[$_GET['id']]['type'])) {
+			if (preg_match("/urltable/i", $a_aliases[$_POST['id']]['type'])) {
 				// this is a URL table type alias, delete its file as well
-				unlink_if_exists("/var/db/aliastables/" . $a_aliases[$_GET['id']]['name'] . ".txt");
+				unlink_if_exists("/var/db/aliastables/" . $a_aliases[$_POST['id']]['name'] . ".txt");
 			}
-			unset($a_aliases[$_GET['id']]);
+			unset($a_aliases[$_POST['id']]);
 			if (write_config()) {
 				filter_configure();
 				mark_subsystem_dirty('aliases');
@@ -254,8 +252,8 @@ display_top_tabs($tab_array);
 				<?=htmlspecialchars($alias['descr'])?>&nbsp;
 			</td>
 			<td>
-				<a class="fa fa-pencil" title="<?=gettext("Edit alias"); ?>" href="firewall_aliases_edit.php?id=<?=$i?>"></a>
-				<a class="fa fa-trash"	title="<?=gettext("Delete alias")?>" href="?act=del&amp;tab=<?=$tab?>&amp;id=<?=$i?>"></a>
+				<a class="fa fa-pencil" title="<?=gettext("Edit alias"); ?>" href="firewall_aliases_edit.php?id=<?=$i?>" usepost></a>
+				<a class="fa fa-trash"	title="<?=gettext("Delete alias")?>" href="?act=del&amp;tab=<?=$tab?>&amp;id=<?=$i?>" usepost></a>
 			</td>
 		</tr>
 <?php endif?>
@@ -268,14 +266,14 @@ display_top_tabs($tab_array);
 </div>
 
 <nav class="action-buttons">
-	<a href="firewall_aliases_edit.php?tab=<?=$tab?>" role="button" class="btn btn-success btn-sm">
+	<a href="firewall_aliases_edit.php?tab=<?=$tab?>" role="button" class="btn btn-success btn-sm" usepost>
 		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add");?>
 	</a>
 <?php
 if (($tab == "ip") || ($tab == "port") || ($tab == "all")):
 ?>
-	<a href="firewall_aliases_import.php?tab=<?=$tab?>" role="button" class="btn btn-primary btn-sm">
+	<a href="firewall_aliases_import.php?tab=<?=$tab?>" role="button" class="btn btn-primary btn-sm" usepost>
 		<i class="fa fa-upload icon-embed-btn"></i>
 		<?=gettext("Import");?>
 	</a>
diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php
index 1e8b468..e67924e 100644
--- a/src/usr/local/www/firewall_aliases_edit.php
+++ b/src/usr/local/www/firewall_aliases_edit.php
@@ -60,7 +60,7 @@ if (!is_array($config['aliases']['alias'])) {
 }
 $a_aliases = &$config['aliases']['alias'];
 
-if ($_POST) {
+if ($_POST['save']) {
 	$origname = $_POST['origname'];
 }
 
@@ -99,9 +99,6 @@ function alias_same_type($name, $type) {
 	return true;
 }
 
-if (is_numericint($_GET['id'])) {
-	$id = $_GET['id'];
-}
 if (isset($_POST['id']) && is_numericint($_POST['id'])) {
 	$id = $_POST['id'];
 }
@@ -142,7 +139,7 @@ if (empty($tab)) {
 $pgtitle = array(gettext("Firewall"), gettext("Aliases"), gettext("Edit"));
 $pglinks = array("", "firewall_aliases.php?tab=" . $tab, "@self");
 
-if ($_POST) {
+if ($_POST['save']) {
 
 	unset($input_errors);
 	$vertical_bar_err_text = gettext("Vertical bars (|) at start or end, or double in the middle of descriptions not allowed. Descriptions have been cleaned. Check and save again.");
diff --git a/src/usr/local/www/firewall_aliases_import.php b/src/usr/local/www/firewall_aliases_import.php
index d42f1a4..d3928ee 100644
--- a/src/usr/local/www/firewall_aliases_import.php
+++ b/src/usr/local/www/firewall_aliases_import.php
@@ -231,7 +231,7 @@ if ($tab == "port") {
 		'import separated by a carriage return. Common examples are lists of IPs, ' .
 		'networks, blacklists, etc. The list may contain IP addresses, with or without ' .
 		'CIDR prefix, IP ranges, blank lines (ignored) and an optional description after ' .
-		'each IP. e.g.:') . 
+		'each IP. e.g.:') .
 		'</span><ul><li>' .
 		'172.16.1.2' .
 		'</li><li>' .