X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbbcode.php;h=105e9595e7c5307017ce5d05bfc56be3467517f5;hb=ec02af593db87e78b0b388047ac4265aa5f987b1;hp=0c4e12c9ad49e6e9fc44faf7fa68656f25682a67;hpb=de5a0dadb0715198b9ba376e4ab79f58cedef098;p=friendica.git diff --git a/include/bbcode.php b/include/bbcode.php index 0c4e12c9ad..105e9595e7 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1,7 +1,11 @@ %s
', $data["url"], $data["title"]); } else { - $text = sprintf('', $data["type"]); + if ($simplehtml != 4) { + $text = sprintf('', $data["type"]); + } else { + $span_end = ''; + } $bookmark = array(sprintf('[bookmark=%s]%s[/bookmark]', $data["url"], $data["title"]), $data["url"], $data["title"]); if ($tryoembed) { @@ -84,9 +92,13 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) { } if (trim($data["description"]) != "") { - $text .= sprintf('
%s
', trim(bbcode($data["description"]))); + $text .= sprintf('
%s
', trim(bbcode($data["description"]))); } } + + if ($simplehtml != 4) { + $text .= ''; + } } return trim($data["text"].' '.$text.' '.$data["after"]); } @@ -481,9 +493,9 @@ function bb_ShareAttributes($share, $simplehtml) { // We only call this so that a previously unknown contact can be added. // This is important for the function "get_contact_details_by_url". // This function then can fetch an entry from the contact table. - get_contact($profile, 0); + Contact::getIdForURL($profile, 0); - $data = get_contact_details_by_url($profile); + $data = Contact::getDetailsByURL($profile); if (isset($data["name"]) && ($data["name"] != "") && isset($data["addr"]) && ($data["addr"] != "")) $userid_compact = $data["name"]." (".$data["addr"].")"; @@ -531,10 +543,9 @@ function bb_ShareAttributes($share, $simplehtml) { break; case 4: - $headline = '
'; - $headline .= ''.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8'); + $headline .= '
'.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8'); $headline .= sprintf(t('%2$s %3$s'), $link, $userid, $posted); - $headline .= ":
"; + $headline .= ":
"; $text = trim($share[1]); @@ -692,7 +703,7 @@ function GetProfileUsername($profile, $username, $compact = false, $getnetwork = } function bb_DiasporaLinks($match) { - return "[url=".App::get_baseurl()."/display/".$match[1]."]".$match[2]."[/url]"; + return "[url=".System::baseUrl()."/display/".$match[1]."]".$match[2]."[/url]"; } function bb_RemovePictureLinks($match) { @@ -904,7 +915,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa $Text = str_replace("\r\n", "\n", $Text); // removing multiplicated newlines - if (get_config("system", "remove_multiplicated_lines")) { + if (Config::get("system", "remove_multiplicated_lines")) { $search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]", "[/li]\n", "\n[li]", "\n[ul]", "[/ul]\n", "\n\n[share ", "[/attachment]\n", "\n[h1]", "[/h1]\n", "\n[h2]", "[/h2]\n", "\n[h3]", "[/h3]\n", "\n[h4]", "[/h4]\n", "\n[h5]", "[/h5]\n", "\n[h6]", "[/h6]\n"); $replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]", "[/li]", "[li]", "[ul]", "[/ul]", "\n[share ", "[/attachment]", @@ -931,17 +942,17 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa // Remove all hashtag addresses if ((!$tryoembed || $simplehtml) && !in_array($simplehtml, array(3, 7))) { - $Text = preg_replace("/([#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text); + $Text = preg_replace("/([#@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text); } elseif ($simplehtml == 3) { - $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", + $Text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text); } elseif ($simplehtml == 7) { - $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", + $Text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text); } elseif (!$simplehtml) { - $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", + $Text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text); } @@ -953,13 +964,13 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa "[bookmark=$1]$2[/bookmark]", $Text); if (in_array($simplehtml, array(2, 6, 7, 8, 9))) { - $Text = preg_replace_callback("/([^#@])\[url\=([^\]]*)\](.*?)\[\/url\]/ism", "bb_expand_links", $Text); - //$Text = preg_replace("/[^#@]\[url\=([^\]]*)\](.*?)\[\/url\]/ism", ' $2 [url]$1[/url]', $Text); + $Text = preg_replace_callback("/([^#@!])\[url\=([^\]]*)\](.*?)\[\/url\]/ism", "bb_expand_links", $Text); + //$Text = preg_replace("/[^#@!]\[url\=([^\]]*)\](.*?)\[\/url\]/ism", ' $2 [url]$1[/url]', $Text); $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", ' $2 [url]$1[/url]',$Text); } if ($simplehtml == 5) { - $Text = preg_replace("/[^#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url]$1[/url]', $Text); + $Text = preg_replace("/[^#@!]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url]$1[/url]', $Text); } // Perform URL Search @@ -976,6 +987,11 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa // Handle Diaspora posts $Text = preg_replace_callback("&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi", 'bb_DiasporaLinks', $Text); + // Server independent link to posts and comments + // See issue: https://github.com/diaspora/diaspora_federation/issues/75 + $expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism"; + $Text = preg_replace($expression, System::baseUrl()."/display/$1", $Text); + // if the HTML is used to generate plain text, then don't do this search, but replace all URL of that kind to text // if ($simplehtml != 7) { if (!$forplaintext) { @@ -1011,7 +1027,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa // 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-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', 'acct:$1@$2', $Text); + $Text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', 'acct:$1@$2', $Text); // Perform MAIL Search $Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '$1', $Text); @@ -1184,9 +1200,9 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa return bb_ShareAttributes($match, $simplehtml); }, $Text); - $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism", '
' . t('Encrypted content') . '
', $Text); - $Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism", '
' . t('Encrypted content') . '
', $Text); - //$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism", '
' . t('Encrypted content') . '
', $Text); + $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism", '
' . t('Encrypted content') . '
', $Text); + $Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism", '
' . t('Encrypted content') . '
', $Text); + //$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism", '
' . t('Encrypted content') . '
', $Text); // Try to Oembed if ($tryoembed) { @@ -1269,6 +1285,10 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa $Text = preg_replace("/\[event\-id\](.*?)\[\/event\-id\]/ism", '', $Text); } + // Replace non graphical smilies for external posts + if ($simplehtml) { + $Text = Smilies::replace($Text, false, true); + } // Replace inline code blocks $Text = preg_replace_callback("|(?!]*>)([^<]*)(?!]*>)|ism", @@ -1308,6 +1328,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa // Always allowed protocol even if config isn't set or not including it $allowed_link_protocols[] = 'http'; + $allowed_link_protocols[] = 'redir/'; $regex = '#<([^>]*?)(href)="(?!' . implode('|', $allowed_link_protocols) . ')(.*?)"(.*?)>#ism'; $Text = preg_replace($regex, '<$1$2="javascript:void(0)"$4 class="invalid-href" title="' . t('Invalid link protocol') . '">', $Text);