mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/12237] Convert yahoo messanger to custom profile field

Browse Source 
PHPBB3-12237
This commit is contained in:
Joas Schilling
2014-03-04 11:22:55 +01:00
parent 71354ef185
commit 2e5106aae1
30 changed files with 119 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/acp/acp_users.php
View File

@@ -1361,7 +1361,6 @@ class acp_users
$data = array(
'aim' => request_var('aim', $user_row['user_aim']),
'yim' => request_var('yim', $user_row['user_yim']),
'jabber' => utf8_normalize_nfc(request_var('jabber', $user_row['user_jabber'], true)),
'bday_day' => 0,
'bday_month' => 0,
@@ -1386,7 +1385,6 @@ class acp_users
'jabber' => array(
array('string', true, 5, 255),
array('jabber')),
'yim' => array('string', true, 5, 255),
'bday_day' => array('num', true, 1, 31),
'bday_month' => array('num', true, 1, 12),
'bday_year' => array('num', true, 1901, gmdate('Y', time())),
@@ -1409,7 +1407,6 @@ class acp_users
{
$sql_ary = array(
'user_aim' => $data['aim'],
'user_yim' => $data['yim'],
'user_jabber' => $data['jabber'],
'user_birthday' => $data['user_birthday'],
);
@@ -1454,7 +1451,6 @@ class acp_users
unset($now);
$template->assign_vars(array(
'YIM' => $data['yim'],
'AIM' => $data['aim'],
'JABBER' => $data['jabber'],

2
phpBB/includes/db/schema_data.php
View File

@@ -796,6 +796,7 @@ $schema_data['phpbb_profile_fields_data'] = array(
'pf_phpbb_occupation' => array('TEXT_UNI', ''),
'pf_phpbb_icq' => array('VCHAR', ''),
'pf_phpbb_wlm' => array('VCHAR', ''),
'pf_phpbb_yahoo' => array('VCHAR', ''),
'pf_phpbb_website' => array('VCHAR', ''),
),
'PRIMARY_KEY' => 'user_id',
@@ -1176,7 +1177,6 @@ $schema_data['phpbb_users'] = array(
'user_sig_bbcode_uid' => array('VCHAR:8', ''),
'user_sig_bbcode_bitfield' => array('VCHAR:255', ''),
'user_aim' => array('VCHAR_UNI', ''),
'user_yim' => array('VCHAR_UNI', ''),
'user_jabber' => array('VCHAR_UNI', ''),
'user_form_salt' => array('VCHAR_UNI:32', ''),
'user_new' => array('BOOL', 1),

1
phpBB/includes/ucp/ucp_pm_viewmessage.php
View File

@@ -210,7 +210,6 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_info['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $author_id) : '',
'U_AIM' => ($user_info['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=aim&u=' . $author_id) : '',
'U_YIM' => ($user_info['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($user_info['user_yim']) . '&.src=pg' : '',
'U_JABBER' => ($user_info['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=jabber&u=' . $author_id) : '',
'U_DELETE' => ($auth->acl_get('u_pm_delete')) ? "$url&mode=compose&action=delete&f=$folder_id&p=" . $message_row['msg_id'] : '',

4
phpBB/includes/ucp/ucp_profile.php
View File

@@ -265,7 +265,6 @@ class ucp_profile
$data = array(
'aim' => request_var('aim', $user->data['user_aim']),
'yim' => request_var('yim', $user->data['user_yim']),
'jabber' => utf8_normalize_nfc(request_var('jabber', $user->data['user_jabber'], true)),
);
@@ -293,7 +292,6 @@ class ucp_profile
'jabber' => array(
array('string', true, 5, 255),
array('jabber')),
'yim' => array('string', true, 5, 255),
);
if ($config['allow_birthdays'])
@@ -334,7 +332,6 @@ class ucp_profile
$sql_ary = array(
'user_aim' => $data['aim'],
'user_yim' => $data['yim'],
'user_jabber' => $data['jabber'],
'user_notify_type' => $data['notify'],
);
@@ -398,7 +395,6 @@ class ucp_profile
$template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
'YIM' => $data['yim'],
'AIM' => $data['aim'],
'JABBER' => $data['jabber'],
));