Merge branch 'master' of https://github.com/friendica/friendica

[friendica.git] / include / oembed.php

diff --git a/include/oembed.php b/include/oembed.php
index 2933252b3e9dd6acf05346b243049033797a546f..1f45d2814325449ce5816e564fd7545b9ea2a4c9 100644 (file)
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -1,39 +1,53 @@
 <?php
 function oembed_replacecb($matches){
+//     logger('oembedcb');
        $embedurl=$matches[1];
        $j = oembed_fetch_url($embedurl);
-       return oembed_format_object($j);
+       $s =  oembed_format_object($j);
+       return $s;//oembed_iframe($s,$j->width,$j->height);
+
+
 }
 
 
 function oembed_fetch_url($embedurl){
-       
+
        $txt = Cache::get($embedurl);
+
+       // These media files should now be caught in bbcode.php
+       // left here as a fallback in case this is called from another source
+
+       $noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm");
+       $ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION);
+       
                                
        if(is_null($txt)){
                $txt = "";
                
-               // try oembed autodiscovery
-               $redirects = 0;
-               $html_text = fetch_url($embedurl, false, $redirects, 15);
-               if($html_text){
-                       $dom = @DOMDocument::loadHTML($html_text);
-                       if ($dom){
-                               $xpath = new DOMXPath($dom);
-                               $attr = "oembed";
-                       
-                               $xattr = oe_build_xpath("class","oembed");
-                               $entries = $xpath->query("//link[@type='application/json+oembed']");
-                               foreach($entries as $e){
-                                       $href = $e->getAttributeNode("href")->nodeValue;
-                                       $txt = fetch_url($href);
+               if (!in_array($ext, $noexts)){
+                       // try oembed autodiscovery
+                       $redirects = 0;
+                       $html_text = fetch_url($embedurl, false, $redirects, 15, "text/*");
+                       if($html_text){
+                               $dom = @DOMDocument::loadHTML($html_text);
+                               if ($dom){
+                                       $xpath = new DOMXPath($dom);
+                                       $attr = "oembed";
+                               
+                                       $xattr = oe_build_xpath("class","oembed");
+                                       $entries = $xpath->query("//link[@type='application/json+oembed']");
+                                       foreach($entries as $e){
+                                               $href = $e->getAttributeNode("href")->nodeValue;
+                                               $txt = fetch_url($href . '&maxwidth=425');
+                                               break;
+                                       }
                                }
                        }
                }
                
                if ($txt==false || $txt==""){
                        // try oohembed service
-                       $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl);  
+                       $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=425';  
                        $txt = fetch_url($ourl);
                }
                
@@ -52,24 +66,27 @@ function oembed_fetch_url($embedurl){
        
 function oembed_format_object($j){
        $embedurl = $j->embedurl;
+       $jhtml = oembed_iframe($j->embedurl,(isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null) );
        $ret="<span class='oembed ".$j->type."'>";
        switch ($j->type) {
                case "video": {
                        if (isset($j->thumbnail_url)) {
-                               /*$tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200;
-                               $th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180;*/
-                               $tw=150; $th=120; 
+                               $tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200;
+                               $th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180;
+                               $tr = $tw/$th;
+                               
+                               $th=120; $tw = $th*$tr;
                                $tpl=get_markup_template('oembed_video.tpl');
                                $ret.=replace_macros($tpl, array(
                                        '$embedurl'=>$embedurl,
-                                       '$escapedhtml'=>urlencode($j->html),
+                                       '$escapedhtml'=>base64_encode($jhtml),
                                        '$tw'=>$tw,
                                        '$th'=>$th,
                                        '$turl'=>$j->thumbnail_url,
                                ));
                                
                        } else {
-                               $ret=$j->html;
+                               $ret=$jhtml;
                        }
                        $ret.="<br>";
                }; break;
@@ -82,12 +99,12 @@ function oembed_format_object($j){
                }; break;  
                case "rich": {
                        // not so safe.. 
-                       $ret.= $j->html;
+                       $ret.= $jhtml;
                }; break;
        }
 
        // add link to source if not present in "rich" type
-       if (  $j->type!='rich' || !strpos($ret,$embedurl) ){
+       if (  $j->type!='rich' || !strpos($j->html,$embedurl) ){
                $embedlink = (isset($j->title))?$j->title:$embedurl;
                $ret .= "<a href='$embedurl' rel='oembed'>$embedlink</a>";
                if (isset($j->author_name)) $ret.=" by ".$j->author_name;
@@ -100,6 +117,24 @@ function oembed_format_object($j){
        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';
+       // try and leave some room for the description line. 
+       $height = intval($height) + 80;
+       $width  = intval($width) + 40;
+
+       $a = get_app();
+
+       $s = $a->get_baseurl()."/oembed/".base64url_encode($src);
+       return '<iframe height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >' . t('Embedded content') . '</iframe>'; 
+
+}
+
+
+
 function oembed_bbcode2html($text){
        $stopoembed = get_config("system","no_oembed");
        if ($stopoembed == true){