makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-20 10:18:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13904] Split up local_upload method

Browse source 
PHPBB3-13904
This commit is contained in:
Marc Alexander 2015-07-15 17:12:24 +02:00
parent 167cc58f27
commit 636a29d589
1 changed files with 31 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
phpBB/phpbb/files/types/local.php
View file

@ -65,22 +65,7 @@ class local extends base
*/ */
protected function local_upload($source_file, $filedata = false) protected function local_upload($source_file, $filedata = false)
{ {
$upload = array(); $upload = $this->get_upload_ary($source_file, $filedata);
$upload['local_mode'] = true;
$upload['tmp_name'] = $source_file;
if ($filedata === false)
{
$upload['name'] = utf8_basename($source_file);
$upload['size'] = 0;
}
else
{
$upload['name'] = $filedata['realname'];
$upload['size'] = $filedata['size'];
$upload['type'] = $filedata['type'];
}
/** @var filespec $file */ /** @var filespec $file */
$file = $this->factory->get('filespec') $file = $this->factory->get('filespec')
@ -134,4 +119,34 @@ class local extends base
return $file; return $file;
} }
/**
* Retrieve upload array
*
* @param string $source_file Source file name
* @param array $filedata File data array
*
* @return array Upload array
*/
protected function get_upload_ary($source_file, $filedata)
{
$upload = array();
$upload['local_mode'] = true;
$upload['tmp_name'] = $source_file;
if ($filedata === false)
{
$upload['name'] = utf8_basename($source_file);
$upload['size'] = 0;
}
else
{
$upload['name'] = $filedata['realname'];
$upload['size'] = $filedata['size'];
$upload['type'] = $filedata['type'];
}
return $upload;
}
} }