makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-23 10:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16329] Add configuration options for Plupload

Browse source 
PHPBB3-16329
PHPBB3-16330
This commit is contained in:
KYPREO 2020-01-20 22:16:38 +11:00
parent a1617548cf
commit 0b03fa963a
3 changed files with 21 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/phpbb/db/migration/data/v32x/enable_plupload_config.php
View file

@ -17,16 +17,14 @@ class enable_plupload_config extends \phpbb\db\migration\migration
{
static public function depends_on()
{
return array(
'\phpbb\db\migration\data\v32x\v329',
);
return ['\phpbb\db\migration\data\v32x\v329',];
}
public function update_data()
{
return array(
array('config.add', array('img_quality', '90')),
array('config.add', array('img_strip_metadata', '1')),
);
return [
['config.add', ['img_quality', '90']],
['config.add', ['img_strip_metadata', '1']],
];
}
}

18
phpBB/phpbb/plupload/plupload.php
View file

@ -263,25 +263,15 @@ class plupload
$resize = '';
if ($this->config['img_max_height'] > 0 && $this->config['img_max_width'] > 0)
{
if ($this->config['img_strip_metadata'] == 1)
{
$preserve_headers_value = $this->config['img_strip_metadata'] ? 'false' : 'true';
$resize = sprintf(
'resize: {width: %d, height: %d, quality: %d, preserve_headers: false},',
'resize: {width: %d, height: %d, quality: %d, preserve_headers: %s},',
(int) $this->config['img_max_width'],
(int) $this->config['img_max_height'],
(int) $this->config['img_quality']
(int) $this->config['img_quality'],
$preserve_headers_value
);
}
else
{
$resize = sprintf(
'resize: {width: %d, height: %d, quality: %d},',
(int) $this->config['img_max_width'],
(int) $this->config['img_max_height'],
(int) $this->config['img_quality']
);
}
}
return $resize;
}

10
tests/plupload/plupload_test.php
View file

@ -19,12 +19,16 @@ class phpbb_plupload_test extends phpbb_test_case
array(
0,
0,
85,
0,
'',
),
array(
130,
150,
'resize: {width: 130, height: 150, quality: 85},'
85,
1,
'resize: {width: 130, height: 150, quality: 85, preserve_headers: false},'
),
);
}
@ -32,7 +36,7 @@ class phpbb_plupload_test extends phpbb_test_case
/**
* @dataProvider generate_resize_string_data
*/
public function test_generate_resize_string($config_width, $config_height, $expected)
public function test_generate_resize_string($config_width, $config_height, $config_quality, $config_metadata, $expected)
{
global $phpbb_root_path, $phpEx;
@ -41,6 +45,8 @@ class phpbb_plupload_test extends phpbb_test_case
$config = new \phpbb\config\config(array(
'img_max_width' => $config_width,
'img_max_height' => $config_height,
'img_quality' => $config_quality,
'img_strip_metadata' => $config_metadata,
'upload_path' => 'files',
));
$plupload = new \phpbb\plupload\plupload(