Merge pull request #110 from annando/master

twitter, statusnet, gpluspost

gpluspost/gpluspost.php

@@ -327,6 +327,16 @@ function gpluspost_feeditem($pid, $uid) {
 				$link = current($links);
 			}
 			$multiplelinks = (sizeof($links) > 1);
+
+			if ($multiplelinks) {
+				$html2 = bbcode($msg, false, false);
+				$links2 = collecturls($html2);
+				if (sizeof($links2) > 0) {
+					reset($links2);
+					$link = current($links2);
+					$multiplelinks = (sizeof($links2) > 1);
+				}
+			}
 		}
 
 		$msglink = "";
@@ -350,8 +360,8 @@ function gpluspost_feeditem($pid, $uid) {
 			$title = $lines[0];
 		}
 
-		if ($image != $msglink)
-			$html = trim(str_replace($msglink, "", $html));
+		//if ($image != $msglink)
+		//	$html = trim(str_replace($msglink, "", $html));
 
 		$title = trim(str_replace($msglink, "", $title));
 
@@ -360,6 +370,8 @@ function gpluspost_feeditem($pid, $uid) {
 		if ($uid == 0)
 			$title = $item["author-name"].": ".$title;
 
+		$msglink = htmlspecialchars(html_entity_decode($msglink));
+
 		$title = str_replace("&", "&", $title);
 		//$html = str_replace("&", "&", $html);
 

statusnet/statusnet.php

@@ -498,6 +498,8 @@ function statusnet_shortenmsg($b, $max_char) {
 	while (strpos($msg, "  ") !== false)
 		$msg = str_replace("  ", " ", $msg);
 
+	$origmsg = $msg;
+
 	// Removing URLs
 	$msg = preg_replace('/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/i', "", $msg);
 
@@ -533,6 +535,10 @@ function statusnet_shortenmsg($b, $max_char) {
 	if (($msglink == "") and strlen($msg) > $max_char)
 		$msglink = $b["plink"];
 
+	// If the message is short enough then don't modify it. (if the link exists in the original message)
+	if ((strlen(trim($origmsg)) <= $max_char) AND (strpos($origmsg, $msglink) OR ($msglink == "")))
+		return(array("msg"=>trim($origmsg), "image"=>""));
+
 	if (strlen($msglink) > 20)
 		$msglink = short_link($msglink);
 

twitter/twitter.php

@@ -351,6 +351,8 @@ function twitter_shortenmsg($b) {
 	while (strpos($msg, "  ") !== false)
 		$msg = str_replace("  ", " ", $msg);
 
+	$origmsg = $msg;
+
 	// Removing URLs
 	$msg = preg_replace('/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/i', "", $msg);
 
@@ -386,6 +388,10 @@ function twitter_shortenmsg($b) {
 	if (($msglink == "") and strlen($msg) > $max_char)
 		$msglink = $b["plink"];
 
+	// If the message is short enough then don't modify it. (if the link exists in the original message)
+	if ((strlen(trim($origmsg)) <= $max_char) AND (strpos($origmsg, $msglink) OR ($msglink == "")))
+		return(trim($origmsg));
+
 	if (strlen($msglink) > 20)
 		$msglink = short_link($msglink);