X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbbcode.php;h=3619015ca9f8c6fa0734ff0af8c6f932c65f34b3;hb=829dc2446477fcac0e8d2cde26e3cc4fed52e4fd;hp=44f571450947858598fec51d00619a405536c075;hpb=1bba63fb607c2cb5fb2c002e63ad7128ecf8b1ea;p=friendica.git
diff --git a/include/bbcode.php b/include/bbcode.php
index 44f5714509..3619015ca9 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1,9 +1,19 @@
', '', $s[1]) . '[/code]';
+}
+
+
// BBcode 2 HTML was written by WAY2WEB.net
// extended to work with Mistpark/Friendika - Mike Macgirvin
-function bbcode($Text) {
+function bbcode($Text,$preserve_nl = false) {
// 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
@@ -12,7 +22,16 @@ function bbcode($Text) {
$Text = str_replace(">", ">", $Text);
// Convert new line chars to html
tags
+
$Text = nl2br($Text);
+ if($preserve_nl)
+ $Text = str_replace(array("\n","\r"), array('',''),$Text);
+
+ // If we find any event code, turn it into an event.
+ // After we're finished processing the bbcode we'll
+ // replace all of the event code with a reformatted version.
+
+ $ev = bbtoevent($Text);
// Set up the parameters for a URL search string
$URLSearchString = "^\[\]";
@@ -25,77 +44,119 @@ function bbcode($Text) {
$Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%\$\!\+\,]+)/", ' $2', $Text);
$Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '$1', $Text);
- $Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '$2', $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);
+ $Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '$2', $Text);
// Check for bold text
- $Text = preg_replace("(\[b\](.+?)\[\/b])is",'$1',$Text);
+ $Text = preg_replace("(\[b\](.*?)\[\/b\])is",'$1',$Text);
// Check for Italics text
- $Text = preg_replace("(\[i\](.+?)\[\/i\])is",'$1',$Text);
+ $Text = preg_replace("(\[i\](.*?)\[\/i\])is",'$1',$Text);
// Check for Underline text
- $Text = preg_replace("(\[u\](.+?)\[\/u\])is",'$1',$Text);
+ $Text = preg_replace("(\[u\](.*?)\[\/u\])is",'$1',$Text);
// Check for strike-through text
- $Text = preg_replace("(\[s\](.+?)\[\/s\])is",'$1',$Text);
+ $Text = preg_replace("(\[s\](.*?)\[\/s\])is",'$1',$Text);
// Check for over-line text
- $Text = preg_replace("(\[o\](.+?)\[\/o\])is",'$1',$Text);
+ $Text = preg_replace("(\[o\](.*?)\[\/o\])is",'$1',$Text);
// Check for colored text
- $Text = preg_replace("(\[color=(.+?)\](.+?)\[\/color\])is","$2",$Text);
+ $Text = preg_replace("(\[color=(.*?)\](.*?)\[\/color\])is","$2",$Text);
// Check for sized text
- $Text = preg_replace("(\[size=(.+?)\](.+?)\[\/size\])is","$2",$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);
+ $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); + $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/is","$QuoteLayout", $Text); // Images // [img]pathtoimage[/img] - $Text = preg_replace("/\[img\](.+?)\[\/img\]/", '