mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-25 00:41:52 +02:00
Code Issues Releases Wiki Activity

Issue #1712, Closes #5098 - Error logging in getRemoteFile() and timeout variable added.

Browse Source
This commit is contained in:
camer0n
2023-11-08 09:29:29 -08:00
parent 14612c5211
commit 9f673644df
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
e107_handlers/file_class.php
View File

@@ -543,44 +543,51 @@ class e_file
* Grab a remote file and save it in the /temp directory. requires CURL
*
* @param string $remote_url
* @param $local_file string filename to save as
* @param string $local_file string filename to save as
* @param string $type media, temp, or import
* @return boolean TRUE on success, FALSE on failure (which includes absence of CURL functions)
*/
function getRemoteFile($remote_url, $local_file, $type = 'temp')
function getRemoteFile($remote_url, $local_file, $type = 'temp', $timeout = 40)
{
// check for cURL
if(!function_exists('curl_init'))
{
$msg = 'e_file::getRemoteFile() requires cURL to be installed.';
if(E107_DEBUG_LEVEL > 0)
{
e107::getLog()->addDebug('getRemoteFile() requires cURL to be installed in file_class.php');
e107::getLog()->addDebug($msg);
}
error_log($msg);
return false; // May not be installed
}
$path = ($type == 'media') ? e_MEDIA : e_TEMP;
$path = ($type === 'media') ? e_MEDIA : e_TEMP;
if($type == 'import')
if($type === 'import')
{
$path = e_IMPORT;
}
$fp = fopen($path . $local_file, 'w'); // media-directory is the root.
$fp = fopen($path . $local_file, 'w'); // media-directory or temp directory is the root.
$cp = $this->initCurl($remote_url);
curl_setopt($cp, CURLOPT_FILE, $fp);
curl_setopt($cp, CURLOPT_TIMEOUT, 40);//FIXME Make Pref - avoids get file timeout on slow connections
curl_setopt($cp, CURLOPT_TIMEOUT, $timeout);
set_time_limit($timeout);
$buffer = curl_exec($cp);
//FIXME addDebug curl_error output - here see #1936
if(curl_errno($cp)) // Fixes curl_error output - here see #1936
{
error_log('cURL error: '.curl_error($cp));
}
curl_close($cp);
fclose($fp);
return ($buffer) ? true : false;
return (bool) $buffer;
}
/**