The CSS code for shared messages is moved from "vier" to the global.css, so that...

[friendica.git] / include / oembed.php

diff --git a/include/oembed.php b/include/oembed.php
index 982f659d8e0ce1753a9f4ebc8b1d79cf36ba9a5f..17fc873ccb304aa339cd4e24d5267a82a60e1015 100755 (executable)
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -12,6 +12,9 @@ function oembed_replacecb($matches){
 
 function oembed_fetch_url($embedurl){
 
+       $embedurl = trim($embedurl, "'");
+       $embedurl = trim($embedurl, '"');
+
        $a = get_app();
 
        $txt = Cache::get($a->videowidth . $embedurl);
@@ -48,9 +51,18 @@ function oembed_fetch_url($embedurl){
                }
 
                if ($txt==false || $txt==""){
-                       // try oohembed service
-                       $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=' . $a->videowidth;  
-                       $txt = fetch_url($ourl);
+                       $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 {
+                               // 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);
                }
 
                $txt=trim($txt);
@@ -62,6 +74,10 @@ function oembed_fetch_url($embedurl){
        }
 
        $j = json_decode($txt);
+
+       if (!is_object($j))
+               return false;
+
        $j->embedurl = $embedurl;
        return $j;
 }