maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

make CURLOPT_FOLLOWLOCATION optional in HttpClient::urlGet

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-09-19 11:09:27 +02:00
parent f72d87228b
commit 6161ad1bd3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/cURL/class.HttpClient.php
View File

@@ -10,13 +10,15 @@ class HttpClient
* *
* @return array * @return array
*/ */
public static function urlGet($url) public static function urlGet($url, $follow_location = true)
{ {
include FROXLOR_INSTALL_DIR . '/lib/version.inc.php'; include FROXLOR_INSTALL_DIR . '/lib/version.inc.php';
$ch = curl_init(); $ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_USERAGENT, 'Froxlor/' . $version); curl_setopt($ch, CURLOPT_USERAGENT, 'Froxlor/' . $version);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); if ($follow_location) {
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
}
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
$output = curl_exec($ch); $output = curl_exec($ch);
if ($output === false) { if ($output === false) {