Merge pull request #87 from nextcloud/fix-contact-noname

refs #85 fix bug with unnamed contacts

Author: Julien Veyssier

lib/Controller/ContactsController.php

@@ -70,7 +70,7 @@ public function getContacts() {
                     $geo = $c['GEO'];
                     if (strlen($geo) > 1) {
                         array_push($result, [
-                            'FN'=>$c['FN'],
+                            'FN'=>$c['FN'] ?? $this->N2FN($c['N']) ?? '???',
                             'URI'=>$c['URI'],
                             'UID'=>$c['UID'],
                             'ADR'=>'',
@@ -98,7 +98,7 @@ public function getContacts() {
                         }
                         if (strlen($geo) > 1) {
                             array_push($result, [
-                                'FN'=>$c['FN'],
+                                'FN'=>$c['FN'] ?? $this->N2FN($c['N']) ?? '???',
                                 'URI'=>$c['URI'],
                                 'UID'=>$c['UID'],
                                 'ADR'=>$adr->getValue(),
@@ -117,6 +117,21 @@ public function getContacts() {
         return new DataResponse($result);
     }
 
+    private function N2FN(string $n) {
+        if ($n) {
+            $spl = explode($n, ';');
+            if (count($spl) >= 4) {
+                return $spl[3] + ' ' + $spl[1] + ' ' + $spl[0];
+            }
+            else {
+                return null;
+            }
+        }
+        else {
+            return null;
+        }
+    }
+
     /**
      * get all contacts
      * @NoAdminRequired
@@ -133,7 +148,7 @@ public function getAllContacts() {
                 strcmp($uid, $userid) !== 0
             ) {
                 array_push($result, [
-                    'FN'=>$c['FN'],
+                    'FN'=>$c['FN'] ?? $this->N2FN($c['N']) ?? '???',
                     'URI'=>$c['URI'],
                     'UID'=>$c['UID'],
                     'BOOKID'=>$c['addressbook-key'],