diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-05 22:13:22 +0100 | 
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-05 22:13:22 +0100 | 
| commit | f2059f52f3f8f430888366b70aa07c534abb35a1 (patch) | |
| tree | a0eac95bf86b38536793107f12d1b39f2b5128cc | |
| parent | a1dab58f6d030ba8d986a27b3faf5a91629d688b (diff) | |
| download | forums-f2059f52f3f8f430888366b70aa07c534abb35a1.tar forums-f2059f52f3f8f430888366b70aa07c534abb35a1.tar.gz forums-f2059f52f3f8f430888366b70aa07c534abb35a1.tar.bz2 forums-f2059f52f3f8f430888366b70aa07c534abb35a1.tar.xz forums-f2059f52f3f8f430888366b70aa07c534abb35a1.zip  | |
[ticket/12236] Move AOL Instant Messanger field to custom profile field
PHPBB3-12236
40 files changed, 139 insertions, 134 deletions
diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html index c21d8833ac..d32348ff1c 100644 --- a/phpBB/adm/style/acp_users_profile.html +++ b/phpBB/adm/style/acp_users_profile.html @@ -3,10 +3,6 @@  	<fieldset>  		<legend>{L_USER_PROFILE}</legend>  	<dl> -		<dt><label for="aim">{L_UCP_AIM}{L_COLON}</label></dt> -		<dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd> -	</dl> -	<dl>  		<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>  		<dd><input type="email" id="jabber" name="jabber" value="{JABBER}" /></dd>  	</dl> diff --git a/phpBB/develop/benchmark.php b/phpBB/develop/benchmark.php index 51340dcedd..27176c97d3 100644 --- a/phpBB/develop/benchmark.php +++ b/phpBB/develop/benchmark.php @@ -370,7 +370,6 @@ function make_user($username)  	$signature_bbcode_uid = "";  	$avatar_filename = "";  	$viewemail = 0; -	$aim = 0;  	$attachsig = 1;  	$allowsmilies = 1;  	$allowhtml = 1; @@ -415,8 +414,8 @@ function make_user($username)  	} -	$sql = "INSERT INTO " . USERS_TABLE . "	(user_id, username, user_regdate, user_password, user_email, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_aim, user_attachsig, user_allowsmilies, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey) -		VALUES ($new_user_id, '$username', " . time() . ", '$password', '$email', '$signature', '$signature_bbcode_uid', '$avatar_filename', $viewemail, '$aim', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $user_timezone, '$user_dateformat', '$user_lang', $user_style, 0, 1, "; +	$sql = "INSERT INTO " . USERS_TABLE . "	(user_id, username, user_regdate, user_password, user_email, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_attachsig, user_allowsmilies, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey) +		VALUES ($new_user_id, '$username', " . time() . ", '$password', '$email', '$signature', '$signature_bbcode_uid', '$avatar_filename', $viewemail, $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $user_timezone, '$user_dateformat', '$user_lang', $user_style, 0, 1, ";  	$sql .= "1, '')"; diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index aabdefeccf..603cb17941 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -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, diff --git a/phpBB/includes/db/schema_data.php b/phpBB/includes/db/schema_data.php index fe9787422f..1a08149f66 100644 --- a/phpBB/includes/db/schema_data.php +++ b/phpBB/includes/db/schema_data.php @@ -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), diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 3e2b8f7456..b68389cba7 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -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'] : '', diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 9ed4278ec2..3772d56e28 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -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'],  				)); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index b3b43f5b77..034b590331 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -907,7 +907,6 @@ if (!$get_info)  				array('user_inactive_time',		'',									'phpbb_inactive_time'),  				array('user_jabber',			'',									''), -				array('user_aim',				'users.user_aim',					array('function1' => 'phpbb_set_encoding')),  				array('user_rank',				'users.user_rank',					'intval'),  				array('user_permissions',		'',									''), @@ -962,6 +961,7 @@ if (!$get_info)  				array('pf_phpbb_icq',			'users.user_icq',					array('function1' => 'phpbb_set_encoding')),  				array('pf_phpbb_wlm',			'users.user_msnm',					array('function1' => 'phpbb_set_encoding')),  				array('pf_phpbb_yahoo',			'users.user_yim',					array('function1' => 'phpbb_set_encoding')), +				array('pf_phpbb_aol',			'users.user_aim',					array('function1' => 'phpbb_set_encoding')),  				array('pf_phpbb_website',		'users.user_website',				'validate_website'),  				'where'			=> 'users.user_id <> -1', diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql index f1c469140a..3782fc66ff 100644 --- a/phpBB/install/schemas/firebird_schema.sql +++ b/phpBB/install/schemas/firebird_schema.sql @@ -955,6 +955,7 @@ CREATE TABLE phpbb_profile_fields_data (  	pf_phpbb_interests BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,  	pf_phpbb_occupation BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,  	pf_phpbb_icq VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, +	pf_phpbb_aol VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,  	pf_phpbb_wlm VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,  	pf_phpbb_yahoo VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,  	pf_phpbb_website VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL @@ -1429,7 +1430,6 @@ CREATE TABLE phpbb_users (  	user_sig BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,  	user_sig_bbcode_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL,  	user_sig_bbcode_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, -	user_aim VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,  	user_jabber VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,  	user_form_salt VARCHAR(32) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,  	user_new INTEGER DEFAULT 1 NOT NULL, diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql index 38f11689c6..66e64cf651 100644 --- a/phpBB/install/schemas/mssql_schema.sql +++ b/phpBB/install/schemas/mssql_schema.sql @@ -1162,6 +1162,7 @@ CREATE TABLE [phpbb_profile_fields_data] (  	[pf_phpbb_interests] [varchar] (4000) DEFAULT ('') NOT NULL ,  	[pf_phpbb_occupation] [varchar] (4000) DEFAULT ('') NOT NULL ,  	[pf_phpbb_icq] [varchar] (255) DEFAULT ('') NOT NULL , +	[pf_phpbb_aol] [varchar] (255) DEFAULT ('') NOT NULL ,  	[pf_phpbb_wlm] [varchar] (255) DEFAULT ('') NOT NULL ,  	[pf_phpbb_yahoo] [varchar] (255) DEFAULT ('') NOT NULL ,  	[pf_phpbb_website] [varchar] (255) DEFAULT ('') NOT NULL  @@ -1745,7 +1746,6 @@ CREATE TABLE [phpbb_users] (  	[user_sig] [text] DEFAULT ('') NOT NULL ,  	[user_sig_bbcode_uid] [varchar] (8) DEFAULT ('') NOT NULL ,  	[user_sig_bbcode_bitfield] [varchar] (255) DEFAULT ('') NOT NULL , -	[user_aim] [varchar] (255) DEFAULT ('') NOT NULL ,  	[user_jabber] [varchar] (255) DEFAULT ('') NOT NULL ,  	[user_form_salt] [varchar] (32) DEFAULT ('') NOT NULL ,  	[user_new] [int] DEFAULT (1) NOT NULL , diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql index 9077d453d8..66c08156d0 100644 --- a/phpBB/install/schemas/mysql_40_schema.sql +++ b/phpBB/install/schemas/mysql_40_schema.sql @@ -680,6 +680,7 @@ CREATE TABLE phpbb_profile_fields_data (  	pf_phpbb_interests blob NOT NULL,  	pf_phpbb_occupation blob NOT NULL,  	pf_phpbb_icq varbinary(255) DEFAULT '' NOT NULL, +	pf_phpbb_aol varbinary(255) DEFAULT '' NOT NULL,  	pf_phpbb_wlm varbinary(255) DEFAULT '' NOT NULL,  	pf_phpbb_yahoo varbinary(255) DEFAULT '' NOT NULL,  	pf_phpbb_website varbinary(255) DEFAULT '' NOT NULL, @@ -1038,7 +1039,6 @@ CREATE TABLE phpbb_users (  	user_sig mediumblob NOT NULL,  	user_sig_bbcode_uid varbinary(8) DEFAULT '' NOT NULL,  	user_sig_bbcode_bitfield varbinary(255) DEFAULT '' NOT NULL, -	user_aim blob NOT NULL,  	user_jabber blob NOT NULL,  	user_form_salt varbinary(96) DEFAULT '' NOT NULL,  	user_new tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql index ef68a1216b..8119d4cd93 100644 --- a/phpBB/install/schemas/mysql_41_schema.sql +++ b/phpBB/install/schemas/mysql_41_schema.sql @@ -680,6 +680,7 @@ CREATE TABLE phpbb_profile_fields_data (  	pf_phpbb_interests text NOT NULL,  	pf_phpbb_occupation text NOT NULL,  	pf_phpbb_icq varchar(255) DEFAULT '' NOT NULL, +	pf_phpbb_aol varchar(255) DEFAULT '' NOT NULL,  	pf_phpbb_wlm varchar(255) DEFAULT '' NOT NULL,  	pf_phpbb_yahoo varchar(255) DEFAULT '' NOT NULL,  	pf_phpbb_website varchar(255) DEFAULT '' NOT NULL, @@ -1038,7 +1039,6 @@ CREATE TABLE phpbb_users (  	user_sig mediumtext NOT NULL,  	user_sig_bbcode_uid varchar(8) DEFAULT '' NOT NULL,  	user_sig_bbcode_bitfield varchar(255) DEFAULT '' NOT NULL, -	user_aim varchar(255) DEFAULT '' NOT NULL,  	user_jabber varchar(255) DEFAULT '' NOT NULL,  	user_form_salt varchar(32) DEFAULT '' NOT NULL,  	user_new tinyint(1) UNSIGNED DEFAULT '1' NOT NULL, diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql index 8a907be6d8..b1f39da7bc 100644 --- a/phpBB/install/schemas/oracle_schema.sql +++ b/phpBB/install/schemas/oracle_schema.sql @@ -1273,6 +1273,7 @@ CREATE TABLE phpbb_profile_fields_data (  	pf_phpbb_interests clob DEFAULT '' ,  	pf_phpbb_occupation clob DEFAULT '' ,  	pf_phpbb_icq varchar2(255) DEFAULT '' , +	pf_phpbb_aol varchar2(255) DEFAULT '' ,  	pf_phpbb_wlm varchar2(255) DEFAULT '' ,  	pf_phpbb_yahoo varchar2(255) DEFAULT '' ,  	pf_phpbb_website varchar2(255) DEFAULT '' , @@ -1862,7 +1863,6 @@ CREATE TABLE phpbb_users (  	user_sig clob DEFAULT '' ,  	user_sig_bbcode_uid varchar2(8) DEFAULT '' ,  	user_sig_bbcode_bitfield varchar2(255) DEFAULT '' , -	user_aim varchar2(765) DEFAULT '' ,  	user_jabber varchar2(765) DEFAULT '' ,  	user_form_salt varchar2(96) DEFAULT '' ,  	user_new number(1) DEFAULT '1' NOT NULL, diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql index 14587b7bbf..36eaddbb78 100644 --- a/phpBB/install/schemas/postgres_schema.sql +++ b/phpBB/install/schemas/postgres_schema.sql @@ -890,6 +890,7 @@ CREATE TABLE phpbb_profile_fields_data (  	pf_phpbb_interests varchar(4000) DEFAULT '' NOT NULL,  	pf_phpbb_occupation varchar(4000) DEFAULT '' NOT NULL,  	pf_phpbb_icq varchar(255) DEFAULT '' NOT NULL, +	pf_phpbb_aol varchar(255) DEFAULT '' NOT NULL,  	pf_phpbb_wlm varchar(255) DEFAULT '' NOT NULL,  	pf_phpbb_yahoo varchar(255) DEFAULT '' NOT NULL,  	pf_phpbb_website varchar(255) DEFAULT '' NOT NULL, @@ -1310,7 +1311,6 @@ CREATE TABLE phpbb_users (  	user_sig TEXT DEFAULT '' NOT NULL,  	user_sig_bbcode_uid varchar(8) DEFAULT '' NOT NULL,  	user_sig_bbcode_bitfield varchar(255) DEFAULT '' NOT NULL, -	user_aim varchar(255) DEFAULT '' NOT NULL,  	user_jabber varchar(255) DEFAULT '' NOT NULL,  	user_form_salt varchar(32) DEFAULT '' NOT NULL,  	user_new INT2 DEFAULT '1' NOT NULL CHECK (user_new >= 0), diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 774ede06b9..92833717c7 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -467,10 +467,10 @@ INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id,  INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts_approved, forum_posts_unapproved, forum_posts_softdeleted, forum_topics_approved, forum_topics_unapproved, forum_topics_softdeleted, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_poster_colour, forum_last_post_subject, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_days, prune_viewed, forum_parents, forum_flags) VALUES ('{L_FORUMS_TEST_FORUM_TITLE}', '{L_FORUMS_TEST_FORUM_DESC}', 2, 3, 1, 1, 1, 0, 0, 1, 0, 0, 1, 2, 'Admin', 'AA0000', '{L_TOPICS_TOPIC_TITLE}', 972086460, '', '', '', '', '', '', '', 0, 0, '', 48);  # -- Users / Anonymous user -INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_aim, user_jabber, user_actkey, user_newpasswd, user_allow_massemail) VALUES (2, 1, 'Anonymous', 'anonymous', 0, '', '', 'en', 1, 0, '', 0, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', 0); +INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_jabber, user_actkey, user_newpasswd, user_allow_massemail) VALUES (2, 1, 'Anonymous', 'anonymous', 0, '', '', 'en', 1, 0, '', 0, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', 0);  # -- username: Admin    password: admin (change this or remove it once everything is working!) -INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_aim, user_jabber, user_actkey, user_newpasswd) VALUES (3, 5, 'Admin', 'admin', 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', 'en', 1, 1, 'AA0000', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', ''); +INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_jabber, user_actkey, user_newpasswd) VALUES (3, 5, 'Admin', 'admin', 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', 'en', 1, 1, 'AA0000', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '');  # -- Groups  INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('GUESTS', 3, 0, '', 0, '', '', '', 5); @@ -795,6 +795,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_website', 'profilefields.type.url', 'phpbb_website', '40', '12', '255', '', '', '', 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 5, 1, 'VISIT_WEBSITE', '%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_wlm', 'profilefields.type.string', 'phpbb_wlm', '40', '5', '255', '', '', '.*', 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 6, 1, '', '');  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, 1, 7, 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_aol', 'profilefields.type.string', 'phpbb_aol', '40', '5', '255', '', '', '.*', 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 8, 1, '', '');  # 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/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql index ab0a8a6f07..5d8ae220f4 100644 --- a/phpBB/install/schemas/sqlite_schema.sql +++ b/phpBB/install/schemas/sqlite_schema.sql @@ -660,6 +660,7 @@ CREATE TABLE phpbb_profile_fields_data (  	pf_phpbb_interests text(65535) NOT NULL DEFAULT '',  	pf_phpbb_occupation text(65535) NOT NULL DEFAULT '',  	pf_phpbb_icq varchar(255) NOT NULL DEFAULT '', +	pf_phpbb_aol varchar(255) NOT NULL DEFAULT '',  	pf_phpbb_wlm varchar(255) NOT NULL DEFAULT '',  	pf_phpbb_yahoo varchar(255) NOT NULL DEFAULT '',  	pf_phpbb_website varchar(255) NOT NULL DEFAULT '', @@ -1009,7 +1010,6 @@ CREATE TABLE phpbb_users (  	user_sig mediumtext(16777215) NOT NULL DEFAULT '',  	user_sig_bbcode_uid varchar(8) NOT NULL DEFAULT '',  	user_sig_bbcode_bitfield varchar(255) NOT NULL DEFAULT '', -	user_aim varchar(255) NOT NULL DEFAULT '',  	user_jabber varchar(255) NOT NULL DEFAULT '',  	user_form_salt varchar(32) NOT NULL DEFAULT '',  	user_new INTEGER UNSIGNED NOT NULL DEFAULT '1', diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index 6954702f1f..e7c149600d 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -182,7 +182,6 @@ $lang = array_merge($lang, array(  	'IMG_ICON_BACK_TOP'		=> 'Top', -	'IMG_ICON_CONTACT_AIM'		=> 'AIM',  	'IMG_ICON_CONTACT_EMAIL'	=> 'Send email',  	'IMG_ICON_CONTACT_JABBER'	=> 'Jabber',  	'IMG_ICON_CONTACT_PM'		=> 'Send message', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 144ffd33d5..2ccff566d4 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -682,7 +682,6 @@ $lang = array_merge($lang, array(  	'TOO_LONG'						=> 'The value you entered is too long.', -	'TOO_LONG_AIM'					=> 'The screenname you entered is too long.',  	'TOO_LONG_CONFIRM_CODE'			=> 'The confirm code you entered is too long.',  	'TOO_LONG_DATEFORMAT'			=> 'The date format you entered is too long.',  	'TOO_LONG_JABBER'				=> 'The Jabber account name you entered is too long.', @@ -696,7 +695,6 @@ $lang = array_merge($lang, array(  	'TOO_SHORT'						=> 'The value you entered is too short.', -	'TOO_SHORT_AIM'					=> 'The screenname you entered is too short.',  	'TOO_SHORT_CONFIRM_CODE'		=> 'The confirm code you entered is too short.',  	'TOO_SHORT_DATEFORMAT'			=> 'The date format you entered is too short.',  	'TOO_SHORT_JABBER'				=> 'The Jabber account name you entered is too short.', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index e641236420..83f5e4107e 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -71,8 +71,6 @@ $lang = array_merge($lang, array(  	'HIDE_MEMBER_SEARCH'	=> 'Hide member search',  	'IM_ADD_CONTACT'		=> 'Add Contact', -	'IM_AIM'				=> 'Please note that you need AOL Instant Messenger installed to use this.', -	'IM_AIM_EXPRESS'		=> 'AIM Express',  	'IM_DOWNLOAD_APP'		=> 'Download application',  	'IM_JABBER'				=> 'Please note that users may have selected to not receive unsolicited instant messages.',  	'IM_JABBER_SUBJECT'		=> 'This is an automated message please do not reply! Message from user %1$s at %2$s.', @@ -114,7 +112,6 @@ $lang = array_merge($lang, array(  	'SELECT_MARKED'			=> 'Select marked',  	'SELECT_SORT_METHOD'	=> 'Select sort method', -	'SEND_AIM_MESSAGE'		=> 'Send AIM message',  	'SEND_ICQ_MESSAGE'		=> 'Send ICQ message',  	'SEND_IM'				=> 'Instant messaging',  	'SEND_JABBER_MESSAGE'	=> 'Send Jabber message', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 4fa73667cb..a0f7a32116 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -481,7 +481,6 @@ $lang = array_merge($lang, array(  	'UCP'						=> 'User Control Panel',  	'UCP_ACTIVATE'				=> 'Activate account',  	'UCP_ADMIN_ACTIVATE'		=> 'Please note that you will need to enter a valid email address before your account is activated. The administrator will review your account and if approved you will receive an email at the address you specified.', -	'UCP_AIM'					=> 'AOL Instant Messenger',  	'UCP_ATTACHMENTS'			=> 'Attachments',  	'UCP_AUTH_LINK'				=> 'External accounts',  	'UCP_AUTH_LINK_ASK'			=> 'You currently have no account associated with this external service. Click the button below to link your board account to an account with this external service.', diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index afae1a60f1..8db2fef2a3 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -305,13 +305,6 @@ switch ($mode)  		$presence_img = '';  		switch ($action)  		{ -			case 'aim': -				$lang = 'AIM'; -				$sql_field = 'user_aim'; -				$s_select = 'S_SEND_AIM'; -				$s_action = ''; -			break; -  			case 'jabber':  				$lang = 'JABBER';  				$sql_field = 'user_jabber'; @@ -395,9 +388,6 @@ switch ($mode)  			'IM_CONTACT'	=> $row[$sql_field],  			'A_IM_CONTACT'	=> addslashes($row[$sql_field]), -			'U_AIM_CONTACT'	=> ($action == 'aim') ? 'aim:addbuddy?screenname=' . urlencode($row[$sql_field]) : '', -			'U_AIM_MESSAGE'	=> ($action == 'aim') ? 'aim:goim?screenname=' . urlencode($row[$sql_field]) . '&message=' . urlencode($config['sitename']) : '', -  			'USERNAME'		=> $row['username'],  			'CONTACT_NAME'	=> $row[$sql_field],  			'SITENAME'		=> $config['sitename'], @@ -643,7 +633,6 @@ switch ($mode)  			'AVATAR_IMG'	=> $poster_avatar,  			'PM_IMG'		=> $user->img('icon_contact_pm', $user->lang['SEND_PRIVATE_MESSAGE']),  			'EMAIL_IMG'		=> $user->img('icon_contact_email', $user->lang['EMAIL']), -			'AIM_IMG'		=> $user->img('icon_contact_aim', $user->lang['AIM']),  			'JABBER_IMG'	=> $user->img('icon_contact_jabber', $user->lang['JABBER']),  			'SEARCH_IMG'	=> $user->img('icon_user_search', $user->lang['SEARCH']), @@ -987,8 +976,8 @@ switch ($mode)  		$pagination = $phpbb_container->get('pagination');  		// Sorting -		$sort_key_text = array('a' => $user->lang['SORT_USERNAME'], 'c' => $user->lang['SORT_JOINED'], 'd' => $user->lang['SORT_POST_COUNT'], 'h' => $user->lang['AIM'], 'k' => $user->lang['JABBER']); -		$sort_key_sql = array('a' => 'u.username_clean', 'c' => 'u.user_regdate', 'd' => 'u.user_posts', 'h' => 'u.user_aim', 'k' => 'u.user_jabber'); +		$sort_key_text = array('a' => $user->lang['SORT_USERNAME'], 'c' => $user->lang['SORT_JOINED'], 'd' => $user->lang['SORT_POST_COUNT'], 'k' => $user->lang['JABBER']); +		$sort_key_sql = array('a' => 'u.username_clean', 'c' => 'u.user_regdate', 'd' => 'u.user_posts',  'k' => 'u.user_jabber');  		if ($auth->acl_get('a_user'))  		{ @@ -1031,7 +1020,7 @@ switch ($mode)  		$select_single 	= request_var('select_single', false);  		// Search URL parameters, if any of these are in the URL we do a search -		$search_params = array('username', 'email', 'aim', 'jabber', 'search_group_id', 'joined_select', 'active_select', 'count_select', 'joined', 'active', 'count', 'ip'); +		$search_params = array('username', 'email', 'jabber', 'search_group_id', 'joined_select', 'active_select', 'count_select', 'joined', 'active', 'count', 'ip');  		// We validate form and field here, only id/class allowed  		$form = (!preg_match('/^[a-z0-9_-]+$/i', $form)) ? '' : $form; @@ -1040,7 +1029,6 @@ switch ($mode)  		{  			$username	= request_var('username', '', true);  			$email		= strtolower(request_var('email', '')); -			$aim		= request_var('aim', '');  			$jabber		= request_var('jabber', '');  			$search_group_id	= request_var('search_group_id', 0); @@ -1081,7 +1069,6 @@ switch ($mode)  			$sql_where .= ($username) ? ' AND u.username_clean ' . $db->sql_like_expression(str_replace('*', $db->any_char, utf8_clean_string($username))) : '';  			$sql_where .= ($auth->acl_get('a_user') && $email) ? ' AND u.user_email ' . $db->sql_like_expression(str_replace('*', $db->any_char, $email)) . ' ' : ''; -			$sql_where .= ($aim) ? ' AND u.user_aim ' . $db->sql_like_expression(str_replace('*', $db->any_char, $aim)) . ' ' : '';  			$sql_where .= ($jabber) ? ' AND u.user_jabber ' . $db->sql_like_expression(str_replace('*', $db->any_char, $jabber)) . ' ' : '';  			$sql_where .= (is_numeric($count) && isset($find_key_match[$count_select])) ? ' AND u.user_posts ' . $find_key_match[$count_select] . ' ' . (int) $count . ' ' : ''; @@ -1310,7 +1297,6 @@ switch ($mode)  			'select_single'	=> array('select_single', $select_single),  			'username'		=> array('username', '', true),  			'email'			=> array('email', ''), -			'aim'			=> array('aim', ''),  			'jabber'		=> array('jabber', ''),  			'search_group_id'	=> array('search_group_id', 0),  			'joined_select'	=> array('joined_select', 'lt'), @@ -1439,7 +1425,6 @@ switch ($mode)  			$template->assign_vars(array(  				'USERNAME'	=> $username,  				'EMAIL'		=> $email, -				'AIM'		=> $aim,  				'JABBER'	=> $jabber,  				'JOINED'	=> implode('-', $joined),  				'ACTIVE'	=> implode('-', $active), @@ -1615,7 +1600,6 @@ switch ($mode)  			'PROFILE_IMG'	=> $user->img('icon_user_profile', $user->lang['PROFILE']),  			'PM_IMG'		=> $user->img('icon_contact_pm', $user->lang['SEND_PRIVATE_MESSAGE']),  			'EMAIL_IMG'		=> $user->img('icon_contact_email', $user->lang['EMAIL']), -			'AIM_IMG'		=> $user->img('icon_contact_aim', $user->lang['AIM']),  			'JABBER_IMG'	=> $user->img('icon_contact_jabber', $user->lang['JABBER']),  			'SEARCH_IMG'	=> $user->img('icon_user_search', $user->lang['SEARCH']), @@ -1625,7 +1609,6 @@ switch ($mode)  			'U_SORT_JOINED'			=> $sort_url . '&sk=c&sd=' . (($sort_key == 'c' && $sort_dir == 'a') ? 'd' : 'a'),  			'U_SORT_POSTS'			=> $sort_url . '&sk=d&sd=' . (($sort_key == 'd' && $sort_dir == 'a') ? 'd' : 'a'),  			'U_SORT_EMAIL'			=> $sort_url . '&sk=e&sd=' . (($sort_key == 'e' && $sort_dir == 'a') ? 'd' : 'a'), -			'U_SORT_AIM'			=> $sort_url . '&sk=h&sd=' . (($sort_key == 'h' && $sort_dir == 'a') ? 'd' : 'a'),  			'U_SORT_ACTIVE'			=> ($auth->acl_get('u_viewonline')) ? $sort_url . '&sk=l&sd=' . (($sort_key == 'l' && $sort_dir == 'a') ? 'd' : 'a') : '',  			'U_SORT_RANK'			=> $sort_url . '&sk=m&sd=' . (($sort_key == 'm' && $sort_dir == 'a') ? 'd' : 'a'),  			'U_LIST_CHAR'			=> $sort_url . '&sk=a&sd=' . (($sort_key == 'l' && $sort_dir == 'a') ? 'd' : 'a'), @@ -1745,10 +1728,8 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f  		'U_WARN'		=> ($warn_user_enabled && $auth->acl_get('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_user&u=' . $user_id, true, $user->session_id) : '',  		'U_PM'			=> ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($data['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=' . $user_id) : '',  		'U_EMAIL'		=> $email, -		'U_AIM'			=> ($data['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=aim&u=' . $user_id) : '',  		'U_JABBER'		=> ($data['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=jabber&u=' . $user_id) : '', -		'USER_AIM'			=> $data['user_aim'],  		'USER_JABBER'		=> $data['user_jabber'],  		'USER_JABBER_IMG'	=> ($data['user_jabber']) ? $user->img('icon_contact_jabber', $data['user_jabber']) : '', diff --git a/phpBB/phpbb/db/migration/data/v310/profilefield_aol.php b/phpBB/phpbb/db/migration/data/v310/profilefield_aol.php new file mode 100644 index 0000000000..87574cb858 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/profilefield_aol.php @@ -0,0 +1,51 @@ +<?php +/** +* +* @package migration +* @copyright (c) 2014 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +namespace phpbb\db\migration\data\v310; + +class profilefield_aol extends \phpbb\db\migration\profilefield_base_migration +{ +	static public function depends_on() +	{ +		return array( +			'\phpbb\db\migration\data\v310\profilefield_yahoo_cleanup', +		); +	} + +	protected $profilefield_name = 'phpbb_aol'; + +	protected $profilefield_database_type = array('VCHAR', ''); + +	protected $profilefield_data = array( +		'field_name'			=> 'phpbb_aol', +		'field_type'			=> 'profilefields.type.string', +		'field_ident'			=> 'phpbb_aol', +		'field_length'			=> '40', +		'field_minlen'			=> '5', +		'field_maxlen'			=> '255', +		'field_novalue'			=> '', +		'field_default_value'	=> '', +		'field_validation'		=> '.*', +		'field_required'		=> 0, +		'field_show_novalue'	=> 0, +		'field_show_on_reg'		=> 0, +		'field_show_on_pm'		=> 1, +		'field_show_on_vt'		=> 1, +		'field_show_on_ml'		=> 0, +		'field_show_profile'	=> 1, +		'field_hide'			=> 0, +		'field_no_view'			=> 0, +		'field_active'			=> 1, +		'field_is_contact'		=> 1, +		'field_contact_desc'	=> '', +		'field_contact_url'		=> '', +	); + +	protected $user_column_name = 'user_aim'; +} diff --git a/phpBB/phpbb/db/migration/data/v310/profilefield_aol_cleanup.php b/phpBB/phpbb/db/migration/data/v310/profilefield_aol_cleanup.php new file mode 100644 index 0000000000..a7088c6a7a --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/profilefield_aol_cleanup.php @@ -0,0 +1,47 @@ +<?php +/** +* +* @package migration +* @copyright (c) 2014 phpBB Group + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +namespace phpbb\db\migration\data\v310; + +class profilefield_aol_cleanup extends \phpbb\db\migration\migration +{ +	public function effectively_installed() +	{ +		return !$this->db_tools->sql_column_exists($this->table_prefix . 'users', 'user_aim'); +	} + +	static public function depends_on() +	{ +		return array( +			'\phpbb\db\migration\data\v310\profilefield_aol', +		); +	} + +	public function update_schema() +	{ +		return array( +			'drop_columns'	=> array( +				$this->table_prefix . 'users'			=> array( +					'user_aim', +				), +			), +		); +	} + +	public function revert_schema() +	{ +		return array( +			'add_columns'	=> array( +				$this->table_prefix . 'users'			=> array( +					'user_aim'	=> array('VCHAR_UNI', ''), +				), +			), +		); +	} +} diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html index 9c63a6c35c..4fb383a0ba 100644 --- a/phpBB/styles/prosilver/template/memberlist_im.html +++ b/phpBB/styles/prosilver/template/memberlist_im.html @@ -12,18 +12,9 @@  	<fieldset>  	<dl class="fields2">  		<dt><label>{L_IM_RECIPIENT}{L_COLON}</label></dt> -		<dd><strong>{USERNAME}</strong><!-- IF S_SEND_AIM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --><!-- IF PRESENCE_IMG --> {PRESENCE_IMG}<!-- ENDIF --></dd> +		<dd><strong>{USERNAME}</strong><!-- IF S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --><!-- IF PRESENCE_IMG --> {PRESENCE_IMG}<!-- ENDIF --></dd>  	</dl> -	<!-- IF S_SEND_AIM --> -		<dl class="fields2"> -			<dt> </dt> -			<dd><a href="{U_AIM_CONTACT}">{L_IM_ADD_CONTACT}</a></dd> -			<dd><a href="{U_AIM_MESSAGE}">{L_IM_SEND_MESSAGE}</a></dd> -			<dd><a href="http://www.aim.com">{L_IM_DOWNLOAD_APP}</a> | <a href="http://www.aim.com/products/express">{L_IM_AIM_EXPRESS}</a></dd> -		</dl> -	<!-- ENDIF --> -  	<!-- IF S_SEND_JABBER -->  		<dl class="fields2">  			<dt><label for="message">{L_IM_MESSAGE}{L_COLON}</label></dt> @@ -33,19 +24,14 @@  			<dt> </dt>  			<dd><input class="button1" name="submit" type="submit" value="{L_IM_SEND}" /></dd>  		</dl> -	<!-- ENDIF --> - -	<!-- IF S_NO_SEND_JABBER -->  		<dl class="fields2">  			<dt> </dt> -			<dd>{L_IM_NO_JABBER}</dd> +			<dd>{L_IM_SENT_JABBER}</dd>  		</dl> -	<!-- ENDIF --> - -	<!-- IF S_SENT_JABBER --> +	<!-- ELSE IF S_NO_SEND_JABBER -->  		<dl class="fields2">  			<dt> </dt> -			<dd>{L_IM_SENT_JABBER}</dd> +			<dd>{L_IM_NO_JABBER}</dd>  		</dl>  	<!-- ENDIF -->  	{S_FORM_TOKEN} diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html index 01ddc48381..69934fcee3 100644 --- a/phpBB/styles/prosilver/template/memberlist_search.html +++ b/phpBB/styles/prosilver/template/memberlist_search.html @@ -18,10 +18,6 @@  	</dl>  <!-- ENDIF -->  	<dl> -		<dt><label for="aim">{L_AIM}{L_COLON}</label></dt> -		<dd><input type="text" name="aim" id="aim" value="{AIM}" class="inputbox" /></dd> -	</dl> -	<dl>  		<dt><label for="jabber">{L_JABBER}:</label></dt>  		<dd><input type="text" name="jabber" id="jabber" value="{JABBER}" class="inputbox" /></dd>  	</dl> diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index e50d7be255..6dc8293551 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -62,7 +62,6 @@  		<dl class="details">  		<!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}{L_COLON}</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER} {USERNAME}</a></dd><!-- ENDIF -->  		<!-- IF U_PM --><dt>{L_PM}{L_COLON}</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd><!-- ENDIF --> -		<!-- IF U_AIM or USER_AIM --><dt>{L_AIM}{L_COLON}</dt> <dd><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_AIM_MESSAGE}</a><!-- ELSE -->{USER_AIM}<!-- ENDIF --></dd><!-- ENDIF -->  		<!-- IF U_JABBER and S_JABBER_ENABLED --><dt>{L_JABBER}{L_COLON}</dt> <dd><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_JABBER_MESSAGE}</a></dd><!-- ELSEIF USER_JABBER --><dt>{L_JABBER}{L_COLON}</dt> <dd>{USER_JABBER}</dd><!-- ENDIF -->  		<!-- BEGIN custom_fields -->  			<!-- IF custom_fields.S_PROFILE_CONTACT --> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 208111b2fb..d57c73217e 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -34,13 +34,12 @@  		<!-- EVENT ucp_pm_viewmessage_custom_fields_after --> -		<!-- IF U_PM or U_EMAIL or U_AIM or U_JABBER --> +		<!-- IF U_PM or U_EMAIL or U_JABBER -->  		<dd>  			<ul class="profile-icons">  			<!-- EVENT ucp_pm_viewmessage_contact_fields_before -->  			<!-- IF U_PM --><li class="pm-icon"><a href="{U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF -->  			<!-- IF U_EMAIL --><li class="email-icon"><a href="{U_EMAIL}" title="{L_SEND_EMAIL_USER} {MESSAGE_AUTHOR}"><span>{L_SEND_EMAIL_USER} {MESSAGE_AUTHOR}</span></a></li><!-- ENDIF --> -			<!-- IF U_AIM --><li class="aim-icon"><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF -->  			<!-- IF U_JABBER --><li class="jabber-icon"><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF -->  			<!-- BEGIN custom_fields -->  				<!-- IF custom_fields.S_PROFILE_CONTACT --> diff --git a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html index 8193f4c6ae..b8ba163d3b 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html +++ b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html @@ -10,14 +10,6 @@  	<fieldset>  	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF --> -	<dl> -		<dt><label for="aim">{L_UCP_AIM}{L_COLON}</label></dt> -		<dd><input type="text" name="aim" id="aim" maxlength="255" value="{AIM}" class="inputbox" /></dd> -	</dl> -	<dl> -		<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt> -		<dd><input type="email" name="jabber" id="jabber" maxlength="255" value="{JABBER}" class="inputbox" /></dd> -	</dl>  	<!-- IF S_BIRTHDAYS_ENABLED -->  		<dl>  			<dt><label for="bday_day">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt> @@ -28,6 +20,10 @@  			</dd>  		</dl>  	<!-- ENDIF --> +		<dl> +			<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt> +			<dd><input type="email" name="jabber" id="jabber" maxlength="255" value="{JABBER}" class="inputbox" /></dd> +		</dl>  	<!-- BEGIN profile_fields -->  		<dl>  			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label> diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 0718b0a2e5..2a3962d21e 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -144,12 +144,11 @@  		<!-- EVENT viewtopic_body_postrow_custom_fields_after -->  		<!-- IF not S_IS_BOT --> -		<!-- IF postrow.U_PM or postrow.U_EMAIL or postrow.U_AIM or postrow.U_JABBER --> +		<!-- IF postrow.U_PM or postrow.U_EMAIL or postrow.U_JABBER -->  			<dd>  				<ul class="profile-icons">  					<!-- IF postrow.U_PM --><li class="pm-icon"><a href="{postrow.U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF -->  					<!-- IF postrow.U_EMAIL --><li class="email-icon"><a href="{postrow.U_EMAIL}" title="{L_SEND_EMAIL_USER} {postrow.POST_AUTHOR}"><span>{L_SEND_EMAIL_USER} {postrow.POST_AUTHOR}</span></a></li><!-- ENDIF --> -					<!-- IF postrow.U_AIM --><li class="aim-icon"><a href="{postrow.U_AIM}" onclick="popup(this.href, 550, 320); return false;" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF -->  					<!-- IF postrow.U_JABBER --><li class="jabber-icon"><a href="{postrow.U_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF -->  					<!-- BEGIN custom_fields -->  						<!-- IF postrow.custom_fields.S_PROFILE_CONTACT --> diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index eace60e35f..4e71dc4de4 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -849,7 +849,7 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {  	padding-right: 11px;  	padding-left: 0;  } -.rtl .imageset.icon_contact_aim, .rtl .imageset.icon_contact_email, .rtl .imageset.icon_contact_icq, .rtl .imageset.phpbb_icq-icon, .rtl .imageset.icon_contact_jabber, .rtl .imageset.icon_contact_msnm, .rtl .imageset.phpbb_wlm-icon, .rtl .imageset.icon_contact_www, .rtl .imageset.phpbb_website-icon, .rtl .imageset.icon_contact_yahoo, .rtl .imageset.phpbb_yahoo-icon, .rtl .imageset.icon_post_delete, .rtl .imageset.icon_post_info, .rtl .imageset.icon_post_report, .rtl .imageset.icon_user_warn { +.rtl .imageset.icon_contact_aim, .rtl .imageset.phpbb_aol-icon, .rtl .imageset.icon_contact_email, .rtl .imageset.icon_contact_icq, .rtl .imageset.phpbb_icq-icon, .rtl .imageset.icon_contact_jabber, .rtl .imageset.icon_contact_msnm, .rtl .imageset.phpbb_wlm-icon, .rtl .imageset.icon_contact_www, .rtl .imageset.phpbb_website-icon, .rtl .imageset.icon_contact_yahoo, .rtl .imageset.phpbb_yahoo-icon, .rtl .imageset.icon_post_delete, .rtl .imageset.icon_post_info, .rtl .imageset.icon_post_report, .rtl .imageset.icon_user_warn {  	padding-right: 20px;  	padding-left: 0;  } diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index 6d0fa06574..68d827b974 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -238,6 +238,7 @@ ul.profile-icons.responsive a.responsive-menu-link:before {  /* Profile & navigation icons */  .email-icon, .email-icon a		{ background: none top left no-repeat; }  .aim-icon, .aim-icon a			{ background: none top left no-repeat; } +.phpbb_aol-icon, .phpbb_aol-icon a			{ background: none top left no-repeat; }  .yahoo-icon, .yahoo-icon a		{ background: none top left no-repeat; }  .phpbb_yahoo-icon, .phpbb_yahoo-icon a		{ background: none top left no-repeat; }  .web-icon, .web-icon a			{ background: none top left no-repeat; } @@ -259,6 +260,7 @@ ul.profile-icons.responsive a.responsive-menu-link:before {  /* Set profile icon dimensions */  ul.profile-icons li.email-icon		{ width: 20px; height: 20px; } +ul.profile-icons li.phpbb_aol-icon	{ width: 20px; height: 20px; }  ul.profile-icons li.aim-icon	{ width: 20px; height: 20px; }  ul.profile-icons li.yahoo-icon	{ width: 20px; height: 20px; }  ul.profile-icons li.phpbb_yahoo-icon	{ width: 20px; height: 20px; } diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 18ead9cab9..4ccc232e86 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -739,6 +739,7 @@ a.sendemail {  /* Profile & navigation icons */  .email-icon, .email-icon a		{ background-image: url("./images/icon_contact_email.gif"); } +.phpbb_aol-icon, .phpbb_aol-icon a			{ background-image: url("./images/icon_contact_aim.gif"); }  .aim-icon, .aim-icon a			{ background-image: url("./images/icon_contact_aim.gif"); }  .yahoo-icon, .yahoo-icon a		{ background-image: url("./images/icon_contact_yahoo.gif"); }  .phpbb_yahoo-icon, .phpbb_yahoo-icon a		{ background-image: url("./images/icon_contact_yahoo.gif"); } diff --git a/phpBB/styles/prosilver/theme/imageset.css b/phpBB/styles/prosilver/theme/imageset.css index 285218e22e..e6d306c7fd 100644 --- a/phpBB/styles/prosilver/theme/imageset.css +++ b/phpBB/styles/prosilver/theme/imageset.css @@ -260,7 +260,7 @@ span.imageset {  	padding-left: 11px;  	padding-top: 11px;  } -.imageset.icon_contact_aim { +.imageset.phpbb_aol-icon, .imageset.icon_contact_aim {  	background-image: url("./images/icon_contact_aim.gif");  	padding-left: 20px;  	padding-top: 20px; diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html index 0fcd139ae1..a19229605a 100644 --- a/phpBB/styles/subsilver2/template/memberlist_im.html +++ b/phpBB/styles/subsilver2/template/memberlist_im.html @@ -12,18 +12,9 @@  	</tr>  	<tr>  		<td class="row1"><b class="genmed">{L_IM_RECIPIENT}{L_COLON} </b></td> -		<td class="row2"><span class="gen"><b>{USERNAME}</b><!-- IF S_SEND_AIM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --></span> <!-- IF PRESENCE_IMG -->{PRESENCE_IMG}<!-- ENDIF --></td> +		<td class="row2"><span class="gen"><b>{USERNAME}</b><!-- IF S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --></span> <!-- IF PRESENCE_IMG -->{PRESENCE_IMG}<!-- ENDIF --></td>  	</tr> -	<!-- IF S_SEND_AIM --> -		<tr> -			<td class="row1" colspan="2" align="center"><br /><a class="gen" href="{U_AIM_CONTACT}">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="{U_AIM_MESSAGE}">{L_IM_SEND_MESSAGE}</a><br /><br /><a class="gensmall" href="http://www.aim.com">{L_IM_DOWNLOAD_APP}</a> | <a class="gensmall" href="http://www.aim.com/products/express">{L_IM_AIM_EXPRESS}</a> </td> -		</tr> -		<tr> -			<td class="cat" colspan="2" align="center"> </td> -		</tr> -	<!-- ENDIF --> -  	<!-- IF S_SEND_JABBER -->  		<tr>  			<td class="row1"><b class="genmed">{L_IM_MESSAGE}{L_COLON} </b></td> @@ -32,21 +23,16 @@  		<tr>  			<td class="cat" colspan="2" align="center"><input class="btnmain" name="submit" type="submit" value="{L_IM_SEND}" /></td>  		</tr> -	<!-- ENDIF --> - -	<!-- IF S_NO_SEND_JABBER --> -		<tr> -			<td class="row1" colspan="2"><span class="genmed">{L_IM_NO_JABBER}</span></td> -		</tr> -	<!-- ENDIF --> - -	<!-- IF S_SENT_JABBER -->  		<tr>  			<td class="row1" colspan="2" align="center"><span class="gen">{L_IM_SENT_JABBER}</span></td>  		</tr>  		<tr>  			<td class="cat" colspan="2" align="center"></td>  		</tr> +	<!-- ELSEIF S_NO_SEND_JABBER --> +		<tr> +			<td class="row1" colspan="2"><span class="genmed">{L_IM_NO_JABBER}</span></td> +		</tr>  	<!-- ENDIF -->  	</table> diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html index bf0bb42b0c..6551820471 100644 --- a/phpBB/styles/subsilver2/template/memberlist_search.html +++ b/phpBB/styles/subsilver2/template/memberlist_search.html @@ -78,16 +78,13 @@  	<td class="row2"><input class="post" type="text" name="username" value="{USERNAME}" /></td>  	<td colspan="2" class="row1"> </td>  </tr> -<tr>  <!-- IF S_EMAIL_SEARCH_ALLOWED --> +<tr>  	<td class="row1"><b class="genmed">{L_EMAIL}{L_COLON}</b></td>  	<td class="row2"><input class="post" type="email" name="email" value="{EMAIL}" /></td> -<!-- ELSE -->  	<td colspan="2" class="row1"> </td> -<!-- ENDIF --> -	<td class="row1"><b class="genmed">{L_AIM}{L_COLON}</b></td> -	<td class="row2"><input class="post" type="text" name="aim" value="{AIM}" /></td>  </tr> +<!-- ENDIF -->  <tr>  	<td class="row1"><b class="genmed">{L_JOINED}{L_COLON}</b></td>  	<td class="row2"><select name="joined_select">{S_JOINED_TIME_OPTIONS}</select> <input class="post" type="text" name="joined" value="{JOINED}" /></td> diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html index 1c71de3111..28f4da4fef 100644 --- a/phpBB/styles/subsilver2/template/memberlist_view.html +++ b/phpBB/styles/subsilver2/template/memberlist_view.html @@ -119,10 +119,6 @@  				</tr>  			<!-- ENDIF -->  			<tr> -				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_AIM}{L_COLON} </td> -				<td><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false" class="imageset">{AIM_IMG}</a><!-- ELSEIF USER_AIM -->{USER_AIM}<!-- ENDIF --></td> -			</tr> -			<tr>  				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_JABBER}{L_COLON} </td>  				<td><!-- IF U_JABBER --><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false" class="imageset">{JABBER_IMG}</a><!-- ELSEIF USER_JABBER -->{USER_JABBER_IMG}<!-- ENDIF --></td>  			</tr> diff --git a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html index 555dcbbe17..bf0aa8f899 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html @@ -13,10 +13,6 @@  	<td class="row1" colspan="2"><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td>  </tr>  <tr> -	<td class="row1" width="35%"><b class="genmed">{L_UCP_AIM}{L_COLON} </b></td> -	<td class="row2"><input class="post" type="text" name="aim" size="30" maxlength="255" value="{AIM}" /></td> -</tr> -<tr>  	<td class="row1" width="35%"><b class="genmed">{L_UCP_JABBER}{L_COLON} </b></td>  	<td class="row2"><input class="post" type="text" name="jabber" size="30" maxlength="255" value="{JABBER}" /></td>  </tr> diff --git a/phpBB/styles/subsilver2/theme/en/stylesheet.css b/phpBB/styles/subsilver2/theme/en/stylesheet.css index e9f24b45d1..57f9fce26d 100644 --- a/phpBB/styles/subsilver2/theme/en/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/en/stylesheet.css @@ -1,5 +1,5 @@  /* EN Language Pack */ -.imageset.icon_contact_aim { +.imageset.phpbb_aol-icon, .imageset.icon_contact_aim {  	background-image: url("./icon_contact_aim.gif");  	padding-left: 72px;  	padding-top: 20px; diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index 6bda3997de..11fc91af0c 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -1013,7 +1013,7 @@ a.imageset {  /* English images for fallback */ -.imageset.icon_contact_aim { +.imageset.phpbb_aol-icon, .imageset.icon_contact_aim {  	background-image: url("./en/icon_contact_aim.gif");  	padding-left: 72px;  	padding-top: 20px; diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 5e1bc68357..ab72b34487 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -620,7 +620,6 @@ $template->assign_vars(array(  	'SEARCH_IMG' 		=> $user->img('icon_user_search', 'SEARCH_USER_POSTS'),  	'PM_IMG' 			=> $user->img('icon_contact_pm', 'SEND_PRIVATE_MESSAGE'),  	'EMAIL_IMG' 		=> $user->img('icon_contact_email', 'SEND_EMAIL'), -	'AIM_IMG' 			=> $user->img('icon_contact_aim', 'AIM'),  	'JABBER_IMG'		=> $user->img('icon_contact_jabber', 'JABBER') ,  	'REPORT_IMG'		=> $user->img('icon_post_report', 'REPORT_POST'),  	'REPORTED_IMG'		=> $user->img('icon_topic_reported', 'POST_REPORTED'), @@ -1113,7 +1112,6 @@ while ($row = $db->sql_fetchrow($result))  				'profile'			=> '',  				'pm'				=> '',  				'email'				=> '', -				'aim'				=> '',  				'jabber'			=> '',  				'search'			=> '',  				'age'				=> '', @@ -1177,7 +1175,6 @@ while ($row = $db->sql_fetchrow($result))  				'online'		=> false,  				'profile'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=viewprofile&u=$poster_id"), -				'aim'			=> ($row['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=aim&u=$poster_id") : '',  				'jabber'		=> ($row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=jabber&u=$poster_id") : '',  				'search'		=> ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id=$poster_id&sr=posts") : '', @@ -1621,7 +1618,6 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)  		'U_SEARCH'		=> $user_cache[$poster_id]['search'],  		'U_PM'			=> ($poster_id != ANONYMOUS && $config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_cache[$poster_id]['allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&action=quotepost&p=' . $row['post_id']) : '',  		'U_EMAIL'		=> $user_cache[$poster_id]['email'], -		'U_AIM'			=> $user_cache[$poster_id]['aim'],  		'U_JABBER'		=> $user_cache[$poster_id]['jabber'],  		'U_APPROVE_ACTION'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&p={$row['post_id']}&f=$forum_id&redirect=" . urlencode(str_replace('&', '&', $viewtopic_url . '&p=' . $row['post_id'] . '#p' . $row['post_id']))), diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php index c584c3ecbe..23d6910843 100644 --- a/tests/auth/provider_apache_test.php +++ b/tests/auth/provider_apache_test.php @@ -193,7 +193,6 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case  			'user_sig' => '',  			'user_sig_bbcode_uid' => '',  			'user_sig_bbcode_bitfield' => '', -			'user_aim' => '',  			'user_jabber' => '',  			'user_actkey' => '',  			'user_newpasswd' => '',  | 
