Fixed a bug where a title was set in a way that affected other addons. Additionally some changes to bb2markdown.

facebook/facebook.php

@@ -941,7 +941,7 @@ function facebook_post_hook(&$a,&$b) {
 			if($fb_token && ($toplevel || $b['private'] || $reply)) {
 				logger('facebook: able to post');
 				require_once('library/facebook.php');
-				require_once('include/bbcode.php');	
+				require_once('include/bbcode.php');
 
 				$msg = $b['body'];
 
@@ -1016,7 +1016,7 @@ function facebook_post_hook(&$a,&$b) {
 				}
 
 				// At first convert the text to html
-				$html = bbcode($body);
+				$html = bbcode($body, false, false);
 
 				// Then convert it to plain text
 				$msg = trim($b['title']." \n\n".html2plain($html, 0, true));
@@ -1133,8 +1133,8 @@ function facebook_post_hook(&$a,&$b) {
 				} else {
 					// if its only a message and a subject and the message is larger than 500 characters then post it as note
 					$postvars = array(
-						'access_token' => $fb_token, 
-						'message' => bbcode($b['body']),
+						'access_token' => $fb_token,
+						'message' => bbcode($b['body'], false, false),
 						'subject' => $b['title'],
 					);
 					$url = 'https://graph.facebook.com/me/notes';

statusnet/statusnet.php

@@ -426,15 +426,15 @@ function statusnet_post_hook(&$a,&$b) {
 
 	if($ckey && $csecret && $otoken && $osecret) {
 
-		require_once('include/bbcode.php');	
+		require_once('include/bbcode.php');
 		$dent = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret);
                 $max_char = $dent->get_maxlength(); // max. length for a dent
                 // we will only work with up to two times the length of the dent 
-                // we can later send to StatusNet. This way we can "gain" some 
-                // information during shortening of potential links but do not 
+                // we can later send to StatusNet. This way we can "gain" some
+                // information during shortening of potential links but do not
                 // shorten all the links in a 200000 character long essay.
                 if (! $b['title']=='') {
-                    $tmp = $b['title'] . ' : '. $b['body'];
+			$tmp = $b['title'].": \n".$b['body'];
 //                    $tmp = substr($tmp, 0, 4*$max_char);
                 } else {
                     $tmp = $b['body']; // substr($b['body'], 0, 3*$max_char);
@@ -476,7 +476,7 @@ function statusnet_post_hook(&$a,&$b) {
                 }
                 // ok, all the links we want to send out are save, now strip 
                 // away the remaining bbcode
-		$msg = strip_tags(bbcode($tmp));
+		$msg = strip_tags(bbcode($tmp, false, false));
 		// quotes not working - let's try this
 		$msg = html_entity_decode($msg);
 		if (( strlen($msg) > $max_char) && $max_char > 0) {

tumblr/tumblr.php

@@ -170,12 +170,13 @@ function tumblr_send(&$a,&$b) {
 
 		$link = "";
 		$video = false;
+		$title = trim($b['title']);
 
 		// Checking for a bookmark
 		if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches)) {
 			$link = $matches[1];
-			if ($b['title'] == '')
-				$b['title'] = html_entity_decode($matches[2],ENT_QUOTES,'UTF-8');
+			if ($title == '')
+				$title = html_entity_decode($matches[2],ENT_QUOTES,'UTF-8');
 
 			$body = $b['body'];
 			// splitting the text in two parts:
@@ -201,20 +202,20 @@ function tumblr_send(&$a,&$b) {
 		if (($link != '') and $video) {
 			$params['type'] = "video";
 			$params['embed'] = $link;
-			if ($b['title'] != '')
-				$params['caption'] = '<h1><a href="'.$link.'">'.$b['title'].
+			if ($title != '')
+				$params['caption'] = '<h1><a href="'.$link.'">'.$title.
 							"</a></h1><p>".bbcode($body)."</p>";
 			else
 				$params['caption'] = bbcode($body);
 		} else if (($link != '') and !$video) {
 			$params['type'] = "link";
-			$params['name'] = $b['title'];
+			$params['name'] = $title;
 			$params['url'] = $link;
 			//$params['description'] = bbcode($body);
 			$params['description'] = bbcode($b["body"]);
 		} else {
 			$params['type'] = "regular";
-			$params['title'] = $b['title'];
+			$params['title'] = $title;
 			$params['body'] = bbcode($b['body']);
 		}
 

twitter/twitter.php

@@ -290,7 +290,7 @@ function twitter_post_hook(&$a,&$b) {
 		logger('twitter: we have customer key and oauth stuff, going to send.', LOGGER_DEBUG);
 
 		require_once('library/twitteroauth.php');
-		require_once('include/bbcode.php');	
+		require_once('include/bbcode.php');
 		$tweet = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
                 // in theory max char is 140 but T. uses t.co to make links 
                 // longer so we give them 10 characters extra
@@ -341,7 +341,7 @@ function twitter_post_hook(&$a,&$b) {
                 }
                 // ok, all the links we want to send out are save, now strip 
                 // away the remaining bbcode
-		$msg = strip_tags(bbcode($tmp));
+		$msg = strip_tags(bbcode($tmp, false, false));
 		// quotes not working - let's try this
 		$msg = html_entity_decode($msg);
 		if (( strlen($msg) > $max_char) && $max_char > 0) {

wppost/wppost.php

@@ -179,24 +179,26 @@ function wppost_send(&$a,&$b) {
 		require_once('include/bbcode.php');
 		require_once('include/html2plain.php');
 
+		$wptitle = trim($b['title']);
+
 		// If the title is empty then try to guess
-		if ($b['title'] == '') {
+		if ($wptitle == '') {
 			// Take the description from the bookmark
 			if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches))
-				$b['title'] = $matches[2];
+				$wptitle = $matches[2];
 
 			// If no bookmark is found then take the first line
-			if ($b['title'] == '') {
+			if ($wptitle == '') {
 				$title = html2plain(bbcode($b['body']), 0, true);
 				$pos = strpos($title, "\n");
 				if (($pos == 0) or ($pos > 60))
 					$pos = 60;
 
-				$b['title'] = substr($title, 0, $pos);
+				$wptitle = substr($title, 0, $pos);
 			}
 		}
 
-		$title = '<title>' . (($b['title']) ? $b['title'] : t('Post from Friendica')) . '</title>';
+		$title = '<title>' . (($wptitle) ? $wptitle : t('Post from Friendica')) . '</title>';
 		$post = $title . bbcode($b['body']);
 
 		$wp_backlink = intval(get_pconfig($b['uid'],'wppost','backlink'));