X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FFile_oembed.php;h=bbf112729b008519877b594c61c5c86dc2d9e4f7;hb=59beff6b46fb7693812558eaf728ca3709e4b066;hp=f1b2cb13c02d90a0b50f2c8bf7e2b0c4d522ebda;hpb=0c28fdda62676bea352b58f05f66d83a92353a14;p=quix0rs-gnu-social.git

diff --git a/classes/File_oembed.php b/classes/File_oembed.php
index f1b2cb13c0..bbf112729b 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, Controlez-Vous, Inc.
+ * Copyright (C) 2008, 2009, Control Yourself, 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
@@ -25,63 +25,79 @@ require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
  * Table Definition for file_oembed
  */
 
-class File_oembed extends Memcached_DataObject 
+class File_oembed extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
     public $__table = 'file_oembed';                     // table name
-    public $id;                              // int(11)  not_null primary_key group_by
-    public $file_id;                         // int(11)  unique_key group_by
-    public $version;                         // varchar(20)  
-    public $type;                            // varchar(20)  
-    public $provider;                        // varchar(50)  
-    public $provider_url;                    // varchar(255)  
-    public $width;                           // int(11)  group_by
-    public $height;                          // int(11)  group_by
-    public $html;                            // blob(65535)  blob
-    public $title;                           // varchar(255)  
-    public $author_name;                     // varchar(50)  
-    public $author_url;                      // varchar(255)  
-    public $url;                             // varchar(255)  
+    public $file_id;                         // int(4)  primary_key not_null
+    public $version;                         // varchar(20)
+    public $type;                            // varchar(20)
+    public $provider;                        // varchar(50)
+    public $provider_url;                    // varchar(255)
+    public $width;                           // int(4)
+    public $height;                          // int(4)
+    public $html;                            // text()
+    public $title;                           // varchar(255)
+    public $author_name;                     // varchar(50)
+    public $author_url;                      // varchar(255)
+    public $url;                             // varchar(255)
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('File_oembed',$k,$v); }
+    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('File_oembed',$k,$v); }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    function sequenceKey()
+    {
+        return array(false, false, false);
+    }
 
-    function _getOembed($url, $maxwidth = 500, $maxheight = 400, $format = 'json') {
-        $cmd = 'http://oohembed.com/oohembed/?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);
         }
     }
 }
 
-