X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FJsonLD.php;h=926fa1437d46aa1cb4efac0c8d79fbdaf1527d2d;hb=c07cb2c8f31154cc424e99c95740d753501e09b7;hp=ec68375d65dca8dc5e3c027af387c95772dca69a;hpb=fb371e10486f535ffcb52569a55e185b5a78c015;p=friendica.git

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index ec68375d65..926fa1437d 100644
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -35,7 +35,7 @@ class JsonLD
 		}
 
 		if ($recursion > 5) {
-			Logger::log('jsonld bomb detected at: ' . $url);
+			Logger::error('jsonld bomb detected at: ' . $url);
 			exit();
 		}
 
@@ -68,7 +68,16 @@ class JsonLD
 		}
 		catch (Exception $e) {
 			$normalized = false;
-			Logger::log('normalise error:' . substr(print_r($e, true), 0, 10000), Logger::DEBUG);
+			$messages = [];
+			$currentException = $e;
+			do {
+				$messages[] = $currentException->getMessage();
+			} while($currentException = $currentException->getPrevious());
+
+			Logger::warning('JsonLD normalize error');
+			Logger::notice('JsonLD normalize error', ['messages' => $messages]);
+			Logger::info('JsonLD normalize error', ['trace' => $e->getTraceAsString()]);
+			Logger::debug('JsonLD normalize error', ['jsonobj' => $jsonobj]);
 		}
 
 		return $normalized;
@@ -94,9 +103,15 @@ class JsonLD
 			'diaspora' => (object)['@id' => 'https://diasporafoundation.org/ns/', '@type' => '@id'],
 			'ostatus' => (object)['@id' => 'http://ostatus.org#', '@type' => '@id'],
 			'dc' => (object)['@id' => 'http://purl.org/dc/terms/', '@type' => '@id'],
-			'toot' => (object)['@id' => 'http://joinmastodon.org/ns#', '@type' => '@id']];
+			'toot' => (object)['@id' => 'http://joinmastodon.org/ns#', '@type' => '@id'],
+			'litepub' => (object)['@id' => 'http://litepub.social/ns#', '@type' => '@id']];
+
+		// Preparation for adding possibly missing content to the context
+		if (!empty($json['@context']) && is_string($json['@context'])) {
+			$json['@context'] = [$json['@context']];
+		}
 
-		// Workaround for Nextcloud Social
+		// Workaround for servers with missing context
 		// See issue https://github.com/nextcloud/social/issues/330
 		if (!empty($json['@context']) && is_array($json['@context'])) {
 			$json['@context'][] = 'https://w3id.org/security/v1';
@@ -115,7 +130,9 @@ class JsonLD
 		}
 		catch (Exception $e) {
 			$compacted = false;
-			Logger::log('compacting error:' . substr(print_r($e, true), 0, 10000), Logger::DEBUG);
+			Logger::error('compacting error');
+			// Sooner or later we should log some details as well - but currently this leads to memory issues
+			// Logger::log('compacting error:' . substr(print_r($e, true), 0, 10000), Logger::DEBUG);
 		}
 
 		$json = json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
@@ -156,7 +173,7 @@ class JsonLD
 		foreach ($array[$element] as $entry) {
 			if (!is_array($entry)) {
 				$elements[] = $entry;
-			} elseif (!empty($entry[$key])) {
+			} elseif (isset($entry[$key])) {
 				$elements[] = $entry[$key];
 			} elseif (!empty($entry) || !is_array($entry)) {
 				$elements[] = $entry;