all endpoints are now working

[friendica.git] / src / Util / JsonLD.php

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index e8ff5888dea15d5a0463aedabc69f650d8ad0ce8..600896715a5d2b2e4201d0bf37b6938b265e786a 100644 (file)
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -40,11 +40,26 @@ class JsonLD
                return $data;
        }
 
+       private static function objectify($element)
+       {
+               if (is_array($element)) {
+                       $keys = array_keys($element);
+                       if (is_int(array_pop($keys))) {
+                               return array_map('objectify', $element);
+                       } else {
+                               return (object)array_map('objectify', $element);
+                       }
+               } else {
+                       return $element;
+               }
+       }
+
        public static function normalize($json)
        {
                jsonld_set_document_loader('Friendica\Util\JsonLD::documentLoader');
 
-               $jsonobj = json_decode(json_encode($json));
+//             $jsonobj = array_map('Friendica\Util\JsonLD::objectify', $json);
+               $jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
 
                return jsonld_normalize($jsonobj, array('algorithm' => 'URDNA2015', 'format' => 'application/nquads'));
        }
@@ -59,10 +74,45 @@ class JsonLD
                        'vcard' => (object)['@id' => 'http://www.w3.org/2006/vcard/ns#', '@type' => '@id'],
                        'uuid' => (object)['@id' => 'http://schema.org/identifier', '@type' => '@id']];
 
-               $jsonobj = json_decode(json_encode($json));
+               $jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
 
                $compacted = jsonld_compact($jsonobj, $context);
 
-               return json_decode(json_encode($compacted), true);
+               return json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
+       }
+
+       public static function fetchElement($array, $element, $key, $type = null, $type_value = null)
+       {
+               if (empty($array)) {
+                       return false;
+               }
+
+               if (empty($array[$element])) {
+                       return false;
+               }
+
+               if (is_string($array[$element])) {
+                       return $array[$element];
+               }
+
+               if (is_null($type_value)) {
+                       if (!empty($array[$element][$key])) {
+                               return $array[$element][$key];
+                       }
+
+                       if (!empty($array[$element][0][$key])) {
+                               return $array[$element][0][$key];
+                       }
+
+                       return false;
+               }
+
+               if (!empty($array[$element][$key]) && !empty($array[$element][$type]) && ($array[$element][$type] == $type_value)) {
+                       return $array[$element][$key];
+               }
+
+               /// @todo Add array search
+
+               return false;
        }
 }