@@ -46,25 +46,25 @@ function mapContactToVCard($contactDetails, $role, $c) {
4646
4747 return [
4848 'objectClassName ' => 'entity ' ,
49- 'handle ' => [ $ contactDetails ['registrant_contact_id ' ] ],
49+ 'handle ' => $ contactDetails ['registrant_contact_id ' ],
5050 'roles ' => [$ role ],
5151 'vcardArray ' => [
5252 "vcard " ,
5353 [
5454 ['version ' , new stdClass (), 'text ' , '4.0 ' ],
5555 ["fn " , new stdClass (), 'text ' , $ c ['privacy ' ] ? $ redacted : $ contactDetails ['contact_first_name ' ] . ' ' . $ contactDetails ['contact_last_name ' ]],
5656 ["org " , new stdClass (), 'text ' , $ c ['privacy ' ] ? $ redacted : $ contactDetails ['contact_company ' ]],
57- ["adr " , new stdClass (), 'text ' , [
58- "" , // Post office box
57+ ["adr " , ["CC " => strtoupper ($ contactDetails ['contact_country ' ])], 'text ' , [
5958 $ c ['privacy ' ] ? $ redacted : $ contactDetails ['contact_address1 ' ], // Extended address
6059 $ c ['privacy ' ] ? $ redacted : $ contactDetails ['contact_address2 ' ], // Street address
61- $ c ['privacy ' ] ? $ redacted : $ contactDetails ['contact_city ' ], // Locality
62- $ c ['privacy ' ] ? $ redacted : $ contactDetails ['contact_state ' ], // Region
63- $ c ['privacy ' ] ? $ redacted : $ contactDetails ['contact_postcode ' ], // Postal code
64- $ c ['privacy ' ] ? $ redacted : strtoupper ($ contactDetails ['contact_country ' ]) // Country name
60+ $ c ['privacy ' ] ? $ redacted : $ contactDetails ['contact_city ' ], // Locality
61+ $ c ['privacy ' ] ? $ redacted : $ contactDetails ['contact_state ' ], // Region
62+ $ c ['privacy ' ] ? $ redacted : $ contactDetails ['contact_postcode ' ], // Postal code
63+ $ c ['privacy ' ] ? $ redacted : strtoupper ($ contactDetails ['contact_country ' ]), // Country name
64+ "" // Required empty last element
6565 ]],
66- ["tel " , new stdClass () , 'text ' , $ c ['privacy ' ] ? $ redacted : $ contactDetails ['contact_phone_cc ' ] . '. ' . $ contactDetails ['contact_phone ' ], [ " type " => " voice " ]],
67- ["tel " , new stdClass () , 'text ' , $ c ['privacy ' ] ? $ redacted : $ contactDetails ['fax ' ], [ " type " => " fax " ]],
66+ ["tel " , [ " type " => " voice " ] , 'text ' , $ c ['privacy ' ] ? $ redacted : $ contactDetails ['contact_phone_cc ' ] . '. ' . $ contactDetails ['contact_phone ' ]],
67+ ["tel " , [ " type " => " fax " ] , 'text ' , $ c ['privacy ' ] ? $ redacted : $ contactDetails ['fax ' ]],
6868 ["email " , new stdClass (), 'text ' , $ c ['privacy ' ] ? $ redacted : $ contactDetails ['contact_email ' ]]
6969 ]
7070 ],
0 commit comments