X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbb2diaspora.php;h=714d780048b9724fe48f5570cd78ed6a433f65a7;hb=4e7657da99f35451150dbec3aeb8d61804d1e691;hp=e5099992366558b722c8c27fb635713bc24a4f6c;hpb=77e8c44016a5c327e61e93724b8921cfd600b66c;p=friendica.git diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index e509999236..714d780048 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -1,11 +1,16 @@ ', $s); - $s = html2bbcode($s); // protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands @@ -99,61 +96,87 @@ 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; // 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. @@ -162,10 +185,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"); @@ -181,20 +205,31 @@ 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 . ')'); } 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 @@ -207,19 +242,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;