X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Foembed.php;h=b1770f68903408034053997dff8a0495081d89aa;hb=6da01c1a3db29960f7c81582cb52e4254981e9cb;hp=a4452586eebb1cd79bd904fc81603ca8bab381a2;hpb=ba4db236ecff1ffdb56adc2715b3f53515f8cb34;p=friendica.git
diff --git a/include/oembed.php b/include/oembed.php
index a4452586ee..b1770f6890 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -1,138 +1,229 @@
width,$j->height);
+ return $s;
+}
-}
+function oembed_fetch_url($embedurl, $no_rich_type = false){
+ $embedurl = trim($embedurl, "'");
+ $embedurl = trim($embedurl, '"');
+ $a = get_app();
-function oembed_fetch_url($embedurl){
+ $r = q("SELECT * FROM `oembed` WHERE `url` = '%s'",
+ dbesc(normalise_link($embedurl)));
- $txt = Cache::get($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
$noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm");
$ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION);
-
-
+
+
if(is_null($txt)){
$txt = "";
-
+
if (!in_array($ext, $noexts)){
// try oembed autodiscovery
$redirects = 0;
- $html_text = fetch_url($embedurl, false, $redirects, 15, "text/*");
+ $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=425');
+ $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=425';
- $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($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);
+
+ 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_cached($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;
+ $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;
- $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');
$ret.=replace_macros($tpl, array(
- '$baseurl' => $a->get_baseurl(),
+ '$baseurl' => $a->get_baseurl(),
'$embedurl'=>$embedurl,
'$escapedhtml'=>base64_encode($jhtml),
'$tw'=>$tw,
'$th'=>$th,
'$turl'=>$j->thumbnail_url,
));
-
+
} else {
$ret=$jhtml;
}
- $ret.="
";
+ //$ret.="
";
}; break;
case "photo": {
- $ret.= "
";
- //$ret.= "
";
- $ret.="
";
- }; break;
+ $ret.= "
";
+ }; break;
case "link": {
- //$ret = "".$j->title."";
- }; break;
+ }; break;
case "rich": {
- // not so safe..
- $ret.= $jhtml;
+ // not so safe..
+ if (!get_config("system","no_oembed_rich_content"))
+ $ret.= proxy_parse_html($jhtml);
}; break;
}
// add link to source if not present in "rich" type
- 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;
+ if ($j->type!='rich' || !strpos($j->html,$embedurl) ){
+ $ret .= "";
+ if (isset($j->title)) {
+ if (isset($j->provider_name))
+ $ret .= $j->provider_name.": ";
+
+ $embedlink = (isset($j->title))?$j->title:$embedurl;
+ $ret .= "$embedlink";
+ if (isset($j->author_name))
+ $ret.=" (".$j->author_name.")";
+ } elseif (isset($j->provider_name) OR isset($j->author_name)) {
+ $embedlink = "";
+ if (isset($j->provider_name))
+ $embedlink .= $j->provider_name;
+
+ if (isset($j->author_name)) {
+ if ($embedlink != "")
+ $embedlink .= ": ";
+
+ $embedlink .= $j->author_name;
+ }
+ if (trim($embedlink) == "")
+ $embedlink = $embedurl;
+
+ $ret .= "$embedlink";
+ }
+ //if (isset($j->author_name)) $ret.=" by ".$j->author_name;
+ //if (isset($j->provider_name)) $ret.=" on ".$j->provider_name;
+ $ret .= "
";
} else {
// add for html2bbcode conversion
- $ret .= "";
+ $ret .= "$embedurl";
}
- $ret.="
";
- return mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));
+ $ret.="";
+ $ret = str_replace("\n","",$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,'%'))
+ if(! $height || strstr($height,'%')) {
$height = '300';
- // try and leave some room for the description line.
+ $resize = 'onload="resizeIframe(this);"';
+ } else
+ $resize = '';
+
+ // 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 '';
+ return '';
}
@@ -159,7 +250,7 @@ function oe_get_inner_html( $node ) {
$innerHTML .= $child->ownerDocument->saveXML( $child );
}
return $innerHTML;
-}
+}
/**
* Find ....
@@ -168,17 +259,17 @@ function oe_get_inner_html( $node ) {
function oembed_html2bbcode($text) {
// start parser only if 'oembed' is in text
if (strpos($text, "oembed")){
-
+
// convert non ascii chars to html entities
$html_text = mb_convert_encoding($text, 'HTML-ENTITIES', mb_detect_encoding($text));
-
+
// If it doesn't parse at all, just return the text.
$dom = @DOMDocument::loadHTML($html_text);
if(! $dom)
return $text;
$xpath = new DOMXPath($dom);
$attr = "oembed";
-
+
$xattr = oe_build_xpath("class","oembed");
$entries = $xpath->query("//span[$xattr]");
@@ -190,8 +281,5 @@ function oembed_html2bbcode($text) {
return oe_get_inner_html( $dom->getElementsByTagName("body")->item(0) );
} else {
return $text;
- }
+ }
}
-
-
-