Try oEmbed discovery before using oohembed

diff --git a/classes/File.php b/classes/File.php
index 56d9f982783a8e6815fae7e8b07ec89724223e21..68d385d1ea2365de360b5d5b8373bf52e90b1883 100644 (file)
--- a/classes/File.php
+++ b/classes/File.php
@@ -79,9 +79,8 @@ class File extends Memcached_DataObject
 
         if (isset($redir_data['type'])
             && ('text/html' === substr($redir_data['type'], 0, 9))
-            && ($oembed_data = File_oembed::_getOembed($given_url))
-            && isset($oembed_data['json'])) {
-            File_oembed::saveNew($oembed_data['json'], $file_id);
+            && ($oembed_data = File_oembed::_getOembed($given_url))) {
+                File_oembed::saveNew($oembed_data, $file_id);
         }
         return $x;
     }

diff --git a/classes/File_oembed.php b/classes/File_oembed.php
index 69230e4a487dcebd5514420bfebc85dcf4a80fe5..bbf112729b008519877b594c61c5c86dc2d9e4f7 100644 (file)
--- a/classes/File_oembed.php
+++ b/classes/File_oembed.php
@@ -56,33 +56,46 @@ class File_oembed extends Memcached_DataObject
         return array(false, false, false);
     }
 
-    function _getOembed($url, $maxwidth = 500, $maxheight = 400, $format = 'json') {
-        $cmd = common_config('oohembed', 'endpoint') . '?url=' . urlencode($url);
-        if (is_int($maxwidth)) $cmd .= "&maxwidth=$maxwidth";
-        if (is_int($maxheight)) $cmd .= "&maxheight=$maxheight";
-        if (is_string($format)) $cmd .= "&format=$format";
-        $oe = @file_get_contents($cmd);
-        if (false === $oe) return false;
-        return array($format => (('json' === $format) ? json_decode($oe, true) : $oe));
+    function _getOembed($url, $maxwidth = 500, $maxheight = 400) {
+        require_once INSTALLDIR.'/extlib/Services/oEmbed.php';
+        $parameters = array(
+            'maxwidth'=>$maxwidth,
+            'maxheight'=>$maxheight,
+        );
+        try{
+            $oEmbed = new Services_oEmbed($url);
+            $object = $oEmbed->getObject($parameters);
+            return $object;
+        }catch(Exception $e){
+            try{
+                $oEmbed = new Services_oEmbed($url, array(
+                    Services_oEmbed::OPTION_API => common_config('oohembed', 'endpoint')
+                ));
+                $object = $oEmbed->getObject($parameters);
+                return $object;
+            }catch(Exception $ex){
+                return false;
+            }
+        }
     }
 
     function saveNew($data, $file_id) {
         $file_oembed = new File_oembed;
         $file_oembed->file_id = $file_id;
-        $file_oembed->version = $data['version'];
-        $file_oembed->type = $data['type'];
-        if (!empty($data['provider_name'])) $file_oembed->provider = $data['provider_name'];
-        if (!isset($file_oembed->provider) && !empty($data['provide'])) $file_oembed->provider = $data['provider'];
-        if (!empty($data['provide_url'])) $file_oembed->provider_url = $data['provider_url'];
-        if (!empty($data['width'])) $file_oembed->width = intval($data['width']);
-        if (!empty($data['height'])) $file_oembed->height = intval($data['height']);
-        if (!empty($data['html'])) $file_oembed->html = $data['html'];
-        if (!empty($data['title'])) $file_oembed->title = $data['title'];
-        if (!empty($data['author_name'])) $file_oembed->author_name = $data['author_name'];
-        if (!empty($data['author_url'])) $file_oembed->author_url = $data['author_url'];
-        if (!empty($data['url'])) $file_oembed->url = $data['url'];
+        $file_oembed->version = $data->version;
+        $file_oembed->type = $data->type;
+        if (!empty($data->provider_name)) $file_oembed->provider = $data->provider_name;
+        if (!empty($data->provider)) $file_oembed->provider = $data->provider;
+        if (!empty($data->provide_url)) $file_oembed->provider_url = $data->provider_url;
+        if (!empty($data->width)) $file_oembed->width = intval($data->width);
+        if (!empty($data->height)) $file_oembed->height = intval($data->height);
+        if (!empty($data->html)) $file_oembed->html = $data->html;
+        if (!empty($data->title)) $file_oembed->title = $data->title;
+        if (!empty($data->author_name)) $file_oembed->author_name = $data->author_name;
+        if (!empty($data->author_url)) $file_oembed->author_url = $data->author_url;
+        if (!empty($data->url)) $file_oembed->url = $data->url;
         $file_oembed->insert();
-        if (!empty($data['thumbnail_url'])) {
+        if (!empty($data->thumbnail_url)) {
             File_thumbnail::saveNew($data, $file_id);
         }
     }

diff --git a/classes/File_thumbnail.php b/classes/File_thumbnail.php
index 44b92a2fadd005c4be6282a100a55f0ee12200fc..0b09c6af8ca53ee2e4806479446bc019579335b9 100644 (file)
--- a/classes/File_thumbnail.php
+++ b/classes/File_thumbnail.php
@@ -51,9 +51,9 @@ class File_thumbnail extends Memcached_DataObject
     function saveNew($data, $file_id) {
         $tn = new File_thumbnail;
         $tn->file_id = $file_id;
-        $tn->url = $data['thumbnail_url'];
-        $tn->width = intval($data['thumbnail_width']);
-        $tn->height = intval($data['thumbnail_height']);
+        $tn->url = $data->thumbnail_url;
+        $tn->width = intval($data->thumbnail_width);
+        $tn->height = intval($data->thumbnail_height);
         $tn->insert();
     }
 }