From 3fcafd1d5019251fed40a1ac4fa34402d22796dd Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 10 Jan 2023 01:08:34 -0500
Subject: [PATCH] Replace HTML regular expression by HTML::extractCharset in
ParseUrl::getSiteInfo
- Address https://github.com/friendica/friendica/issues/12488#issuecomment-1374537440
---
src/Util/ParseUrl.php | 30 +++++++++++-------------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index f21528353d..9d19a4ebac 100644
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -24,6 +24,8 @@ namespace Friendica\Util;
use DOMDocument;
use DOMXPath;
use Friendica\Content\OEmbed;
+use Friendica\Content\Text\HTML;
+use Friendica\Protocol\HTTP\MediaType;
use Friendica\Core\Hook;
use Friendica\Core\Logger;
use Friendica\Database\Database;
@@ -283,25 +285,13 @@ class ParseUrl
}
$charset = '';
- // Look for a charset, first in headers
- // Expected form: Content-Type: text/html; charset=ISO-8859-4
- if (preg_match('/charset=([a-z0-9-_.\/]+)/i', $curlResult->getContentType(), $matches)) {
- $charset = trim(trim(trim(array_pop($matches)), ';,'));
- } else {
- // Then in body that gets precedence
- // Expected forms:
- // - <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- // - <meta charset="utf-8">
- // - <meta charset=utf-8>
- // - <meta charSet="utf-8">
- // We escape <style> and <script> tags since they can contain irrelevant charset information
- // (see https://github.com/friendica/friendica/issues/9251#issuecomment-698636806)
- Strings::performWithEscapedBlocks($body, '#<(?:style|script).*?</(?:style|script)>#ism', function ($body) use (&$charset) {
- if (preg_match('/charset=["\']?([a-z0-9-_.\/]+)/i', $body, $matches)) {
- $charset = trim(trim(trim(array_pop($matches)), ';,'));
- }
- });
- }
+ try {
+ // Look for a charset, first in headers
+ $mediaType = MediaType::fromContentType($curlResult->getContentType());
+ if (isset($mediaType->parameters['charset'])) {
+ $charset = $mediaType->parameters['charset'];
+ }
+ } catch(\InvalidArgumentException $e) {}
$siteinfo['charset'] = $charset;
@@ -322,6 +312,8 @@ class ParseUrl
$doc = new DOMDocument();
@$doc->loadHTML($body);
+ $siteinfo['charset'] = HTML::extractCharset($doc) ?? $siteinfo['charset'];
+
XML::deleteNode($doc, 'style');
XML::deleteNode($doc, 'option');
XML::deleteNode($doc, 'h1');
--
2.39.5