X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbb2diaspora.php;h=8487f845a62848a75750632f14b773047096dbde;hb=9b6e91086b29554fd04362f6c87ea148718e8b1c;hp=5ce34d6660a955237b18ea0f925c66372f22c514;hpb=56c29a527d79391a1d30a1be043f924bc1ae1466;p=friendica.git
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
old mode 100644
new mode 100755
index 5ce34d6660..8487f845a6
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -3,24 +3,84 @@
require_once("include/oembed.php");
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) {
+
+ // for testing purposes: Collect raw markdown articles
+ // $file = tempnam("/tmp/friendica/", "markdown");
+ // file_put_contents($file, $s);
+
+ $s = html_entity_decode($s,ENT_COMPAT,'UTF-8');
+
+ // Too many new lines. So deactivated the following line
+ // $s = str_replace("\r","\n",$s);
+ // Simply remove cr.
+ $s = str_replace("\r","",$s);
+
+ // is invalid. Replace it with the valid expression
+ $s = str_replace(" "," ",$s);
+
+ $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);
+
+ // Escaping the hash tags - doesn't always seem to work
+ // $s = preg_replace('/\#([^\s\#])/','\\#$1',$s);
+ // This seems to work
+ $s = preg_replace('/\#([^\s\#])/','#$1',$s);
+
+ $s = Markdown($s);
+
+ $s = str_replace('#','#',$s);
+
+ $s = str_replace("\n",' ',$s);
+
+ $s = html2bbcode($s);
+// $s = str_replace('*','*',$s);
+
+ // Convert everything that looks like a link to a link
+ $s = preg_replace("/([^\]\=]|^)(https?\:\/\/)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url=$2$3]$2$3[/url]',$s);
+
+ //$s = preg_replace("/([^\]\=]|^)(https?\:\/\/)(vimeo|youtu|www\.youtube|soundcloud)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url=$2$3$4]$2$3$4[/url]',$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);
+ // remove duplicate adjacent code tags
+ $s = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/ism","[code]$2[/code]", $s);
+
+ // Don't show link to full picture (until it is fixed)
+ $s = scale_external_images($s, false);
+
+ return $s;
+}
function stripdcode_br_cb($s) {
- return '[code]' . str_replace(' ', '', $s[1]) . '[/code]';
+ return '[code]' . str_replace(' ', "\n\t", $s[1]) . '[/code]';
}
- // BBcode 2 HTML was written by WAY2WEB.net
- // extended to work with Mistpark/Friendika - Mike Macgirvin
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
$Text = str_replace("<", "<", $Text);
$Text = str_replace(">", ">", $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.
+
if($preserve_nl)
$Text = str_replace(array("\n","\r"), array('',''),$Text);
@@ -34,12 +94,23 @@ 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",
+ '' . "\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);
- $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '[$1]($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'), $Text);
+
+ $Text = preg_replace("/\[img\](.*?)\[\/img\]/", '', $Text);
+ $Text = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/", '', $Text);
// Perform MAIL Search
$Text = preg_replace("(\[mail\]([$MAILSearchString]*)\[/mail\])", '[$1](mailto:$1)', $Text);
@@ -93,67 +164,102 @@ 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","```$1```", $Text);
+ $Text = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/is","\t$2\n", $Text);
// Declare the format for [quote] layout
-// $QuoteLayout = '