X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbb2diaspora.php;h=03eff5a6b73a5bd2c398d11fe8c4d448110a1497;hb=2952e2b3e47d0d16e89c6ff81353a9059bfe474c;hp=fc05e720f4f7b1c7a16896532d7e534d315cc7d1;hpb=fc18123082f2e0606066ae18a385db5bffc19142;p=friendica.git diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index fc05e720f4..03eff5a6b7 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -7,6 +7,27 @@ require_once("include/html2bbcode.php"); require_once("include/bbcode.php"); require_once("library/html-to-markdown/HTML_To_Markdown.php"); +/** + * @brief Callback function to replace a Diaspora style mention in a mention for Friendica + * + * @param array $match Matching values for the callback + * @return string Replaced mention + */ +function diaspora_mention2bb($match) { + if ($match[2] == '') { + return; + } + + $data = get_contact_details_by_addr($match[2]); + + $name = $match[1]; + + if ($name == '') { + $name = $data['name']; + } + + return '@[url='.$data['url'].']'.$name.'[/url]'; +} // we don't want to support a bbcode specific markdown interpreter // and the markdown library we have is pretty good, but provides HTML output. @@ -15,49 +36,45 @@ 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\n", "\n", $s); + $s = str_replace("\n", " \n", $s); + $s = str_replace("\r", " \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 = str_replace('#','#',$s);
+ $regexp = "/@\{(?:([^\}]+?); )?([^\} ]+)\}/";
+ $s = preg_replace_callback($regexp, 'diaspora_mention2bb', $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 = str_replace('#', '#', $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
$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);
+ // mask some special HTML chars from conversation to markdown
+ $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.
@@ -116,8 +155,8 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
// Now convert HTML to Markdown
$Text = new HTML_To_Markdown($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,6 +167,11 @@ 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);
+ }
+
call_hooks('bb2diaspora',$Text);
return $Text;
@@ -140,8 +184,6 @@ function unescape_underscores_in_links($m) {
function format_event_diaspora($ev) {
- $a = get_app();
-
if(! ((is_array($ev)) && count($ev)))
return '';
@@ -156,7 +198,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 +206,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'])