$s = html_entity_decode($s,ENT_COMPAT,'UTF-8');
- // Simply remove cr.
- //$s = str_replace("\r","",$s);
-/*
- // The parser has problems with unbalanced HTML elements
- $doc = new DOMDocument();
- $doc->preserveWhiteSpace = false;
- $s = mb_convert_encoding($s, 'HTML-ENTITIES', "UTF-8");
- $doctype = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">';
- $encoding = '<?xml encoding="UTF-8">';
- @$doc->loadHTML($encoding.$doctype."<html><body>".$s."</body></html>");
- $doc->encoding = 'UTF-8';
- $s = $doc->saveHTML();
- $s = str_replace(array("<html><body>", "</body></html>", $doctype, $encoding), array("", "", "", ""), $s);
-*/
-
- // The parser has problems with unbalanced html elements
- $s = str_replace(array("<br/>", "</p>", "<p>", '<p dir="ltr">'),array("<br />", "<br />", "<br />", "<br />"),$s);
+ // Remove CR to avoid problems with following code
+ $s = str_replace("\r","",$s);
+
+ $s = str_replace("\n"," \n",$s);
+
+ // The parser cannot handle paragraphs correctly
+ $s = str_replace(array("</p>", "<p>", '<p dir="ltr">'),array("<br>", "<br>", "<br>"),$s);
// Escaping the hash tags
$s = preg_replace('/\#([^\s\#])/','#$1',$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", "<br>", $s);
+
$s = html2bbcode($s);
// protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands
} 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);
+
// 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("</a><blockquote>"), array("</a><br><blockquote>"), $Text);
// 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);
+
$a->save_timestamp($stamp1, "parser");
- // Libertree has a problem with escaped hashtags - Diaspora doesn't seem to.
- if (!$fordiaspora)
- $Text = str_replace(array('\#'), array('#'), $Text);
+ // Libertree has a problem with escaped hashtags.
+ $Text = str_replace(array('\#'), array('#'), $Text);
// Remove any leading or trailing whitespace, as this will mess up
// the Diaspora signature verification and cause the item to disappear
$o .= '**' . (($ev['summary']) ? bb2diaspora($ev['summary']) : bb2diaspora($ev['desc'])) . '**' . "\n";
$o .= t('Starts:') . ' ' . '['
- . (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC',
+ . (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC',
$ev['start'] , $bd_format ))
- : day_translate(datetime_convert('UTC', 'UTC',
+ : day_translate(datetime_convert('UTC', 'UTC',
$ev['start'] , $bd_format)))
. '](' . $a->get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n";
if(! $ev['nofinish'])
- $o .= t('Finishes:') . ' ' . '['
- . (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC',
+ $o .= t('Finishes:') . ' ' . '['
+ . (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC',
$ev['finish'] , $bd_format ))
- : day_translate(datetime_convert('UTC', 'UTC',
+ : day_translate(datetime_convert('UTC', 'UTC',
$ev['finish'] , $bd_format )))
. '](' . $a->get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n";
if(strlen($ev['location']))
- $o .= t('Location:') . bb2diaspora($ev['location'])
+ $o .= t('Location:') . bb2diaspora($ev['location'])
. "\n";
$o .= "\n";