X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbb2diaspora.php;h=cef293c7667a3904efd595c247458e19f3c5b488;hb=ffbf330585a5766fcd16e99e10ff56a6c0af0cbd;hp=6ddbb6ef30f59f403a8ac7726ec3ef02da7750cf;hpb=9a6478b273e1fb9866948baa92b101d765f6264a;p=friendica.git diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 6ddbb6ef30..cef293c766 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -1,12 +1,34 @@ ', $s); - + $s = str_replace("\r\n", "\n", $s); $s = str_replace("\n", " \n", $s); + $s = str_replace("\r", " \n", $s); // Replace lonely stars in lines not starting with it with literal stars $s = preg_replace('/^([^\*]+)\*([^\*]*)$/im', '$1\*$2', $s); @@ -33,19 +55,11 @@ function diaspora2bb($s) { $s = Markdown($s); - $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/', '@[url=https://$3/u/$2]$1[/url]', $s); + $regexp = "/@\{(?:([^\}]+?); )?([^\} ]+)\}/"; + $s = preg_replace_callback($regexp, 'diaspora_mention2bb', $s); $s = str_replace('#', '#', $s); - $search = array(" \n", "\n "); - $replace = array("\n", "\n"); - do { - $oldtext = $s; - $s = str_replace($search, $replace, $s); - } while ($oldtext != $s); - - $s = str_replace("\n\n", '
', $s); - $s = html2bbcode($s); // protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands @@ -73,7 +87,7 @@ function diaspora2bb($s) { * @brief Callback function to replace a Friendica style mention in a mention for Diaspora * * @param array $match Matching values for the callback - * @return text Replaced mention + * @return string Replaced mention */ function diaspora_mentions($match) { @@ -91,47 +105,73 @@ function diaspora_mentions($match) { return $mention; } -function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) { - +/** + * @brief Converts a BBCode text into Markdown + * + * This function converts a BBCode item body to be sent to Markdown-enabled + * systems like Diaspora and Libertree + * + * @param string $Text + * @param bool $preserve_nl Effects unclear, unused in Friendica + * @param bool $fordiaspora Diaspora requires more changes than Libertree + * @return string + */ +function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) { $a = get_app(); $OriginalText = $Text; // Since Diaspora is creating a summary for links, this function removes them before posting - if ($fordiaspora) + if ($fordiaspora) { $Text = bb_remove_share_information($Text); + } /** * Transform #tags, strip off the [url] and replace spaces with underscore */ $URLSearchString = "^\[\]"; - $Text = preg_replace_callback("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/i", create_function('$match', - 'return \'#\'. str_replace(\' \', \'_\', $match[2]);' - ), $Text); + $Text = preg_replace_callback("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/i", + function ($matches) { + return '#' . str_replace(' ', '_', $matches[2]); + } + , $Text); // Converting images with size parameters to simple images. Markdown doesn't know it. $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text); + // Extracting multi-line code blocks before the whitespace processing/code highlighter in bbcode() + $codeblocks = []; + $Text = preg_replace_callback('#\[code(?:=([^\]]*))?\](?=\n)(.*?)\[\/code\]#is', + function ($matches) use (&$codeblocks) { + $return = '#codeblock-' . count($codeblocks) . '#'; + + $prefix = '````' . $matches[1] . PHP_EOL; + $codeblocks[] = $prefix . trim($matches[2]) . PHP_EOL . '````'; + return $return; + } + , $Text); + // Convert it to HTML - don't try oembed if ($fordiaspora) { $Text = bbcode($Text, $preserve_nl, false, 3); // Add all tags that maybe were removed - if (preg_match_all("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",$OriginalText, $tags)) { + if (preg_match_all("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $OriginalText, $tags)) { $tagline = ""; - foreach($tags[2] as $tag) { + foreach ($tags[2] as $tag) { $tag = html_entity_decode($tag, ENT_QUOTES, 'UTF-8'); - if (!strpos(html_entity_decode($Text, ENT_QUOTES, 'UTF-8'), "#".$tag)) - $tagline .= "#".$tag." "; + if (!strpos(html_entity_decode($Text, ENT_QUOTES, 'UTF-8'), '#' . $tag)) { + $tagline .= '#' . $tag . ' '; + } } $Text = $Text." ".$tagline; } - - } else + } else { $Text = bbcode($Text, $preserve_nl, false, 4); + } // mask some special HTML chars from conversation to markdown - $Text = str_replace(array('<','>','&'),array('&_lt_;','&_gt_;','&_amp_;'),$Text); + $Text = str_replace(array('<', '>', '&'), array('&_lt_;', '&_gt_;', '&_amp_;'), $Text); // If a link is followed by a quote then there should be a newline before it // Maybe we should make this newline at every time before a quote. @@ -140,10 +180,11 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) { $stamp1 = microtime(true); // Now convert HTML to Markdown - $Text = new HTML_To_Markdown($Text); + $converter = new HtmlConverter(); + $Text = $converter->convert($Text); // unmask the special chars back to HTML - $Text = str_replace(array('&_lt_;','&_gt_;','&_amp_;'),array('<','>','&'),$Text); + $Text = str_replace(array('&_lt_;', '&_gt_;', '&_amp_;'), array('<', '>', '&'), $Text); $a->save_timestamp($stamp1, "parser"); @@ -159,13 +200,24 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) { $Text = preg_replace_callback("/([@]\[(.*?)\])\(([$URLSearchString]*?)\)/ism", 'diaspora_mentions', $Text); } + // Restore code blocks + $Text = preg_replace_callback('/#codeblock-([0-9]+)#/iU', + function ($matches) use ($codeblocks) { + $return = ''; + if (isset($codeblocks[intval($matches[1])])) { + $return = $codeblocks[$matches[1]]; + } + return $return; + } + , $Text); + call_hooks('bb2diaspora',$Text); return $Text; } function unescape_underscores_in_links($m) { - $y = str_replace('\\_','_', $m[2]); + $y = str_replace('\\_', '_', $m[2]); return('[' . $m[1] . '](' . $y . ')'); }