From a5416de22195347b14dfdc8a07ac676b463c9ccc Mon Sep 17 00:00:00 2001
From: Warren Baker <warren@decoy.co.za>
Date: Tue, 24 Jul 2012 16:35:27 +0200
Subject: Return the user to the tab they were working originally working on

---
 usr/local/www/firewall_aliases.php      | 30 ++++++++++++++++--------------
 usr/local/www/firewall_aliases_edit.php |  8 ++++++--
 2 files changed, 22 insertions(+), 16 deletions(-)

(limited to 'usr/local')

diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php
index c6a904f..48115d2 100755
--- a/usr/local/www/firewall_aliases.php
+++ b/usr/local/www/firewall_aliases.php
@@ -52,7 +52,8 @@ $a_aliases = &$config['aliases']['alias'];
 
 if ($_POST) {
 
-	$pconfig = $_POST;
+	if($_POST['tab'])
+		$tab = $_POST['tab'];
 
 	if ($_POST['apply']) {
 		$retval = 0;
@@ -164,19 +165,20 @@ include("head.inc");
 <?php endif; ?>
 <?php pfSense_handle_custom_code("/usr/local/pkg/firewall_aliases/pre_table"); ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0" >
-<tr><td class="tabnavtbl">
-		<?php
-	$tab=($_REQUEST['tab'] == "" ? "ip" : preg_replace("/\W/","",$_REQUEST['tab']));
-	$tab_array = array();
-	$tab_array[] = array(gettext("IP"),($tab=="ip"? true : false), "/firewall_aliases.php?tab=ip");
-	$tab_array[] = array(gettext("Ports"), ($tab=="port"? true : false), "/firewall_aliases.php?tab=port");
-	$tab_array[] = array(gettext("Urls"), ($tab=="url"? true : false), "/firewall_aliases.php?tab=url");
-	$tab_array[] = array(gettext("All"), ($tab=="all"? true : false), "/firewall_aliases.php?tab=all");
-	display_top_tabs($tab_array);
-
-	?>
-		</td></tr>
-
+	<tr>
+		<td class="tabnavtbl">
+			<?php
+				$tab=($_REQUEST['tab'] == "" ? "ip" : preg_replace("/\W/","",$_REQUEST['tab']));
+				$tab_array = array();
+				$tab_array[] = array(gettext("IP"),($tab=="ip"? true : false), "/firewall_aliases.php?tab=ip");
+				$tab_array[] = array(gettext("Ports"), ($tab=="port"? true : false), "/firewall_aliases.php?tab=port");
+				$tab_array[] = array(gettext("Urls"), ($tab=="url"? true : false), "/firewall_aliases.php?tab=url");
+				$tab_array[] = array(gettext("All"), ($tab=="all"? true : false), "/firewall_aliases.php?tab=all");
+				display_top_tabs($tab_array);
+			?>
+		<input type="hidden" name="tab" value="<?=htmlspecialchars($tab);?>">
+		</td>
+	</tr>
 <tr><td><div id="mainarea">
 		<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
 		<tr>
diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index 8b9df48..194d445 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -357,8 +357,11 @@ if ($_POST) {
 
 		write_config();
 
-		header("Location: firewall_aliases.php");
-		exit;		
+		if($_POST['tab'])
+			header("Location: firewall_aliases.php?tab=" . htmlspecialchars ($_POST['tab']));
+		else
+			header("Location: firewall_aliases.php");
+		exit;
 	}
 	//we received input errors, copy data to prevent retype
 	else
@@ -573,6 +576,7 @@ EOD;
 <div id="inputerrors"></div>
 
 <form action="firewall_aliases_edit.php" method="post" name="iform" id="iform">
+<input name="tab" type="hidden" id="tab" value="<?=htmlspecialchars($pconfig['type']);?>" />
 <table width="100%" border="0" cellpadding="6" cellspacing="0">
   <tr>
 	<td colspan="2" valign="top" class="listtopic"><?=gettext("Alias Edit"); ?></td>
-- 
cgit v1.1