X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Foembed.php;h=b1770f68903408034053997dff8a0495081d89aa;hb=6da01c1a3db29960f7c81582cb52e4254981e9cb;hp=29d462d8f7d2252629e1cd3fb75b6508b90c04f2;hpb=53d925095f3bd7437af9b341da5775bcc479c739;p=friendica.git
diff --git a/include/oembed.php b/include/oembed.php
index 29d462d8f7..b1770f6890 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -1,23 +1,25 @@
width,$j->height);
-
-
+ return $s;
}
function oembed_fetch_url($embedurl, $no_rich_type = false){
-
$embedurl = trim($embedurl, "'");
$embedurl = trim($embedurl, '"');
$a = get_app();
- $txt = Cache::get($a->videowidth . $embedurl);
+ $r = q("SELECT * FROM `oembed` WHERE `url` = '%s'",
+ dbesc(normalise_link($embedurl)));
+
+ if ($r)
+ $txt = $r[0]["content"];
+ else
+ $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,6 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
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){
@@ -46,31 +47,39 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
$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==""){
$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
+ $j = json_decode($txt);
+ if ($j->type != "error")
+ q("INSERT INTO `oembed` (`url`, `content`, `created`) VALUES ('%s', '%s', '%s')",
+ dbesc(normalise_link($embedurl)), dbesc($txt), dbesc(datetime_convert()));
+ Cache::set($a->videowidth . $embedurl,$txt, CACHE_DAY);
+ }
}
$j = json_decode($txt);
@@ -78,12 +87,17 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
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);
+ $data = parseurl_getsiteinfo_cached($embedurl, true, false);
$j->type = $data["type"];
if ($j->type == "photo") {
@@ -105,10 +119,14 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
}
}
+ 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) );
@@ -135,25 +153,23 @@ function oembed_format_object($j){
} else {
$ret=$jhtml;
}
- $ret.="
";
+ //$ret.="
";
}; break;
case "photo": {
- $ret.= "";
- //$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;
}
// add link to source if not present in "rich" type
if ($j->type!='rich' || !strpos($j->html,$embedurl) ){
+ $ret .= "