Merge pull request #2758 from annando/1609-sql-charset

[friendica.git] / include / oembed.php

diff --git a/include/oembed.php b/include/oembed.php
index aec92bfa04ee05498e8baa8b5124728a9183ddf1..c362ab45e6516fd31c9a0078a9067a6f5c12f6f0 100755 (executable)
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -1,12 +1,9 @@
 <?php
 function oembed_replacecb($matches){
-//     logger('oembedcb');
        $embedurl=$matches[1];
        $j = oembed_fetch_url($embedurl);
        $s =  oembed_format_object($j);
-       return $s;//oembed_iframe($s,$j->width,$j->height);
-
-
+       return $s;
 }
 
 
@@ -16,7 +13,13 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 
        $a = get_app();
 
-       $txt = Cache::get($a->videowidth . $embedurl);
+       $r = q("SELECT * FROM `oembed` WHERE `url` = '%s'",
+               dbesc(normalise_link($embedurl)));
+
+       if ($r)
+               $txt = $r[0]["content"];
+       else
+               $txt = Cache::get($a->videowidth . $embedurl);
 
        // These media files should now be caught in bbcode.php
        // left here as a fallback in case this is called from another source
@@ -56,25 +59,30 @@ 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, CACHE_DAY);
 
+               if ($txt[0]!="{")
+                       $txt='{"type":"error"}';
+               else {  //save in cache
+                       $j = json_decode($txt);
+                       if ($j->type != "error")
+                               q("INSERT INTO `oembed` (`url`, `content`, `created`) VALUES ('%s', '%s', '%s')
+                                       ON DUPLICATE KEY UPDATE `content` = '%s', `created` = '%s'",
+                                       dbesc(normalise_link($embedurl)),
+                                       dbesc($txt), dbesc(datetime_convert()),
+                                       dbesc($txt), dbesc(datetime_convert()));
+
+                       Cache::set($a->videowidth.$embedurl,$txt, CACHE_DAY);
+               }
        }
 
        $j = json_decode($txt);
@@ -92,7 +100,7 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
        // If fetching information doesn't work, then improve via internal functions
        if (($j->type == "error") OR ($no_rich_type AND ($j->type == "rich"))) {
                require_once("mod/parse_url.php");
-               $data = parseurl_getsiteinfo($embedurl, true, false);
+               $data = parseurl_getsiteinfo_cached($embedurl, true, false);
                $j->type = $data["type"];
 
                if ($j->type == "photo") {
@@ -148,20 +156,17 @@ function oembed_format_object($j){
                        } else {
                                $ret=$jhtml;
                        }
-                       $ret.="<br>";
+                       //$ret.="<br>";
                }; break;
                case "photo": {
                        $ret.= "<img width='".$j->width."' src='".proxy_url($j->url)."'>";
-                       //$ret.= "<img width='".$j->width."' height='".$j->height."' src='".proxy_url($j->url)."'>";
-                       $ret.="<br>";
                }; break;
                case "link": {
-                       //$ret = "<a href='".$embedurl."'>".$j->title."</a>";
                }; break;
                case "rich": {
                        // not so safe..
                        if (!get_config("system","no_oembed_rich_content"))
-                               $ret.= $jhtml;
+                               $ret.= proxy_parse_html($jhtml);
                }; break;
        }
 
@@ -198,10 +203,10 @@ function oembed_format_object($j){
        } else {
                // add <a> for html2bbcode conversion
                $ret .= "<a href='$embedurl' rel='oembed'>$embedurl</a>";
-               $ret .= "<br style='clear:left'>";
        }
        $ret.="</span>";
-       return  mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));
+       $ret = str_replace("\n","",$ret);
+       return mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));
 }
 
 function oembed_iframe($src,$width,$height) {