Use constants for the BBCode modes

diff --git a/include/api.php b/include/api.php
index 764664ff6d6db94609fd6d37acbc261b31bb17fa..d5c64073a4635e6227745682bc3b992ab95162d9 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -2491,10 +2491,10 @@ function api_format_messages($item, $recipient, $sender)
                if ($_GET['getText'] == 'html') {
                        $ret['text'] = BBCode::convert($item['body'], false);
                } elseif ($_GET['getText'] == 'plain') {
-                       $ret['text'] = trim(HTML::toPlaintext(BBCode::convert(api_clean_plain_items($item['body']), false, 2, true), 0));
+                       $ret['text'] = trim(HTML::toPlaintext(BBCode::convert(api_clean_plain_items($item['body']), false, BBCode::API, true), 0));
                }
        } else {
-               $ret['text'] = $item['title'] . "\n" . HTML::toPlaintext(BBCode::convert(api_clean_plain_items($item['body']), false, 2, true), 0);
+               $ret['text'] = $item['title'] . "\n" . HTML::toPlaintext(BBCode::convert(api_clean_plain_items($item['body']), false, BBCode::API, true), 0);
        }
        if (!empty($_GET['getUserObjects']) && $_GET['getUserObjects'] == 'false') {
                unset($ret['sender']);
@@ -2520,7 +2520,7 @@ function api_convert_item($item)
        $attachments = api_get_attachments($body);
 
        // Workaround for ostatus messages where the title is identically to the body
-       $html = BBCode::convert(api_clean_plain_items($body), false, 2, true);
+       $html = BBCode::convert(api_clean_plain_items($body), false, BBCode::API, true);
        $statusbody = trim(HTML::toPlaintext($html, 0));
 
        // handle data: images

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 25a6d0d897c08dbd14f3b96c3e4b3a5f392eab2a..4d4dc11fc4594bdb317fde364e68130ed79c8f6a 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -48,6 +48,15 @@ use Friendica\Util\XML;
 
 class BBCode
 {
+       const INTERNAL = 0;
+       const API = 2;
+       const DIASPORA = 3;
+       const CONNECTORS = 4;
+       const OSTATUS = 7;
+       const TWITTER = 8;
+       const BACKLINK = 8;
+       const ACTIVITYPUB = 9;
+
        /**
         * Fetches attachment data that were generated the old way
         *
@@ -439,10 +448,10 @@ class BBCode
                return $naked_text;
        }
 
-       private static function proxyUrl($image, $simplehtml = false)
+       private static function proxyUrl($image, $simplehtml = BBCode::INTERNAL)
        {
                // Only send proxied pictures to API and for internal display
-               if (in_array($simplehtml, [false, 2])) {
+               if (in_array($simplehtml, [BBCode::INTERNAL, BBCode::API])) {
                        return ProxyUtils::proxifyUrl($image);
                } else {
                        return $image;
@@ -605,13 +614,13 @@ class BBCode
         *
         * Note: Can produce a [bookmark] tag in the returned string
         *
-        * @param string   $text
-        * @param bool|int $simplehtml
-        * @param bool     $tryoembed
+        * @param string  $text
+        * @param integer $simplehtml
+        * @param bool    $tryoembed
         * @return string
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private static function convertAttachment($text, $simplehtml = false, $tryoembed = true)
+       private static function convertAttachment($text, $simplehtml = BBCode::INTERNAL, $tryoembed = true)
        {
                $data = self::getAttachmentData($text);
                if (empty($data) || empty($data['url'])) {
@@ -640,7 +649,7 @@ class BBCode
                } catch (Exception $e) {
                        $data['title'] = ($data['title'] ?? '') ?: $data['url'];
 
-                       if ($simplehtml != 4) {
+                       if ($simplehtml != BBCode::CONNECTORS) {
                                $return = sprintf('<div class="type-%s">', $data['type']);
                        }
 
@@ -667,7 +676,7 @@ class BBCode
                                $return .= sprintf('<sup><a href="%s">%s</a></sup>', $data['url'], parse_url($data['url'], PHP_URL_HOST));
                        }
 
-                       if ($simplehtml != 4) {
+                       if ($simplehtml != BBCode::CONNECTORS) {
                                $return .= '</div>';
                        }
                }
@@ -1025,13 +1034,10 @@ class BBCode
                $mention = Protocol::formatMention($attributes['profile'], $attributes['author']);
 
                switch ($simplehtml) {
-                       case 1:
-                               $text = ($is_quote_share? '<br />' : '') . '<p>' . html_entity_decode('&#x2672; ', ENT_QUOTES, 'UTF-8') . ' <a href="' . $attributes['profile'] . '">' . $mention . '</a>: </p>' . "\n" . '«' . $content . '»';
-                               break;
-                       case 2:
+                       case self::API:
                                $text = ($is_quote_share? '<br />' : '') . '<p>' . html_entity_decode('&#x2672; ', ENT_QUOTES, 'UTF-8') . ' ' . $author_contact['addr'] . ': </p>' . "\n" . $content;
                                break;
-                       case 3: // Diaspora
+                       case self::DIASPORA:
                                if (stripos(Strings::normaliseLink($attributes['link']), 'http://twitter.com/') === 0) {
                                        $text = ($is_quote_share? '<hr />' : '') . '<p><a href="' . $attributes['link'] . '">' . $attributes['link'] . '</a></p>' . "\n";
                                } else {
@@ -1049,7 +1055,7 @@ class BBCode
                                }
 
                                break;
-                       case 4:
+                       case self::CONNECTORS:
                                $headline = '<p><b>' . html_entity_decode('&#x2672; ', ENT_QUOTES, 'UTF-8');
                                $headline .= DI::l10n()->t('<a href="%1$s" target="_blank" rel="noopener noreferrer">%2$s</a> %3$s', $attributes['link'], $mention, $attributes['posted']);
                                $headline .= ':</b></p>' . "\n";
@@ -1057,13 +1063,10 @@ class BBCode
                                $text = ($is_quote_share? '<hr />' : '') . $headline . '<blockquote class="shared_content">' . trim($content) . '</blockquote>' . "\n";
 
                                break;
-                       case 5:
-                               $text = ($is_quote_share? '<br />' : '') . '<p>' . html_entity_decode('&#x2672; ', ENT_QUOTES, 'UTF-8') . ' ' . $author_contact['addr'] . ': </p>' . "\n" . $content;
-                               break;
-                       case 7: // statusnet/GNU Social
+                       case self::OSTATUS:
                                $text = ($is_quote_share? '<br />' : '') . '<p>' . html_entity_decode('&#x2672; ', ENT_QUOTES, 'UTF-8') . ' @' . $author_contact['addr'] . ': ' . $content . '</p>' . "\n";
                                break;
-                       case 9: // ActivityPub
+                       case self::ACTIVITYPUB:
                                $author = '@<span class="vcard"><a href="' . $author_contact['url'] . '" class="url u-url mention" title="' . $author_contact['addr'] . '"><span class="fn nickname mention">' . $author_contact['addr'] . '</span></a>:</span>';
                                $text = '<div><a href="' . $attributes['link'] . '">' . html_entity_decode('&#x2672;', ENT_QUOTES, 'UTF-8') . '</a> ' . $author . '<blockquote>' . $content . '</blockquote></div>' . "\n";
                                break;
@@ -1258,7 +1261,7 @@ class BBCode
         * @return string
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function convert($text, $try_oembed = true, $simple_html = 0, $for_plaintext = false)
+       public static function convert($text, $try_oembed = true, $simple_html = BBCode::INTERNAL, $for_plaintext = false)
        {
                $a = DI::app();
 
@@ -1386,9 +1389,9 @@ class BBCode
 
                /// @todo Have a closer look at the different html modes
                // Handle attached links or videos
-               if (in_array($simple_html, [9])) {
+               if ($simple_html == BBCode::ACTIVITYPUB) {
                        $text = self::removeAttachment($text);
-               } elseif (!in_array($simple_html, [0, 4])) {
+               } elseif (!in_array($simple_html, [BBCode::INTERNAL, BBCode::CONNECTORS])) {
                        $text = self::removeAttachment($text, true);
                } else {
                        $text = self::convertAttachment($text, $simple_html, $try_oembed);
@@ -1451,7 +1454,7 @@ class BBCode
 
                // Check for sized text
                // [size=50] --> font-size: 50px (with the unit).
-               if ($simple_html != 3) {
+               if ($simple_html != BBCode::DIASPORA) {
                        $text = preg_replace("(\[size=(\d*?)\](.*?)\[\/size\])ism", "<span style=\"font-size: $1px; line-height: initial;\">$2</span>", $text);
                        $text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])ism", "<span style=\"font-size: $1; line-height: initial;\">$2</span>", $text);
                } else {
@@ -1725,7 +1728,7 @@ class BBCode
                }
 
                if (!$for_plaintext) {
-                       if (in_array($simple_html, [7, 9])) {
+                       if (in_array($simple_html, [BBCode::OSTATUS, BBCode::ACTIVITYPUB])) {
                                $text = preg_replace_callback("/\[url\](.*?)\[\/url\]/ism", 'self::convertUrlForActivityPubCallback', $text);
                                $text = preg_replace_callback("/\[url\=(.*?)\](.*?)\[\/url\]/ism", 'self::convertUrlForActivityPubCallback', $text);
                        }
@@ -1737,14 +1740,14 @@ class BBCode
                $text = str_replace(["\r","\n"], ['<br />', '<br />'], $text);
 
                // Remove all hashtag addresses
-               if ($simple_html && !in_array($simple_html, [3, 7, 9])) {
+               if ($simple_html && !in_array($simple_html, [BBCode::DIASPORA, BBCode::OSTATUS, BBCode::ACTIVITYPUB])) {
                        $text = preg_replace("/([#@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", '$1$3', $text);
-               } elseif ($simple_html == 3) {
+               } elseif ($simple_html == BBCode::DIASPORA) {
                        // The ! is converted to @ since Diaspora only understands the @
                        $text = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism",
                                '@<a href="$2">$3</a>',
                                $text);
-               } elseif (in_array($simple_html, [7, 9])) {
+               } elseif (in_array($simple_html, [BBCode::OSTATUS, BBCode::ACTIVITYPUB])) {
                        $text = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism",
                                '$1<span class="vcard"><a href="$2" class="url u-url mention" title="$3"><span class="fn nickname mention">$3</span></a></span>',
                                $text);
@@ -1760,26 +1763,18 @@ class BBCode
                $text = preg_replace("/#\[url\=.*?\]\^\[\/url\]\[url\=(.*?)\](.*?)\[\/url\]/i",
                                        "[bookmark=$1]$2[/bookmark]", $text);
 
-               if (in_array($simple_html, [2, 6, 7, 8])) {
+               if (in_array($simple_html, [BBCode::API, BBCode::OSTATUS, BBCode::TWITTER])) {
                        $text = preg_replace_callback("/([^#@!])\[url\=([^\]]*)\](.*?)\[\/url\]/ism", "self::expandLinksCallback", $text);
                        //$Text = preg_replace("/[^#@!]\[url\=([^\]]*)\](.*?)\[\/url\]/ism", ' $2 [url]$1[/url]', $Text);
                        $text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", ' $2 [url]$1[/url]',$text);
                }
 
-               if ($simple_html == 5) {
-                       $text = preg_replace("/[^#@!]\[url\=(.*?)\](.*?)\[\/url\]/ism", '[url]$1[/url]', $text);
-               }
-
                // Perform URL Search
                if ($try_oembed) {
                        $text = preg_replace_callback("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $try_oembed_callback, $text);
                }
 
-               if ($simple_html == 5) {
-                       $text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", '[url]$1[/url]', $text);
-               } else {
-                       $text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", '[url=$1]$2[/url]', $text);
-               }
+               $text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", '[url=$1]$2[/url]', $text);
 
                // Handle Diaspora posts
                $text = preg_replace_callback(

diff --git a/src/Factory/Api/Mastodon/Field.php b/src/Factory/Api/Mastodon/Field.php
index 6570ab884510919a8b21016e8aafa505febe3529..fdf0a4ef6da478ca0cc523b54503b4e334b37fb2 100644 (file)
--- a/src/Factory/Api/Mastodon/Field.php
+++ b/src/Factory/Api/Mastodon/Field.php
@@ -37,7 +37,7 @@ class Field extends BaseFactory
         */
        public function createFromProfileField(ProfileField $profileField)
        {
-               return new \Friendica\Api\Entity\Mastodon\Field($profileField->label, BBCode::convert($profileField->value, false, 9));
+               return new \Friendica\Api\Entity\Mastodon\Field($profileField->label, BBCode::convert($profileField->value, false, BBCode::ACTIVITYPUB));
        }
 
        /**

diff --git a/src/Model/Event.php b/src/Model/Event.php
index b8d578bbad4e353b62cc2ae8d6e8b193c5bacbd2..1e4aed608bbd8c3edb7573338dd28269774781a5 100644 (file)
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -611,7 +611,7 @@ class Event
 
                        $title = BBCode::convert(Strings::escapeHtml($event['summary']));
                        if (!$title) {
-                               list($title, $_trash) = explode("<br", BBCode::convert(Strings::escapeHtml($event['desc'])), 2);
+                               list($title, $_trash) = explode("<br", BBCode::convert(Strings::escapeHtml($event['desc'])), BBCode::API);
                        }
 
                        $author_link = $event['author-link'];

diff --git a/src/Module/Api/Friendica/Profile/Show.php b/src/Module/Api/Friendica/Profile/Show.php
index 316072d9b9ab8ea21dc0ff5527705633d2412b77..a6bf25f2ebf908f5fae3adced54da499fbabe632 100644 (file)
--- a/src/Module/Api/Friendica/Profile/Show.php
+++ b/src/Module/Api/Friendica/Profile/Show.php
@@ -83,7 +83,7 @@ class Show extends BaseApi
                foreach ($profileFields as $profileField) {
                        $custom_fields[] = [
                                'label' => $profileField->label,
-                               'value' => BBCode::convert($profileField->value, false, 2),
+                               'value' => BBCode::convert($profileField->value, false, BBCode::API),
                        ];
                }
 

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 60f29f41515c5e0b91c218c55ef0215fa9a01398..2d385c028cada493066f31d5fbded96ec7d4991a 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -644,7 +644,7 @@ class Processor
                                        $title = $matches[3];
                                }
 
-                               $title = trim(HTML::toPlaintext(BBCode::convert($title, false, 2, true), 0));
+                               $title = trim(HTML::toPlaintext(BBCode::convert($title, false, BBCode::API, true), 0));
 
                                if (strlen($title) > 20) {
                                        $title = substr($title, 0, 20) . '...';

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index aa15dd15f838cc27a3030e5783fae2ffab75b2d2..a7e4a738403dbb413b562872696fcead781e225b 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -1215,7 +1215,7 @@ class Transmitter
        {
                $event = [];
                $event['name'] = $item['event-summary'];
-               $event['content'] = BBCode::convert($item['event-desc'], false, 9);
+               $event['content'] = BBCode::convert($item['event-desc'], false, BBCode::ACTIVITYPUB);
                $event['startTime'] = DateTimeFormat::utc($item['event-start'] . '+00:00', DateTimeFormat::ATOM);
 
                if (!$item['event-nofinish']) {
@@ -1309,7 +1309,7 @@ class Transmitter
                        $regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
                        $body = preg_replace_callback($regexp, ['self', 'mentionCallback'], $body);
 
-                       $data['content'] = BBCode::convert($body, false, 9);
+                       $data['content'] = BBCode::convert($body, false, BBCode::ACTIVITYPUB);
                }
 
                // The regular "content" field does contain a minimized HTML. This is done since systems like

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 7d8bc9dc59be756c84686e3db5639c418c86f8e3..9ca23f1dcb71f41c5a1e9c6c346c24e809ab7564 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -951,7 +951,7 @@ class DFRN
                                $htmlbody = "[b]" . $item['title'] . "[/b]\n\n" . $htmlbody;
                        }
 
-                       $htmlbody = BBCode::convert($htmlbody, false, 7);
+                       $htmlbody = BBCode::convert($htmlbody, false, BBCode::OSTATUS);
                }
 
                $author = self::addEntryAuthor($doc, "author", $item["author-link"], $item);
@@ -2428,7 +2428,8 @@ class DFRN
                                if (($term != "") && ($scheme != "")) {
                                        $parts = explode(":", $scheme);
                                        if ((count($parts) >= 4) && (array_shift($parts) == "X-DFRN")) {
-                                               $termurl = implode(":", $parts);
+                                               $termurl = array_pop($parts);
+                                               $termurl = array_pop($parts) . $termurl;
                                                Tag::store($item['uri-id'], Tag::IMPLICIT_MENTION, $term, $termurl);
                                        }
                                }

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index c7882d03557051dd3d37decbfe112e6b8c6d15b2..4cb27956bac2575ad77d2ba1a2e3586a3d554e5e 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -1456,7 +1456,7 @@ class OStatus
                XML::addElement($doc, $author, "name", $owner["nick"]);
                XML::addElement($doc, $author, "email", $owner["addr"]);
                if ($show_profile) {
-                       XML::addElement($doc, $author, "summary", BBCode::convert($owner["about"], false, 7));
+                       XML::addElement($doc, $author, "summary", BBCode::convert($owner["about"], false, BBCode::OSTATUS));
                }
 
                $attributes = ["rel" => "alternate", "type" => "text/html", "href" => $owner["url"]];
@@ -1483,7 +1483,7 @@ class OStatus
                XML::addElement($doc, $author, "poco:preferredUsername", $owner["nick"]);
                XML::addElement($doc, $author, "poco:displayName", $owner["name"]);
                if ($show_profile) {
-                       XML::addElement($doc, $author, "poco:note", BBCode::convert($owner["about"], false, 7));
+                       XML::addElement($doc, $author, "poco:note", BBCode::convert($owner["about"], false, BBCode::OSTATUS));
 
                        if (trim($owner["location"]) != "") {
                                $element = $doc->createElement("poco:address");
@@ -1895,7 +1895,7 @@ class OStatus
 
                if (!$toplevel) {
                        if (!empty($item['title'])) {
-                               $title = BBCode::convert($item['title'], false, 7);
+                               $title = BBCode::convert($item['title'], false, BBCode::OSTATUS);
                        } else {
                                $title = sprintf("New note by %s", $owner["nick"]);
                        }
@@ -1984,7 +1984,7 @@ class OStatus
                        $body = "[b]".$item['title']."[/b]\n\n".$body;
                }
 
-               $body = BBCode::convert($body, false, 7);
+               $body = BBCode::convert($body, false, BBCode::OSTATUS);
 
                XML::addElement($doc, $entry, "content", $body, ["type" => "html"]);