diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index a8b39f741..0c637dc3a 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:\/\-?&;.=_~#%$!+,@]+(?