import images for wall photos (which facebook provides as an unnamed link and not...

diff --git a/facebook.tgz b/facebook.tgz
index 5010ead9e086633603d089606ae86c896603cab6..eb199aff21457619a1f3b26e6ac66003e57879a9 100644 (file)
Binary files a/facebook.tgz and b/facebook.tgz differ

diff --git a/facebook/facebook.php b/facebook/facebook.php
index 69461d63dadccf9fb92405361a9f7caf824c5fdc..57212fef9ac89a9fb0d937455bb503e6f1a61b3d 100644 (file)
--- a/facebook/facebook.php
+++ b/facebook/facebook.php
@@ -863,6 +863,21 @@ function fb_consume_all($uid) {
 
 }
 
+function fb_get_photo($uid,$link) {
+       $access_token = get_pconfig($uid,'facebook','access_token');
+       if(! $access_token || (! stristr($link,'facebook.com/photo.php')))
+               return "\n" . '[url=' . $link . ']' . t('link') . '[/url]';
+       $ret = preg_match('/fbid=([0-9]*)/',$link,$match);
+       if($ret)
+               $photo_id = $match[1];
+       $x = fetch_url('https://graph.facebook.com/' . $photo_id . '?access_token=' . $access_token);
+       $j = json_decode($x);
+       if($j->picture)
+               return "\n\n" . '[url=' . $link . '][img]' . $j->picture . '[/img][/url]';
+       else
+               return "\n" . '[url=' . $link . ']' . t('link') . '[/url]';
+}
+
 function fb_consume_stream($uid,$j,$wall = false) {
 
        $a = get_app();
@@ -973,8 +988,9 @@ function fb_consume_stream($uid,$j,$wall = false) {
                        else {
                                if($entry->picture)
                                        $datarray['body'] .= "\n\n" . '[img]' . $entry->picture . '[/img]';
+                               // if just a link, it may be a wall photo - check
                                if($entry->link)
-                                       $datarray['body'] .= "\n" . '[url=' . $entry->link . ']' . t('link') . '[/url]';
+                                       $datarray['body'] .= fb_get_photo($uid,$entry->link);
                        }
                        if($entry->name)
                                $datarray['body'] .= "\n" . $entry->name;