From dd4d8a56bc8e1ae28686b9b86ded2bef306db361 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Wed, 21 Mar 2001 00:25:50 +0000
Subject: [PATCH] Fix parsing of birthday and label, still some issues

---
 addressbook/vcardout.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/addressbook/vcardout.php b/addressbook/vcardout.php
index ad66d9be03..61e8ecbb6d 100644
--- a/addressbook/vcardout.php
+++ b/addressbook/vcardout.php
@@ -96,7 +96,13 @@
 
 	$company      = $fields["org_name"];
 	$dept         = $fields["org_unit"];
+	
 	$bday         = $fields["bday"];
+	$tmp = split("/",$bday); # 12/31/1969 -> 1969-12-31
+	if ($tmp[0]) {
+		$bday = $tmp[2]."-".$tmp[0]."/".$tmp[1];
+	}
+
 	$notes        = ereg_replace("\r\n","=0A",$fields["note"]);
 	$access       = $fields["access"];
 	$url          = $fields["url"];
@@ -153,10 +159,11 @@
 				$astreet,$acity,$astate,$azip,$acountry);
 		}
 		if ($label) {
-			printf("LABEL;WORK;QUOTED-PRINTABLE:%s\r\n",$label);
+			$label = ereg_replace("\n","=0D=0A",$label);
+			printf("LABEL;WORK;QUOTED-PRINTABLE:%s\n",$label);
 		} else {
 			if ($address2 && $astreet && $acity && $astate && $azip && $acountry) {
-				printf("LABEL;WORK;QUOTED-PRINTABLE:%s=0A%s=0A%s,%s  %s=0A%s\r\n",$address2,$astreet,$acity,$astate,$azip,$acountry);
+				printf("LABEL;WORK;QUOTED-PRINTABLE:%s=0D=0A%s=0D=0A%s,%s  %s=0D=0A%s\n",$address2,$astreet,$acity,$astate,$azip,$acountry);
 			}
 		}
 		// end 'A' grouping
@@ -175,7 +182,7 @@
 				$bcity,$bstate,$bzip,$bcountry);
 		}
 		if ($bstreet && $bcity && $bstate && $bzip && $bcountry) {
-			printf("LABEL;HOME;QUOTED-PRINTABLE:%s=0A%s,%s  %s=0A%s\r\n",$bstreet,$bcity,$bstate,$bzip,$bcountry);
+			printf("LABEL;HOME;QUOTED-PRINTABLE:%s=0D=0A%s,%s  %s=0D=0A%s\n",$bstreet,$bcity,$bstate,$bzip,$bcountry);
 		}
 
 		if ($url) {