X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FJsonLD.php;h=bed7a67d60a01eeccf58bc6a312f6f363541f4b6;hb=0a9dba005c0c70302e37ab4ce7f9598984ec9953;hp=a581892939c2fce4f0724c1769c8bda7ff05b134;hpb=28b4fdb1c367981c842c64ef10cbd804a97f1696;p=friendica.git

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index a581892939..bed7a67d60 100644
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -5,6 +5,7 @@
 namespace Friendica\Util;
 
 use Friendica\Core\Cache;
+use Friendica\Core\Logger;
 use Exception;
 
 /**
@@ -33,7 +34,7 @@ class JsonLD
 		}
 
 		if ($recursion > 5) {
-			logger('jsonld bomb detected at: ' . $url);
+			Logger::log('jsonld bomb detected at: ' . $url);
 			exit();
 		}
 
@@ -43,7 +44,7 @@ class JsonLD
 		}
 
 		$data = jsonld_default_document_loader($url);
-		Cache::set('documentLoader:' . $url, $data, CACHE_DAY);
+		Cache::set('documentLoader:' . $url, $data, Cache::DAY);
 		return $data;
 	}
 
@@ -65,7 +66,7 @@ class JsonLD
 		}
 		catch (Exception $e) {
 			$normalized = false;
-			logger('normalise error:' . print_r($e, true), LOGGER_DEBUG);
+			Logger::log('normalise error:' . print_r($e, true), Logger::DEBUG);
 		}
 
 		return $normalized;
@@ -84,15 +85,23 @@ class JsonLD
 
 		$context = (object)['as' => 'https://www.w3.org/ns/activitystreams#',
 			'w3id' => 'https://w3id.org/security#',
+			'ldp' => (object)['@id' => 'http://www.w3.org/ns/ldp#', '@type' => '@id'],
 			'vcard' => (object)['@id' => 'http://www.w3.org/2006/vcard/ns#', '@type' => '@id'],
-			'ostatus' => (object)['@id' => 'http://ostatus.org#', '@type' => '@id'],
+			'dfrn' => (object)['@id' => 'http://purl.org/macgirvin/dfrn/1.0/', '@type' => '@id'],
 			'diaspora' => (object)['@id' => 'https://diasporafoundation.org/ns/', '@type' => '@id'],
-			'dc' => (object)['@id' => 'http://purl.org/dc/terms/', '@type' => '@id'],
-			'uuid' => (object)['@id' => 'http://schema.org/identifier', '@type' => '@id']];
+			'ostatus' => (object)['@id' => 'http://ostatus.org#', '@type' => '@id'],
+			'dc' => (object)['@id' => 'http://purl.org/dc/terms/', '@type' => '@id']];
 
 		$jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
 
-		$compacted = jsonld_compact($jsonobj, $context);
+
+		try {
+			$compacted = jsonld_compact($jsonobj, $context);
+		}
+		catch (Exception $e) {
+			$compacted = false;
+			Logger::log('compacting error:' . print_r($e, true), Logger::DEBUG);
+		}
 
 		return json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
 	}
@@ -128,7 +137,7 @@ class JsonLD
 				$elements[] = $entry;
 			} elseif (!empty($entry[$key])) {
 				$elements[] = $entry[$key];
-			} else {
+			} elseif (!empty($entry) || !is_array($entry)) {
 				$elements[] = $entry;
 			}
 		}