From 561670a24d2ba046e02e3dfd19bd6d474bf0ba46 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Wed, 28 Mar 2001 01:59:08 +0000
Subject: [PATCH] More query string handling

---
 addressbook/export.php | 10 +++++++---
 addressbook/import.php | 11 ++++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/addressbook/export.php b/addressbook/export.php
index 499bee7208..0787f59dc2 100644
--- a/addressbook/export.php
+++ b/addressbook/export.php
@@ -53,11 +53,13 @@
 		$t->set_var("lang_cancel",lang("Cancel"));
 		$t->set_var("lang_cat",lang("Select Category"));
 		$t->set_var("cat_id",cat_option($cat_id,'ncat_id',True));
-		$t->set_var("cancel_url",$phpgw->link("/addressbook/index.php"));
+		$t->set_var("cancel_url",$phpgw->link("/addressbook/index.php",
+			"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));
 		$t->set_var("navbar_bg",$phpgw_info["theme"]["navbar_bg"]);
 		$t->set_var("navbar_text",$phpgw_info["theme"]["navbar_text"]);
 		$t->set_var("export_text",lang("Export from Addressbook"));
-		$t->set_var("action_url",$phpgw->link("/addressbook/export.php"));
+		$t->set_var("action_url",$phpgw->link("/addressbook/export.php",
+			"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));
 		$t->set_var("filename",lang("Export file name"));
 		$t->set_var("conv",$conv);
 		$t->set_var("debug",lang(""));
@@ -116,7 +118,9 @@
 			echo "<pre>\n";
 			echo $buffer;
 			echo "\n</pre>\n";
-			echo '<a href="'.$phpgw->link("/addressbook/index.php").'">'.lang("OK").'</a>';
+			echo '<a href="'.$phpgw->link("/addressbook/index.php",
+				"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id")
+				. '">'.lang("OK").'</a>';
 			$phpgw->common->phpgw_footer();
 		}
 	}
diff --git a/addressbook/import.php b/addressbook/import.php
index feedb6b99e..fb4a05ec5d 100644
--- a/addressbook/import.php
+++ b/addressbook/import.php
@@ -58,7 +58,8 @@
 		$t->set_var("navbar_bg",$phpgw_info["theme"]["navbar_bg"]);
 		$t->set_var("navbar_text",$phpgw_info["theme"]["navbar_text"]);
 		$t->set_var("import_text",lang("Import from LDIF, CSV, or VCard"));
-		$t->set_var("action_url",$phpgw->link("/addressbook/import.php"));
+		$t->set_var("action_url",$phpgw->link("/addressbook/import.php",
+			"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));
 		$t->set_var("cat_id",cat_option($cat_id,True));
 		$t->set_var("tsvfilename","");
 		$t->set_var("conv",$conv);
@@ -169,12 +170,16 @@
 				echo $buffer;
 			} else {
 				echo "<pre>$buffer</pre>";
-				echo '<a href="'.$phpgw->link("/addressbook/index.php").'">'.lang("OK").'</a>';
+				echo '<a href="'.$phpgw->link("/addressbook/index.php",
+					"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id")
+					. '">'.lang("OK").'</a>';
 				$phpgw->common->phpgw_footer();
 			}
 		} else {
 			echo "<pre>$buffer</pre>";
-			echo '<a href="'.$phpgw->link("/addressbook/index.php").'">'.lang("OK").'</a>';
+			echo '<a href="'.$phpgw->link("/addressbook/index.php",
+				"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id")
+				. '">'.lang("OK").'</a>';
 			$phpgw->common->phpgw_footer();
 		}
 	}