Moved oEmbed stuff out to a plugin (Oembed).

[quix0rs-gnu-social.git] / classes / File_redirection.php

diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index 321a0b751f64e41c557ca6537116af3985f38836..0bcccc6cffbbb52ecd8aa4b0100e2afe6cd93dda 100644 (file)
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -17,11 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
-
-require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
-require_once INSTALLDIR.'/classes/File.php';
-require_once INSTALLDIR.'/classes/File_oembed.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Table Definition for file_redirection
@@ -165,16 +161,16 @@ class File_redirection extends Managed_DataObject
      */
     public function where($in_url, $discover=true) {
         // let's see if we know this...
-        $a = File::staticGet('url', $in_url);
+        $a = File::getKV('url', $in_url);
 
         if (!empty($a)) {
             // this is a direct link to $a->url
             return $a->url;
         } else {
-            $b = File_redirection::staticGet('url', $in_url);
+            $b = File_redirection::getKV('url', $in_url);
             if (!empty($b)) {
                 // this is a redirect to $b->file_id
-                $a = File::staticGet('id', $b->file_id);
+                $a = File::getKV('id', $b->file_id);
                 return $a->url;
             }
         }
@@ -250,8 +246,10 @@ class File_redirection extends Managed_DataObject
         if (!empty($short_url) && $short_url != $long_url) {
             $short_url = (string)$short_url;
             // store it
-            $file = File::staticGet('url', $long_url);
-            if (empty($file)) {
+            $file = File::getKV('url', $long_url);
+            if ($file instanceof File) {
+                $file_id = $file->id;
+            } else {
                 // Check if the target URL is itself a redirect...
                 $redir_data = File_redirection::where($long_url);
                 if (is_array($redir_data)) {
@@ -259,12 +257,9 @@ class File_redirection extends Managed_DataObject
                     // Save file and embedding data about it!
                     $file = File::saveNew($redir_data, $long_url);
                     $file_id = $file->id;
-                    if (!empty($redir_data['oembed']['json'])) {
-                        File_oembed::saveNew($redir_data['oembed']['json'], $file_id);
-                    }
                 } else if (is_string($redir_data)) {
                     // The file is a known redirect target.
-                    $file = File::staticGet('url', $redir_data);
+                    $file = File::getKV('url', $redir_data);
                     if (empty($file)) {
                         // @fixme should we save a new one?
                         // this case was triggering sometimes for redirects
@@ -275,11 +270,9 @@ class File_redirection extends Managed_DataObject
                     }
                     $file_id = $file->id;
                 }
-            } else {
-                $file_id = $file->id;
             }
-            $file_redir = File_redirection::staticGet('url', $short_url);
-            if (empty($file_redir)) {
+            $file_redir = File_redirection::getKV('url', $short_url);
+            if (!$file_redir instanceof File_redirection) {
                 $file_redir = new File_redirection;
                 $file_redir->url = $short_url;
                 $file_redir->file_id = $file_id;