diff options
author | Andrew Dolgov <[email protected]> | 2018-02-12 09:38:17 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2018-02-12 09:38:17 +0300 |
commit | bcdbfa7c675832704095fd65157bcc421becbf95 (patch) | |
tree | f54752a80b9ce1eb9fafc9998ff06d25fced9127 | |
parent | 3d7db21602bd61d3b6acd1fe0db0fad461faa18e (diff) | |
parent | 478e990beb74f28adc1b86fe43271e568f10c058 (diff) |
Merge branch 'master' of git.tt-rss.org:fox/tt-rss
-rwxr-xr-x | plugins/af_readability/init.php | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php index 04673000a..8e420bfe3 100755 --- a/plugins/af_readability/init.php +++ b/plugins/af_readability/init.php @@ -137,29 +137,11 @@ class Af_Readability extends Plugin { } public function extract_content($url) { - if (!class_exists("Readability")) require_once(dirname(dirname(__DIR__)). "/lib/readability/Readability.php"); - - if (!defined('NO_CURL') && function_exists('curl_init') && !ini_get("open_basedir")) { - - $ch = curl_init($url); - - curl_setopt($ch, CURLOPT_TIMEOUT, 5); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($ch, CURLOPT_HEADER, true); - curl_setopt($ch, CURLOPT_NOBODY, true); - curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); - curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT); - - @curl_exec($ch); - $content_type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE); + global $fetch_effective_url; - if (strpos($content_type, "text/html") === FALSE) - return false; - - $effective_url = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL); - } + if (!class_exists("Readability")) require_once(dirname(dirname(__DIR__)). "/lib/readability/Readability.php"); - $tmp = fetch_file_contents($url); + $tmp = fetch_file_contents(array("url" => $url, "type" => "text/html")); if ($tmp && mb_strlen($tmp) < 1024 * 500) { $tmpdoc = new DOMDocument("1.0", "UTF-8"); @@ -167,9 +149,6 @@ class Af_Readability extends Plugin { if (!$tmpdoc->loadHTML('<?xml encoding="utf-8" ?>\n' . $tmp)) return false; - if (!isset($effective_url)) - $effective_url = $url; - if (strtolower($tmpdoc->encoding) != 'utf-8') { $tmpxpath = new DOMXPath($tmpdoc); @@ -180,7 +159,7 @@ class Af_Readability extends Plugin { $tmp = $tmpdoc->saveHTML(); } - $r = new Readability($tmp, $url); + $r = new Readability($tmp, $fetch_effective_url); if ($r->init()) { $tmpxpath = new DOMXPath($r->dom); @@ -190,13 +169,13 @@ class Af_Readability extends Plugin { foreach ($entries as $entry) { if ($entry->hasAttribute("href")) { $entry->setAttribute("href", - rewrite_relative_url($effective_url, $entry->getAttribute("href"))); + rewrite_relative_url($fetch_effective_url, $entry->getAttribute("href"))); } if ($entry->hasAttribute("src")) { $entry->setAttribute("src", - rewrite_relative_url($effective_url, $entry->getAttribute("src"))); + rewrite_relative_url($fetch_effective_url, $entry->getAttribute("src"))); } |