Disable richtext editor for frio - followup for #2938

[friendica.git] / include / bbcode.php

diff --git a/include/bbcode.php b/include/bbcode.php
index 84425e8ef65d961ef92a0ea33493f36a6dfb2c55..ebafc353a4dcb153b759ab3820f6cdf79f17a0c0 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -34,7 +34,6 @@ function bb_map_location($match) {
 function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
 
        $data = get_attachment_data($Text);
-
        if (!$data)
                return $Text;
 
@@ -85,7 +84,7 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
                                $text .= $oembed;
 
                        if (trim($data["description"]) != "")
-                               $text .= sprintf('<blockquote>%s</blockquote></span>', trim($data["description"]));
+                               $text .= sprintf('<blockquote>%s</blockquote></span>', trim(bbcode($data["description"])));
                }
        }
        return $data["text"].$text.$data["after"];
@@ -147,7 +146,7 @@ function cleancss($input) {
                if (($char >= "a") and ($char <= "z"))
                        $cleaned .= $char;
 
-               if (!(strpos(" #;:0123456789-_", $char) === false))
+               if (!(strpos(" #;:0123456789-_.%", $char) === false))
                        $cleaned .= $char;
        }
 
@@ -415,21 +414,21 @@ function bb_ShareAttributes($share, $simplehtml) {
 
        $data = get_contact_details_by_url($profile);
 
-       if (isset($data["name"]) AND isset($data["addr"]))
+       if (isset($data["name"]) AND ($data["name"] != "") AND isset($data["addr"]) AND ($data["addr"] != ""))
                $userid_compact = $data["name"]." (".$data["addr"].")";
        else
                $userid_compact = GetProfileUsername($profile,$author, true);
 
-       if (isset($data["addr"]))
+       if (isset($data["addr"]) AND ($data["addr"] != ""))
                $userid = $data["addr"];
        else
                $userid = GetProfileUsername($profile,$author, false);
 
-       if (isset($data["name"]))
+       if (isset($data["name"]) AND ($data["name"] != ""))
                $author = $data["name"];
 
-       if (isset($data["thumb"]))
-               $avatar = $data["thumb"];
+       if (isset($data["micro"]) AND ($data["micro"] != ""))
+               $avatar = $data["micro"];
 
        $preshare = trim($share[1]);
 
@@ -724,6 +723,13 @@ function bb_CleanPictureLinks($text) {
        return ($text);
 }
 
+function bb_highlight($match) {
+       if(in_array(strtolower($match[1]),['php','css','mysql','sql','abap','diff','html','perl','ruby',
+               'vbscript','avrc','dtd','java','xml','cpp','python','javascript','js','sh']))
+               return text_highlight($match[2],strtolower($match[1]));
+       return $match[0];
+}
+
        // BBcode 2 HTML was written by WAY2WEB.net
        // extended to work with Mistpark/Friendica - Mike Macgirvin
 
@@ -776,6 +782,11 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        if (!$tryoembed)
                $Text = preg_replace("/\[share(.*?)avatar\s?=\s?'.*?'\s?(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","\n[share$1$2]$3[/share]",$Text);
 
+       // Check for [code] text here, before the linefeeds are messed with.
+       // The highlighter will unescape and re-escape the content.
+       if (strpos($Text,'[code=') !== false) {
+               $Text = preg_replace_callback("/\[code=(.*?)\](.*?)\[\/code\]/ism", 'bb_highlight', $Text);
+       }
        // Convert new line chars to html <br /> tags
 
        // nlbr seems to be hopelessly messed up
@@ -881,8 +892,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        // we may need to restrict this further if it picks up too many strays
        // link acct:user@host to a webfinger profile redirector
 
-       $Text = preg_replace('/acct:(.*?)@(.*?)([ ,])/', '<a href="' . $a->get_baseurl() . '/acctlink?addr=' . "$1@$2"
-               . '" target="extlink" >acct:' . "$1@$2$3" . '</a>',$Text);
+       $Text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', '<a href="' . $a->get_baseurl() . '/acctlink?addr=$1@$2" target="extlink">acct:$1@$2</a>',$Text);
 
        // Perform MAIL Search
        $Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1">$1</a>', $Text);
@@ -909,6 +919,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        $Text = preg_replace("(\[h5\](.*?)\[\/h5\])ism",'<h5>$1</h5>',$Text);
        $Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism",'<h6>$1</h6>',$Text);
 
+       // Check for paragraph
+       $Text = preg_replace("(\[p\](.*?)\[\/p\])ism",'<p>$1</p>',$Text);
+
        // Check for bold text
        $Text = preg_replace("(\[b\](.*?)\[\/b\])ism",'<strong>$1</strong>',$Text);
 
@@ -1128,6 +1141,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
                $Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/ism",'',$Text);
                $Text = preg_replace("/\[event\-location\](.*?)\[\/event\-location\]/ism",'',$Text);
                $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/ism",'',$Text);
+               $Text = preg_replace("/\[event\-id\](.*?)\[\/event\-id\]/ism",'',$Text);
        }