X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Foembed.php;h=d28a97e322046690eee01300199ceca9891090c4;hb=5aee2fde1bbbe8ed3ba7f91c5916ff291758ec15;hp=5abd03b61769587180e292d9ebdb825e12ddf757;hpb=d489ba1510a2dcfaa7851d937d3c37a9541544c9;p=friendica.git diff --git a/include/oembed.php b/include/oembed.php index 5abd03b617..d28a97e322 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -4,8 +4,9 @@ * @file include/oembed.php */ -use \Friendica\ParseUrl; -use \Friendica\Core\Config; +use Friendica\App; +use Friendica\ParseUrl; +use Friendica\Core\Config; function oembed_replacecb($matches){ $embedurl=$matches[1]; @@ -17,10 +18,10 @@ function oembed_replacecb($matches){ /** * @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 */ @@ -41,8 +42,8 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){ // 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); + $noexts = array("mp3", "mp4", "ogg", "ogv", "oga", "ogm", "webm"); + $ext = pathinfo(strtolower($embedurl), PATHINFO_EXTENSION); if (is_null($txt)) { @@ -74,21 +75,10 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){ } } - if ($txt==false || $txt=="") { - $embedly = Config::get("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); - $txt=trim($txt); - - if ($txt[0]!="{") { - $txt='{"type":"error"}'; + if ($txt[0] != "{") { + $txt = '{"type":"error"}'; } else { //save in cache $j = json_decode($txt); if ($j->type != "error") { @@ -165,12 +155,12 @@ function oembed_format_object($j){ $th=120; $tw = $th*$tr; $tpl=get_markup_template('oembed_video.tpl'); $ret.=replace_macros($tpl, array( - '$baseurl' => App::get_baseurl(), - '$embedurl'=>$embedurl, - '$escapedhtml'=>base64_encode($jhtml), - '$tw'=>$tw, - '$th'=>$th, - '$turl'=>$j->thumbnail_url, + '$baseurl' => App::get_baseurl(), + '$embedurl' => $embedurl, + '$escapedhtml' => base64_encode($jhtml), + '$tw' => $tw, + '$th' => $th, + '$turl' => $j->thumbnail_url, )); } else { @@ -255,12 +245,14 @@ function oembed_format_object($j){ * @see oembed_format_object() */ function oembed_iframe($src, $width, $height) { + $a = get_app(); + if (!$height || strstr($height,'%')) { $height = '200'; } $width = '100%'; - $s = App::get_baseurl() . '/oembed/'.base64url_encode($src); + $s = App::get_baseurl() . '/oembed/' . base64url_encode($src); return ''; } @@ -312,9 +304,11 @@ function oembed_html2bbcode($text) { $entries = $xpath->query("//span[$xattr]"); $xattr = "@rel='oembed'";//oe_build_xpath("rel","oembed"); - foreach($entries as $e) { + foreach ($entries as $e) { $href = $xpath->evaluate("a[$xattr]/@href", $e)->item(0)->nodeValue; - if(!is_null($href)) $e->parentNode->replaceChild(new DOMText("[embed]".$href."[/embed]"), $e); + if (!is_null($href)) { + $e->parentNode->replaceChild(new DOMText("[embed]".$href."[/embed]"), $e); + } } return oe_get_inner_html( $dom->getElementsByTagName("body")->item(0) ); } else {