X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbb2diaspora.php;h=2673750eec5f4fa4aea5c957a65c28dbe3e01ab8;hb=df7bdbfc66566a5063fa754fdcc83ec9230f9b6e;hp=e1a67d432d261600cae885ed2185b422275288cd;hpb=18d93cddf60d46e1334d6dd7454a76f1d6549052;p=friendica.git diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index e1a67d432d..2673750eec 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -1,15 +1,13 @@ ', '
', '
'), 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);
@@ -147,12 +145,16 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
// Extracting multi-line code blocks before the whitespace processing/code highlighter in bbcode()
$codeblocks = [];
- $Text = preg_replace_callback('#\[code(?:=([^\]]*))?\](?=\n)(.*?)\[\/code\]#is',
+
+ $Text = preg_replace_callback("#\[code(?:=([^\]]*))?\](.*?)\[\/code\]#is",
function ($matches) use (&$codeblocks) {
- $return = '#codeblock-' . count($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 . '````';
+ $prefix = '````' . $matches[1] . PHP_EOL;
+ $codeblocks[] = $prefix . trim($matches[2]) . PHP_EOL . '````';
+ }
return $return;
}
, $Text);
@@ -177,11 +179,11 @@ 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); @@ -190,12 +192,12 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) { $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 @@ -217,7 +219,7 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) { } , $Text); - call_hooks('bb2diaspora',$Text); + Addon::callHooks('bb2diaspora',$Text); return $Text; } @@ -232,13 +234,13 @@ function format_event_diaspora($ev) { return ''; } - $bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM + $bd_format = L10n::t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM $o = 'Friendica event notification:' . "\n"; $o .= '**' . (($ev['summary']) ? bb2diaspora($ev['summary']) : bb2diaspora($ev['desc'])) . '**' . "\n"; - $o .= t('Starts:') . ' ' . '[' + $o .= L10n::t('Starts:') . ' ' . '[' . (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC', $ev['start'] , $bd_format )) : day_translate(datetime_convert('UTC', 'UTC', @@ -246,7 +248,7 @@ function format_event_diaspora($ev) { . '](' . System::baseUrl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n"; if (! $ev['nofinish']) { - $o .= t('Finishes:') . ' ' . '[' + $o .= L10n::t('Finishes:') . ' ' . '[' . (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC', $ev['finish'] , $bd_format )) : day_translate(datetime_convert('UTC', 'UTC', @@ -255,7 +257,7 @@ function format_event_diaspora($ev) { } if (strlen($ev['location'])) { - $o .= t('Location:') . bb2diaspora($ev['location']) + $o .= L10n::t('Location:') . bb2diaspora($ev['location']) . "\n"; }