X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Foembed.php;h=bc127b5c3515f61cd061bcb63f9fa2710dc2f426;hb=39d8fec290613cac87c2821b9f7b20fa94d319ca;hp=2933252b3e9dd6acf05346b243049033797a546f;hpb=75d4f332335e66375815b339526252e8ab34be32;p=friendica.git
diff --git a/include/oembed.php b/include/oembed.php
old mode 100644
new mode 100755
index 2933252b3e..bc127b5c35
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -1,39 +1,55 @@
width,$j->height);
+
+
}
function oembed_fetch_url($embedurl){
+
+ $a = get_app();
+
+ $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
+
+ $noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm");
+ $ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION);
- $txt = Cache::get($embedurl);
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=' . $a->videowidth);
+ 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=' . $a->videowidth;
$txt = fetch_url($ourl);
}
@@ -41,7 +57,7 @@ function oembed_fetch_url($embedurl){
if ($txt[0]!="{") $txt='{"type":"error"}';
//save in cache
- Cache::set($embedurl,$txt);
+ Cache::set($a->videowidth . $embedurl,$txt);
}
@@ -51,30 +67,37 @@ function oembed_fetch_url($embedurl){
}
function oembed_format_object($j){
- $embedurl = $j->embedurl;
+ $a = get_app();
+ $embedurl = $j->embedurl;
+ $jhtml = oembed_iframe($j->embedurl,(isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null) );
$ret="";
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) && intval($j->thumbnail_width)) ? $j->thumbnail_width:200;
+ $th = (isset($j->thumbnail_height) && intval($j->thumbnail_height)) ? $j->thumbnail_height:180;
+ // make sure we don't attempt divide by zero, fallback is a 1:1 ratio
+ $tr = (($th) ? $tw/$th : 1);
+
+ $th=120; $tw = $th*$tr;
$tpl=get_markup_template('oembed_video.tpl');
$ret.=replace_macros($tpl, array(
+ '$baseurl' => $a->get_baseurl(),
'$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.="
";
}; break;
case "photo": {
- $ret.= "
";
+ $ret.= "
";
+ //$ret.= "
";
$ret.="
";
}; break;
case "link": {
@@ -82,24 +105,42 @@ 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 .= "$embedlink";
if (isset($j->author_name)) $ret.=" by ".$j->author_name;
if (isset($j->provider_name)) $ret.=" on ".$j->provider_name;
} else {
// add for html2bbcode conversion
- $ret .= "";
+ $ret .= "";
}
$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';
+ // 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 '';
+
+}
+
+
+
function oembed_bbcode2html($text){
$stopoembed = get_config("system","no_oembed");
if ($stopoembed == true){