diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/bbcode.php | 25 | ||||
| -rw-r--r-- | include/event.php | 6 |
2 files changed, 28 insertions, 3 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 6ab67ffdc..a44838c24 100644 --- 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 @@ -104,8 +113,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); diff --git a/include/event.php b/include/event.php index 31cf536ff..86a822080 100644 --- a/include/event.php +++ b/include/event.php @@ -1,7 +1,7 @@ <?php -function format_event_html($ev,$pre = '') { +function format_event_html($ev) { require_once('include/bbcode.php'); @@ -115,7 +115,7 @@ function format_event_bbcode($ev) { if($ev['start']) $o .= '[event-start]' . $ev['start'] . '[/event-start]'; - if($ev['start']) + if(($ev['finish']) && (! $ev['nofinish'])) $o .= '[event-finish]' . $ev['finish'] . '[/event-finish]'; if($ev['location']) @@ -158,7 +158,7 @@ function bbtoevent($s) { if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match)) $ev['adjust'] = $match[1]; $match = ''; - + $ev['nofinish'] = (($ev['start'] && (! $ev['finish'])) ? 1 : 0); return $ev; } |