X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Foembed.php;h=c848a4580c9dafc407c649fc2a36e0e2130eb399;hb=885dc1df81c9ab752f9f5d66894786944184a9c9;hp=b32cb512be54a90d242f6cf9d15cbeebd8934df0;hpb=5a1bb9866dbb09b00861688f4a78baf0391ea58f;p=friendica.git
diff --git a/include/oembed.php b/include/oembed.php
index b32cb512be..c848a4580c 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -1,12 +1,9 @@
width,$j->height);
-
-
+ return $s;
}
@@ -56,25 +53,21 @@ 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);
+ if ($txt[0]!="{")
+ $txt='{"type":"error"}';
+ else //save in cache
+ Cache::set($a->videowidth . $embedurl,$txt, CACHE_DAY);
}
$j = json_decode($txt);
@@ -148,20 +141,17 @@ function oembed_format_object($j){
} else {
$ret=$jhtml;
}
- $ret.="
";
+ //$ret.="
";
}; break;
case "photo": {
$ret.= "
";
- //$ret.= "
";
- $ret.="
";
}; break;
case "link": {
- //$ret = "".$j->title."";
}; break;
case "rich": {
// not so safe..
if (!get_config("system","no_oembed_rich_content"))
- $ret.= $jhtml;
+ $ret.= proxy_parse_html($jhtml);
}; break;
}
@@ -198,10 +188,10 @@ function oembed_format_object($j){
} else {
// add for html2bbcode conversion
$ret .= "$embedurl";
- $ret .= "
";
}
$ret.="";
- 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) {