From 5c431fd271bf87b41a19fe94556d97724660a6bf Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Fri, 13 Jul 2001 17:57:10 +0000
Subject: [PATCH] Fix passing of cat_id

---
 addressbook/inc/class.boXport.inc.php | 4 ++--
 addressbook/inc/class.uiXport.inc.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addressbook/inc/class.boXport.inc.php b/addressbook/inc/class.boXport.inc.php
index 3096bd0e3c..69140dbc7c 100644
--- a/addressbook/inc/class.boXport.inc.php
+++ b/addressbook/inc/class.boXport.inc.php
@@ -90,7 +90,7 @@
 			$this->cat_id = $data['cat_id'];
 		}
 
-		function import($tsvfile,$conv_type,$private)
+		function import($tsvfile,$conv_type,$private,$fcat_id)
 		{
 			global $phpgw;
 
@@ -221,7 +221,7 @@
 			}
 
 			fclose($fp);
-			$buffer = $contacts->import_end_file($buffer,$private,$cat_id);
+			$buffer = $contacts->import_end_file($buffer,$private,$fcat_id);
 			return $buffer;
 		}
 
diff --git a/addressbook/inc/class.uiXport.inc.php b/addressbook/inc/class.uiXport.inc.php
index d8adea5ac9..5335c4dbcc 100644
--- a/addressbook/inc/class.uiXport.inc.php
+++ b/addressbook/inc/class.uiXport.inc.php
@@ -56,7 +56,7 @@
 				$jselect = ' onChange="this.form.submit();"';
 			}
 			/* Setup all and none first */
-			$cats_link  = "\n" .'<select name="cat_id'.($multiple?'[]':'').'"' .$jselect . ($multiple ? 'multiple size="3"' : '') . ">\n";
+			$cats_link  = "\n" .'<select name="fcat_id'.($multiple?'[]':'').'"' .$jselect . ($multiple ? 'multiple size="3"' : '') . ">\n";
 			if (!$notall)
 			{
 				$cats_link .= '<option value=""';
@@ -75,11 +75,11 @@
 
 		function import()
 		{
-			global $phpgw,$convert,$download,$tsvfile,$private,$conv_type;
+			global $phpgw,$convert,$download,$tsvfile,$private,$conv_type,$fcat_id;
 
 			if ($convert)
 			{
-				$buffer = $this->bo->import($tsvfile,$conv_type,$private);
+				$buffer = $this->bo->import($tsvfile,$conv_type,$private,$fcat_id);
 
 				if ($download == '')
 				{