X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Foembed.php;h=be6c298e8d5ff0f5f89ccc1e15afc2395ca3366c;hb=edbdd0e34a90612349001fbfc4f2246f23ab36ab;hp=6fc981729944a29323b969bb6fcdf78ba1de1b4c;hpb=98bba66dcb335a86385967bc08ce30f5be0f4b75;p=friendica.git
diff --git a/include/oembed.php b/include/oembed.php
index 6fc9817299..be6c298e8d 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -1,23 +1,34 @@
width,$j->height);
-
-
+ return $s;
}
-
+/**
+ * @brief Get data from an URL to embed its content.
+ *
+ * @param string $embedurl The URL from which the data should be fetched.
+ * @param bool $no_rich_type If set to true rich type content won't be fetched.
+ *
+ * @return bool|object Returns object with embed content or false if no embedable
+ * content exists
+ */
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 (dbm::is_result($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
@@ -25,22 +36,27 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
$ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION);
- if(is_null($txt)){
+ if (is_null($txt)) {
$txt = "";
if (!in_array($ext, $noexts)){
// try oembed autodiscovery
$redirects = 0;
- $html_text = fetch_url($embedurl, false, $redirects, 15, "text/*"); /**/
- if($html_text){
+ $html_text = fetch_url($embedurl, false, $redirects, 15, "text/*");
+ if ($html_text) {
$dom = @DOMDocument::loadHTML($html_text);
- if ($dom){
+ 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){
+ foreach ($entries as $e) {
+ $href = $e->getAttributeNode("href")->nodeValue;
+ $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;
@@ -49,45 +65,53 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
}
}
- if ($txt==false || $txt==""){
+ 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')
+ ON DUPLICATE KEY UPDATE `content` = '%s', `created` = '%s'",
+ dbesc(normalise_link($embedurl)),
+ dbesc($txt), dbesc(datetime_convert()),
+ dbesc($txt), dbesc(datetime_convert()));
+ }
+ Cache::set($a->videowidth.$embedurl, $txt, CACHE_DAY);
+ }
}
$j = json_decode($txt);
- if (!is_object($j))
+ if (!is_object($j)) {
return false;
+ }
// Always embed the SSL version
- if (isset($j->html))
+ 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") {
@@ -96,16 +120,18 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
//$j->height = $data["images"][0]["height"];
}
- if (isset($data["title"]))
- $j->title = $data["title"];
+ if (isset($data["title"])) {
+ $j->title = $data["title"];
+ }
- if (isset($data["text"]))
- $j->description = $data["text"];
+ 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"];
+ $j->thumbnail_url = $data["images"][0]["src"];
+ $j->thumbnail_width = $data["images"][0]["width"];
+ $j->thumbnail_height = $data["images"][0]["height"];
}
}
@@ -143,20 +169,17 @@ function oembed_format_object($j){
} else {
$ret=$jhtml;
}
- $ret.="
";
+ //$ret.="
";
}; break;
case "photo": {
$ret.= "![](".proxy_url($j->url).")
";
- //$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;
}
@@ -193,30 +216,40 @@ function oembed_format_object($j){
} else {
// add for html2bbcode conversion
$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,'%')) {
- $height = '300';
- $resize = 'onload="resizeIframe(this);"';
- } else
- $resize = '';
-
- // try and leave some room for the description line.
- $height = intval($height) + 80;
- $width = intval($width) + 40;
+/**
+ * @brief Generates the iframe HTML for an oembed attachment.
+ *
+ * Width and height are given by the remote, and are regularly too small for
+ * the generated iframe.
+ *
+ * The width is entirely discarded for the actual width of the post, while fixed
+ * height is used as a starting point before the inevitable resizing.
+ *
+ * Since the iframe is automatically resized on load, there are no need for ugly
+ * and impractical scrollbars.
+ *
+ * @param string $src Original remote URL to embed
+ * @param string $width
+ * @param string $height
+ * @return string formatted HTML
+ *
+ * @see oembed_format_object()
+ */
+function oembed_iframe($src, $width, $height) {
+ if (!$height || strstr($height,'%')) {
+ $height = '200';
+ }
+ $width = '100%';
$a = get_app();
-
- $s = $a->get_baseurl()."/oembed/".base64url_encode($src);
- return '';
-
+ $s = $a->get_baseurl() . '/oembed/'.base64url_encode($src);
+ return '';
}