X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbb2diaspora.php;h=cef293c7667a3904efd595c247458e19f3c5b488;hb=ffbf330585a5766fcd16e99e10ff56a6c0af0cbd;hp=d6bff9ab5b993a608a004474e11cb754effb4c67;hpb=60b9203dd54cdc4c323acce224a4ef93b4884398;p=friendica.git diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index d6bff9ab5b..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); // The parser cannot handle paragraphs correctly $s = str_replace(array('
', '', '
'), array('
', '
', '
'), $s);
@@ -30,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
@@ -52,10 +69,11 @@ function diaspora2bb($s) {
$s = preg_replace('/([^\]=]|^)(https?\:\/\/)([a-zA-Z0-9:\/\-?&;.=_~#%$!+,@]+(?convert($Text);
- // unmask the special chars back to HTML
- $Text = str_replace(array('&_lt_;','&_gt_;','&_amp_;'),array('<','>','&'),$Text);
+ // unmask the special chars back to HTML
+ $Text = str_replace(array('&_lt_;', '&_gt_;', '&_amp_;'), array('<', '>', '&'), $Text);
$a->save_timestamp($stamp1, "parser");
@@ -128,20 +195,34 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
// the Diaspora signature verification and cause the item to disappear
$Text = trim($Text);
+ if ($fordiaspora) {
+ $URLSearchString = "^\[\]";
+ $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) {
- $a = get_app();
-
if(! ((is_array($ev)) && count($ev)))
return '';
@@ -156,7 +237,7 @@ function format_event_diaspora($ev) {
$ev['start'] , $bd_format ))
: day_translate(datetime_convert('UTC', 'UTC',
$ev['start'] , $bd_format)))
- . '](' . $a->get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n";
+ . '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n";
if(! $ev['nofinish'])
$o .= t('Finishes:') . ' ' . '['
@@ -164,7 +245,7 @@ function format_event_diaspora($ev) {
$ev['finish'] , $bd_format ))
: day_translate(datetime_convert('UTC', 'UTC',
$ev['finish'] , $bd_format )))
- . '](' . $a->get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n";
+ . '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n";
if(strlen($ev['location']))
$o .= t('Location:') . bb2diaspora($ev['location'])