Skip to content

Commit 8bdbf1b

Browse files
authored
skip empty vcard addresses (#984)
1 parent ad3e30d commit 8bdbf1b

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

app/Http/Controllers/UserController.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,8 +409,12 @@ public function vcard(request $request)
409409
$vcard->addPhoneNumber($data['home_phone'], 'HOME');
410410
$vcard->addPhoneNumber($data['work_phone'], 'WORK');
411411
$vcard->addPhoneNumber($data['cell_phone'], 'CELL');
412-
$vcard->addAddress($data['home_address_street'], '', $data['home_address_city'], $data['home_address_state'], $data['home_address_zip'], $data['home_address_country'], 'HOME');
413-
$vcard->addAddress($data['work_address_street'], '', $data['work_address_city'], $data['work_address_state'], $data['work_address_zip'], $data['work_address_country'], 'WORK');
412+
if (array_filter([$data['home_address_street'], $data['home_address_city'], $data['home_address_state'], $data['home_address_zip'], $data['home_address_country']], fn ($part) => trim((string) $part) !== '')) {
413+
$vcard->addAddress($data['home_address_street'], '', $data['home_address_city'], $data['home_address_state'], $data['home_address_zip'], $data['home_address_country'], 'HOME');
414+
}
415+
if (array_filter([$data['work_address_street'], $data['work_address_city'], $data['work_address_state'], $data['work_address_zip'], $data['work_address_country']], fn ($part) => trim((string) $part) !== '')) {
416+
$vcard->addAddress($data['work_address_street'], '', $data['work_address_city'], $data['work_address_state'], $data['work_address_zip'], $data['work_address_country'], 'WORK');
417+
}
414418

415419

416420
// $vcard->addPhoto(base_path('img/1.png'));

0 commit comments

Comments
 (0)