mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-19 23:32:02 +02:00
Code Issues Releases Wiki Activity

Merge pull request #6049 from rxu/ticket/16604

Browse Source 
[ticket/16604] Display warning messages on avatar upload setting issues
This commit is contained in:
Marc Alexander 2020-10-05 18:12:38 +02:00
commit 1f98477c22
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
3 changed files with 108 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
phpBB/includes/acp/acp_board.php
View File

@ -510,6 +510,29 @@ class acp_board
}
}
if ($mode == 'avatar' && $cfg_array['allow_avatar_upload'])
{
// If avatar uploading is enabled but the path setting is empty,
// config variable validation is bypassed. Catch the case here
if (!$cfg_array['avatar_path'])
{
$error[] = $language->lang('AVATAR_NO_UPLOAD_PATH');
}
else if (!$submit)
{
$filesystem = $phpbb_container->get('filesystem');
$avatar_path_exists = $filesystem->exists($phpbb_root_path . $cfg_array['avatar_path']);
$avatar_path_writable = $filesystem->is_writable($phpbb_root_path . $cfg_array['avatar_path']);
// Not existing or writable path will be caught on submit by validate_config_vars().
// Display the warning if the directory was changed on the server afterwards
if (!$avatar_path_exists || !$avatar_path_writable)
{
$error[] = $language->lang('AVATAR_NO_UPLOAD_DIR');
}
}
}
// We validate the complete config if wished
validate_config_vars($display_vars['vars'], $cfg_array, $error);

2
phpBB/language/en/common.php
View File

@ -110,6 +110,8 @@ $lang = array_merge($lang, array(
'AVATAR_NOT_UPLOADED' => 'Avatar could not be uploaded.',
'AVATAR_NO_TEMP_DIR' => 'Temporary folder could not be found or is not writable.',
'AVATAR_NO_SIZE' => 'The width or height of the linked avatar could not be determined. Please enter them manually.',
'AVATAR_NO_UPLOAD_DIR' => 'Avatar storage path does not exist or is not writable.',
'AVATAR_NO_UPLOAD_PATH' => 'Avatar uploading is enabled but avatar storage path is not set.',
'AVATAR_PARTIAL_UPLOAD' => 'The specified file was only partially uploaded.',
'AVATAR_PHP_SIZE_NA' => 'The avatar’s filesize is too large.<br />The maximum allowed filesize set in php.ini could not be determined.',
'AVATAR_PHP_SIZE_OVERRUN' => 'The avatar’s filesize is too large. The maximum allowed upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.',

83
tests/functional/acp_avatar_settings_test.php Normal file
View File

@ -0,0 +1,83 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
/**
* @group functional
*/
class phpbb_functional_acp_avatar_settings_test extends phpbb_functional_test_case
{
public function test_avatar_upload_settings()
{
$this->add_lang(['acp/common', 'acp/board']);
$this->login();
$this->admin_login();
$crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
$this->assertContainsLang('ACP_AVATAR_SETTINGS', $this->get_content());
$this->assertContainsLang('ACP_AVATAR_SETTINGS_EXPLAIN', $this->get_content());
// Test disabling avatar uploading - valid
$form = $crawler->selectButton($this->lang('SUBMIT'))->form([
'config[allow_avatar_upload]' => '0'
]);
$crawler = self::submit($form);
$this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('div[class="successbox"] > p')->text());
$crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
// Test enabling avatar uploading - valid
$form = $crawler->selectButton($this->lang('SUBMIT'))->form([
'config[allow_avatar_upload]' => '1'
]);
$crawler = self::submit($form);
$this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('div[class="successbox"] > p')->text());
$crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
// Test empty avatar storage path while avatar uploading is enabled - invalid
$form = $crawler->selectButton($this->lang('SUBMIT'))->form([
'config[avatar_path]' => ''
]);
$crawler = self::submit($form);
$this->assertContainsLang('WARNING', $crawler->filter('div[class="errorbox"] > h3')->text());
$this->assertContainsLang('AVATAR_NO_UPLOAD_PATH', $crawler->filter('div[class="errorbox"] > p')->text());
// Test avatar upload path became not writable on the server afterwards
// Unix tests only
if (!defined('PHP_WINDOWS_VERSION_MAJOR'))
{
$crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
$values = $form->getValues();
$avatar_upload_path = $values['config[avatar_path]'];
$filesystem = new \phpbb\filesystem\filesystem;
// Make the directory not writable
global $phpbb_root_path;
$filesystem->chmod($phpbb_root_path . $avatar_upload_path, 444);
$this->assertFalse($filesystem->is_writable($phpbb_root_path . $avatar_upload_path));
// Visit Avatar ACP settings again - warning should be displayed
$crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
$this->assertContainsLang('WARNING', $crawler->filter('div[class="errorbox"] > h3')->text());
$this->assertContainsLang('AVATAR_NO_UPLOAD_DIR', $crawler->filter('div[class="errorbox"] > p')->text());
// Restore default state
$filesystem->chmod($phpbb_root_path . $avatar_upload_path, 777);
$this->assertTrue($filesystem->is_writable($phpbb_root_path . $avatar_upload_path));
$crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
$this->assertNotContainsLang('AVATAR_NO_UPLOAD_DIR', $this->get_content());
$this->assertNotContainsLang('AVATAR_NO_UPLOAD_PATH', $this->get_content());
}
}
}