Added some functionality if oembed isn't working. (Should be extended in the future)
This commit is contained in:
parent
135a403cec
commit
53d925095f
2 changed files with 35 additions and 7 deletions
|
@ -10,7 +10,7 @@ function oembed_replacecb($matches){
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function oembed_fetch_url($embedurl){
|
function oembed_fetch_url($embedurl, $no_rich_type = false){
|
||||||
|
|
||||||
$embedurl = trim($embedurl, "'");
|
$embedurl = trim($embedurl, "'");
|
||||||
$embedurl = trim($embedurl, '"');
|
$embedurl = trim($embedurl, '"');
|
||||||
|
@ -79,6 +79,32 @@ function oembed_fetch_url($embedurl){
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
$j->embedurl = $embedurl;
|
$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);
|
||||||
|
$j->type = $data["type"];
|
||||||
|
|
||||||
|
if ($j->type == "photo") {
|
||||||
|
$j->url = $data["url"];
|
||||||
|
//$j->width = $data["images"][0]["width"];
|
||||||
|
//$j->height = $data["images"][0]["height"];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($data["title"]))
|
||||||
|
$j->title = $data["title"];
|
||||||
|
|
||||||
|
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"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return $j;
|
return $j;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -50,7 +50,7 @@ function completeurl($url, $scheme) {
|
||||||
return($complete);
|
return($complete);
|
||||||
}
|
}
|
||||||
|
|
||||||
function parseurl_getsiteinfo($url, $no_guessing = false) {
|
function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true) {
|
||||||
|
|
||||||
$siteinfo = array();
|
$siteinfo = array();
|
||||||
|
|
||||||
|
@ -82,12 +82,14 @@ function parseurl_getsiteinfo($url, $no_guessing = false) {
|
||||||
return($siteinfo);
|
return($siteinfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($do_oembed) {
|
||||||
require_once("include/oembed.php");
|
require_once("include/oembed.php");
|
||||||
|
|
||||||
$oembed_data = oembed_fetch_url($url);
|
$oembed_data = oembed_fetch_url($url);
|
||||||
|
|
||||||
if ($oembed_data->type != "error")
|
if ($oembed_data->type != "error")
|
||||||
$siteinfo["type"] = $oembed_data->type;
|
$siteinfo["type"] = $oembed_data->type;
|
||||||
|
}
|
||||||
|
|
||||||
// Fetch the first mentioned charset. Can be in body or header
|
// Fetch the first mentioned charset. Can be in body or header
|
||||||
$charset = "";
|
$charset = "";
|
||||||
|
@ -217,7 +219,7 @@ function parseurl_getsiteinfo($url, $no_guessing = false) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($oembed_data->type == "link") {
|
if (isset($oembed_data) AND ($oembed_data->type == "link")) {
|
||||||
if (isset($oembed_data->title) AND (trim($oembed_data->title) != ""))
|
if (isset($oembed_data->title) AND (trim($oembed_data->title) != ""))
|
||||||
$siteinfo["title"] = $oembed_data->title;
|
$siteinfo["title"] = $oembed_data->title;
|
||||||
if (isset($oembed_data->description) AND (trim($oembed_data->description) != ""))
|
if (isset($oembed_data->description) AND (trim($oembed_data->description) != ""))
|
||||||
|
|
Loading…
Reference in a new issue