X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Foembed.php;h=b1770f68903408034053997dff8a0495081d89aa;hb=416a0e5ec2684f1bfe029da9438b2782127d9355;hp=0e1238360310b87efc675e453bd0805b8868d944;hpb=c73d9611983b05cd1207d69c71a157c051b3f2e8;p=friendica.git
diff --git a/include/oembed.php b/include/oembed.php
index 0e12383603..b1770f6890 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -1,12 +1,9 @@
width,$j->height);
-
-
+ return $s;
}
@@ -16,7 +13,13 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
$a = get_app();
- $txt = Cache::get($a->videowidth . $embedurl);
+ $r = q("SELECT * FROM `oembed` WHERE `url` = '%s'",
+ dbesc(normalise_link($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
@@ -69,8 +72,14 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
if ($txt[0]!="{")
$txt='{"type":"error"}';
- else //save in cache
+ 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);
@@ -88,7 +97,7 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
// 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") {
@@ -144,15 +153,12 @@ function oembed_format_object($j){
} else {
$ret=$jhtml;
}
- $ret.="
";
+ //$ret.="
";
}; break;
case "photo": {
$ret.= "";
- //$ret.= "";
- $ret.="
";
}; break;
case "link": {
- //$ret = "".$j->title."";
}; break;
case "rich": {
// not so safe..
@@ -194,10 +200,10 @@ function oembed_format_object($j){
} else {
// add for html2bbcode conversion
$ret .= "$embedurl";
- $ret .= "
";
}
$ret.="";
- return mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));
+ $ret = str_replace("\n","",$ret);
+ return mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));
}
function oembed_iframe($src,$width,$height) {