X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Foembed.php;h=bc127b5c3515f61cd061bcb63f9fa2710dc2f426;hb=d1a0206cdd1a65b08feb16197fe2236c8e1a8037;hp=e2504b7eb8554e040e24e43da081d1e97da1b66d;hpb=62e9047b8d1b7f3272213a6407db34c9cd1a2cbb;p=friendica.git
diff --git a/include/oembed.php b/include/oembed.php
index e2504b7eb8..bc127b5c35 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -12,7 +12,9 @@ function oembed_replacecb($matches){
function oembed_fetch_url($embedurl){
- $txt = Cache::get($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
@@ -38,7 +40,7 @@ function oembed_fetch_url($embedurl){
$entries = $xpath->query("//link[@type='application/json+oembed']");
foreach($entries as $e){
$href = $e->getAttributeNode("href")->nodeValue;
- $txt = fetch_url($href . '&maxwidth=425');
+ $txt = fetch_url($href . '&maxwidth=' . $a->videowidth);
break;
}
}
@@ -47,7 +49,7 @@ function oembed_fetch_url($embedurl){
if ($txt==false || $txt==""){
// try oohembed service
- $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=425';
+ $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=' . $a->videowidth;
$txt = fetch_url($ourl);
}
@@ -55,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);
}
@@ -72,9 +74,10 @@ function oembed_format_object($j){
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;
- $tr = $tw/$th;
+ $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');
@@ -93,7 +96,8 @@ function oembed_format_object($j){
$ret.="
";
}; break;
case "photo": {
- $ret.= "";
+ $ret.= "";
+ //$ret.= "";
$ret.="
";
}; break;
case "link": {
@@ -113,7 +117,7 @@ function oembed_format_object($j){
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));