From e921b97a7f4e6f16e499eb7a8dd496f88d18277a Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 5 Sep 2011 18:34:30 -0700 Subject: bug #127, add Diaspora notes to Connect (dfrn_request) page, get rid of security warnings --- include/bb2diaspora.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include') diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index ca0c961b3..591aaf7fa 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -8,6 +8,10 @@ require_once('include/event.php'); function diaspora2bb($s) { + // bug #127 + $s = preg_replace('/\[(.+?)\]\((.+?)[^\\\]_(.+?)\)/','[$1]($2\\_$3)',$s); + + $s = str_replace(array('\\**','\\__','\\*','\\_'), array('-^doublestar^-','-^doublescore-^','-^star^-','-^score^-'),$s); $s = preg_replace("/\*\*\*(.+?)\*\*\*/", '[b][i]$1[/i][/b]', $s); $s = preg_replace("/\_\_\_(.+?)\_\_\_/", '[b][i]$1[/i][/b]', $s); @@ -15,6 +19,7 @@ function diaspora2bb($s) { $s = preg_replace("/\_\_(.+?)\_\_/", '[b]$1[/b]', $s); $s = preg_replace("/\*(.+?)\*/", '[i]$1[/i]', $s); $s = preg_replace("/\_(.+?)\_/", '[i]$1[/i]', $s); + $s = str_replace(array('-^doublestar^-','-^doublescore-^','-^star^-','-^score^-'), array('**','__','*','_'), $s); $s = preg_replace('/\!\[(.+?)\]\((.+?)\)/','[img]$2[/img]',$s); $s = preg_replace('/\[(.+?)\]\((.+?)\)/','[url=$2]$1[/url]',$s); -- cgit v1.2.3