mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[ticket/13904] Split code up and pass root path to remote upload type

Browse Source 
PHPBB3-13904
This commit is contained in:
Marc Alexander
2015-07-15 23:10:23 +02:00
parent 0a6f54d522
commit a09c6d1fb7
3 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
phpBB/phpbb/files/types/remote.php
View File

@@ -32,17 +32,21 @@ class remote extends base
/** @var \phpbb\files\upload */
protected $upload;
/** @var string phpBB root path */
protected $phpbb_root_path;
/**
* Construct a form upload type
*
* @param factory $factory
* @param request_interface $request
*/
public function __construct(factory $factory, language $language, request_interface $request)
public function __construct(factory $factory, language $language, request_interface $request, $phpbb_root_path)
{
$this->factory = $factory;
$this->language = $language;
$this->request = $request;
$this->phpbb_root_path = $phpbb_root_path;
}
/**
@@ -93,30 +97,7 @@ class remote extends base
$filename = $url['path'];
$filesize = 0;
$remote_max_filesize = $this->upload->max_filesize;
if (!$remote_max_filesize)
{
$max_filesize = @ini_get('upload_max_filesize');
if (!empty($max_filesize))
{
$unit = strtolower(substr($max_filesize, -1, 1));
$remote_max_filesize = (int) $max_filesize;
switch ($unit)
{
case 'g':
$remote_max_filesize *= 1024;
// no break
case 'm':
$remote_max_filesize *= 1024;
// no break
case 'k':
$remote_max_filesize *= 1024;
// no break
}
}
}
$remote_max_filesize = $this->get_max_file_size();
$errno = 0;
$errstr = '';
@@ -238,4 +219,39 @@ class remote extends base
return $file;
}
/**
* Get maximum file size for remote uploads
*
* @return int Maximum file size
*/
protected function get_max_file_size()
{
$max_file_size = $this->upload->max_filesize;
if (!$max_file_size)
{
$max_file_size = @ini_get('upload_max_filesize');
if (!empty($max_filesize))
{
$unit = strtolower(substr($max_file_size, -1, 1));
$max_file_size = (int) $max_filesize;
switch ($unit)
{
case 'g':
$max_file_size *= 1024;
// no break
case 'm':
$max_file_size *= 1024;
// no break
case 'k':
$max_file_size *= 1024;
// no break
}
}
}
return $max_file_size;
}
}