Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x

[quix0rs-gnu-social.git] / lib / facebookutil.php

diff --git a/lib/facebookutil.php b/lib/facebookutil.php
index 36b7452793b430ae9acfcf3b5e8de762d8329dd7..ad61b6f0a545e5f976ea413da6c799b95b21f865 100644 (file)
--- a/lib/facebookutil.php
+++ b/lib/facebookutil.php
@@ -178,20 +178,38 @@ function format_attachments($attachments)
     $fbattachment          = array();
     $fbattachment['media'] = array();
 
-    // Facebook only supports one attachment per item
+    foreach($attachments as $attachment)
+    {
+        $fbmedia = get_fbmedia_for_attachment($attachment);
+        if($fbmedia){
+            $fbattachment['media'][]=$fbmedia;
+        }else{
+            $fbattachment['name'] = ($attachment->title ?
+                                  $attachment->title : $attachment->url);
+            $fbattachment['href'] = $attachment->url;
+        }
+    }
+    if(count($fbattachment['media'])>0){
+        unset($fbattachment['name']);
+        unset($fbattachment['href']);
+    }
+    return $fbattachment;
+}
 
-    $attachment = $attachments[0];
+/**
+* given an File objects, returns an associative array suitable for Facebook media
+*/
+function get_fbmedia_for_attachment($attachment)
+{
     $fbmedia    = array();
 
     if (strncmp($attachment->mimetype, 'image/', strlen('image/')) == 0) {
         $fbmedia['type']         = 'image';
         $fbmedia['src']          = $attachment->url;
         $fbmedia['href']         = $attachment->url;
-        $fbattachment['media'][] = $fbmedia;
     } else if ($attachment->mimetype == 'audio/mpeg') {
         $fbmedia['type']         = 'mp3';
         $fbmedia['src']          = $attachment->url;
-        $fbattachment['media'][] = $fbmedia;
     }else if ($attachment->mimetype == 'application/x-shockwave-flash') {
         $fbmedia['type']         = 'flash';
 
@@ -200,14 +218,10 @@ function format_attachments($attachments)
         // $fbmedia['imgsrc']='';
 
         $fbmedia['swfsrc']       = $attachment->url;
-        $fbattachment['media'][] = $fbmedia;
     }else{
-        $fbattachment['name'] = ($attachment->title ?
-                                 $attachment->title : $attachment->url);
-        $fbattachment['href'] = $attachment->url;
+        return false;
     }
-
-    return $fbattachment;
+    return $fbmedia;
 }
 
 function remove_facebook_app($flink)