preparation for 3g email contacts

[friendica.git] / include / bb2diaspora.php

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 036e6cdb84491f83c457b821658b1b19f3ab6c67..0e001df3508a5682d4fafbb643fe0bb2b488d08f 100644 (file)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -13,10 +13,12 @@ require_once('include/html2bbcode.php');
 
 function diaspora2bb($s) {
 
+       $s = html_entity_decode($s,ENT_COMPAT,'UTF-8');
+
        $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);
        $s = Markdown($s);
        $s = html2bbcode($s);
-       $s = str_replace('*','*',$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); 
@@ -171,9 +173,9 @@ function bb2diaspora($Text,$preserve_nl = false) {
 
        // html5 video and audio
 
-//     $Text = preg_replace("/\[video\](.*?)\[\/video\]/", '<video src="$1" controls="controls" width="425" height="350"><a href="$1">$1</a></video>', $Text);
+       $Text = preg_replace("/\[video\](.*?)\[\/video\]/", '$1', $Text);
 
-//     $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text);
+       $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '$1', $Text);
 
 //     $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/", '<iframe src="$1" width="425" height="350"><a href="$1">$1</a></iframe>', $Text);