aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-09-20 15:23:36 -0700
committerFriendika <info@friendika.com>2011-09-20 15:23:36 -0700
commitdeeae7bdb5dffcdb8f11a604d7ca3078cfadf754 (patch)
tree4b4441173fdd23935882bf3c72dfe35672f639ba /include
parent119cd9c0cee5e416199da900016609259598cb0b (diff)
downloadvolse-hubzilla-deeae7bdb5dffcdb8f11a604d7ca3078cfadf754.tar.gz
volse-hubzilla-deeae7bdb5dffcdb8f11a604d7ca3078cfadf754.tar.bz2
volse-hubzilla-deeae7bdb5dffcdb8f11a604d7ca3078cfadf754.zip
diaspora markdown changes, parse_url format change
Diffstat (limited to 'include')
-rw-r--r--include/bb2diaspora.php27
1 files changed, 5 insertions, 22 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 5b240bdd2..3d6408bcf 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -3,30 +3,14 @@
require_once("include/oembed.php");
require_once('include/event.php');
-
-
+require_once('library/markdown.php');
+require_once('include/html2bbcode.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);
- $s = preg_replace("/\*\*(.+?)\*\*/", '[b]$1[/b]', $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);
$s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);
-
-
- $s = escape_tags($s);
+ $s = Markdown($s);
+ $s = html2bbcode($s);
return $s;
}
@@ -188,8 +172,7 @@ function bb2diaspora($Text,$preserve_nl = false) {
$Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
- $Text = preg_replace('/\[(.*?)\\\\_(.*?)\]\((.*?)\)/ism','[$1_$2]($3)',$Text);
- $Text = preg_replace('/\[(.*?)\\\\\*(.*?)\]\((.*?)\)/ism','[$1*$2]($3)',$Text);
+ $Text = preg_replace('/\[(.*?)\]\((.*?)\\\\_(.*?)\)/ism','[$1]($2_$3)',$Text);
call_hooks('bb2diaspora',$Text);