From dab3d59f045d567e4101491d325bbf2e8f604717 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Wed, 21 Mar 2001 22:51:37 +0000
Subject: [PATCH] A few small comment and field choice changes

---
 addressbook/export.php    | 4 +++-
 addressbook/parsecard.php | 4 ++--
 addressbook/vcardin.php   | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addressbook/export.php b/addressbook/export.php
index e109ce389f..a4f404e2f7 100644
--- a/addressbook/export.php
+++ b/addressbook/export.php
@@ -84,7 +84,9 @@
 			"address2" => "address2",
 			"address3" => "address3"
 		);
-		$this->qfields = $this->stock_contact_fields;# + $extrafields;# + $customfields;
+		if ($this->type != 'vcard') {
+			$this->qfields = $this->stock_contact_fields;# + $extrafields;# + $customfields;
+		}
 
 		$buffer = $this->export_start_file($buffer);
 		
diff --git a/addressbook/parsecard.php b/addressbook/parsecard.php
index 5815a7e1e9..dcf60fa140 100644
--- a/addressbook/parsecard.php
+++ b/addressbook/parsecard.php
@@ -24,9 +24,9 @@
 	//	$access = $n_groups;
 	//echo $access . "<BR>";
 
-	parsevcard($filename,$access);
+	//parsevcard($filename,$access);
 	// Delete the temp file.
 	unlink($filename);
 	unlink($filename . '.info');
 	Header('Location: ' . $phpgw->link('/addressbook/index.php','cd=14'));
-?>
\ No newline at end of file
+?>
diff --git a/addressbook/vcardin.php b/addressbook/vcardin.php
index 82fb1b885b..5d724ba83c 100644
--- a/addressbook/vcardin.php
+++ b/addressbook/vcardin.php
@@ -30,6 +30,7 @@
   
 	// Some of the methods where borrowed from
 	// Squirrelmail <Luke Ehresman> http://www.squirrelmail.org
+	// (only the uploaddir naming anymore)
 	$sep = SEP;
 
 	$uploaddir = $phpgw_info["server"]["temp_dir"] . $sep;
@@ -48,7 +49,6 @@
 			fputs($ftp,"$uploadedfile_type\n$uploadedfile_name\n");
 			fclose($ftp);
 
-			// This has to be non-interactive in case of a multi-entry vcard.
 			$filename = $uploaddir . $newfilename;
 
 			$contacts = CreateObject("phpgwapi.contacts");
@@ -78,7 +78,6 @@
 			$entry = $vcard->in($buffer);
 			$contacts->add($phpgw_info["user"]["account_id"],$entry);
 
-			//parsevcard($filename,$access);
 			// Delete the temp file.
 			unlink($filename);
 			unlink($filename . ".info");