X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbbcode.php;h=a44838c2462dc49ffba46eaebe5bc1d9edaff608;hb=494288ab9f9370bdf4f7b4ab9990b64f05adbd9d;hp=b2e9cee6dfdb544e84ab73b76df69a796ed7f8ec;hpb=ef64c5187df80da2065655726b8d05a9ce6b0e0a;p=friendica.git
diff --git a/include/bbcode.php b/include/bbcode.php
index b2e9cee6df..a44838c246 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1,5 +1,8 @@
$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", '
' ,$Text);
- $Text = preg_replace("/\[list=1\](.+?)\[\/list\]/is", '' ,$Text);
- $Text = preg_replace("/\[list=i\](.+?)\[\/list\]/s",'' ,$Text);
- $Text = preg_replace("/\[list=I\](.+?)\[\/list\]/s", '' ,$Text);
- $Text = preg_replace("/\[list=a\](.+?)\[\/list\]/s", '' ,$Text);
- $Text = preg_replace("/\[list=A\](.+?)\[\/list\]/s", '' ,$Text);
+ $Text = preg_replace("/\[list\](.*?)\[\/list\]/is", '' ,$Text);
+ $Text = preg_replace("/\[list=1\](.*?)\[\/list\]/is", '' ,$Text);
+ $Text = preg_replace("/\[list=i\](.*?)\[\/list\]/s",'' ,$Text);
+ $Text = preg_replace("/\[list=I\](.*?)\[\/list\]/s", '' ,$Text);
+ $Text = preg_replace("/\[list=a\](.*?)\[\/list\]/s", '' ,$Text);
+ $Text = preg_replace("/\[list=A\](.*?)\[\/list\]/s", '' ,$Text);
$Text = str_replace("[*]", "", $Text);
// Check for font change text
- $Text = preg_replace("(\[font=(.+?)\](.+?)\[\/font\])","$2 ",$Text);
+ $Text = preg_replace("(\[font=(.*?)\](.*?)\[\/font\])","$2 ",$Text);
// Declare the format for [code] layout
$CodeLayout = '$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\]/", ' ', $Text);
+ $Text = preg_replace("/\[img\](.*?)\[\/img\]/", ' ', $Text);
// html5 video and audio
- $Text = preg_replace("/\[video\](.+?)\[\/video\]/", '$1 ', $Text);
+ $Text = preg_replace("/\[video\](.*?)\[\/video\]/", '$1 ', $Text);
- $Text = preg_replace("/\[audio\](.+?)\[\/audio\]/", '$1 ', $Text);
+ $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '$1 ', $Text);
// [img=widthxheight]image source[/img]
- $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.+?)\[\/img\]/", ' ', $Text);
+ $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/", ' ', $Text);
- $a = get_app();
- if ($a->config['system']['embed_all']){
+ if (get_pconfig(local_user(), 'oembed', 'use_for_youtube' )==1){
// use oembed for youtube links
$Text = preg_replace("/\[youtube\]/",'[embed]',$Text);
$Text = preg_replace("/\[\/youtube\]/",'[/embed]',$Text);
} else {
// Youtube extensions
- $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.+?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text);
- $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.+?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text);
- $Text = preg_replace("/\[youtube\](.+?)\[\/youtube\]/", 'VIDEO ', $Text);
+ $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text);
+ $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text);
+ $Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", 'VIDEO ', $Text);
}
-// $Text = preg_replace("/\[youtube\](.+?)\[\/youtube\]/", ' ', $Text);
+// $Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", ' ', $Text);
+
+
// oembed tag
$Text = oembed_bbcode2html($Text);
+
+ // If we found an event earlier, strip out all the event code and replace with a reformatted version.
+
+ if(x($ev,'desc') && x($ev,'start')) {
+ $sub = format_event_html($ev);
+
+ $Text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/is",$sub,$Text);
+ $Text = preg_replace("/\[event\-start\](.*?)\[\/event\-start\]/is",'',$Text);
+ $Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/is",'',$Text);
+ $Text = preg_replace("/\[event\-location\](.*?)\[\/event\-location\]/is",'',$Text);
+ $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",'',$Text);
+ }
+
+
call_hooks('bbcode',$Text);