X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Foembed.php;h=d4d7ce05e115212c096ac3e8bf7c19d22b620316;hb=6e981ed798f8938ce7f0de91d523b1ba6359381c;hp=ee042f8ce97a5869a9cd766d66d6580484102bbe;hpb=c2abf0aeeab6aa15545bea436fc68ad3d997f0bb;p=friendica.git
diff --git a/include/oembed.php b/include/oembed.php
index ee042f8ce9..d4d7ce05e1 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -10,7 +10,9 @@ function oembed_replacecb($matches){
}
-function oembed_fetch_url($embedurl){
+function oembed_fetch_url($embedurl, $no_rich_type = false){
+ $embedurl = trim($embedurl, "'");
+ $embedurl = trim($embedurl, '"');
$a = get_app();
@@ -35,7 +37,6 @@ function oembed_fetch_url($embedurl){
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){
@@ -43,22 +44,33 @@ function oembed_fetch_url($embedurl){
$txt = fetch_url($href . '&maxwidth=' . $a->videowidth);
break;
}
+ $entries = $xpath->query("//link[@type='text/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).'&maxwidth=' . $a->videowidth;
- $txt = fetch_url($ourl);
+ $embedly = get_config("system", "embedly");
+ 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);
+ }
}
$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);
@@ -66,11 +78,46 @@ function oembed_fetch_url($embedurl){
if (!is_object($j))
return false;
+ // Always embed the SSL version
+ if (isset($j->html))
+ $j->html = str_replace(array("http://www.youtube.com/", "http://player.vimeo.com/"),
+ array("https://www.youtube.com/", "https://player.vimeo.com/"), $j->html);
+
$j->embedurl = $embedurl;
+
+ // 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);
+ $j->type = $data["type"];
+
+ if ($j->type == "photo") {
+ $j->url = $data["url"];
+ //$j->width = $data["images"][0]["width"];
+ //$j->height = $data["images"][0]["height"];
+ }
+
+ if (isset($data["title"]))
+ $j->title = $data["title"];
+
+ if (isset($data["text"]))
+ $j->description = $data["text"];
+
+ if (is_array($data["images"])) {
+ $j->thumbnail_url = $data["images"][0]["src"];
+ $j->thumbnail_width = $data["images"][0]["width"];
+ $j->thumbnail_height = $data["images"][0]["height"];
+ }
+ }
+
+ call_hooks('oembed_fetch_url', $embedurl, $j);
+
return $j;
}
function oembed_format_object($j){
+ require_once("mod/proxy.php");
+
$a = get_app();
$embedurl = $j->embedurl;
$jhtml = oembed_iframe($j->embedurl,(isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null) );
@@ -100,8 +147,8 @@ function oembed_format_object($j){
$ret.="
";
}; break;
case "photo": {
- $ret.= "";
- //$ret.= "
";
+ $ret.= "
";
+ //$ret.= "
";
$ret.="
";
}; break;
case "link": {
@@ -116,6 +163,7 @@ function oembed_format_object($j){
// add link to source if not present in "rich" type
if ($j->type!='rich' || !strpos($j->html,$embedurl) ){
+ $ret .= "