mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/12236] Move AOL Instant Messanger field to custom profile field

Browse Source 
PHPBB3-12236
This commit is contained in:
Joas Schilling
2014-03-05 22:13:22 +01:00
parent a1dab58f6d
commit f2059f52f3
40 changed files with 141 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1360,7 +1360,6 @@ class acp_users
$user_row['iso_lang_id'] = $row['lang_id'];
$data = array(
'aim' => request_var('aim', $user_row['user_aim']),
'jabber' => utf8_normalize_nfc(request_var('jabber', $user_row['user_jabber'], true)),
'bday_day' => 0,
'bday_month' => 0,
@@ -1381,7 +1380,6 @@ class acp_users
if ($submit)
{
$error = validate_data($data, array(
'aim' => array('string', true, 3, 255),
'jabber' => array(
array('string', true, 5, 255),
array('jabber')),
@@ -1406,7 +1404,6 @@ class acp_users
if (!sizeof($error))
{
$sql_ary = array(
'user_aim' => $data['aim'],
'user_jabber' => $data['jabber'],
'user_birthday' => $data['user_birthday'],
);
@@ -1451,9 +1448,7 @@ class acp_users
unset($now);
$template->assign_vars(array(
'AIM' => $data['aim'],
'JABBER' => $data['jabber'],
'S_BIRTHDAY_DAY_OPTIONS' => $s_birthday_day_options,
'S_BIRTHDAY_MONTH_OPTIONS' => $s_birthday_month_options,
'S_BIRTHDAY_YEAR_OPTIONS' => $s_birthday_year_options,

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

@@ -795,6 +795,7 @@ $schema_data['phpbb_profile_fields_data'] = array(
'pf_phpbb_interests' => array('TEXT_UNI', ''),
'pf_phpbb_occupation' => array('TEXT_UNI', ''),
'pf_phpbb_icq' => array('VCHAR', ''),
'pf_phpbb_aol' => array('VCHAR', ''),
'pf_phpbb_wlm' => array('VCHAR', ''),
'pf_phpbb_yahoo' => array('VCHAR', ''),
'pf_phpbb_website' => array('VCHAR', ''),
@@ -1176,7 +1177,6 @@ $schema_data['phpbb_users'] = array(
'user_sig' => array('MTEXT_UNI', ''),
'user_sig_bbcode_uid' => array('VCHAR:8', ''),
'user_sig_bbcode_bitfield' => array('VCHAR:255', ''),
'user_aim' => 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

@@ -209,7 +209,6 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
'MESSAGE_ID' => $message_row['msg_id'],
'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_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'] : '',

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

@@ -264,7 +264,6 @@ class ucp_profile
$cp_data = $cp_error = array();
$data = array(
'aim' => request_var('aim', $user->data['user_aim']),
'jabber' => utf8_normalize_nfc(request_var('jabber', $user->data['user_jabber'], true)),
);
@@ -288,7 +287,6 @@ class ucp_profile
if ($submit)
{
$validate_array = array(
'aim' => array('string', true, 3, 255),
'jabber' => array(
array('string', true, 5, 255),
array('jabber')),
@@ -331,7 +329,6 @@ class ucp_profile
}
$sql_ary = array(
'user_aim' => $data['aim'],
'user_jabber' => $data['jabber'],
'user_notify_type' => $data['notify'],
);
@@ -394,8 +391,6 @@ class ucp_profile
$template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
'AIM' => $data['aim'],
'JABBER' => $data['jabber'],
));