Skip to content

Commit 9d87f1c

Browse files
chaochaoweb3JulianPrieber
authored andcommitted
skip empty vcard addresses (#984)
1 parent 1878570 commit 9d87f1c

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
@@ -405,8 +405,12 @@ public function vcard(request $request)
405405
$vcard->addPhoneNumber($data['home_phone'], 'HOME');
406406
$vcard->addPhoneNumber($data['work_phone'], 'WORK');
407407
$vcard->addPhoneNumber($data['cell_phone'], 'CELL');
408-
$vcard->addAddress($data['home_address_street'], '', $data['home_address_city'], $data['home_address_state'], $data['home_address_zip'], $data['home_address_country'], 'HOME');
409-
$vcard->addAddress($data['work_address_street'], '', $data['work_address_city'], $data['work_address_state'], $data['work_address_zip'], $data['work_address_country'], 'WORK');
408+
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) !== '')) {
409+
$vcard->addAddress($data['home_address_street'], '', $data['home_address_city'], $data['home_address_state'], $data['home_address_zip'], $data['home_address_country'], 'HOME');
410+
}
411+
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) !== '')) {
412+
$vcard->addAddress($data['work_address_street'], '', $data['work_address_city'], $data['work_address_state'], $data['work_address_zip'], $data['work_address_country'], 'WORK');
413+
}
410414

411415

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

0 commit comments

Comments
 (0)