A few small comment and field choice changes

This commit is contained in:
Miles Lott 2001-03-21 22:51:37 +00:00
parent 7d8a40f222
commit dab3d59f04
3 changed files with 6 additions and 5 deletions

View File

@ -84,7 +84,9 @@
"address2" => "address2", "address2" => "address2",
"address3" => "address3" "address3" => "address3"
); );
if ($this->type != 'vcard') {
$this->qfields = $this->stock_contact_fields;# + $extrafields;# + $customfields; $this->qfields = $this->stock_contact_fields;# + $extrafields;# + $customfields;
}
$buffer = $this->export_start_file($buffer); $buffer = $this->export_start_file($buffer);

View File

@ -24,7 +24,7 @@
// $access = $n_groups; // $access = $n_groups;
//echo $access . "<BR>"; //echo $access . "<BR>";
parsevcard($filename,$access); //parsevcard($filename,$access);
// Delete the temp file. // Delete the temp file.
unlink($filename); unlink($filename);
unlink($filename . '.info'); unlink($filename . '.info');

View File

@ -30,6 +30,7 @@
// Some of the methods where borrowed from // Some of the methods where borrowed from
// Squirrelmail <Luke Ehresman> http://www.squirrelmail.org // Squirrelmail <Luke Ehresman> http://www.squirrelmail.org
// (only the uploaddir naming anymore)
$sep = SEP; $sep = SEP;
$uploaddir = $phpgw_info["server"]["temp_dir"] . $sep; $uploaddir = $phpgw_info["server"]["temp_dir"] . $sep;
@ -48,7 +49,6 @@
fputs($ftp,"$uploadedfile_type\n$uploadedfile_name\n"); fputs($ftp,"$uploadedfile_type\n$uploadedfile_name\n");
fclose($ftp); fclose($ftp);
// This has to be non-interactive in case of a multi-entry vcard.
$filename = $uploaddir . $newfilename; $filename = $uploaddir . $newfilename;
$contacts = CreateObject("phpgwapi.contacts"); $contacts = CreateObject("phpgwapi.contacts");
@ -78,7 +78,6 @@
$entry = $vcard->in($buffer); $entry = $vcard->in($buffer);
$contacts->add($phpgw_info["user"]["account_id"],$entry); $contacts->add($phpgw_info["user"]["account_id"],$entry);
//parsevcard($filename,$access);
// Delete the temp file. // Delete the temp file.
unlink($filename); unlink($filename);
unlink($filename . ".info"); unlink($filename . ".info");