blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

remove fetch_file_contents2, use a compat shim instead

Browse source
This commit is contained in:
Andrew Dolgov 2016-03-30 13:45:27 +03:00
parent 633fb7ffe2
commit 465fb16d33
2 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
include/functions.php
View file

@ -333,25 +333,9 @@
} }
} }
// TODO: deprecated, remove // TODO: multiple-argument way is deprecated, first parameter is a hash now
function fetch_file_contents($url, $type = false, $login = false, $pass = false, $post_query = false, function fetch_file_contents($options /* previously: 0: $url , 1: $type = false, 2: $login = false, 3: $pass = false,
$timeout = false, $timestamp = 0, $useragent = false) { 4: $post_query = false, 5: $timeout = false, 6: $timestamp = 0, 7: $useragent = false*/) {
$options = array(
"url" => $url,
"type" => $type,
"login" => $login,
"pass" => $pass,
"post_query" => $post_query,
"timeout" => $timeout,
"timestamp" => $timestamp,
"useragent" => $useragent
);
return fetch_file_contents2($options);
}
function fetch_file_contents2($options) {
global $fetch_last_error; global $fetch_last_error;
global $fetch_last_error_code; global $fetch_last_error_code;
@ -359,15 +343,30 @@
global $fetch_last_content_type; global $fetch_last_content_type;
global $fetch_curl_used; global $fetch_curl_used;
if (!is_array($options) && func_num_args() > 1) {
// falling back on compatibility shim
$options = array(
"url" => func_get_arg(0),
"type" => @func_get_arg(1),
"login" => @func_get_arg(2),
"pass" => @func_get_arg(3),
"post_query" => @func_get_arg(4),
"timeout" => @func_get_arg(5),
"timestamp" => @func_get_arg(6),
"useragent" => @func_get_arg(7)
);
}
$url = $options["url"]; $url = $options["url"];
$type = isset($options["type"]) ? $options["type"] : false; $type = isset($options["type"]) ? $options["type"] : false;
$login = isset($options["login"]) ? $options["login"] : false; $login = isset($options["login"]) ? $options["login"] : false;
$pass = isset($options["pass"]) ? $options["pass"] : false; $pass = isset($options["pass"]) ? $options["pass"] : false;
$post_query = isset($options["post_query"]) ? $options["post_query"] : false; $post_query = isset($options["post_query"]) ? $options["post_query"] : false;
$timeout = isset($options["timeout"]) ? $options["timeout"] : false; $timeout = isset($options["timeout"]) ? $options["timeout"] : false;
$timestamp = isset($options["timestamp"]) ? $options["timestamp"] : 0; $timestamp = isset($options["timestamp"]) ? $options["timestamp"] : 0;
$useragent = isset($options["useragent"]) ? $options["useragent"] : false; $useragent = isset($options["useragent"]) ? $options["useragent"] : false;
$url = ltrim($url, ' '); $url = ltrim($url, ' ');
$url = str_replace(' ', '%20', $url); $url = str_replace(' ', '%20', $url);

2
include/functions2.php
View file

@ -203,7 +203,7 @@
function check_for_update() { function check_for_update() {
if (defined("GIT_VERSION_TIMESTAMP")) { if (defined("GIT_VERSION_TIMESTAMP")) {
$content = @fetch_file_contents2(array("url" => "http://tt-rss.org/version.json", "timeout" => 5)); $content = @fetch_file_contents(array("url" => "http://tt-rss.org/version.json", "timeout" => 5));
if ($content) { if ($content) {
$content = json_decode($content, true); $content = json_decode($content, true);