X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FFile_oembed.php;h=4813d5dda52e8709fde611ba7deb48726959ab8d;hb=73a73c936251f4f481eba2ca0264b49064797067;hp=69230e4a487dcebd5514420bfebc85dcf4a80fe5;hpb=65f784120b45dc187e28313fa2c2dca2c976c150;p=quix0rs-gnu-social.git

diff --git a/classes/File_oembed.php b/classes/File_oembed.php
index 69230e4a48..4813d5dda5 100644
--- a/classes/File_oembed.php
+++ b/classes/File_oembed.php
@@ -1,7 +1,7 @@
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, Control Yourself, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,9 +17,10 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+require_once INSTALLDIR.'/classes/File_redirection.php';
 
 /**
  * Table Definition for file_oembed
@@ -34,6 +35,7 @@ class File_oembed extends Memcached_DataObject
     public $file_id;                         // int(4)  primary_key not_null
     public $version;                         // varchar(20)
     public $type;                            // varchar(20)
+    public $mimetype;                        // varchar(50)
     public $provider;                        // varchar(50)
     public $provider_url;                    // varchar(255)
     public $width;                           // int(4)
@@ -56,35 +58,76 @@ 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;
+            }
+        }
     }
 
+    /**
+     * Save embedding info for a new file.
+     *
+     * @param object $data Services_oEmbed_Object_*
+     * @param int $file_id
+     */
     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;
+            $given_url = File_redirection::_canonUrl($file_oembed->url);
+            if (! empty($given_url)){
+                $file = File::staticGet('url', $given_url);
+                if (empty($file)) {
+                    $file_redir = File_redirection::staticGet('url', $given_url);
+                    if (empty($file_redir)) {
+                        $redir_data = File_redirection::where($given_url);
+                        $file_oembed->mimetype = $redir_data['type'];
+                    } else {
+                        $file_id = $file_redir->file_id;
+                    }
+                } else {
+                    $file_oembed->mimetype=$file->mimetype;
+                }
+            }
+        }
         $file_oembed->insert();
-        if (!empty($data['thumbnail_url'])) {
-            File_thumbnail::saveNew($data, $file_id);
+        if (!empty($data->thumbnail_url)) {
+            $ft = File_thumbnail::staticGet('file_id', $file_id);
+            if (!empty($ft)) {
+                common_log(LOG_WARNING, "Strangely, a File_thumbnail object exists for new file $file_id",
+                           __FILE__);
+            } else {
+                File_thumbnail::saveNew($data, $file_id);
+            }
         }
     }
 }
-