X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Foembed.php;h=0f3296b254c9a7db2e2efa29f48b8695fd6d7c28;hb=8cb4a8d0c420dc7c7fe9b96a43b78016c105a8fc;hp=a3d2deaca00fead83b14b1fec50605179b040e2f;hpb=0f2c27e041720ef25e353e7b38de1e85f7a73db3;p=friendica.git
diff --git a/include/oembed.php b/include/oembed.php
index a3d2deaca0..0f3296b254 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") {
@@ -118,7 +108,7 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
$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"))) {
+ if (($j->type == "error") || ($no_rich_type && ($j->type == "rich"))) {
$data = ParseUrl::getSiteinfoCached($embedurl, true, false);
$j->type = $data["type"];
@@ -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 {
@@ -204,7 +194,7 @@ function oembed_format_object($j){
if (isset($j->author_name)) {
$ret.=" (".$j->author_name.")";
}
- } elseif (isset($j->provider_name) OR isset($j->author_name)) {
+ } elseif (isset($j->provider_name) || isset($j->author_name)) {
$embedlink = "";
if (isset($j->provider_name)) {
$embedlink .= $j->provider_name;
@@ -255,13 +245,15 @@ 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);
- return '';
+ $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 {