Improve html message rendering

Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
nextcloud · Nov 5, 2020 · 175240a · 175240a
1 parent b7de0e3
commit 175240a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/Controller/ProxyController.php b/lib/Controller/ProxyController.php
@@ -122,6 +122,13 @@ public function proxy(string $src): ProxyDownloadResponse {
 		$client = $this->clientService->newClient();
 		$response = $client->get($src);
 		$content = $response->getBody();
-		return new ProxyDownloadResponse($content, $src, 'application/octet-stream');
+
+		// Only proxy content type of svgs (fix display in chromium based browsers)
+		$contentType = $response->getHeader('Content-Type');
+		if ($contentType !== 'image/svg+xml') {
+			$contentType = 'application/octet-stream';
+		}
+
+		return new ProxyDownloadResponse($content, $src, $contentType);
 	}
 }
diff --git a/lib/Service/Html.php b/lib/Service/Html.php
@@ -120,6 +120,8 @@ public function sanitizeHtmlMailBody(string $mailBody, array $messageParameters,
 		$config->set('URI.Host', Util::getServerHostName());
 
 		$config->set('Filter.ExtractStyleBlocks', true);
+		$config->set('CSS.AllowTricky', true);
+		$config->set('CSS.Proprietary', true);
 
 		// Disable the cache since ownCloud has no really appcache
 		// TODO: Fix this - requires https://github.com/owncloud/core/issues/10767 to be fixed