valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

af_redditimgur: use common header retrieval function

This commit is contained in:
wn_ 2017-09-17 13:56:57 -05:00
parent 8352d7c6cb
commit b4b5236ec4
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/af_redditimgur/init.php
View File

@ -479,8 +479,8 @@ class Af_RedditImgur extends Plugin {
} }
} }
private function get_content_type($url, $useragent = SELF_USER_AGENT) { private function get_header($url, $useragent = SELF_USER_AGENT, $header) {
$content_type = false; $ret = false;
if (function_exists("curl_init") && !defined("NO_CURL")) { if (function_exists("curl_init") && !defined("NO_CURL")) {
$ch = curl_init($url); $ch = curl_init($url);
@ -492,29 +492,18 @@ class Af_RedditImgur extends Plugin {
curl_setopt($ch, CURLOPT_USERAGENT, $useragent); curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
@curl_exec($ch); @curl_exec($ch);
$content_type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE); $ret = curl_getinfo($ch, $header);
} }
return $content_type; return $ret;
}
private function get_content_type($url, $useragent = SELF_USER_AGENT) {
return $this->get_header($url, $useragent, CURLINFO_CONTENT_TYPE);
} }
private function get_location($url, $useragent = SELF_USER_AGENT) { private function get_location($url, $useragent = SELF_USER_AGENT) {
$location = false; return $this->get_header($url, $useragent, CURLINFO_EFFECTIVE_URL);
if (function_exists("curl_init") && !defined("NO_CURL")) {
$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, !ini_get("open_basedir"));
curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
@curl_exec($ch);
$location = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
}
return $location;
} }
/** /**