mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-07 20:08:53 +00:00
Merge pull request #2628 from Dragooon/ticket/12731
[ticket/12731] Add YouTube custom profile field * Dragooon/ticket/12731: [ticket/12731] Add functional test for youtube field [ticket/12731] Set field_active to 1 for YouTube field [ticket/12731] Add YouTube 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
This commit is contained in:
Joas Schilling
commit
18bf45ab1b
6 changed files with 69 additions and 0 deletions
|
|
@ -2096,6 +2096,10 @@
|
|||
"VCHAR",
|
||||
""
|
||||
],
|
||||
"pf_phpbb_youtube": [
|
||||
"VCHAR",
|
||||
""
|
||||
],
|
||||
"pf_phpbb_facebook": [
|
||||
"VCHAR",
|
||||
""
|
||||
|
|
|
|||
|
|
@ -809,6 +809,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_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');
|
||||
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_youtube', 'profilefields.type.string', 'phpbb_youtube', '20', '3', '60', '', '', '[a-zA-Z][\w\.,\-_]+', 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 12, 1, 'VIEW_YOUTUBE_CHANNEL', 'http://youtube.com/user/%s');
|
||||
|
||||
# User Notification Options (for first user)
|
||||
INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('post', 0, 2, '');
|
||||
|
|
|
|||
|
|
@ -860,6 +860,7 @@ $lang = array_merge($lang, array(
|
|||
'WROTE' => 'wrote',
|
||||
|
||||
'YAHOO' => 'Yahoo Messenger',
|
||||
'YOUTUBE' => 'YouTube',
|
||||
'YEAR' => 'Year',
|
||||
'YEAR_MONTH_DAY' => '(YYYY-MM-DD)',
|
||||
'YES' => 'Yes',
|
||||
|
|
|
|||
|
|
@ -147,4 +147,5 @@ $lang = array_merge($lang, array(
|
|||
'VIEW_FACEBOOK_PROFILE' => 'View Facebook Profile',
|
||||
'VIEW_SKYPE_PROFILE' => 'View Skype Profile',
|
||||
'VIEW_TWITTER_PROFILE' => 'View Twitter Profile',
|
||||
'VIEW_YOUTUBE_CHANNEL' => 'View YouTube Channel',
|
||||
));
|
||||
|
|
|
|||
60
phpBB/phpbb/db/migration/data/v310/profilefield_youtube.php
Normal file
60
phpBB/phpbb/db/migration/data/v310/profilefield_youtube.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_youtube 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_youtube';
|
||||
|
||||
protected $profilefield_database_type = array('VCHAR', '');
|
||||
|
||||
protected $profilefield_data = array(
|
||||
'field_name' => 'phpbb_youtube',
|
||||
'field_type' => 'profilefields.type.string',
|
||||
'field_ident' => 'phpbb_youtube',
|
||||
'field_length' => '20',
|
||||
'field_minlen' => '3',
|
||||
'field_maxlen' => '60',
|
||||
'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_YOUTUBE_CHANNEL',
|
||||
'field_contact_url' => 'http://youtube.com/user/%s',
|
||||
);
|
||||
}
|
||||
|
|
@ -29,6 +29,7 @@ class phpbb_functional_ucp_profile_test extends phpbb_functional_test_case
|
|||
'pf_phpbb_location' => 'Bertie´s Empire',
|
||||
'pf_phpbb_skype' => 'phpbb.skype.account',
|
||||
'pf_phpbb_twitter' => 'phpbb_twitter',
|
||||
'pf_phpbb_youtube' => 'phpbb.youtube',
|
||||
));
|
||||
|
||||
$crawler = self::submit($form);
|
||||
|
|
@ -41,5 +42,6 @@ class phpbb_functional_ucp_profile_test extends phpbb_functional_test_case
|
|||
$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());
|
||||
$this->assertEquals('phpbb.youtube', $form->get('pf_phpbb_youtube')->getValue());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue