From c927c31391de940f0f2520f190dc7a39e2ad1b14 Mon Sep 17 00:00:00 2001 From: KYPREO <58344533+KYPREO@users.noreply.github.com> Date: Tue, 28 Jan 2020 23:57:31 +1100 Subject: [ticket/16329] Add configuration options for Plupload PHPBB3-16329 PHPBB3-16330 --- phpBB/install/schemas/schema_data.sql | 2 +- phpBB/language/en/acp/attachments.php | 4 +-- .../db/migration/data/v32x/add_plupload_config.php | 30 ++++++++++++++++++++++ .../migration/data/v32x/enable_plupload_config.php | 30 ---------------------- 4 files changed, 33 insertions(+), 33 deletions(-) create mode 100644 phpBB/phpbb/db/migration/data/v32x/add_plupload_config.php delete mode 100644 phpBB/phpbb/db/migration/data/v32x/enable_plupload_config.php diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index d20e00a53d..52c6061eb4 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -156,7 +156,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_thumb_widt INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_width', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_min_thumb_filesize', '12000'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_quality', '85'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_strip_metadata', '1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_strip_metadata', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_check', '3'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_login_limit_max', '50'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_login_limit_time', '21600'); diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index 1e67a0c3fb..d4768cae07 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -112,9 +112,9 @@ $lang = array_merge($lang, array( 'IMAGE_LINK_SIZE' => 'Image link dimensions', 'IMAGE_LINK_SIZE_EXPLAIN' => 'Display image attachment as an inline text link if image is larger than this. To disable this behaviour, set the values to 0px by 0px.', 'IMAGE_QUALITY' => 'Quality of uploaded image attachments (JPEG only)', - 'IMAGE_QUALITY_EXPLAIN' => 'Specify value between 50% (smaller file size) and 90% (higher quality). Quality higher than 90% increases filesize and is disabled. Setting only applies if max image dimensions set to value other than 0px by 0px.', + 'IMAGE_QUALITY_EXPLAIN' => 'Specify value between 50% (smaller file size) and 90% (higher quality). Quality higher than 90% increases filesize and is disabled. Setting only applies if maximum image dimensions are set to a value other than 0px by 0px.', 'IMAGE_STRIP_METADATA' => 'Strip image metadata (JPEG only)', - 'IMAGE_STRIP_METADATA_EXPLAIN' => 'Strip Exif metadata eg author name, GPS coordinates & camera details. Setting only applies if max image dimensions set to value other than 0px by 0px.', + 'IMAGE_STRIP_METADATA_EXPLAIN' => 'Strip Exif metadata, e.g. author name, GPS coordinates and camera details. Setting only applies if maximum image dimensions are set to a value other than 0px by 0px.', 'MAX_ATTACHMENTS' => 'Maximum number of attachments per post', 'MAX_ATTACHMENTS_PM' => 'Maximum number of attachments per private message', diff --git a/phpBB/phpbb/db/migration/data/v32x/add_plupload_config.php b/phpBB/phpbb/db/migration/data/v32x/add_plupload_config.php new file mode 100644 index 0000000000..d708155807 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v32x/add_plupload_config.php @@ -0,0 +1,30 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v32x; + +class add_plupload_config extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return ['\phpbb\db\migration\data\v32x\v329']; + } + + public function update_data() + { + return [ + ['config.add', ['img_quality', '85']], + ['config.add', ['img_strip_metadata', '0']], + ]; + } +} diff --git a/phpBB/phpbb/db/migration/data/v32x/enable_plupload_config.php b/phpBB/phpbb/db/migration/data/v32x/enable_plupload_config.php deleted file mode 100644 index a2f6af53db..0000000000 --- a/phpBB/phpbb/db/migration/data/v32x/enable_plupload_config.php +++ /dev/null @@ -1,30 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -namespace phpbb\db\migration\data\v32x; - -class enable_plupload_config extends \phpbb\db\migration\migration -{ - static public function depends_on() - { - return ['\phpbb\db\migration\data\v32x\v329',]; - } - - public function update_data() - { - return [ - ['config.add', ['img_quality', '85']], - ['config.add', ['img_strip_metadata', '1']], - ]; - } -} -- cgit v1.2.3-65-gdbad