X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=gpluspost%2Fgpluspost.php;h=c8918e1cc73eb7632f6345407f938b98195a132a;hb=18784a484b04b5f74e6d4dca516b2dc20cffe953;hp=b3ae3293536517bb7e3d45b7664e19057d2366d8;hpb=7521977ab8cb5586e9d68fa70cfdb0f340f00e71;p=friendica-addons.git

diff --git a/gpluspost/gpluspost.php b/gpluspost/gpluspost.php
index b3ae3293..c8918e1c 100644
--- a/gpluspost/gpluspost.php
+++ b/gpluspost/gpluspost.php
@@ -5,6 +5,7 @@
  * Description: Posts to a Google+ page with the help of Hootsuite
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
+ * Status: Unsupported
  */
 
 function gpluspost_install() {
@@ -13,7 +14,7 @@ function gpluspost_install() {
 	register_hook('jot_networks',         'addon/gpluspost/gpluspost.php', 'gpluspost_jot_nets');
 	register_hook('connector_settings',      'addon/gpluspost/gpluspost.php', 'gpluspost_settings');
 	register_hook('connector_settings_post', 'addon/gpluspost/gpluspost.php', 'gpluspost_settings_post');
-        register_hook('queue_predeliver', 'addon/gpluspost/gpluspost.php', 'gpluspost_queue_hook');
+	register_hook('queue_predeliver', 'addon/gpluspost/gpluspost.php', 'gpluspost_queue_hook');
 }
 
 
@@ -23,7 +24,7 @@ function gpluspost_uninstall() {
 	unregister_hook('jot_networks',     'addon/gpluspost/gpluspost.php', 'gpluspost_jot_nets');
 	unregister_hook('connector_settings',      'addon/gpluspost/gpluspost.php', 'gpluspost_settings');
 	unregister_hook('connector_settings_post', 'addon/gpluspost/gpluspost.php', 'gpluspost_settings_post');
-        unregister_hook('queue_predeliver', 'addon/gpluspost/gpluspost.php', 'gpluspost_queue_hook');
+	unregister_hook('queue_predeliver', 'addon/gpluspost/gpluspost.php', 'gpluspost_queue_hook');
 }
 
 function gpluspost_jot_nets(&$a,&$b) {
@@ -58,6 +59,7 @@ function gpluspost_settings(&$a,&$s) {
 
 	$enabled = get_pconfig(local_user(),'gpluspost','post');
 	$checked = (($enabled) ? ' checked="checked" ' : '');
+	$css = (($enabled) ? '' : '-disabled');
 
 	$def_enabled = get_pconfig(local_user(),'gpluspost','post_by_default');
 	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
@@ -81,11 +83,11 @@ function gpluspost_settings(&$a,&$s) {
 		$title = "Google+ Export";
 
 	$s .= '<span id="settings_gpluspost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_gpluspost_expanded\'); openClose(\'settings_gpluspost_inflated\');">';
-	$s .= '<img class="connector" src="images/googleplus.png" /><h3 class="connector">'. t($title).'</h3>';
+	$s .= '<img class="connector'.$css.'" src="images/googleplus.png" /><h3 class="connector">'. t($title).'</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_gpluspost_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_gpluspost_expanded\'); openClose(\'settings_gpluspost_inflated\');">';
-	$s .= '<img class="connector" src="images/googleplus.png" /><h3 class="connector">'. t($title).'</h3>';
+	$s .= '<img class="connector'.$css.'" src="images/googleplus.png" /><h3 class="connector">'. t($title).'</h3>';
 	$s .= '</span>';
 	$s .= '<div id="gpluspost-enable-wrapper">';
 
@@ -96,8 +98,8 @@ function gpluspost_settings(&$a,&$s) {
 	if (gpluspost_nextscripts()) {
 		/*
 		// To-Do: Option to check the credentials if requested
-		if (($username != "") AND ($password != "")) {
-			require_once("addon/googleplus/postToGooglePlus.php");
+		if (($username != "") && ($password != "")) {
+			require_once("addon/gpluspost/postToGooglePlus.php");
 			$loginError = doConnectToGooglePlus2($username, $password);
 			if ($loginError)
 				$s .= '<p>Login Error. Please enter the correct credentials.</p>';
@@ -181,6 +183,9 @@ function gpluspost_settings_post(&$a,&$b) {
 			set_pconfig(local_user(),'fromgplus','account',trim($_POST['fromgplus-account']));
 			$enable = ((x($_POST,'fromgplus-enable')) ? intval($_POST['fromgplus-enable']) : 0);
 			set_pconfig(local_user(),'fromgplus','enable', $enable);
+
+			if (!$enable)
+				del_pconfig(local_user(),'fromgplus','lastdate');
 		}
 	}
 }
@@ -226,281 +231,164 @@ function gpluspost_send(&$a,&$b) {
 		return;
 
 	// if post comes from Google+ don't send it back
-	if (!get_pconfig($b["uid"],'gpluspost','no_loop_prevention') and ($b['app'] == "Google+"))
-                return;
+	if (!get_pconfig($b["uid"],'gpluspost','no_loop_prevention') && (($b['app'] == "Google+") || ($b["extid"] == NETWORK_GPLUS)))
+		return;
 
-	// Always do the export via RSS-Feed (even if NextScripts is enabled), since it doesn't hurt
-	$itemlist = get_pconfig($b["uid"],'gpluspost','itemlist');
-	$items = explode(",", $itemlist);
+	if (!gpluspost_nextscripts()) {
+		// Posting via RSS-Feed and Hootsuite
+		$itemlist = get_pconfig($b["uid"],'gpluspost','itemlist');
+		$items = explode(",", $itemlist);
 
-	$i = 0;
-	$newitems = array($b['id']);
-	foreach ($items AS $item)
-		if ($i++ < 9)
-			$newitems[] = $item;
+		$i = 0;
+		$newitems = array($b['id']);
+		foreach ($items AS $item)
+			if ($i++ < 9)
+				$newitems[] = $item;
 
-	$itemlist = implode(",", $newitems);
+		$itemlist = implode(",", $newitems);
 
-	logger('gpluspost_send: new itemlist: '.$itemlist." for uid ".$b["uid"]);
+		logger('gpluspost_send: new itemlist: '.$itemlist." for uid ".$b["uid"]);
 
-	set_pconfig($b["uid"],'gpluspost','itemlist', $itemlist);
+		set_pconfig($b["uid"],'gpluspost','itemlist', $itemlist);
 
-	// Posting via NextScripts
-	if (gpluspost_nextscripts()) {
+	} else {
+		// Posting via NextScripts
 		$username = get_pconfig($b['uid'],'gpluspost','username');
-	        $password = get_pconfig($b['uid'],'gpluspost','password');
-	        $page = get_pconfig($b['uid'],'gpluspost','page');
+		$password = get_pconfig($b['uid'],'gpluspost','password');
+		$page = get_pconfig($b['uid'],'gpluspost','page');
 
-	        $success = false;
+		$success = false;
 
-	        if($username && $password) {
-	                require_once("addon/gpluspost/postToGooglePlus.php");
+		if($username && $password) {
+			require_once("addon/gpluspost/postToGooglePlus.php");
+			require_once("include/plaintext.php");
 
-	                $data = gpluspost_createmsg($b);
+			$item = $b;
 
-	                logger('gpluspost_send: data: '.print_r($data, true), LOGGER_DEBUG);
+			// Markup for Google+
+			if  ($item["title"] != "")
+				$item["title"] = "*".$item["title"]."*";
 
-	                $loginError = doConnectToGooglePlus2($username, $password);
-	                if (!$loginError) {
-	                        if ($data["link"] != "")
-        	                        $lnk = doGetGoogleUrlInfo2($data["link"]);
-                	        elseif ($data["image"] != "")
-                        	        $lnk = array('img'=>$data["image"]);
-	                        else
-        	                        $lnk = "";
+			$item["body"] = preg_replace("(\[b\](.*?)\[\/b\])ism",'*$1*',$item["body"]);
+			$item["body"] = preg_replace("(\[i\](.*?)\[\/i\])ism",'_$1_',$item["body"]);
+			$item["body"] = preg_replace("(\[s\](.*?)\[\/s\])ism",'-$1-',$item["body"]);
 
-                	        // Send a special blank to identify the post through the "fromgplus" addon
-                        	$blank = html_entity_decode("&#x00A0;", ENT_QUOTES, 'UTF-8');
+			$data = plaintext($a, $item, 0, false, 9);
 
-	                        doPostToGooglePlus2($data["msg"].$blank, $lnk, $page);
+			logger('gpluspost_send: data: '.print_r($data, true), LOGGER_DEBUG);
 
-        	                $success = true;
+			$loginError = doConnectToGooglePlus2($username, $password);
+			if (!$loginError) {
+				if ($data["url"] != "")
+					$lnk = doGetGoogleUrlInfo2($data["url"]);
+				elseif ($data["image"] != "")
+					$lnk = array('img'=>$data["image"]);
+				else
+					$lnk = "";
 
-	                        logger('gpluspost_send: '.$b['uid'].' success', LOGGER_DEBUG);
-        	        } else
-                	        logger('gpluspost_send: '.$b['uid'].' failed '.$loginError, LOGGER_DEBUG);
+				// Send a special blank to identify the post through the "fromgplus" addon
+				$blank = html_entity_decode("&#x00A0;", ENT_QUOTES, 'UTF-8');
 
-	                if (!$success) {
-        	                logger('gpluspost_send: requeueing '.$b['uid'], LOGGER_DEBUG);
+				doPostToGooglePlus2($data["text"].$blank, $lnk, $page);
 
-                	        $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']);
-                        	if (count($r))
-                                	$a->contact = $r[0]["id"];
+				$success = true;
 
-	                        $s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $data));
-        	                require_once('include/queue_fn.php');
-                	        add_to_queue($a->contact,NETWORK_GPLUS,$s);
-                        	notice(t('Google+ post failed. Queued for retry.').EOL);
-	                }
-	        } else
-	                        logger('gpluspost_send: '.$b['uid'].' missing username or password', LOGGER_DEBUG);
-	}
+				logger('gpluspost_send: '.$b['uid'].' success', LOGGER_DEBUG);
+			} else
+				logger('gpluspost_send: '.$b['uid'].' failed '.$loginError, LOGGER_DEBUG);
 
-}
+			if (!$success) {
+				logger('gpluspost_send: requeueing '.$b['uid'], LOGGER_DEBUG);
+
+				$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']);
+				if (count($r))
+					$a->contact = $r[0]["id"];
+
+				$s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $data));
+				require_once('include/queue_fn.php');
+				add_to_queue($a->contact,NETWORK_GPLUS,$s);
+				notice(t('Google+ post failed. Queued for retry.').EOL);
+			}
+		} else
+				logger('gpluspost_send: '.$b['uid'].' missing username or password', LOGGER_DEBUG);
+	}
 
-function gpluspost_createmsg($b) {
-        require_once("include/bbcode.php");
-        require_once("include/html2plain.php");
-
-        $b['body'] = bb_CleanPictureLinks($b['body']);
-
-        // Looking for the first image
-        $image = '';
-        if(preg_match("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/is",$b['body'],$matches))
-                $image = $matches[3];
-
-        if ($image == '')
-                if(preg_match("/\[img\](.*?)\[\/img\]/is",$b['body'],$matches))
-                        $image = $matches[1];
-
-        $multipleimages = (strpos($b['body'], "[img") != strrpos($b['body'], "[img"));
-
-        // When saved into the database the content is sent through htmlspecialchars
-        // That means that we have to decode all image-urls
-        $image = htmlspecialchars_decode($image);
-
-        $body = $b["body"];
-        if ($b["title"] != "")
-                $body = "*".$b["title"]."*\n\n".$body;
-
-        if (strpos($body, "[bookmark") !== false) {
-                // splitting the text in two parts:
-                // before and after the bookmark
-                $pos = strpos($body, "[bookmark");
-                $body1 = substr($body, 0, $pos);
-                $body2 = substr($body, $pos);
-
-                // Removing all quotes after the bookmark
-                // they are mostly only the content after the bookmark.
-                $body2 = preg_replace("/\[quote\=([^\]]*)\](.*?)\[\/quote\]/ism",'',$body2);
-                $body2 = preg_replace("/\[quote\](.*?)\[\/quote\]/ism",'',$body2);
-
-                $pos2 = strpos($body2, "[/bookmark]");
-                if ($pos2)
-                        $body2 = substr($body2, $pos2 + 11);
-
-                $body = $body1.$body2;
-        }
-
-        // Add some newlines so that the message could be cut better
-        $body = str_replace(array("[quote", "[bookmark", "[/bookmark]", "[/quote]"),
-                                array("\n[quote", "\n[bookmark", "[/bookmark]\n", "[/quote]\n"), $body);
-
-        // remove the recycle signs and the names since they aren't helpful on twitter
-        // recycle 1
-        $recycle = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8');
-        $body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n", $body);
-
-        // remove the share element
-        //$body = preg_replace("/\[share(.*?)\](.*?)\[\/share\]/ism","\n\n$2\n\n",$body);
-
-        $body = preg_replace("(\[b\](.*?)\[\/b\])ism",'*$1*',$body);
-        $body = preg_replace("(\[i\](.*?)\[\/i\])ism",'_$1_',$body);
-        $body = preg_replace("(\[s\](.*?)\[\/s\])ism",'-$1-',$body);
-
-        // At first convert the text to html
-        $html = bbcode($body, false, false, 2);
-
-        // Then convert it to plain text
-        //$msg = trim($b['title']." \n\n".html2plain($html, 0, true));
-        $msg = trim(html2plain($html, 0, true));
-        $msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8');
-
-        // Removing multiple newlines
-        while (strpos($msg, "\n\n\n") !== false)
-                $msg = str_replace("\n\n\n", "\n\n", $msg);
-
-        // Removing multiple spaces
-        while (strpos($msg, "  ") !== false)
-                $msg = str_replace("  ", " ", $msg);
-
-        // Removing URLs
-        $msg = preg_replace('/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/i', "", $msg);
-
-        $msg = trim($msg);
-
-        $link = '';
-        // look for bookmark-bbcode and handle it with priority
-        if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches))
-                $link = $matches[1];
-
-        $multiplelinks = (strpos($b['body'], "[bookmark") != strrpos($b['body'], "[bookmark"));
-
-        // If there is no bookmark element then take the first link
-        if ($link == '') {
-                $links = collecturls($html);
-                if (sizeof($links) > 0) {
-                        reset($links);
-                        $link = current($links);
-                }
-                $multiplelinks = (sizeof($links) > 1);
-        }
-
-        $msglink = "";
-        if ($multiplelinks)
-                $msglink = $b["plink"];
-        else if ($link != "")
-                $msglink = $link;
-        else if ($multipleimages)
-                $msglink = $b["plink"];
-        else if ($image != "")
-                $msglink = $image;
-
-        // Removing multiple spaces - again
-        while (strpos($msg, "  ") !== false)
-                $msg = str_replace("  ", " ", $msg);
-
-        if ($msglink != "") {
-                // Looking if the link points to an image
-                $img_str = fetch_url($msglink);
-
-                $tempfile = tempnam(get_config("system","temppath"), "cache");
-                file_put_contents($tempfile, $img_str);
-                $mime = image_type_to_mime_type(exif_imagetype($tempfile));
-                unlink($tempfile);
-        } else
-                $mime = "";
-
-        if (($image == $msglink) OR (substr($mime, 0, 6) == "image/"))
-                return(array("msg"=>trim($msg), "link"=>"", "image"=>$msglink));
-        else
-                return(array("msg"=>trim($msg), "link"=>$msglink, "image"=>""));
 }
 
 function gpluspost_queue_hook(&$a,&$b) {
 
-        $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
-                dbesc(NETWORK_GPLUS)
-        );
-        if(! count($qi))
-                return;
+	$qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
+		dbesc(NETWORK_GPLUS)
+	);
+	if(! count($qi))
+		return;
 
-        require_once('include/queue_fn.php');
+	require_once('include/queue_fn.php');
 
-        foreach($qi as $x) {
-                if($x['network'] !== NETWORK_GPLUS)
-                        continue;
+	foreach($qi as $x) {
+		if($x['network'] !== NETWORK_GPLUS)
+			continue;
 
-                logger('gpluspost_queue: run');
+		logger('gpluspost_queue: run');
 
-                $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid` 
-                        WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
-                        intval($x['cid'])
-                );
-                if(! count($r))
-                        continue;
+		$r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid`
+			WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
+			intval($x['cid'])
+		);
+		if(! count($r))
+			continue;
 
-                $userdata = $r[0];
+		$userdata = $r[0];
 
-                //logger('gpluspost_queue: fetching userdata '.print_r($userdata, true));
+		//logger('gpluspost_queue: fetching userdata '.print_r($userdata, true));
 
-                $username = get_pconfig($userdata['uid'],'gpluspost','username');
-                $password = get_pconfig($userdata['uid'],'gpluspost','password');
-                $page = get_pconfig($userdata['uid'],'gpluspost','page');
+		$username = get_pconfig($userdata['uid'],'gpluspost','username');
+		$password = get_pconfig($userdata['uid'],'gpluspost','password');
+		$page = get_pconfig($userdata['uid'],'gpluspost','page');
 
-                $success = false;
+		$success = false;
 
-                if($username && $password) {
-                        require_once("addon/googleplus/postToGooglePlus.php");
+		if($username && $password) {
+			require_once("addon/gpluspost/postToGooglePlus.php");
 
-                        logger('gpluspost_queue: able to post for user '.$username);
+			logger('gpluspost_queue: able to post for user '.$username);
 
-                        $z = unserialize($x['content']);
+			$z = unserialize($x['content']);
 
-                        $data = $z['post'];
-                        // $z['url']
+			$data = $z['post'];
+			// $z['url']
 
-                        logger('gpluspost_send: data: '.print_r($data, true), LOGGER_DATA);
+			logger('gpluspost_send: data: '.print_r($data, true), LOGGER_DATA);
 
-                        $loginError = doConnectToGooglePlus2($username, $password);
-                        if (!$loginError) {
-                                if ($data["link"] != "")
-                                        $lnk = doGetGoogleUrlInfo2($data["link"]);
-                                elseif ($data["image"] != "")
-                                        $lnk = array('img'=>$data["image"]);
-                                else
-                                        $lnk = "";
+			$loginError = doConnectToGooglePlus2($username, $password);
+			if (!$loginError) {
+				if ($data["url"] != "")
+					$lnk = doGetGoogleUrlInfo2($data["url"]);
+				elseif ($data["image"] != "")
+					$lnk = array('img'=>$data["image"]);
+				else
+					$lnk = "";
 
-                                // Send a special blank to identify the post through the "fromgplus" addon
-                                $blank = html_entity_decode("&#x00A0;", ENT_QUOTES, 'UTF-8');
+				// Send a special blank to identify the post through the "fromgplus" addon
+				$blank = html_entity_decode("&#x00A0;", ENT_QUOTES, 'UTF-8');
 
-                                doPostToGooglePlus2($data["msg"].$blank, $lnk, $page);
+				doPostToGooglePlus2($data["text"].$blank, $lnk, $page);
 
-                                logger('gpluspost_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG);
+				logger('gpluspost_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG);
 
-                                $success = true;
+				$success = true;
 
-                                remove_queue_item($x['id']);
-                        } else
-                                logger('gpluspost_queue: send '.$userdata['uid'].' failed '.$loginError, LOGGER_DEBUG);
-                } else
-                        logger('gpluspost_queue: send '.$userdata['uid'].' missing username or password', LOGGER_DEBUG);
+				remove_queue_item($x['id']);
+			} else
+				logger('gpluspost_queue: send '.$userdata['uid'].' failed '.$loginError, LOGGER_DEBUG);
+		} else
+			logger('gpluspost_queue: send '.$userdata['uid'].' missing username or password', LOGGER_DEBUG);
 
-                if (!$success) {
-                        logger('gpluspost_queue: delayed');
-                        update_queue_time($x['id']);
-                }
-        }
+		if (!$success) {
+			logger('gpluspost_queue: delayed');
+			update_queue_time($x['id']);
+		}
+	}
 }
 
 function gpluspost_module() {}
@@ -546,7 +434,7 @@ function gpluspost_init() {
 		foreach ($items AS $item)
 			gpluspost_feeditem($item, $uid);
 	} else {
-		$items = q("SELECT `id` FROM `item` FORCE INDEX (`received`) WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `item`.`id` = `item`.`parent` ORDER BY `received` DESC LIMIT 10");
+		$items = q("SELECT `id` FROM `item` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `item`.`id` = `item`.`parent` ORDER BY `received` DESC LIMIT 10");
 		foreach ($items AS $item)
 			gpluspost_feeditem($item["id"], $uid);
 	}
@@ -557,6 +445,7 @@ function gpluspost_init() {
 function gpluspost_feeditem($pid, $uid) {
 	global $a;
 
+	require_once('include/api.php');
 	require_once('include/bbcode.php');
 	require_once("include/html2plain.php");
 	require_once("include/network.php");
@@ -568,6 +457,11 @@ function gpluspost_feeditem($pid, $uid) {
 
 		$item['body'] = bb_CleanPictureLinks($item['body']);
 
+		$item['body'] = bb_remove_share_information($item['body'], true);
+
+		if ($item["title"] != "")
+			$item['body'] = "*".$item["title"]."*\n\n".$item['body'];
+
 		// Looking for the first image
 		$image = '';
 		if(preg_match("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/is",$item['body'],$matches))
@@ -592,8 +486,12 @@ function gpluspost_feeditem($pid, $uid) {
 
 		$body = $item['body'];
 
+		$body = preg_replace("(\[b\](.*?)\[\/b\])ism",'*$1*',$body);
+		$body = preg_replace("(\[i\](.*?)\[\/i\])ism",'_$1_',$body);
+		$body = preg_replace("(\[s\](.*?)\[\/s\])ism",'-$1-',$body);
+
 		// At first convert the text to html
-		$html = bbcode($body, false, false, 2);
+		$html = bbcode(api_clean_plain_items($body), false, false, 2);
 
 		// Then convert it to plain text
 		$msg = trim(html2plain($html, 0, true));
@@ -629,7 +527,7 @@ function gpluspost_feeditem($pid, $uid) {
 		else if ($image != "")
 			$msglink = $image;
 
-		if (($msglink == "") AND $skipwithoutlink)
+		if (($msglink == "") && $skipwithoutlink)
 			continue;
 		else if ($msglink == "")
 			$msglink = $item["plink"];
@@ -654,6 +552,11 @@ function gpluspost_feeditem($pid, $uid) {
 
 		$msglink = htmlspecialchars(html_entity_decode($msglink));
 
+		if (strpos($msg, $msglink) == 0)
+			$msg .= "\n".$msglink;
+
+		$msg = nl2br($msg);
+
 		$title = str_replace("&", "&amp;", $title);
 		//$html = str_replace("&", "&amp;", $html);
 
@@ -667,7 +570,7 @@ function gpluspost_feeditem($pid, $uid) {
 		echo "\t\t<author>\n\t\t\t<name><![CDATA[".$item["author-name"]."]]></name>\n";
 		echo "\t\t\t<uri>".$item["author-link"]."</uri>\n\t\t</author>\n";
 		//echo '<content type="image/png" src="http://media.example.org/the_beach.png"/>';
-		echo "\t\t".'<content type="html" xml:space="preserve" xml:base="'.$item["plink"].'"><![CDATA['.$html."]]></content>\n";
+		echo "\t\t".'<content type="html" xml:space="preserve" xml:base="'.$item["plink"].'"><![CDATA['.$msg."]]></content>\n";
 		echo "\t</entry>\n";
 	}
 }