X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fbb2diaspora.php;h=842dbf0b1cf4595212a5c363f790867a0689cd7c;hb=d242e72c656e6185e634ba6978783c2596f0918a;hp=fc05e720f4f7b1c7a16896532d7e534d315cc7d1;hpb=4b6afbf6814acde5151edc74f0b6cf1fd7685432;p=friendica.git
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index fc05e720f4..842dbf0b1c 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -15,24 +15,27 @@ require_once("library/html-to-markdown/HTML_To_Markdown.php");
function diaspora2bb($s) {
- $s = html_entity_decode($s,ENT_COMPAT,'UTF-8');
+ $s = html_entity_decode($s, ENT_COMPAT, 'UTF-8');
- // Remove CR to avoid problems with following code
- $s = str_replace("\r","",$s);
+ // Handles single newlines
+ $s = str_replace("\r", '
', $s);
- $s = str_replace("\n"," \n",$s);
+ $s = str_replace("\n", " \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);
+ $s = str_replace(array('
', '
'), array('
', '
', '
'), $s);
// Escaping the hash tags
- $s = preg_replace('/\#([^\s\#])/','#$1',$s);
+ $s = preg_replace('/\#([^\s\#])/', '#$1', $s);
$s = Markdown($s);
- $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);
+ $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/', '@[url=https://$3/u/$2]$1[/url]', $s);
- $s = str_replace('#','#',$s);
+ $s = str_replace('#', '#', $s);
$search = array(" \n", "\n ");
$replace = array("\n", "\n");
@@ -41,23 +44,24 @@ function diaspora2bb($s) {
$s = str_replace($search, $replace, $s);
} while ($oldtext != $s);
- $s = str_replace("\n\n", "
", $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
- $s = str_replace('♲',html_entity_decode('♲',ENT_QUOTES,'UTF-8'),$s);
+ $s = str_replace('♲', html_entity_decode('♲', ENT_QUOTES, 'UTF-8'), $s);
// Convert everything that looks like a link to a link
- $s = preg_replace("/([^\]\=]|^)(https?\:\/\/)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url=$2$3]$2$3[/url]',$s);
+ $s = preg_replace('/([^\]=]|^)(https?\:\/\/)([a-zA-Z0-9:\/\-?&;.=_~#%$!+,@]+(?".$tagline;
+ }
+ $Text = $Text." ".$tagline;
}
} else
@@ -140,8 +144,6 @@ function unescape_underscores_in_links($m) {
function format_event_diaspora($ev) {
- $a = get_app();
-
if(! ((is_array($ev)) && count($ev)))
return '';
@@ -156,7 +158,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 +166,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'])