]> git.mxchange.org Git - friendica.git/blobdiff - addon/facebook/facebook.php
item source
[friendica.git] / addon / facebook / facebook.php
index ae69805fa7dc9306476612fc0f0a2c42769a3d11..5d86c66c2ce96435167e54bd304026030f826674 100644 (file)
@@ -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];
                                                }
@@ -662,12 +667,20 @@ function facebook_post_hook(&$a,&$b) {
 
 function fb_queue_hook(&$a,&$b) {
 
-       require_once('include/queue_fn.php');
-       if((! is_array($b)) || (! count($b)))
+       $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
+               dbesc(NETWORK_FACEBOOK)
+       );
+       if(! count($qi))
                return;
-       foreach($b as $x) {
+
+       require_once('include/queue_fn.php');
+
+       foreach($qi as $x) {
                if($x['network'] !== NETWORK_FACEBOOK)
                        continue;
+
+               logger('facebook_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'])
@@ -698,7 +711,7 @@ function fb_queue_hook(&$a,&$b) {
                                                dbesc('fb::' . $retj->id),
                                                intval($item)
                                        );
-                                       logger('facebook queue: success: ' . $j); 
+                                       logger('facebook_queue: success: ' . $j); 
                                        remove_queue_item($x['id']);
                                }
                                else {
@@ -900,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);                  
                        }