From e3bc4591afbc8e93a3dbdc751d6a4e70256b81d9 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 30 Mar 2016 13:24:53 +0300 Subject: [PATCH] add a hash-based fetch_file_contents2() --- include/functions.php | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/include/functions.php b/include/functions.php index d4394396..6a230a15 100755 --- a/include/functions.php +++ b/include/functions.php @@ -333,7 +333,25 @@ } } - function fetch_file_contents($url, $type = false, $login = false, $pass = false, $post_query = false, $timeout = false, $timestamp = 0, $useragent = false) { + // TODO: deprecated, remove + function fetch_file_contents($url, $type = false, $login = false, $pass = false, $post_query = false, + $timeout = false, $timestamp = 0, $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_code; @@ -341,6 +359,15 @@ global $fetch_last_content_type; global $fetch_curl_used; + $url = $options["url"]; + $type = isset($options["type"]) ? $options["type"] : false; + $login = isset($options["login"]) ? $options["login"] : false; + $pass = isset($options["pass"]) ? $options["pass"] : false; + $post_query = isset($options["post_query"]) ? $options["post_query"] : false; + $timeout = isset($options["timeout"]) ? $options["timeout"] : false; + $timestamp = isset($options["timestamp"]) ? $options["timestamp"] : 0; + $useragent = isset($options["useragent"]) ? $options["useragent"] : false; + $url = ltrim($url, ' '); $url = str_replace(' ', '%20', $url); -- 2.39.5