Merge remote-tracking branch 'upstream/develop' into 1610-performance

[friendica.git] / include / oembed.php

diff --git a/include/oembed.php b/include/oembed.php
index cbd856648f9366a8463fa8a7fbec17659078e84f..898d900f43bf86759188d917b807918f37718182 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
@@ -67,13 +70,19 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 
                $txt=trim($txt);
 
-               if ($txt==false || $txt=="")
-                       return false;
-
                if ($txt[0]!="{")
                        $txt='{"type":"error"}';
-               else    //save in cache
-                       Cache::set($a->videowidth . $embedurl,$txt, CACHE_DAY);
+               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);
@@ -91,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") {
@@ -147,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;
        }
 
@@ -197,31 +203,40 @@ 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) {
-
-       if(! $width || strstr($width,'%'))
-               $width = '640';
-       if(! $height || strstr($height,'%')) {
-               $height = '300';
-               $resize = 'onload="resizeIframe(this);"';
-       } else
-               $resize = '';
-
-       // try and leave some room for the description line.
-       $height = intval($height) + 80;
-       $width  = intval($width) + 40;
+/**
+ * @brief Generates the iframe HTML for an oembed attachment.
+ *
+ * Width and height are given by the remote, and are regularly too small for
+ * the generated iframe.
+ *
+ * The width is entirely discarded for the actual width of the post, while fixed
+ * height is used as a starting point before the inevitable resizing.
+ *
+ * Since the iframe is automatically resized on load, there are no need for ugly
+ * and impractical scrollbars.
+ *
+ * @param string $src Original remote URL to embed
+ * @param string $width
+ * @param string $height
+ * @return string formatted HTML
+ *
+ * @see oembed_format_object()
+ */
+function oembed_iframe($src, $width, $height) {
+       if (!$height || strstr($height,'%')) {
+               $height = '200';
+       }
+       $width = '100%';
 
        $a = get_app();
-
-       $s = $a->get_baseurl()."/oembed/".base64url_encode($src);
-       return '<iframe '.$resize.' class="embed_rich" height="'.$height.'" width="'.$width.'" src="'.$s.'" frameborder="no">'.t('Embedded content').'</iframe>';
-
+       $s = $a->get_baseurl() . '/oembed/'.base64url_encode($src);
+       return '<iframe onload="resizeIframe(this);" class="embed_rich" height="' . $height . '" width="' . $width . '" src="' . $s . '" scrolling="no" frameborder="no">' . t('Embedded content') . '</iframe>';
 }