fix banner in duepuntozero

[friendica.git] / include / bbcode.php

diff --git a/include/bbcode.php b/include/bbcode.php
index c1576fbcf0bebe9023ee2e1ba979c6f05adb0cf2..40f4935fba21aecba992fa4d6c7277a2ea75dd1a 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1,5 +1,8 @@
 <?php
+
 require_once("include/oembed.php");
+require_once('include/event.php');
+
        // BBcode 2 HTML was written by WAY2WEB.net
        // extended to work with Mistpark/Friendika - Mike Macgirvin
 
@@ -17,6 +20,12 @@ function bbcode($Text,$preserve_nl = false) {
        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 = "^\[\]";
        // Set up the parameters for a MAIL search string
@@ -37,7 +46,7 @@ function bbcode($Text,$preserve_nl = false) {
        $Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '<a href="mailto:$1">$2</a>', $Text);
          
        // Check for bold text
-       $Text = preg_replace("(\[b\](.*?)\[\/b])is",'<strong>$1</strong>',$Text);
+       $Text = preg_replace("(\[b\](.*?)\[\/b\])is",'<strong>$1</strong>',$Text);
 
        // Check for Italics text
        $Text = preg_replace("(\[i\](.*?)\[\/i\])is",'<em>$1</em>',$Text);
@@ -88,6 +97,7 @@ function bbcode($Text,$preserve_nl = false) {
 
        $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text);
 
+       $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/", '<iframe src="$1" width="425" height="350"><a href="$1">$1</a></iframe>', $Text);
          
        // [img=widthxheight]image source[/img]
        $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/", '<img src="$3" style="height:{$2}px; width:{$1}px;" >', $Text);
@@ -104,8 +114,24 @@ function bbcode($Text,$preserve_nl = false) {
        }
 //     $Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '<object width="425" height="350" type="application/x-shockwave-flash" data="http://www.youtube.com/v/$1" ><param name="movie" value="http://www.youtube.com/v/$1"></param><!--[if IE]><embed src="http://www.youtube.com/v/$1" type="application/x-shockwave-flash" width="425" height="350" /><![endif]--></object>', $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);