X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=addon%2Ffacebook%2Ffacebook.php;h=5d86c66c2ce96435167e54bd304026030f826674;hb=55112cfdd0dc63c8ad7f719aea5b46db37fcf081;hp=657ba7dc2390d2bf782888869c8da0fb75508756;hpb=e036434b8a2dbd8594c0ac5ac7233f4700e4e475;p=friendica.git

diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php
index 657ba7dc23..5d86c66c2c 100644
--- a/addon/facebook/facebook.php
+++ b/addon/facebook/facebook.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * Name: Facebook Connector
+ * Version: 1.0
+ * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ */
 
 /**
  * Installing the Friendika/Facebook connector
@@ -525,7 +530,7 @@ function facebook_post_hook(&$a,&$b) {
 
 				$search_str = $a->get_baseurl() . '/search';
 
-				if(preg_match("/\[url=(.+?)\](.+?)\[\/url\]/is",$msg,$matches)) {
+				if(preg_match("/\[url=(.*?)\](.*?)\[\/url\]/is",$msg,$matches)) {
 
 					// don't use hashtags for message link
 
@@ -536,12 +541,12 @@ function facebook_post_hook(&$a,&$b) {
 					}
 				}
 
-				$msg = preg_replace("/\[url=(.+?)\](.+?)\[\/url\]/is",'$2 $1',$msg);
+				$msg = preg_replace("/\[url=(.*?)\](.*?)\[\/url\]/is",'$2 $1',$msg);
 
-				if(preg_match("/\[img\](.+?)\[\/img\]/is",$msg,$matches))
+				if(preg_match("/\[img\](.*?)\[\/img\]/is",$msg,$matches))
 					$image = $matches[1];
 
-				$msg = preg_replace("/\[img\](.+?)\[\/img\]/is", t('Image: ') . '$1', $msg);
+				$msg = preg_replace("/\[img\](.*?)\[\/img\]/is", t('Image: ') . '$1', $msg);
 
 				if((strpos($link,$a->get_baseurl()) !== false) && (! $image))
 					$image = $a->get_baseurl() . '/images/friendika-64.jpg';
@@ -557,7 +562,7 @@ function facebook_post_hook(&$a,&$b) {
 					$msg .= "\n";
         			foreach($arr as $r) {
             			$matches = false;
-						$cnt = preg_match('|\[attach\]href=\"(.+?)\" size=\"(.+?)\" type=\"(.+?)\" title=\"(.+?)\"\[\/attach\]|',$r,$matches);
+						$cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches);
 						if($cnt) {
 							$msg .= $matches[1];
 						}
@@ -908,7 +913,7 @@ function fb_consume_stream($uid,$j,$wall = false) {
 
 				$likedata['body'] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
 				$likedata['object'] = '<object><type>' . ACTIVITY_OBJ_NOTE . '</type><local>1</local>' . 
-					'<id>' . $orig_post['uri'] . '</id><link>' . xmlify('<link rel="alternate" type="text/html" href="' . $orig_post['plink'] . '">') . '</link><title>' . $orig_post['title'] . '</title><content>' . $orig_post['body'] . '</content></object>';  
+					'<id>' . $orig_post['uri'] . '</id><link>' . xmlify('<link rel="alternate" type="text/html" href="' . xmlify($orig_post['plink']) . '" />') . '</link><title>' . $orig_post['title'] . '</title><content>' . $orig_post['body'] . '</content></object>';  
 
 				$item = item_store($likedata);			
 			}