diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-20 23:42:54 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-20 23:42:54 +0200 |
| commit | 18bf45ab1b3f07fbed5c7d566766170ff0a71e8e (patch) | |
| tree | e1e51f757365e99b3e5a2bc8530321b422bbe02a /phpBB | |
| parent | 3c38fcce40b28d7b67f4a9686be88044eda40b9a (diff) | |
| parent | 51b4dc7077e40518307f726956ec49b73ca1a808 (diff) | |
| download | forums-18bf45ab1b3f07fbed5c7d566766170ff0a71e8e.tar forums-18bf45ab1b3f07fbed5c7d566766170ff0a71e8e.tar.gz forums-18bf45ab1b3f07fbed5c7d566766170ff0a71e8e.tar.bz2 forums-18bf45ab1b3f07fbed5c7d566766170ff0a71e8e.tar.xz forums-18bf45ab1b3f07fbed5c7d566766170ff0a71e8e.zip | |
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
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/schemas/schema.json | 4 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 1 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/memberlist.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/profilefield_youtube.php | 60 |
5 files changed, 67 insertions, 0 deletions
diff --git a/phpBB/install/schemas/schema.json b/phpBB/install/schemas/schema.json index 207e52d731..c6974aab21 100644 --- a/phpBB/install/schemas/schema.json +++ b/phpBB/install/schemas/schema.json @@ -2096,6 +2096,10 @@ "VCHAR", "" ], + "pf_phpbb_youtube": [ + "VCHAR", + "" + ], "pf_phpbb_facebook": [ "VCHAR", "" diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index b79a2fe1ad..1087ba1851 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -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, ''); diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 68a63450bd..46f19359cd 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -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', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index 913fab59fc..b5fd21e5e3 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -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', )); diff --git a/phpBB/phpbb/db/migration/data/v310/profilefield_youtube.php b/phpBB/phpbb/db/migration/data/v310/profilefield_youtube.php new file mode 100644 index 0000000000..bb90c0aa5c --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/profilefield_youtube.php @@ -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', + ); +} |