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

[ticket/11538] Use regex for testing color value and improve tests

Browse source 
We are now using a regex with preg_match() in order to properly check
if the entered color value is in hex color format or not. A proper
error message is triggered if an incorrect color value is entered and
the prepended '#' is removed if necessary.

PHPBB3-11538
This commit is contained in:
Marc Alexander 2013-05-14 19:44:55 +02:00
parent b7b0b0ccc3
commit a547ba3f9d
3 changed files with 30 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/includes/ucp/ucp_groups.php
View file

@ -595,18 +595,22 @@ class ucp_groups
$error[] = $user->lang['FORM_INVALID']; $error[] = $user->lang['FORM_INVALID'];
} }
if (!sizeof($error)) if (!empty($submit_ary['colour']))
{ {
// Make sure maximum length of 6 of group color is not exceeded preg_match('/^(#?)+(?:[0-9a-fA-F]{6}|[0-9a-fA-F]{3})\b/', $submit_ary['colour'], $group_colour);
if (strpos($submit_ary['colour'], '#') === 0)
if (sizeof($group_colour))
{ {
$submit_ary['colour'] = substr($submit_ary['colour'], 1, 6); $submit_ary['colour'] = (strpos($group_colour[0], '#') !== false) ? str_replace('#', '', $group_colour[0]) : $group_colour[0];
} }
else else
{ {
$submit_ary['colour'] = substr($submit_ary['colour'], 0, 6); $error[] = $user->lang['COLOUR_INVALID'];
} }
}
if (!sizeof($error))
{
// Only set the rank, colour, etc. if it's changed or if we're adding a new // Only set the rank, colour, etc. if it's changed or if we're adding a new
// group. This prevents existing group members being updated if no changes // group. This prevents existing group members being updated if no changes
// were made. // were made.

1
phpBB/language/en/common.php
View file

@ -120,6 +120,7 @@ $lang = array_merge($lang, array(
'CLICK_VIEW_PRIVMSG' => '%sGo to your inbox%s', 'CLICK_VIEW_PRIVMSG' => '%sGo to your inbox%s',
'COLLAPSE_VIEW' => 'Collapse view', 'COLLAPSE_VIEW' => 'Collapse view',
'CLOSE_WINDOW' => 'Close window', 'CLOSE_WINDOW' => 'Close window',
'COLOUR_INVALID' => 'The colour value you entered is invalid.',
'COLOUR_SWATCH' => 'Colour swatch', 'COLOUR_SWATCH' => 'Colour swatch',
'COMMA_SEPARATOR' => ', ', // Used in pagination of ACP & prosilver, use localised comma if appropriate, eg: Ideographic or Arabic 'COMMA_SEPARATOR' => ', ', // Used in pagination of ACP & prosilver, use localised comma if appropriate, eg: Ideographic or Arabic
'CONFIRM' => 'Confirm', 'CONFIRM' => 'Confirm',

57
tests/functional/ucp_groups_test.php
View file

@ -12,50 +12,33 @@
*/ */
class phpbb_functional_ucp_groups_test extends phpbb_functional_test_case class phpbb_functional_ucp_groups_test extends phpbb_functional_test_case
{ {
public function test_groups_manage() public function groups_manage_test_data()
{
return array(
array('#AA0000', 'GROUP_UPDATED'),
array('AA0000', 'GROUP_UPDATED'),
array('AA0000v', 'COLOUR_INVALID'),
array('vAA0000', 'COLOUR_INVALID'),
array('AAG000', 'COLOUR_INVALID'),
array('#a00', 'GROUP_UPDATED'),
array('ag0', 'COLOUR_INVALID'),
array('#ag0', 'COLOUR_INVALID'),
);
}
/**
* @dataProvider groups_manage_test_data
*/
public function test_groups_manage($input, $expected)
{ {
$values = array();
$this->login(); $this->login();
$this->add_lang(array('ucp', 'acp/groups')); $this->add_lang(array('ucp', 'acp/groups'));
$crawler = $this->request('GET', 'ucp.php?i=groups&mode=manage&action=edit&g=5&sid=' . $this->sid); $crawler = $this->request('GET', 'ucp.php?i=groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
$this->assert_response_success(); $this->assert_response_success();
$form = $crawler->selectButton($this->lang('SUBMIT'))->form(); $form = $crawler->selectButton($this->lang('SUBMIT'))->form();
$form['group_colour']->setValue('#AA0000'); $form['group_colour']->setValue($input);
$crawler = $this->client->submit($form); $crawler = $this->client->submit($form);
$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text()); $this->assertContains($this->lang($expected), $crawler->text());
$crawler = $this->request('GET', 'ucp.php?i=groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
$this->assert_response_success();
$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
$values = $form->getValues();
$this->assertContains('AA0000', $values['group_colour']);
$form['group_colour']->setValue('AA0000');
$crawler = $this->client->submit($form);
$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
$crawler = $this->request('GET', 'ucp.php?i=groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
$this->assert_response_success();
$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
$values = $form->getValues();
$this->assertContains('AA0000', $values['group_colour']);
$form['group_colour']->setValue('AA0000v');
$crawler = $this->client->submit($form);
$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
$crawler = $this->request('GET', 'ucp.php?i=groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
$this->assert_response_success();
$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
$values = $form->getValues();
$this->assertContains('AA0000', $values['group_colour']);
$form['group_colour']->setValue('vAA0000');
$crawler = $this->client->submit($form);
$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
$crawler = $this->request('GET', 'ucp.php?i=groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
$this->assert_response_success();
$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
$values = $form->getValues();
$this->assertContains('vAA000', $values['group_colour']);
} }
} }