diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php index be45fabf099..c43157f101c 100644 --- a/htdocs/contact/vcard.php +++ b/htdocs/contact/vcard.php @@ -61,13 +61,13 @@ $v->setName($contact->lastname, $contact->firstname, "", "", ""); $v->setFormattedName($contact->getFullName($langs)); // By default, all informations are for work (except phone_perso and phone_mobile) -$v->setPhoneNumber($contact->phone_pro, "PREF;WORK;VOICE"); -$v->setPhoneNumber($contact->phone_mobile, "CELL;VOICE"); -$v->setPhoneNumber($contact->fax, "WORK;FAX"); +$v->setPhoneNumber($contact->phone_pro, "TYPE=WORK;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:''), "WORK;POSTAL"); -$v->setLabel("", "", $contact->address, $contact->town, "", $contact->zip, ($contact->country_code?$contact->country:''), "WORK"); -$v->setEmail($contact->email,'internet,pref'); +$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); $v->setTitle($contact->poste); @@ -75,17 +75,17 @@ $v->setTitle($contact->poste); // Data from linked company if ($company->id) { - $v->setURL($company->url, "WORK"); - if (! $contact->phone_pro) $v->setPhoneNumber($company->phone, "WORK;VOICE"); - if (! $contact->fax) $v->setPhoneNumber($company->fax, "WORK;FAX"); - if (! $contact->zip) $v->setAddress("", "", $company->address, $company->town, "", $company->zip, $company->country, "WORK;POSTAL"); - if ($company->email != $contact->email) $v->setEmail($company->email,'internet'); + $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 ($company->email != $contact->email) $v->setEmail($company->email,'TYPE=PREF,INTERNET'); // Si contact lie a un tiers non de type "particulier" if ($contact->typent_code != 'TE_PRIVATE') $v->setOrg($company->name); } // Personal informations -$v->setPhoneNumber($contact->phone_perso, "HOME;VOICE"); +$v->setPhoneNumber($contact->phone_perso, "TYPE=HOME;VOICE"); if ($contact->birthday) $v->setBirthday($contact->birthday); $db->close();