Fallback to formatted name if available

carddav2fb.php

@@ -248,6 +248,7 @@ public function get_carddav_entries()
           $prefix = '';
           $suffix = '';
           $orgname = '';
+          $formattedname = '';
 
           // Build name Parts if existing ans switch to true in config
           if(isset($name_arr['prefixes']) and $this->config['prefix'])
@@ -262,6 +263,9 @@ public function get_carddav_entries()
           if(isset($org_arr['name']) and $this->config['orgname'])
             $orgname = trim($org_arr['name']);
 
+          if (isset($vcard_obj->fn[0]))
+            $formattedname = $vcard_obj->fn[0];
+
           $firstname = trim($name_arr['firstname']);
           $lastname = trim($name_arr['lastname']);
 
@@ -349,9 +353,13 @@ public function get_carddav_entries()
           // make sure to trim whitespaces and double spaces
           $name = trim(str_replace('  ', ' ', $name));
 
+          // perform a fallback to formatted name, if we don't have any name and formatted name is available
+          if(empty($name) and !empty($formattedname))
+            $name = $formattedname;
+
           if(empty($name))
           {
-            print '  WARNING: No fullname, lastname or orgname found!';
+            print '  WARNING: No fullname, lastname, orgname or formatted name found!' . PHP_EOL;
             $name = 'UNKNOWN';
           }