Merge pull request #37 from fabrixxm/master

[friendica.git] / include / bb2diaspora.php

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 65ccc750f119b1952f176371744ddb16494168b4..f7398067b9f0f2527e584bc7c1c56b1e680e73a6 100644 (file)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -3,32 +3,27 @@
 require_once("include/oembed.php");
 require_once('include/event.php');
 
-
-
+require_once('library/markdown.php');
+require_once('include/html2bbcode.php');
 
 function diaspora2bb($s) {
 
-       $s = str_replace(array('\\**','\\__','\\*','\\_'), array('-^doublestar^-','-^doublescore-^','-^star^-','-^score^-'),$s);
-       $s = preg_replace("/\*\*\*(.+?)\*\*\*/", '[b][i]$1[/i][/b]', $s);
-       $s = preg_replace("/\_\_\_(.+?)\_\_\_/", '[b][i]$1[/i][/b]', $s);
-       $s = preg_replace("/\*\*(.+?)\*\*/", '[b]$1[/b]', $s);
-       $s = preg_replace("/\_\_(.+?)\_\_/", '[b]$1[/b]', $s);
-       $s = preg_replace("/\*(.+?)\*/", '[i]$1[/i]', $s);
-       $s = preg_replace("/\_(.+?)\_/", '[i]$1[/i]', $s);
-       $s = str_replace(array('-^doublestar^-','-^doublescore-^','-^star^-','-^score^-'), array('**','__','*','_'), $s);
-       $s = preg_replace('/\!\[(.+?)\]\((.+?)\)/','[img]$2[/img]',$s);
-       $s = preg_replace('/\[(.+?)\]\((.+?)\)/','[url=$2]$1[/url]',$s);
        $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);
+       $s = Markdown($s);
+       $s = html2bbcode($s);
+       $s = str_replace('*','*',$s);
+    $s = preg_replace("/\[url\=?(.*?)\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/url\]/ism",'[youtube]$2[/youtube]',$s); 
+    $s = preg_replace("/\[url\=https?:\/\/www.youtube.com\/watch\?v\=(.*?)\].*?\[\/url\]/ism",'[youtube]$1[/youtube]',$s); 
+       $s = preg_replace("/\[url\=?(.*?)\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/url\]/ism",'[vimeo]$2[/vimeo]',$s); 
+       $s = preg_replace("/\[url\=https?:\/\/vimeo.com\/([0-9]+)\](.*?)\[\/url\]/ism",'[vimeo]$1[/vimeo]',$s); 
+       $s = preg_replace("/([^\]\=]|^)(https?\:\/\/)(vimeo|youtu|www\.youtube|soundcloud)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url]$2$3$4[/url]',$s);
 
-
-       $s = escape_tags($s);
        return $s;
-
 }
 
 
 function stripdcode_br_cb($s) {
-       return '[code]' . str_replace('<br />', '', $s[1]) . '[/code]';
+       return '[code]' . str_replace('<br />', "\n\t", $s[1]) . '[/code]';
 }
 
 
@@ -37,6 +32,8 @@ function stripdcode_br_cb($s) {
 
 function bb2diaspora($Text,$preserve_nl = false) {
 
+       $ev = bbtoevent($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
 
@@ -47,7 +44,6 @@ function bb2diaspora($Text,$preserve_nl = false) {
        // After we're finished processing the bbcode we'll 
        // replace all of the event code with a reformatted version.
 
-       $ev = bbtoevent($Text);
 
        if($preserve_nl)
                $Text = str_replace(array("\n","\r"), array('',''),$Text);
@@ -62,11 +58,11 @@ function bb2diaspora($Text,$preserve_nl = false) {
        // [img]pathtoimage[/img]
 
 
-       $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '[$1]($1)', $Text);
-       $Text = preg_replace("/\#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/", '[#$2]($1)', $Text);
-       $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/", '[$2]($1)', $Text);
+       $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '[$1]($1)', $Text);
+       $Text = preg_replace("/\#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[#$2]($1)', $Text);
+       $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[$2]($1)', $Text);
 
-//     $Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('Image/photo: ') . '$1', $Text);
+       $Text = preg_replace("/\[img\](.*?)\[\/img\]/", '![' . t('image/photo') . '](' . '$1' . ')', $Text);
 //     $Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('image/photo'), $Text);
 
        // Perform MAIL Search
@@ -125,17 +121,17 @@ function bb2diaspora($Text,$preserve_nl = false) {
 
        $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/is",'stripdcode_br_cb',$Text);
 
-//     $CodeLayout = '<code>$1</code>';
+       //      $CodeLayout = '<code>$1</code>';
        // Check for [code] text
-       $Text = preg_replace("/\[code\](.*?)\[\/code\]/is","```$1```", $Text);
+       $Text = preg_replace("/\[code\](.*?)\[\/code\]/is","\t$1\n", $Text);
 
 
 
 
        // Declare the format for [quote] layout
-//     $QuoteLayout = '<blockquote>$1</blockquote>';                     
+       //      $QuoteLayout = '<blockquote>$1</blockquote>';                     
        // Check for [quote] text
-//     $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/is","$QuoteLayout", $Text);
+       $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/is",">$1\n\n", $Text);
          
        // Images
 
@@ -165,7 +161,7 @@ function bb2diaspora($Text,$preserve_nl = false) {
 
 
        // oembed tag
-//     $Text = oembed_bbcode2html($Text);
+       //      $Text = oembed_bbcode2html($Text);
 
        // If we found an event earlier, strip out all the event code and replace with a reformatted version.
 
@@ -180,7 +176,9 @@ function bb2diaspora($Text,$preserve_nl = false) {
                $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",'',$Text);
        }
 
+       $Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
 
+       $Text = preg_replace('/\[(.*?)\]\((.*?)\\\\_(.*?)\)/ism','[$1]($2_$3)',$Text);
        
        call_hooks('bb2diaspora',$Text);
 
@@ -189,7 +187,7 @@ function bb2diaspora($Text,$preserve_nl = false) {
 
 function format_event_diaspora($ev) {
 
-//     require_once('include/bbcode.php');
+       $a = get_app();
 
        if(! ((is_array($ev)) && count($ev)))
                return '';
@@ -200,20 +198,20 @@ function format_event_diaspora($ev) {
 
        $o .= '**' . bb2diaspora($ev['desc']) .  '**' . "\n";
 
-       $o .= t('Starts:') . ' ' 
+       $o .= t('Starts:') . ' ' . '['
                . (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC', 
                        $ev['start'] , $bd_format ))
                        :  day_translate(datetime_convert('UTC', 'UTC', 
                        $ev['start'] , $bd_format)))
-               . "\n";
+               .  '](' . $a->get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n";
 
        if(! $ev['nofinish'])
-               $o .= t('Finishes:') . ' ' 
+               $o .= t('Finishes:') . ' ' . '[' 
                        . (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC', 
                                $ev['finish'] , $bd_format ))
                                :  day_translate(datetime_convert('UTC', 'UTC', 
                                $ev['finish'] , $bd_format )))
-                       . "\n";
+                       . '](' . $a->get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n";
 
        if(strlen($ev['location']))
                $o .= t('Location:') . bb2diaspora($ev['location'])