From: Michael Vogel <icarus@dabo.de>
Date: Sat, 23 Jun 2012 10:50:00 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a81af2e042ae133bec3097488feeaa1318dc798b;p=friendica.git

Merge remote branch 'upstream/master'

Conflicts:
	include/bb2diaspora.php
---

a81af2e042ae133bec3097488feeaa1318dc798b
diff --cc include/bb2diaspora.php
index 7b4caec462,6f8f925149..96cc735bdb
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@@ -90,13 -94,18 +106,18 @@@ function bb2diaspora($Text,$preserve_n
  	$Text = str_replace(">", "&gt;", $Text);
  
  	// If we find any event code, turn it into an event.
 -	// After we're finished processing the bbcode we'll 
 +	// After we're finished processing the bbcode we'll
  	// replace all of the event code with a reformatted version.
  
 -
  	if($preserve_nl)
  		$Text = str_replace(array("\n","\r"), array('',''),$Text);
+ 	else
+ 		// Remove the "return" character, as Diaspora uses only the "newline"
+ 		// character, so having the "return" character can cause signature
+ 		// failures
+ 		$Text = str_replace("\r", "", $Text);
  
 +
  	// Set up the parameters for a URL search string
  	$URLSearchString = "^\[\]";
  	// Set up the parameters for a MAIL search string
@@@ -149,28 -159,34 +171,34 @@@
  //	$Text = preg_replace("(\[o\](.*?)\[\/o\])is",'<span class="overline">$1</span>',$Text);
  
  	// Check for colored text
- //	$Text = preg_replace("(\[color=(.*?)\](.*?)\[\/color\])is","<span style=\"color: $1;\">$2</span>",$Text);
+ 	// Remove color since Diaspora doesn't support it
+ 	$Text = preg_replace("(\[color=(.*?)\](.*?)\[\/color\])is","$2",$Text);
  
  	// Check for sized text
- //	$Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])is","<span style=\"font-size: $1;\">$2</span>",$Text);
+ 	// Remove it since Diaspora doesn't support sizes very well
+ 	$Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])is","$2",$Text);
  
  	// Check for list text
- //	$Text = preg_replace("/\[list\](.*?)\[\/list\]/is", '<ul class="listbullet">$1</ul>' ,$Text);
- //	$Text = preg_replace("/\[list=1\](.*?)\[\/list\]/is", '<ul class="listdecimal">$1</ul>' ,$Text);
- //	$Text = preg_replace("/\[list=i\](.*?)\[\/list\]/s",'<ul class="listlowerroman">$1</ul>' ,$Text);
- //	$Text = preg_replace("/\[list=I\](.*?)\[\/list\]/s", '<ul class="listupperroman">$1</ul>' ,$Text);
- //	$Text = preg_replace("/\[list=a\](.*?)\[\/list\]/s", '<ul class="listloweralpha">$1</ul>' ,$Text);
- //	$Text = preg_replace("/\[list=A\](.*?)\[\/list\]/s", '<ul class="listupperalpha">$1</ul>' ,$Text);
+ 	$Text = preg_replace_callback("/\[list\](.*?)\[\/list\]/is", 'diaspora_ul', $Text);
+ 	$Text = preg_replace_callback("/\[ul\](.*?)\[\/ul\]/is", 'diaspora_ul', $Text);
+ 	$Text = preg_replace_callback("/\[list=1\](.*?)\[\/list\]/is", 'diaspora_ol', $Text);
+ 	$Text = preg_replace_callback("/\[list=i\](.*?)\[\/list\]/s",'diaspora_ol', $Text);
+ 	$Text = preg_replace_callback("/\[list=I\](.*?)\[\/list\]/s", 'diaspora_ol', $Text);
+ 	$Text = preg_replace_callback("/\[list=a\](.*?)\[\/list\]/s", 'diaspora_ol', $Text);
+ 	$Text = preg_replace_callback("/\[list=A\](.*?)\[\/list\]/s", 'diaspora_ol', $Text);
+ 	$Text = preg_replace_callback("/\[ol\](.*?)\[\/ol\]/is", 'diaspora_ol', $Text);
  //	$Text = preg_replace("/\[li\](.*?)\[\/li\]/s", '<li>$1</li>' ,$Text);
  
- //	$Text = preg_replace("/\[td\](.*?)\[\/td\]/s", '<td>$1</td>' ,$Text);
- //	$Text = preg_replace("/\[tr\](.*?)\[\/tr\]/s", '<tr>$1</tr>' ,$Text);
- //	$Text = preg_replace("/\[table\](.*?)\[\/table\]/s", '<table>$1</table>' ,$Text);
+ 	// Just get rid of table tags since Diaspora doesn't support tables
+ 	$Text = preg_replace("/\[th\](.*?)\[\/th\]/s", '$1' ,$Text);
+ 	$Text = preg_replace("/\[td\](.*?)\[\/td\]/s", '$1' ,$Text);
+ 	$Text = preg_replace("/\[tr\](.*?)\[\/tr\]/s", '$1' ,$Text);
+ 	$Text = preg_replace("/\[table\](.*?)\[\/table\]/s", '$1' ,$Text);
  
- //	$Text = preg_replace("/\[table border=1\](.*?)\[\/table\]/s", '<table border="1" >$1</table>' ,$Text);
+ 	$Text = preg_replace("/\[table border=(.*?)\](.*?)\[\/table\]/s", '$2' ,$Text);
  //	$Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/s", '<table border="0" >$1</table>' ,$Text);
  
 -	
 +
  //	$Text = str_replace("[*]", "<li>", $Text);
  
  	// Check for font change text
@@@ -186,10 -202,11 +214,11 @@@
  
  
  	// Declare the format for [quote] layout
 -	//	$QuoteLayout = '<blockquote>$1</blockquote>';                     
 +	//	$QuoteLayout = '<blockquote>$1</blockquote>';
  	// Check for [quote] text
  	$Text = preg_replace("/\[quote\](.*?)\[\/quote\]/is",">$1\n\n", $Text);
+ 	$Text = preg_replace("/\[quote=(.*?)\](.*?)\[\/quote\]/is",">$2\n\n", $Text);
 -         
 +
  	// Images
  
  	// html5 video and audio
@@@ -234,7 -251,11 +263,12 @@@
  	$Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
  
  	$Text = preg_replace_callback('/\[(.*?)\]\((.*?)\)/ism','unescape_underscores_in_links',$Text);
 +*/
+ 
+ 	// Remove any leading or trailing whitespace, as this will mess up
+ 	// the Diaspora signature verification and cause the item to disappear
+ 	$Text = trim($Text);
 -	
++
  	call_hooks('bb2diaspora',$Text);
  
  	return $Text;