X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbb2diaspora.php;h=d367b6716678ede92306685a5dba102d27c8ee2d;hb=64d0616762efcff413a335f2fdde4d8219d44895;hp=2331865aeda0eec44b6c35aace9cdc2b5727617d;hpb=eeec29c6be2429ea38ab258591200e0178886a25;p=friendica.git diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php old mode 100644 new mode 100755 index 2331865aed..d367b67166 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -6,18 +6,35 @@ require_once('include/event.php'); require_once('library/markdown.php'); require_once('include/html2bbcode.php'); +// we don't want to support a bbcode specific markdown interpreter +// and the markdown library we have is pretty good, but provides HTML output. +// So we'll use that to convert to HTML, then convert the HTML back to bbcode, +// and then clean up a few Diaspora specific constructs. + 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); $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); + // remove duplicate adjacent code tags + $s = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/ism","[code]$2[/code]", $s); $s = scale_diaspora_images($s); + + // we seem to get a lot of text smushed together with links from Diaspora. + + $s = preg_replace('/[^ ]\[url\=(.*?)\]/',' [url=$1]' ,$s); + $s = preg_replace('/\[\/url\][^ ]/','[/url] ',$s); + return $s; } @@ -57,8 +74,6 @@ function stripdcode_br_cb($s) { } - // BBcode 2 HTML was written by WAY2WEB.net - // extended to work with Mistpark/Friendika - Mike Macgirvin function bb2diaspora($Text,$preserve_nl = false) { @@ -87,6 +102,13 @@ function bb2diaspora($Text,$preserve_nl = false) { // [img]pathtoimage[/img] + // the following was added on 10-January-2012 due to an inability of Diaspora's + // new javascript markdown processor to handle links with images as the link "text" + // It is not optimal and may be removed if this ability is restored in the future + + $Text = preg_replace("/\[url\=([$URLSearchString]*)\]\[img\](.*?)\[\/img\]\[\/url\]/ism", + '![' . t('image/photo') . '](' . '$2' . ')' . "\n" . '[' . t('link') . '](' . '$1' . ')', $Text); + $Text = preg_replace("/\[bookmark\]([$URLSearchString]*)\[\/bookmark\]/ism", '[$1]($1)', $Text); $Text = preg_replace("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism", '[$2]($1)', $Text); @@ -94,8 +116,9 @@ function bb2diaspora($Text,$preserve_nl = false) { $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'), $Text); + $Text = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/", '![' . t('image/photo') . '](' . '$2' . ')', $Text); // Perform MAIL Search $Text = preg_replace("(\[mail\]([$MAILSearchString]*)\[/mail\])", '[$1](mailto:$1)', $Text); @@ -149,13 +172,11 @@ function bb2diaspora($Text,$preserve_nl = false) { // Check for font change text // $Text = preg_replace("(\[font=(.*?)\](.*?)\[\/font\])","$2",$Text); - // Declare the format for [code] layout - $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/is",'stripdcode_br_cb',$Text); + $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/is",'stripdcode_br_cb',$Text); - // $CodeLayout = '$1'; // Check for [code] text - $Text = preg_replace("/\[code\](.*?)\[\/code\]/is","\t$1\n", $Text); + $Text = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/is","\t$2\n", $Text); @@ -169,26 +190,24 @@ function bb2diaspora($Text,$preserve_nl = false) { // html5 video and audio -// $Text = preg_replace("/\[video\](.*?)\[\/video\]/", '', $Text); + $Text = preg_replace("/\[video\](.*?)\[\/video\]/", '$1', $Text); -// $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '', $Text); + $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '$1', $Text); // $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/", '', $Text); // [img=widthxheight]image source[/img] // $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/", '', $Text); -// 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\]/", '', $Text); -// } -// $Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '', $Text); + $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism",'http://www.youtube.com/watch?v=$1',$Text); + $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism",'http://www.youtube.com/watch?v=$1',$Text); + $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'http://www.youtube.com/watch?v=$1',$Text); + $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", 'http://www.youtube.com/watch?v=$1', $Text); + + $Text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism",'http://vimeo.com/$1',$Text); + $Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism",'http://vimeo.com/$1',$Text); + $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", 'http://vimeo.com/$1',$Text); + @@ -226,7 +245,7 @@ function format_event_diaspora($ev) { $bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM - $o = 'Friendika event notification:' . "\n"; + $o = 'Friendica event notification:' . "\n"; $o .= '**' . bb2diaspora($ev['desc']) . '**' . "\n";