X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbbcode.php;h=eb0806dc527fee8b6b36a89d6d6239e807ca665e;hb=64be33a3ff9ddae16ba7a57c842441a2d0058a5b;hp=674c44ec29e0985b425a4ba791cf340f453fb717;hpb=dfd3cef734be3bc1bf2d16dfe8b2f71d6aff18a7;p=friendica.git
diff --git a/include/bbcode.php b/include/bbcode.php
index 674c44ec29..eb0806dc52 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1,78 +1,102 @@
", ">", $Text);
-
- // Convert new line chars to html
tags
- $Text = nl2br($Text);
-
- // Set up the parameters for a URL search string
- $URLSearchString = " a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'";
- // Set up the parameters for a MAIL search string
- $MAILSearchString = $URLSearchString . " a-zA-Z0-9\.@";
-
- // Perform URL Search
- $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '$1', $Text);
- $Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '$2', $Text);
- //$Text = preg_replace("(\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[/url\])", '$2', $Text);
-
- // Perform MAIL Search
- $Text = preg_replace("(\[mail\]([$MAILSearchString]*)\[/mail\])", '$1', $Text);
- $Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.+?)\[\/mail\]/", '$2', $Text);
-
- // Check for bold text
- $Text = preg_replace("(\[b\](.+?)\[\/b])is",'$1',$Text);
-
- // Check for Italics text
- $Text = preg_replace("(\[i\](.+?)\[\/i\])is",'$1',$Text);
-
- // Check for Underline text
- $Text = preg_replace("(\[u\](.+?)\[\/u\])is",'$1',$Text);
-
- // Check for strike-through text
- $Text = preg_replace("(\[s\](.+?)\[\/s\])is",'$1',$Text);
-
- // Check for over-line text
- $Text = preg_replace("(\[o\](.+?)\[\/o\])is",'$1',$Text);
-
- // Check for colored text
- $Text = preg_replace("(\[color=(.+?)\](.+?)\[\/color\])is","$2",$Text);
-
- // Check for sized text
- $Text = preg_replace("(\[size=(.+?)\](.+?)\[\/size\])is","$2",$Text);
-
- // Check for list text
- $Text = preg_replace("/\[list\](.+?)\[\/list\]/is", '
$1
';
- // Check for [code] text
- $Text = preg_replace("/\[code\](.+?)\[\/code\]/is","$CodeLayout", $Text);
- // Declare the format for [quote] layout
- $QuoteLayout = '$1'; - // Check for [quote] text - $Text = preg_replace("/\[quote\](.+?)\[\/quote\]/is","$QuoteLayout", $Text); +require_once("include/oembed.php"); + // BBcode 2 HTML was written by WAY2WEB.net + // extended to work with Mistpark/Friendika - Mike Macgirvin + +function bbcode($Text) { + + // Replace any html brackets with HTML Entities to prevent executing HTML or script + // Don't use strip_tags here because it breaks [url] search by replacing & with amp + + $Text = str_replace("<", "<", $Text); + $Text = str_replace(">", ">", $Text); + + // Convert new line chars to html
$1
';
+ // Check for [code] text
+ $Text = preg_replace("/\[code\](.+?)\[\/code\]/is","$CodeLayout", $Text);
+ // Declare the format for [quote] layout
+ $QuoteLayout = '$1'; + // Check for [quote] text + $Text = preg_replace("/\[quote\](.+?)\[\/quote\]/is","$QuoteLayout", $Text); - // [img=widthxheight]image source[/img] - $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.+?)\[\/img\]/", '