X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FFile_oembed.php;h=e41ccfd097eb4d415d02d587f2fc08d6d7e57ecc;hb=3262930ed46936140244c5385e4b172632d2dd44;hp=bbf112729b008519877b594c61c5c86dc2d9e4f7;hpb=a54b809778d2f281bebe5d7bc169097294cb183e;p=quix0rs-gnu-social.git

diff --git a/classes/File_oembed.php b/classes/File_oembed.php
index bbf112729b..e41ccfd097 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)
@@ -93,7 +95,24 @@ class File_oembed extends Memcached_DataObject
         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;
+        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);