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

[ticket/12866] Assume underscore is part of \w

Browse source 
PHPBB3-12866
This commit is contained in:
Jakub Senko 2014-10-26 20:08:28 +01:00 • committed by Joas Schilling
parent 8f1a1874a9
commit b7f69edaa2
2 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/phpbb/profilefields/type/type_string_common.php
View file

@ -18,11 +18,11 @@ abstract class type_string_common extends type_base
protected $validation_options = array( protected $validation_options = array(
'CHARS_ANY' => '.*', 'CHARS_ANY' => '.*',
'NUMBERS_ONLY' => '[0-9]+', 'NUMBERS_ONLY' => '[0-9]+',
'ALPHA_ONLY' => '[\w]+', 'ALPHA_ONLY' => '[a-zA-Z0-9]+',
'ALPHA_UNDERSCORE' => '[\w_]+', 'ALPHA_UNDERSCORE' => '[\w]+',
'ALPHA_DOTS' => '[\w.]+', 'ALPHA_DOTS' => '[a-zA-Z0-9.]+',
'ALPHA_SPACERS' => '[\w\x20_+\-\[\]]+', 'ALPHA_SPACERS' => '[\w\x20+\-\[\]]+',
'ALPHA_PUNCTUATION' => '[a-zA-Z][\w\.,\-_]+', 'ALPHA_PUNCTUATION' => '[a-zA-Z][\w\.,\-]+',
'LETTER_NUM_ONLY' => '[\p{Lu}\p{Ll}0-9]+', 'LETTER_NUM_ONLY' => '[\p{Lu}\p{Ll}0-9]+',
'LETTER_NUM_UNDERSCORE' => '[\p{Lu}\p{Ll}0-9_]+', 'LETTER_NUM_UNDERSCORE' => '[\p{Lu}\p{Ll}0-9_]+',
'LETTER_NUM_DOTS' => '[\p{Lu}\p{Ll}0-9.]+', 'LETTER_NUM_DOTS' => '[\p{Lu}\p{Ll}0-9.]+',

24
tests/profilefields/type_string_test.php
View file

@ -133,37 +133,49 @@ class phpbb_profilefield_type_string_test extends phpbb_test_case
), ),
array( array(
'ö äö äö ä', 'ö äö äö ä',
array('field_validation' => '[\w]+'), array('field_validation' => '[a-zA-Z0-9]+'),
'FIELD_INVALID_CHARS_ALPHA_ONLY-field', 'FIELD_INVALID_CHARS_ALPHA_ONLY-field',
'Required field should reject UTF-8 in alpha only field', 'Required field should reject UTF-8 in alpha only field',
), ),
array(
'a_abc',
array('field_validation' => '[a-zA-Z0-9]+'),
'FIELD_INVALID_CHARS_ALPHA_ONLY-field',
'Required field should reject underscore in alpha only field',
),
array( array(
'Hello', 'Hello',
array('field_validation' => '[\w]+'), array('field_validation' => '[a-zA-Z0-9]+'),
false, false,
'Required field should accept a characters only field', 'Required field should accept a characters only field',
), ),
array( array(
'Valid.Username123', 'Valid.Username123',
array('field_validation' => '[\w.]+'), array('field_validation' => '[a-zA-Z0-9.]+'),
false, false,
'Required field should accept a alphanumeric field with dots', 'Required field should accept a alphanumeric field with dots',
), ),
array( array(
'Invalid.,username123', 'Invalid.,username123',
array('field_validation' => '[\w.]+'), array('field_validation' => '[a-zA-Z0-9.]+'),
'FIELD_INVALID_CHARS_ALPHA_DOTS-field', 'FIELD_INVALID_CHARS_ALPHA_DOTS-field',
'Required field should reject field with comma', 'Required field should reject field with comma',
), ),
array(
'Invalid._username123',
array('field_validation' => '[a-zA-Z0-9.]+'),
'FIELD_INVALID_CHARS_ALPHA_DOTS-field',
'Required field should reject field with underscore',
),
array( array(
'skype.test.name,_this', 'skype.test.name,_this',
array('field_validation' => '[a-zA-Z][\w\.,\-_]+'), array('field_validation' => '[a-zA-Z][\w\.,\-]+'),
false, false,
'Required field should accept alphanumeric field with punctuations', 'Required field should accept alphanumeric field with punctuations',
), ),
array( array(
'1skype.this.should.faila', '1skype.this.should.faila',
array('field_validation' => '[a-zA-Z][\w\.,\-_]+'), array('field_validation' => '[a-zA-Z][\w\.,\-]+'),
'FIELD_INVALID_CHARS_ALPHA_PUNCTUATION-field', 'FIELD_INVALID_CHARS_ALPHA_PUNCTUATION-field',
'Required field should reject field having invalid input for the given validation', 'Required field should reject field having invalid input for the given validation',
), ),