Improved code / updated messages.po

[friendica.git] / src / Content / Text / HTML.php

diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index ebd74121b11552414cca0473c9fd305867326614..5ad66e85ea2c941a6a857236d8594bc94c4616d5 100644 (file)
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,7 +24,6 @@ namespace Friendica\Content\Text;
 use DOMDocument;
 use DOMXPath;
 use Friendica\Protocol\HTTP\MediaType;
-use Friendica\Content\Widget\ContactBlock;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;
@@ -281,9 +280,9 @@ class HTML
                        self::tagToBBCode($doc, 'div', [], "\r", "\r");
                        self::tagToBBCode($doc, 'p', [], "\n", "\n");
 
-                       self::tagToBBCode($doc, 'ul', [], "[ul]", "[/ul]");
-                       self::tagToBBCode($doc, 'ol', [], "[ol]", "[/ol]");
-                       self::tagToBBCode($doc, 'li', [], "[*]", "");
+                       self::tagToBBCode($doc, 'ul', [], "[ul]", "\n[/ul]");
+                       self::tagToBBCode($doc, 'ol', [], "[ol]", "\n[/ol]");
+                       self::tagToBBCode($doc, 'li', [], "\n[li]", "[/li]");
 
                        self::tagToBBCode($doc, 'hr', [], "[hr]", "");
 
@@ -349,33 +348,6 @@ class HTML
                                $message = str_replace("\n\n\n", "\n\n", $message);
                        } while ($oldmessage != $message);
 
-                       do {
-                               $oldmessage = $message;
-                               $message = str_replace(
-                                       [
-                                               "[/size]\n\n",
-                                               "\n[hr]",
-                                               "[hr]\n",
-                                               "\n[list",
-                                               "[/list]\n",
-                                               "\n[/",
-                                               "[list]\n",
-                                               "[list=1]\n",
-                                               "\n[*]"],
-                                       [
-                                               "[/size]\n",
-                                               "[hr]",
-                                               "[hr]",
-                                               "[list",
-                                               "[/list]",
-                                               "[/",
-                                               "[list]",
-                                               "[list=1]",
-                                               "[*]"],
-                                       $message
-                               );
-                       } while ($message != $oldmessage);
-
                        $message = str_replace(
                                ['[b][b]', '[/b][/b]', '[i][i]', '[/i][/i]'],
                                ['[b]', '[/b]', '[i]', '[/i]'],
@@ -450,7 +422,8 @@ class HTML
        {
                $URLSearchString = "^\[\]";
 
-               $matches = ["/\[url\=([$URLSearchString]*)\].*?\[\/url\]/ism",
+               $matches = [
+                       "/\[url\=([$URLSearchString]*)\].*?\[\/url\]/ism",
                        "/\[url\]([$URLSearchString]*)\[\/url\]/ism",
                        "/\[img\=[0-9]*x[0-9]*\](.*?)\[\/img\]/ism",
                        "/\[img\](.*?)\[\/img\]/ism",
@@ -559,8 +532,10 @@ class HTML
                        $ignore = false;
 
                        // A list of some links that should be ignored
-                       $list = ["/user/", "/tag/", "/group/", "/profile/", "/search?search=", "/search?tag=", "mailto:", "/u/", "/node/",
-                               "//plus.google.com/", "//twitter.com/"];
+                       $list = [
+                               "/user/", "/tag/", "/group/", "/circle/", "/profile/", "/search?search=", "/search?tag=", "mailto:", "/u/", "/node/",
+                               "//plus.google.com/", "//twitter.com/"
+                       ];
                        foreach ($list as $listitem) {
                                if (strpos($treffer[1], $listitem) !== false) {
                                        $ignore = true;
@@ -869,7 +844,7 @@ class HTML
         *
         * @param string $s     Search query.
         * @param string $id    HTML id
-        * @param bool   $aside Display the search widgit aside.
+        * @param bool   $aside Display the search widget aside.
         *
         * @return string Formatted HTML.
         * @throws \Exception
@@ -889,7 +864,7 @@ class HTML
                        '$id'           => $id,
                        '$search_label' => DI::l10n()->t('Search'),
                        '$save_label'   => $save_label,
-                       '$search_hint'  => DI::l10n()->t('@name, !forum, #tags, content'),
+                       '$search_hint'  => DI::l10n()->t('@name, !group, #tags, content'),
                        '$mode'         => $mode,
                        '$return_url'   => urlencode(Search::getSearchPath($s)),
                ];
@@ -902,7 +877,7 @@ class HTML
                        ];
 
                        if (DI::config()->get('system', 'poco_local_search')) {
-                               $values['$searchoption']['forums'] = DI::l10n()->t('Forums');
+                               $values['$searchoption']['groups'] = DI::l10n()->t('Groups');
                        }
                }
 
@@ -969,7 +944,8 @@ class HTML
                        $domain = '(?:(?!-)[A-Za-z0-9-]{1,63}(?<!-)\.)*' . preg_quote(trim($domain, '/'), '%');
                });
 
-               $config->set('URI.SafeIframeRegexp',
+               $config->set(
+                       'URI.SafeIframeRegexp',
                        '%^https://(?:
                                ' . implode('|', $allowedIframeDomains) . '
                        )
@@ -1078,7 +1054,8 @@ class HTML
                        if (isset($mediaType->parameters['charset'])) {
                                return strtolower($mediaType->parameters['charset']);
                        }
-               } catch(\InvalidArgumentException $e) {}
+               } catch (\InvalidArgumentException $e) {
+               }
 
                return null;
        }