X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Foembed.php;h=0b8b713667e7aa1faede525a5a08db1b07b03c0b;hb=45d73b106bbebdea17c56c00235c0dcebc471536;hp=a3d2deaca00fead83b14b1fec50605179b040e2f;hpb=0f2c27e041720ef25e353e7b38de1e85f7a73db3;p=friendica.git
diff --git a/include/oembed.php b/include/oembed.php
index a3d2deaca0..0b8b713667 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -17,10 +17,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 +41,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 +74,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 +154,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,13 +244,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 '';
}