Fix passing of cat_id

This commit is contained in:
Miles Lott 2001-07-13 17:57:10 +00:00
parent 02cd5e8a7c
commit 5c431fd271
2 changed files with 5 additions and 5 deletions

View File

@ -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;
}

View File

@ -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 == '')
{