mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 04:18:52 +00:00
Merge pull request #2621 from Dragooon/ticket/12732
[ticket/12732] Add Skype custom profile field * Dragooon/ticket/12732: [ticket/12732] Update schema.json for Skype [ticket/12732] Add functional test for Skype profile field [ticket/12732] Values shouldn't be escaped for schema_data.sql [ticket/12732] Set field_active to 1 for Skype's field [ticket/12732] Add unit tests for ALPHA_PUNCTUATION [ticket/12732] Missing comma after validation definition [ticket/12732] Improve ALPHA_PUNCTUATION description [ticket/12732] Use user info instead of chat as default Skype action [ticket/12732] Add Skype custom profile field Conflicts: phpBB/install/schemas/schema.json phpBB/install/schemas/schema_data.sql phpBB/language/en/memberlist.php tests/functional/ucp_profile_test.php tests/profilefields/type_string_test.php
This commit is contained in:
Joas Schilling
commit
3c38fcce40
9 changed files with 87 additions and 4 deletions
|
|
@ -2088,6 +2088,10 @@
|
|||
"UINT",
|
||||
0
|
||||
],
|
||||
"pf_phpbb_skype": [
|
||||
"VCHAR",
|
||||
""
|
||||
],
|
||||
"pf_phpbb_twitter": [
|
||||
"VCHAR",
|
||||
""
|
||||
|
|
|
|||
|
|
@ -808,6 +808,7 @@ INSERT INTO phpbb_profile_fields (field_name, field_type, field_ident, field_len
|
|||
INSERT INTO phpbb_profile_fields (field_name, field_type, field_ident, field_length, field_minlen, field_maxlen, field_novalue, field_default_value, field_validation, field_required, field_show_novalue, field_show_on_reg, field_show_on_pm, field_show_on_vt, field_show_on_ml, field_show_profile, field_hide, field_no_view, field_active, field_order, field_is_contact, field_contact_desc, field_contact_url) VALUES ('phpbb_yahoo', 'profilefields.type.string', 'phpbb_yahoo', '40', '5', '255', '', '', '.*', 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 8, 1, 'SEND_YIM_MESSAGE', 'http://edit.yahoo.com/config/send_webmesg?.target=%s&.src=pg');
|
||||
INSERT INTO phpbb_profile_fields (field_name, field_type, field_ident, field_length, field_minlen, field_maxlen, field_novalue, field_default_value, field_validation, field_required, field_show_novalue, field_show_on_reg, field_show_on_pm, field_show_on_vt, field_show_on_ml, field_show_profile, field_hide, field_no_view, field_active, field_order, field_is_contact, field_contact_desc, field_contact_url) VALUES ('phpbb_facebook', 'profilefields.type.string', 'phpbb_facebook', '20', '5', '50', '', '', '[\w.]+', 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 9, 1, 'VIEW_FACEBOOK_PROFILE', 'http://facebook.com/%s/');
|
||||
INSERT INTO phpbb_profile_fields (field_name, field_type, field_ident, field_length, field_minlen, field_maxlen, field_novalue, field_default_value, field_validation, field_required, field_show_novalue, field_show_on_reg, field_show_on_pm, field_show_on_vt, field_show_on_ml, field_show_profile, field_hide, field_no_view, field_active, field_order, field_is_contact, field_contact_desc, field_contact_url) VALUES ('phpbb_twitter', 'profilefields.type.string', 'phpbb_twitter', '20', '1', '15', '', '', '[\w_]+', 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 10, 1, 'VIEW_TWITTER_PROFILE', 'http://twitter.com/%s');
|
||||
INSERT INTO phpbb_profile_fields (field_name, field_type, field_ident, field_length, field_minlen, field_maxlen, field_novalue, field_default_value, field_validation, field_required, field_show_novalue, field_show_on_reg, field_show_on_pm, field_show_on_vt, field_show_on_ml, field_show_profile, field_hide, field_no_view, field_active, field_order, field_is_contact, field_contact_desc, field_contact_url) VALUES ('phpbb_skype', 'profilefields.type.string', 'phpbb_skype', '20', '6', '32', '', '', '[a-zA-Z][\w\.,\-_]+', 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 11, 1, 'VIEW_SKYPE_PROFILE', 'skype:%s?userinfo');
|
||||
|
||||
# User Notification Options (for first user)
|
||||
INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('post', 0, 2, '');
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ $lang = array_merge($lang, array(
|
|||
'ALPHA_ONLY' => 'Alphanumeric only',
|
||||
'ALPHA_SPACERS' => 'Alphanumeric and spacers',
|
||||
'ALPHA_UNDERSCORE' => 'Alphanumeric and underscores',
|
||||
'ALPHA_PUNCTUATION' => 'Alphanumeric with comma, dots, underscore and dashes beginning with a letter',
|
||||
'ALWAYS_TODAY' => 'Always the current date',
|
||||
|
||||
'BOOL_ENTRIES_EXPLAIN' => 'Enter your options now',
|
||||
|
|
|
|||
|
|
@ -677,6 +677,7 @@ $lang = array_merge($lang, array(
|
|||
'SETTINGS' => 'Settings',
|
||||
'SIGNATURE' => 'Signature',
|
||||
'SKIP' => 'Skip to content',
|
||||
'SKYPE' => 'Skype',
|
||||
'SMTP_NO_AUTH_SUPPORT' => 'SMTP server does not support authentication.',
|
||||
'SORRY_AUTH_READ' => 'You are not authorised to read this forum.',
|
||||
'SORRY_AUTH_VIEW_ATTACH' => 'You are not authorised to download this attachment.',
|
||||
|
|
|
|||
|
|
@ -144,6 +144,7 @@ $lang = array_merge($lang, array(
|
|||
'USERS_PER_PAGE' => 'Users per page',
|
||||
|
||||
'VIEWING_PROFILE' => 'Viewing profile - %s',
|
||||
'VIEW_FACEBOOK_PROFILE' => 'View Facebook Profile',
|
||||
'VIEW_TWITTER_PROFILE' => 'View Twitter Profile',
|
||||
'VIEW_FACEBOOK_PROFILE' => 'View Facebook Profile',
|
||||
'VIEW_SKYPE_PROFILE' => 'View Skype Profile',
|
||||
'VIEW_TWITTER_PROFILE' => 'View Twitter Profile',
|
||||
));
|
||||
|
|
|
|||
60
phpBB/phpbb/db/migration/data/v310/profilefield_skype.php
Normal file
60
phpBB/phpbb/db/migration/data/v310/profilefield_skype.php
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
<?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.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace phpbb\db\migration\data\v310;
|
||||
|
||||
class profilefield_skype extends \phpbb\db\migration\profilefield_base_migration
|
||||
{
|
||||
static public function depends_on()
|
||||
{
|
||||
return array(
|
||||
'\phpbb\db\migration\data\v310\profilefield_types',
|
||||
'\phpbb\db\migration\data\v310\profilefield_show_novalue',
|
||||
);
|
||||
}
|
||||
|
||||
public function update_data()
|
||||
{
|
||||
return array(
|
||||
array('custom', array(array($this, 'create_custom_field'))),
|
||||
);
|
||||
}
|
||||
|
||||
protected $profilefield_name = 'phpbb_skype';
|
||||
|
||||
protected $profilefield_database_type = array('VCHAR', '');
|
||||
|
||||
protected $profilefield_data = array(
|
||||
'field_name' => 'phpbb_skype',
|
||||
'field_type' => 'profilefields.type.string',
|
||||
'field_ident' => 'phpbb_skype',
|
||||
'field_length' => '20',
|
||||
'field_minlen' => '6',
|
||||
'field_maxlen' => '32',
|
||||
'field_novalue' => '',
|
||||
'field_default_value' => '',
|
||||
'field_validation' => '[a-zA-Z][\w\.,\-_]+',
|
||||
'field_required' => 0,
|
||||
'field_show_novalue' => 0,
|
||||
'field_show_on_reg' => 0,
|
||||
'field_show_on_pm' => 1,
|
||||
'field_show_on_vt' => 1,
|
||||
'field_show_profile' => 1,
|
||||
'field_hide' => 0,
|
||||
'field_no_view' => 0,
|
||||
'field_active' => 1,
|
||||
'field_is_contact' => 1,
|
||||
'field_contact_desc' => 'VIEW_SKYPE_PROFILE',
|
||||
'field_contact_url' => 'skype:%s?userinfo',
|
||||
);
|
||||
}
|
||||
|
|
@ -22,6 +22,7 @@ abstract class type_string_common extends type_base
|
|||
'ALPHA_UNDERSCORE' => '[\w_]+',
|
||||
'ALPHA_DOTS' => '[\w.]+',
|
||||
'ALPHA_SPACERS' => '[\w_\+\. \-\[\]]+',
|
||||
'ALPHA_PUNCTUATION' => '[a-zA-Z][\w\.,\-_]+',
|
||||
);
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,9 +25,10 @@ class phpbb_functional_ucp_profile_test extends phpbb_functional_test_case
|
|||
$this->assertContainsLang('UCP_PROFILE_PROFILE_INFO', $crawler->filter('#cp-main h2')->text());
|
||||
|
||||
$form = $crawler->selectButton('Submit')->form(array(
|
||||
'pf_phpbb_facebook' => 'phpbb',
|
||||
'pf_phpbb_facebook' => 'phpbb',
|
||||
'pf_phpbb_location' => 'Bertie´s Empire',
|
||||
'pf_phpbb_twitter' => 'phpbb_twitter',
|
||||
'pf_phpbb_skype' => 'phpbb.skype.account',
|
||||
'pf_phpbb_twitter' => 'phpbb_twitter',
|
||||
));
|
||||
|
||||
$crawler = self::submit($form);
|
||||
|
|
@ -38,6 +39,7 @@ class phpbb_functional_ucp_profile_test extends phpbb_functional_test_case
|
|||
|
||||
$this->assertEquals('phpbb', $form->get('pf_phpbb_facebook')->getValue());
|
||||
$this->assertEquals('Bertie´s Empire', $form->get('pf_phpbb_location')->getValue());
|
||||
$this->assertEquals('phpbb.skype.account', $form->get('pf_phpbb_skype')->getValue());
|
||||
$this->assertEquals('phpbb_twitter', $form->get('pf_phpbb_twitter')->getValue());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -155,6 +155,18 @@ class phpbb_profilefield_type_string_test extends phpbb_test_case
|
|||
'FIELD_INVALID_CHARS_ALPHA_DOTS-field',
|
||||
'Required field should reject field with comma',
|
||||
),
|
||||
array(
|
||||
'skype.test.name,_this',
|
||||
array('field_validation' => '[a-zA-Z][\w\.,\-_]+'),
|
||||
false,
|
||||
'Required field should accept alphanumeric field with punctuations',
|
||||
),
|
||||
array(
|
||||
'1skype.this.should.faila',
|
||||
array('field_validation' => '[a-zA-Z][\w\.,\-_]+'),
|
||||
'FIELD_INVALID_CHARS_ALPHA_PUNCTUATION-field',
|
||||
'Required field should reject field having invalid input for the given validation',
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue