Merge pull request #12976 from annando/npf2

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

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 81e1476b584ac13f2bf939cb4bf93b04027b7fa7..715a2ba8f1fbf25ee13b25f9ecbd48df1cb6cc25 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -57,6 +57,7 @@ class BBCode
        const DIASPORA     = 3;
        const CONNECTORS   = 4;
        const TWITTER_API  = 5;
+       const NPF          = 6;
        const OSTATUS      = 7;
        const TWITTER      = 8;
        const BACKLINK     = 8;
@@ -548,7 +549,7 @@ class BBCode
 
        /*
         * The previously spacefied [noparse][ i ]italic[ /i ][/noparse],
-        * now turns back and the [noparse] tags are trimed
+        * now turns back and the [noparse] tags are trimmed
         * returning [i]italic[/i]
         *
         * @param array $match
@@ -1355,7 +1356,9 @@ class BBCode
 
                                /// @todo Have a closer look at the different html modes
                                // Handle attached links or videos
-                               if (in_array($simple_html, [self::MASTODON_API, self::TWITTER_API, self::ACTIVITYPUB])) {
+                               if ($simple_html == self::NPF) {
+                                       $text = self::removeAttachment($text);
+                               } elseif (in_array($simple_html, [self::MASTODON_API, self::TWITTER_API, self::ACTIVITYPUB])) {
                                        $text = self::replaceAttachment($text);
                                } elseif (!in_array($simple_html, [self::INTERNAL, self::EXTERNAL, self::CONNECTORS])) {
                                        $text = self::replaceAttachment($text, true);
@@ -1373,7 +1376,7 @@ class BBCode
                                        });
                                }
 
-                               // leave open the posibility of [map=something]
+                               // leave open the possibility of [map=something]
                                // this is replaced in Item::prepareBody() which has knowledge of the item location
                                if (strpos($text, '[/map]') !== false) {
                                        $text = preg_replace_callback(
@@ -1475,8 +1478,8 @@ class BBCode
                                        $text = preg_replace("/\[list=((?-i)I)\](.*?)\[\/list\]/ism", '</p><ul class="listupperroman" style="list-style-type: upper-roman;">$2</ul><p>', $text);
                                        $text = preg_replace("/\[list=((?-i)a)\](.*?)\[\/list\]/ism", '</p><ul class="listloweralpha" style="list-style-type: lower-alpha;">$2</ul><p>', $text);
                                        $text = preg_replace("/\[list=((?-i)A)\](.*?)\[\/list\]/ism", '</p><ul class="listupperalpha" style="list-style-type: upper-alpha;">$2</ul><p>', $text);
-                                       $text = preg_replace("/\[ul\](.*?)\[\/ul\]/ism", '</p><ul class="listbullet" style="list-style-type: circle;">$1</ul><p>', $text);
-                                       $text = preg_replace("/\[ol\](.*?)\[\/ol\]/ism", '</p><ul class="listdecimal" style="list-style-type: decimal;">$1</ul><p>', $text);
+                                       $text = preg_replace("/\[ul\](.*?)\[\/ul\]/ism", '</p><ul>$1</ul><p>', $text);
+                                       $text = preg_replace("/\[ol\](.*?)\[\/ol\]/ism", '</p><ol>$1</ol><p>', $text);
                                        $text = preg_replace("/\[li\](.*?)\[\/li\]/ism", '<li>$1</li>', $text);
                                }
 
@@ -1567,8 +1570,13 @@ class BBCode
                                        "/\[[iz]mg\=(.*?)\](.*?)\[\/[iz]mg\]/ism",
                                        function ($matches) use ($simple_html, $uriid) {
                                                $matches[1] = self::proxyUrl($matches[1], $simple_html, $uriid);
-                                               $matches[2] = htmlspecialchars($matches[2], ENT_COMPAT);
-                                               return '<img src="' . $matches[1] . '" alt="' . $matches[2] . '" title="' . $matches[2] . '">';
+                                               $alt = htmlspecialchars($matches[2], ENT_COMPAT);
+                                               // Fix for Markdown problems with Diaspora, see issue #12701
+                                               if (($simple_html != self::DIASPORA) || strpos($matches[2], '"') === false) {
+                                                       return '<img src="' . $matches[1] . '" alt="' . $alt . '" title="' . $alt . '">';
+                                               } else {
+                                                       return '<img src="' . $matches[1] . '" alt="' . $alt . '">';
+                                               }
                                        },
                                        $text
                                );
@@ -1600,7 +1608,18 @@ class BBCode
                                // Simplify "video" element
                                $text = preg_replace('(\[video[^\]]*?\ssrc\s?=\s?([^\s\]]+)[^\]]*?\].*?\[/video\])ism', '[video]$1[/video]', $text);
 
-                               if ($try_oembed) {
+                               if ($simple_html == self::NPF) {
+                                       $text = preg_replace(
+                                               "/\[video\](.*?)\[\/video\]/ism",
+                                               '</p><video src="$1" controls width="100%" height="auto">$1</video><p>',
+                                               $text
+                                       );
+                                       $text = preg_replace(
+                                               "/\[audio\](.*?)\[\/audio\]/ism",
+                                               '</p><audio src="$1" controls>$1">$1</audio><p>',
+                                               $text
+                                       );
+                               } elseif ($try_oembed) {
                                        // html5 video and audio
                                        $text = preg_replace(
                                                "/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4).*?)\[\/video\]/ism",