From cab4f35438a391fff7301c21320bc2fb7efbf1a0 Mon Sep 17 00:00:00 2001
From: Tobias Sekan <tobias.sekan@startmail.com>
Date: Fri, 24 Apr 2020 14:01:08 +0200
Subject: [PATCH] fix missing vcard values

---
 htdocs/contact/vcard.php | 60 ++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 15 deletions(-)

diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
index 297cadac0be..bf1e8528960 100644
--- a/htdocs/contact/vcard.php
+++ b/htdocs/contact/vcard.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2020		Tobias Sekan		<tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,19 +38,19 @@ $id = GETPOST('id', 'int');
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
 
 
-$result = $contact->fetch($id);
+$result=$contact->fetch($id);
 if ($result <= 0)
 {
 	dol_print_error($contact->error);
 	exit;
 }
 
-$physicalperson = 1;
+$physicalperson=1;
 
 $company = new Societe($db);
 if ($contact->socid)
 {
-	$result = $company->fetch($contact->socid);
+	$result=$company->fetch($contact->socid);
 }
 
 // We create VCard
@@ -57,29 +58,58 @@ $v = new vCard();
 $v->setProdId('Dolibarr '.DOL_VERSION);
 
 $v->setUid('DOLIBARR-CONTACTID-'.$contact->id);
-$v->setName($contact->lastname, $contact->firstname, "", "", "");
-$v->setFormattedName($contact->getFullName($langs));
+$v->setName($contact->lastname, $contact->firstname, "", $contact->civility, "");
+$v->setFormattedName($contact->getFullName($langs, 1));
 
-// By default, all informations are for work (except phone_perso and phone_mobile)
 $v->setPhoneNumber($contact->phone_pro, "TYPE=WORK;VOICE");
+//$v->setPhoneNumber($contact->phone_perso,"TYPE=HOME;VOICE");
 $v->setPhoneNumber($contact->phone_mobile, "TYPE=CELL;VOICE");
 $v->setPhoneNumber($contact->fax, "TYPE=WORK;FAX");
 
-$v->setAddress("", "", $contact->address, $contact->town, "", $contact->zip, ($contact->country_code ? $contact->country : ''), "TYPE=WORK;POSTAL");
-$v->setLabel("", "", $contact->address, $contact->town, "", $contact->zip, ($contact->country_code ? $contact->country : ''), "TYPE=WORK");
-$v->setEmail($contact->email, 'TYPE=PREF,INTERNET');
-$v->setNote($contact->note);
+$country = $contact->country_code ? $contact->country : '' ;
 
+$v->setAddress("", "", $contact->address, $contact->town, $contact->state, $contact->zip, $country, "TYPE=WORK;POSTAL");
+$v->setLabel("", "", $contact->address, $contact->town, $contact->state, $contact->zip, $country, "TYPE=WORK");
+
+$v->setEmail($contact->email);
+$v->setNote($contact->note);
 $v->setTitle($contact->poste);
 
 // Data from linked company
 if ($company->id)
 {
 	$v->setURL($company->url, "TYPE=WORK");
-	if (!$contact->phone_pro) $v->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
-	if (!$contact->fax)       $v->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
-	if (!$contact->zip)        $v->setAddress("", "", $company->address, $company->town, "", $company->zip, $company->country, "TYPE=WORK;POSTAL");
-	if (empty($contact->email)) $v->setEmail($company->email, 'TYPE=PREF,INTERNET');
+	if (! $contact->phone_pro) $v->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
+	if (! $contact->fax)       $v->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
+	if (! $contact->zip)       $v->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK;POSTAL");
+
+	// when company e-mail is empty, use only contact e-mail
+	if (empty(trim($company->email)))
+	{
+		// was set before, don't set twice
+	}
+	// when contact e-mail is empty, use only company e-mail
+	elseif (empty(trim($contact->email)))
+	{
+		$v->setEmail($company->email);
+	}
+	// when e-mail domain of contact and company are the same, use contact e-mail at first (and company e-mail at second)
+	elseif (strtolower(end(explode("@", $contact->email))) == strtolower(end(explode("@", $company->email))))
+	{
+		$v->setEmail($contact->email);
+
+		// support by Microsoft Outlook (2019 and possible earlier)
+		$v->setEmail($company->email, 'INTERNET');
+	}
+	// when e-mail of contact and company complete different use company e-mail at first (and contact e-mail at second)
+	else
+	{
+		$v->setEmail($company->email);
+
+		// support by Microsoft Outlook (2019 and possible earlier)
+		$v->setEmail($contact->email, 'INTERNET');
+	}
+
 	// Si contact lie a un tiers non de type "particulier"
 	if ($contact->typent_code != 'TE_PRIVATE') $v->setOrg($company->name);
 }
@@ -95,7 +125,7 @@ $db->close();
 
 $output = $v->getVCard();
 
-$filename = trim(urldecode($v->getFileName())); // "Nom prenom.vcf"
+$filename =trim(urldecode($v->getFileName()));      // "Nom prenom.vcf"
 $filenameurlencoded = dol_sanitizeFileName(urlencode($filename));
 //$filename = dol_sanitizeFileName($filename);