X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbb2diaspora.php;h=fc25a584a91b44ffd3513722ebe9683cacf4b5e3;hb=c4d3ab68785122ff070c65a444aaa0833b746b2b;hp=5a60cd945a5dacfad2c8c1f4f8731229be02cdf2;hpb=8149e21adda5d209cc995b0981e7c3b6d5354b7e;p=friendica.git diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 5a60cd945a..fc25a584a9 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -1,12 +1,14 @@ ', '
', '
'), array('
', '
', '
'), $s);
+ $s = str_replace(['
', '
'], ['
', '
', '
'], $s);
// Escaping the hash tags
$s = preg_replace('/\#([^\s\#])/', '#$1', $s);
- $s = Markdown($s);
+ $s = Markdown::convert($s);
$regexp = "/@\{(?:([^\}]+?); )?([^\} ]+)\}/";
$s = preg_replace_callback($regexp, 'diaspora_mention2bb', $s);
@@ -91,22 +94,32 @@ function diaspora2bb($s) {
*/
function diaspora_mentions($match) {
- $contact = get_contact_details_by_url($match[3]);
+ $contact = Contact::getDetailsByURL($match[3]);
- if (!isset($contact['addr'])) {
+ if (!x($contact, 'addr')) {
$contact = Probe::uri($match[3]);
}
- if (!isset($contact['addr'])) {
+ if (!x($contact, 'addr')) {
return $match[0];
}
- $mention = '@{'.$match[2].'; '.$contact['addr'].'}';
+ $mention = '@{' . $match[2] . '; ' . $contact['addr'] . '}';
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;
@@ -129,6 +142,22 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
// 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(?:=([^\]]*))?\](.*?)\[\/code\]#is",
+ function ($matches) use (&$codeblocks) {
+ $return = $matches[0];
+ if (strpos($matches[2], "\n") !== false) {
+ $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);
@@ -149,24 +178,25 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
}
// mask some special HTML chars from conversation to markdown
- $Text = str_replace(array('<', '>', '&'), array('&_lt_;', '&_gt_;', '&_amp_;'), $Text);
+ $Text = str_replace(['<', '>', '&'], ['&_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.
- $Text = str_replace(array("
"), array(""), $Text); + $Text = str_replace([""], [""], $Text); $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(['&\_lt\_;', '&\_gt\_;', '&\_amp\_;'], ['<', '>', '&'], $Text); $a->save_timestamp($stamp1, "parser"); // Libertree has a problem with escaped hashtags. - $Text = str_replace(array('\#'), array('#'), $Text); + $Text = str_replace(['\#'], ['#'], $Text); // Remove any leading or trailing whitespace, as this will mess up // the Diaspora signature verification and cause the item to disappear @@ -177,6 +207,17 @@ 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; @@ -188,9 +229,9 @@ function unescape_underscores_in_links($m) { } function format_event_diaspora($ev) { - - if(! ((is_array($ev)) && count($ev))) + if (! ((is_array($ev)) && count($ev))) { return ''; + } $bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM @@ -203,19 +244,21 @@ function format_event_diaspora($ev) { $ev['start'] , $bd_format )) : day_translate(datetime_convert('UTC', 'UTC', $ev['start'] , $bd_format))) - . '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n"; + . '](' . System::baseUrl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n"; - if(! $ev['nofinish']) + if (! $ev['nofinish']) { $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 ))) - . '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n"; + . '](' . System::baseUrl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n"; + } - if(strlen($ev['location'])) + if (strlen($ev['location'])) { $o .= t('Location:') . bb2diaspora($ev['location']) . "\n"; + } $o .= "\n"; return $o;