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

[ticket/13904] Modify constructor to be instantiatable by container

Browse source 
PHPBB3-13904
This commit is contained in:
Marc Alexander 2015-05-31 14:02:02 +02:00
parent 557f1a89d5
commit c72d6a71bb
2 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/config/default/container/services_files.yml
View file

@ -4,3 +4,7 @@ services:
files.filespec:
class: phpbb\files\filespec
arguments:
- @filesystem
- @mimetype.guesser
- @plupload

41
phpBB/phpbb/files/filespec.php
View file

@ -33,7 +33,6 @@ class filespec
var $destination_path = '';
var $file_moved = false;
var $init_error = false;
var $local = false;
var $error = array();
@ -61,14 +60,19 @@ class filespec
* File Class
* @access private
*/
function filespec($upload_ary, $upload_namespace, \phpbb\filesystem\filesystem_interface $phpbb_filesystem, \phpbb\mimetype\guesser $mimetype_guesser = null, \phpbb\plupload\plupload $plupload = null)
function filespec(\phpbb\filesystem\filesystem_interface $phpbb_filesystem, \phpbb\mimetype\guesser $mimetype_guesser = null, \phpbb\plupload\plupload $plupload = null)
{
if (!isset($upload_ary))
{
$this->init_error = true;
return;
}
// @todo call this via files
//$this->set_upload_ary($upload_ary);
//$this->set_upload_namespace($upload_namespace);
$this->plupload = $plupload;
$this->mimetype_guesser = $mimetype_guesser;
$this->filesystem = $phpbb_filesystem;
}
public function set_upload_ary($upload_ary)
{
$this->filename = $upload_ary['tmp_name'];
$this->filesize = $upload_ary['size'];
$name = (STRIP) ? stripslashes($upload_ary['name']) : $upload_ary['name'];
@ -93,10 +97,21 @@ class filespec
$this->file_moved = false;
$this->local = (isset($upload_ary['local_mode'])) ? true : false;
$this->upload = $upload_namespace;
$this->plupload = $plupload;
$this->mimetype_guesser = $mimetype_guesser;
$this->filesystem = $phpbb_filesystem;
}
public function set_upload_namespace($namespace)
{
$this->upload = $namespace;
}
/**
* Check if class members were not properly initalised yet
*
* @return bool True if there was an init error, false if not
*/
protected function init_error()
{
return !isset($upload_ary);
}
/**
@ -109,7 +124,7 @@ class filespec
*/
function clean_filename($mode = 'unique', $prefix = '', $user_id = '')
{
if ($this->init_error)
if ($this->init_error())
{
return;
}
@ -154,7 +169,7 @@ class filespec
*/
function get($property)
{
if ($this->init_error || !isset($this->$property))
if ($this->init_error() || !isset($this->$property))
{
return false;
}