strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1479 from annando/1504-parse_url

Browse source 
The order for the page parsing is changed
This commit is contained in:
Tobias Diekershoff 2015-04-10 10:13:13 +02:00
parent 5e3f2b67a8 e81f9c91fa
commit dea1b067bd
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
mod/parse_url.php
View file

@ -97,15 +97,6 @@ function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $co
return($siteinfo); return($siteinfo);
} }
if ($do_oembed) {
require_once("include/oembed.php");
$oembed_data = oembed_fetch_url($url);
if ($oembed_data->type != "error")
$siteinfo["type"] = $oembed_data->type;
}
// if the file is too large then exit // if the file is too large then exit
if ($curl_info["download_content_length"] > 1000000) if ($curl_info["download_content_length"] > 1000000)
return($siteinfo); return($siteinfo);
@ -114,6 +105,24 @@ function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $co
if (($curl_info["content_type"] != "") AND !strstr(strtolower($curl_info["content_type"]),"html")) if (($curl_info["content_type"] != "") AND !strstr(strtolower($curl_info["content_type"]),"html"))
return($siteinfo); return($siteinfo);
if ($do_oembed) {
require_once("include/oembed.php");
$oembed_data = oembed_fetch_url($url);
if ($oembed_data->type != "error")
$siteinfo["type"] = $oembed_data->type;
if (($oembed_data->type == "link") AND ($siteinfo["type"] != "photo")) {
if (isset($oembed_data->title))
$siteinfo["title"] = $oembed_data->title;
if (isset($oembed_data->description))
$siteinfo["text"] = trim($oembed_data->description);
if (isset($oembed_data->thumbnail_url))
$siteinfo["image"] = $oembed_data->thumbnail_url;
}
}
$stamp1 = microtime(true); $stamp1 = microtime(true);
// Now fetch the body as well // Now fetch the body as well
@ -283,15 +292,6 @@ function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $co
} }
} }
if (isset($oembed_data) AND ($oembed_data->type == "link") AND ($siteinfo["type"] != "photo")) {
if (isset($oembed_data->title) AND (trim($oembed_data->title) != ""))
$siteinfo["title"] = $oembed_data->title;
if (isset($oembed_data->description) AND (trim($oembed_data->description) != ""))
$siteinfo["text"] = trim($oembed_data->description);
if (isset($oembed_data->thumbnail_url) AND (trim($oembed_data->thumbnail_url) != ""))
$siteinfo["image"] = $oembed_data->thumbnail_url;
}
if ((@$siteinfo["image"] == "") AND !$no_guessing) { if ((@$siteinfo["image"] == "") AND !$no_guessing) {
$list = $xpath->query("//img[@src]"); $list = $xpath->query("//img[@src]");
foreach ($list as $node) { foreach ($list as $node) {