Change getBySelfURL to use same node interpretation logic as getAll

rapidwebltd · Nov 18, 2016 · f98d20f · f98d20f
1 parent ff2bf5e
commit f98d20f
Showing 1 changed file with 21 additions and 7 deletions.
diff --git a/factories/ContactFactory.php b/factories/ContactFactory.php
@@ -105,14 +105,28 @@ public static function getBySelfURL($selfURL)
         }
 
         $contactGDNodes = $xmlContactsEntry->children('http://schemas.google.com/g/2005');
-
         foreach ($contactGDNodes as $key => $value) {
-            $attributes = $value->attributes();
-
-            if ($key == 'email') {
-                $contactDetails[$key] = (string) $attributes['address'];
-            } else {
-                $contactDetails[$key] = (string) $value;
+            switch ($key) {
+                case 'organization':
+                    $contactDetails[$key]['orgName'] = (string) $value->orgName;
+                    $contactDetails[$key]['orgTitle'] = (string) $value->orgTitle;
+                    break;
+                case 'email':
+                    $attributes = $value->attributes();
+                    $emailadress = (string) $attributes['address'];
+                    $emailtype = substr(strstr($attributes['rel'], '#'), 1);
+                    $contactDetails[$key][] = ['type' => $emailtype, 'email' => $emailadress];
+                    break;
+                case 'phoneNumber':
+                    $attributes = $value->attributes();
+                    $uri = (string) $attributes['uri'];
+                    $type = substr(strstr($attributes['rel'], '#'), 1);
+                    $e164 = substr(strstr($uri, ':'), 1);
+                    $contactDetails[$key][] = ['type' => $type, 'number' => $e164];
+                    break;
+                default:
+                    $contactDetails[$key] = (string) $value;
+                    break;
             }
         }