From 166df0180b34a8c92de254fd993e701d5399daf0 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 3 Dec 2016 22:04:13 -0500 Subject: [PATCH 1/4] Improve diaspora2bb autolinker for URLs - Add @ support for URLs (Medium URLs) - Exclude trailing commas from autolinked URLs, likely to be normal text - Formatting --- include/bb2diaspora.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index a8b39f741..cd5424216 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -15,24 +15,24 @@ 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); + $s = str_replace("\r", '', $s); - $s = str_replace("\n"," \n",$s); + $s = str_replace("\n", " \n", $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 +41,23 @@ 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:\/\-?&;.=_~#%$!+,@]+(? Date: Mon, 5 Dec 2016 22:46:51 -0500 Subject: [PATCH 2/4] Add
for each carriage return Fixes #2993 --- include/bb2diaspora.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index cd5424216..d6bff9ab5 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -17,8 +17,8 @@ function diaspora2bb($s) { $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); From d0cb8cdccfc0260ec00468079769e3615df06774 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 5 Dec 2016 22:47:52 -0500 Subject: [PATCH 3/4] Fixs edge case where single stars on succeeding lines are wrongly turned into multi-line --- include/bb2diaspora.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index d6bff9ab5..933055b1b 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -22,6 +22,9 @@ function diaspora2bb($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); From aef2c7373ca7221edb2ce7ff7d590af306200951 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 5 Dec 2016 22:48:02 -0500 Subject: [PATCH 4/4] Formatting --- include/bb2diaspora.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 933055b1b..0c637dc3a 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -55,10 +55,11 @@ function diaspora2bb($s) { $s = preg_replace('/([^\]=]|^)(https?\:\/\/)([a-zA-Z0-9:\/\-?&;.=_~#%$!+,@]+(?