X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbb2diaspora.php;h=5b240bdd24143b0e1fe82064459efa91fba79c1f;hb=9edf15d3ef0548a35862fab37eee1fd310705285;hp=65ccc750f119b1952f176371744ddb16494168b4;hpb=c0a2cc3e98868b3b10472dee00a4590bb11f45c1;p=friendica.git

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 65ccc750f1..5b240bdd24 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);
@@ -37,6 +42,8 @@ function stripdcode_br_cb($s) {
 
 function bb2diaspora($Text,$preserve_nl = false) {
 
+	$ev = bbtoevent($Text);
+
 	// Replace any html brackets with HTML Entities to prevent executing HTML or script
 	// Don't use strip_tags here because it breaks [url] search by replacing & with amp
 
@@ -47,7 +54,6 @@ function bb2diaspora($Text,$preserve_nl = false) {
 	// After we're finished processing the bbcode we'll 
 	// replace all of the event code with a reformatted version.
 
-	$ev = bbtoevent($Text);
 
 	if($preserve_nl)
 		$Text = str_replace(array("\n","\r"), array('',''),$Text);
@@ -62,9 +68,9 @@ function bb2diaspora($Text,$preserve_nl = false) {
 	// [img]pathtoimage[/img]
 
 
-	$Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '[$1]($1)', $Text);
-	$Text = preg_replace("/\#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/", '[#$2]($1)', $Text);
-	$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/", '[$2]($1)', $Text);
+	$Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '[$1]($1)', $Text);
+	$Text = preg_replace("/\#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[#$2]($1)', $Text);
+	$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[$2]($1)', $Text);
 
 //	$Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('Image/photo: ') . '$1', $Text);
 //	$Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('image/photo'), $Text);
@@ -165,7 +171,7 @@ function bb2diaspora($Text,$preserve_nl = false) {
 
 
 	// oembed tag
-//	$Text = oembed_bbcode2html($Text);
+	//	$Text = oembed_bbcode2html($Text);
 
 	// If we found an event earlier, strip out all the event code and replace with a reformatted version.
 
@@ -180,7 +186,10 @@ function bb2diaspora($Text,$preserve_nl = false) {
 		$Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",'',$Text);
 	}
 
+	$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);
 	
 	call_hooks('bb2diaspora',$Text);
 
@@ -189,8 +198,6 @@ function bb2diaspora($Text,$preserve_nl = false) {
 
 function format_event_diaspora($ev) {
 
-//	require_once('include/bbcode.php');
-
 	if(! ((is_array($ev)) && count($ev)))
 		return '';