fixes #847

Signed-off-by: Arne Hamann <[email protected]>
nextcloud · Sep 6, 2022 · d8057ba · d8057ba
1 parent 7820f97
commit d8057ba
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/Controller/ContactsController.php b/lib/Controller/ContactsController.php
@@ -71,28 +71,28 @@ public function getContacts(): DataResponse {
                 // if the contact has a geo attibute use it
                 if (key_exists('GEO', $c)) {
                     $geo = $c['GEO'];
-                    if (strlen($geo) > 1) {
+                    if (is_string($geo) && strlen($geo) > 1) {
                         $result[] = [
 							'FN' => $c['FN'] ?? $this->N2FN($c['N']) ?? '???',
 							'URI' => $c['URI'],
 							'UID' => $c['UID'],
 							'ADR' => '',
 							'ADRTYPE' => '',
-							'HAS_PHOTO' => (isset($c['PHOTO']) && $c['PHOTO'] !== null),
+							'HAS_PHOTO' => (isset($c['PHOTO'])),
 							'BOOKID' => $c['addressbook-key'],
 							'BOOKURI' => $addressBookUri,
 							'GEO' => $geo,
 							'GROUPS' => $c['CATEGORIES'] ?? null
 						];
-                    } elseif (count($geo)>0) {
+                    } elseif (is_countable($geo) && count($geo)>0 && is_iterable($geo)) {
 						foreach ($geo as $g) {
 							$result[] = [
 								'FN' => $c['FN'] ?? $this->N2FN($c['N']) ?? '???',
 								'URI' => $c['URI'],
 								'UID' => $c['UID'],
 								'ADR' => '',
 								'ADRTYPE' => '',
-								'HAS_PHOTO' => (isset($c['PHOTO']) && $c['PHOTO'] !== null),
+								'HAS_PHOTO' => (isset($c['PHOTO'])),
 								'BOOKID' => $c['addressbook-key'],
 								'BOOKURI' => $addressBookUri,
 								'GEO' => $g,