Merge pull request #2148 from annando/issue-1871

[friendica.git] / include / oembed.php

diff --git a/include/oembed.php b/include/oembed.php
index b32cb512be54a90d242f6cf9d15cbeebd8934df0..0e1238360310b87efc675e453bd0805b8868d944 100755 (executable)
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -56,25 +56,21 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 
                if ($txt==false || $txt==""){
                        $embedly = get_config("system", "embedly");
-                       if ($embedly == "") {
-                               // try oohembed service
-                               $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=' . $a->videowidth;
-                               $txt = fetch_url($ourl);
-                       } else {
+                       if ($embedly != "") {
                                // try embedly service
                                $ourl = "https://api.embed.ly/1/oembed?key=".$embedly."&url=".urlencode($embedurl);
                                $txt = fetch_url($ourl);
-                       }
 
-                       logger("oembed_fetch_url: ".$txt, LOGGER_DEBUG);
+                               logger("oembed_fetch_url: ".$txt, LOGGER_DEBUG);
+                       }
                }
 
                $txt=trim($txt);
-               if ($txt[0]!="{") $txt='{"type":"error"}';
-
-               //save in cache
-               Cache::set($a->videowidth . $embedurl,$txt);
 
+               if ($txt[0]!="{")
+                       $txt='{"type":"error"}';
+               else    //save in cache
+                       Cache::set($a->videowidth . $embedurl,$txt, CACHE_DAY);
        }
 
        $j = json_decode($txt);
@@ -161,7 +157,7 @@ function oembed_format_object($j){
                case "rich": {
                        // not so safe..
                        if (!get_config("system","no_oembed_rich_content"))
-                               $ret.= $jhtml;
+                               $ret.= proxy_parse_html($jhtml);
                }; break;
        }