Forráskód Böngészése

Merge pull request #1436 from MissAllSunday/im_fields

im fields
Michael Eshom 10 éve
szülő
commit
365e01f7b9

+ 2 - 44
Sources/Load.php

@@ -946,9 +946,9 @@ function loadMemberData($users, $is_name = false, $set = 'normal')
 	// Used by default
 	// Used by default
 	$select_columns = '
 	$select_columns = '
 			IFNULL(lo.log_time, 0) AS is_online, IFNULL(a.id_attach, 0) AS id_attach, a.filename, a.attachment_type,
 			IFNULL(lo.log_time, 0) AS is_online, IFNULL(a.id_attach, 0) AS id_attach, a.filename, a.attachment_type,
-			mem.signature, mem.personal_text, mem.location, mem.gender, mem.avatar, mem.id_member, mem.member_name,
+			mem.signature, mem.personal_text, mem.avatar, mem.id_member, mem.member_name,
 			mem.real_name, mem.email_address, mem.hide_email, mem.date_registered, mem.website_title, mem.website_url,
 			mem.real_name, mem.email_address, mem.hide_email, mem.date_registered, mem.website_title, mem.website_url,
-			mem.birthdate, mem.member_ip, mem.member_ip2, mem.icq, mem.aim, mem.yim, mem.skype, mem.posts, mem.last_login,
+			mem.birthdate, mem.member_ip, mem.member_ip2, mem.posts, mem.last_login,
 			mem.karma_good, mem.id_post_group, mem.karma_bad, mem.lngfile, mem.id_group, mem.time_offset, mem.show_online,
 			mem.karma_good, mem.id_post_group, mem.karma_bad, mem.lngfile, mem.id_group, mem.time_offset, mem.show_online,
 			mg.online_color AS member_group_color, IFNULL(mg.group_name, {string:blank_string}) AS member_group,
 			mg.online_color AS member_group_color, IFNULL(mg.group_name, {string:blank_string}) AS member_group,
 			pg.online_color AS post_group_color, IFNULL(pg.group_name, {string:blank_string}) AS post_group,
 			pg.online_color AS post_group_color, IFNULL(pg.group_name, {string:blank_string}) AS post_group,
@@ -1121,10 +1121,8 @@ function loadMemberContext($user, $display_custom_fields = false)
 	// Censor everything.
 	// Censor everything.
 	censorText($profile['signature']);
 	censorText($profile['signature']);
 	censorText($profile['personal_text']);
 	censorText($profile['personal_text']);
-	censorText($profile['location']);
 
 
 	// Set things up to be used before hand.
 	// Set things up to be used before hand.
-	$gendertxt = $profile['gender'] == 2 ? $txt['female'] : ($profile['gender'] == 1 ? $txt['male'] : '');
 	$profile['signature'] = str_replace(array("\n", "\r"), array('<br>', ''), $profile['signature']);
 	$profile['signature'] = str_replace(array("\n", "\r"), array('<br>', ''), $profile['signature']);
 	$profile['signature'] = parse_bbc($profile['signature'], true, 'sig' . $profile['id_member']);
 	$profile['signature'] = parse_bbc($profile['signature'], true, 'sig' . $profile['id_member']);
 
 
@@ -1158,41 +1156,12 @@ function loadMemberContext($user, $display_custom_fields = false)
 			'buddies' => $buddy_list,
 			'buddies' => $buddy_list,
 			'title' => !empty($modSettings['titlesEnable']) ? $profile['usertitle'] : '',
 			'title' => !empty($modSettings['titlesEnable']) ? $profile['usertitle'] : '',
 			'blurb' => $profile['personal_text'],
 			'blurb' => $profile['personal_text'],
-			'gender' => array(
-				'name' => $gendertxt,
-				'image' => !empty($profile['gender']) ? '<span class="generic_icons ' . ($profile['gender'] == 1 ? 'gender_male' : 'gender_female') . '" title="' . $gendertxt . '"></span>' : ''
-			),
 			'website' => array(
 			'website' => array(
 				'title' => $profile['website_title'],
 				'title' => $profile['website_title'],
 				'url' => $profile['website_url'],
 				'url' => $profile['website_url'],
 			),
 			),
 			'birth_date' => empty($profile['birthdate']) || $profile['birthdate'] === '0001-01-01' ? '0000-00-00' : (substr($profile['birthdate'], 0, 4) === '0004' ? '0000' . substr($profile['birthdate'], 4) : $profile['birthdate']),
 			'birth_date' => empty($profile['birthdate']) || $profile['birthdate'] === '0001-01-01' ? '0000-00-00' : (substr($profile['birthdate'], 0, 4) === '0004' ? '0000' . substr($profile['birthdate'], 4) : $profile['birthdate']),
 			'signature' => $profile['signature'],
 			'signature' => $profile['signature'],
-			'location' => $profile['location'],
-			'icq' => $profile['icq'] != '' && !$user_info['is_guest'] ? array(
-				'name' => $profile['icq'],
-				'href' => 'http://www.icq.com/whitepages/about_me.php?uin=' . $profile['icq'],
-				'link' => '<a class="icq new_win" href="http://www.icq.com/whitepages/about_me.php?uin=' . $profile['icq'] . '" target="_blank" title="' . $txt['icq_title'] . ' - ' . $profile['icq'] . '"><img src="' . $settings['images_url'] . '/icq.png" alt="' . $txt['icq'] . ' - ' . $profile['icq'] . '"></a>',
-				'link_text' => '<a class="icq extern" href="http://www.icq.com/whitepages/about_me.php?uin=' . $profile['icq'] . '" title="' . $txt['icq_title'] . ' - ' . $profile['icq'] . '">' . $profile['icq'] . '</a>',
-			) : array('name' => '', 'add' => '', 'href' => '', 'link' => '', 'link_text' => ''),
-			'aim' => $profile['aim'] != '' && !$user_info['is_guest'] ? array(
-				'name' => $profile['aim'],
-				'href' => 'aim:goim?screenname=' . urlencode(strtr($profile['aim'], array(' ' => '%20'))) . '&amp;message=' . $txt['aim_default_message'],
-				'link' => '<a class="aim" href="aim:goim?screenname=' . urlencode(strtr($profile['aim'], array(' ' => '%20'))) . '&amp;message=' . $txt['aim_default_message'] . '" title="' . $txt['aim_title'] . ' - ' . $profile['aim'] . '"><img src="' . $settings['images_url'] . '/aim.png" alt="' . $txt['aim_title'] . ' - ' . $profile['aim'] . '"></a>',
-				'link_text' => '<a class="aim" href="aim:goim?screenname=' . urlencode(strtr($profile['aim'], array(' ' => '%20'))) . '&amp;message=' . $txt['aim_default_message'] . '" title="' . $txt['aim_title'] . ' - ' . $profile['aim'] . '">' . $profile['aim'] . '</a>'
-			) : array('name' => '', 'href' => '', 'link' => '', 'link_text' => ''),
-			'yim' => $profile['yim'] != '' && !$user_info['is_guest'] ? array(
-				'name' => $profile['yim'],
-				'href' => 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($profile['yim']),
-				'link' => '<a class="yim" href="http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($profile['yim']) . '" title="' . $txt['yim_title'] . ' - ' . $profile['yim'] . '"><img src="' . $settings['images_url'] . '/yahoo.png" alt="' . $txt['yim_title'] . ' - ' . $profile['yim'] . '"></a>',
-				'link_text' => '<a class="yim" href="http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($profile['yim']) . '" title="' . $txt['yim_title'] . ' - ' . $profile['yim'] . '">' . $profile['yim'] . '</a>'
-			) : array('name' => '', 'href' => '', 'link' => '', 'link_text' => ''),
-			'skype' => !empty($profile['skype']) && !$user_info['is_guest'] ? array(
-				'name' => $profile['skype'],
-				'href' => 'skype:' . $profile['skype'] . '?chat',
-				'link' => '<a class="skype new_win" href="skype:' . $profile['skype'] . '?chat" title="' . $txt['skype'] . ' - ' . $profile['skype'] . '"><img src="' . $settings['images_url'] . '/skype.png" alt="' . $txt['skype'] . ' - ' . $profile['skype'] . '"></a>',
-				'link_text' => '<a class="skype new_win" href="skype:' . $profile['skype'] . '?chat" title="' . $txt['skype'] . ' - ' . $profile['skype'] . '">' . $profile['skype'] . '</a>',
-			) : array('name' => '', 'href' => '', 'link' => '', 'link_text' => '',),
 			'real_posts' => $profile['posts'],
 			'real_posts' => $profile['posts'],
 			'posts' => $profile['posts'] > 500000 ? $txt['geek'] : comma_format($profile['posts']),
 			'posts' => $profile['posts'] > 500000 ? $txt['geek'] : comma_format($profile['posts']),
 			'avatar' => array(
 			'avatar' => array(
@@ -1236,17 +1205,6 @@ function loadMemberContext($user, $display_custom_fields = false)
 			'local_time' => timeformat(time() + ($profile['time_offset'] - $user_info['time_offset']) * 3600, false),
 			'local_time' => timeformat(time() + ($profile['time_offset'] - $user_info['time_offset']) * 3600, false),
 		);
 		);
 
 
-	// First do a quick run through to make sure there is something to be shown.
-	$memberContext[$user]['has_messenger'] = false;
-	foreach (array('icq', 'skype', 'aim', 'yim') as $messenger)
-	{
-		if (!isset($context['disabled_fields'][$messenger]) && !empty($memberContext[$user][$messenger]['link']))
-		{
-			$memberContext[$user]['has_messenger'] = true;
-			break;
-		}
-	}
-
 	// Are we also loading the members custom fields into context?
 	// Are we also loading the members custom fields into context?
 	if ($display_custom_fields && !empty($modSettings['displayFields']))
 	if ($display_custom_fields && !empty($modSettings['displayFields']))
 	{
 	{

+ 0 - 13
Sources/ManageMembers.php

@@ -235,11 +235,6 @@ function ViewMemberlist()
 				'type' => 'date',
 				'type' => 'date',
 				'range' => true
 				'range' => true
 			),
 			),
-			'gender' => array(
-				'db_fields' => array('gender'),
-				'type' => 'checkbox',
-				'values' => array('0', '1', '2'),
-			),
 			'activated' => array(
 			'activated' => array(
 				'db_fields' => array('CASE WHEN is_activated IN (1, 11) THEN 1 ELSE 0 END'),
 				'db_fields' => array('CASE WHEN is_activated IN (1, 11) THEN 1 ELSE 0 END'),
 				'type' => 'checkbox',
 				'type' => 'checkbox',
@@ -257,17 +252,9 @@ function ViewMemberlist()
 				'db_fields' => array('website_title', 'website_url'),
 				'db_fields' => array('website_title', 'website_url'),
 				'type' => 'string'
 				'type' => 'string'
 			),
 			),
-			'location' => array(
-				'db_fields' => array('location'),
-				'type' => 'string'
-			),
 			'ip' => array(
 			'ip' => array(
 				'db_fields' => array('member_ip'),
 				'db_fields' => array('member_ip'),
 				'type' => 'string'
 				'type' => 'string'
-			),
-			'messenger' => array(
-				'db_fields' => array('icq', 'aim', 'yim', 'skype'),
-				'type' => 'string'
 			)
 			)
 		);
 		);
 		$range_trans = array(
 		$range_trans = array(

+ 2 - 2
Sources/ManageSettings.php

@@ -1127,7 +1127,7 @@ function ShowCustomProfiles()
 	$context['sub_template'] = 'show_custom_profile';
 	$context['sub_template'] = 'show_custom_profile';
 
 
 	// What about standard fields they can tweak?
 	// What about standard fields they can tweak?
-	$standard_fields = array('icq', 'aim', 'yim', 'skype', 'location', 'gender', 'website', 'personal_text', 'posts', 'warning_status');
+	$standard_fields = array('website', 'personal_text', 'posts', 'warning_status');
 	// What fields can't you put on the registration page?
 	// What fields can't you put on the registration page?
 	$context['fields_no_registration'] = array('posts', 'warning_status');
 	$context['fields_no_registration'] = array('posts', 'warning_status');
 
 
@@ -1369,7 +1369,7 @@ function list_getProfileFields($start, $items_per_page, $sort, $standardFields)
 
 
 	if ($standardFields)
 	if ($standardFields)
 	{
 	{
-		$standard_fields = array('icq', 'aim', 'yim', 'skype', 'location', 'gender', 'website', 'personal_text', 'posts', 'warning_status');
+		$standard_fields = array('website', 'personal_text', 'posts', 'warning_status');
 		$fields_no_registration = array('posts', 'warning_status');
 		$fields_no_registration = array('posts', 'warning_status');
 		$disabled_fields = isset($modSettings['disabled_profile_fields']) ? explode(',', $modSettings['disabled_profile_fields']) : array();
 		$disabled_fields = isset($modSettings['disabled_profile_fields']) ? explode(',', $modSettings['disabled_profile_fields']) : array();
 		$registration_fields = isset($modSettings['registration_fields']) ? explode(',', $modSettings['registration_fields']) : array();
 		$registration_fields = isset($modSettings['registration_fields']) ? explode(',', $modSettings['registration_fields']) : array();

+ 1 - 32
Sources/Memberlist.php

@@ -83,34 +83,6 @@ function Memberlist()
 				'up' => 'LENGTH(mem.website_url) > 0 DESC, IFNULL(mem.website_url, 1=1) ASC, mem.website_url ASC'
 				'up' => 'LENGTH(mem.website_url) > 0 DESC, IFNULL(mem.website_url, 1=1) ASC, mem.website_url ASC'
 			),
 			),
 		),
 		),
-		'icq' => array(
-			'label' => $txt['icq'],
-			'sort' => array(
-				'down' => 'LENGTH(mem.icq) > 0 ASC, mem.icq = 0 DESC, mem.icq DESC',
-				'up' => 'LENGTH(mem.icq) > 0 DESC, mem.icq = 0 ASC, mem.icq ASC'
-			),
-		),
-		'aim' => array(
-			'label' => $txt['aim'],
-			'sort' => array(
-				'down' => 'LENGTH(mem.aim) > 0 ASC, IFNULL(mem.aim, 1=1) DESC, mem.aim DESC',
-				'up' => 'LENGTH(mem.aim) > 0 DESC, IFNULL(mem.aim, 1=1) ASC, mem.aim ASC'
-			),
-		),
-		'yim' => array(
-			'label' => $txt['yim'],
-			'sort' => array(
-				'down' => 'LENGTH(mem.yim) > 0 ASC, IFNULL(mem.yim, 1=1) DESC, mem.yim DESC',
-				'up' => 'LENGTH(mem.yim) > 0 DESC, IFNULL(mem.yim, 1=1) ASC, mem.yim ASC'
-			),
-		),
-		'skype' => array(
-			'label' => $txt['skype'],
-			'sort' => array(
-				'down' => 'LENGTH(mem.skype) > 0 ASC, IFNULL(mem.skype, 1=1) DESC, mem.skype DESC',
-				'up' => 'LENGTH(mem.skype) > 0 DESC, IFNULL(mem.skype, 1=1) ASC, mem.skype ASC',
-			),
-		),
 		'id_group' => array(
 		'id_group' => array(
 			'label' => $txt['position'],
 			'label' => $txt['position'],
 			'sort' => array(
 			'sort' => array(
@@ -468,9 +440,7 @@ function MLSearch()
 			$fields = allowedTo('moderate_forum') ? array('member_name', 'real_name') : array('real_name');
 			$fields = allowedTo('moderate_forum') ? array('member_name', 'real_name') : array('real_name');
 		else
 		else
 			$fields = array();
 			$fields = array();
-		// Search for messengers...
-		if (in_array('messenger', $_POST['fields']) && !$user_info['is_guest'])
-			$fields += array(3 => 'aim', 'icq', 'yim', 'skype');
+
 		// Search for websites.
 		// Search for websites.
 		if (in_array('website', $_POST['fields']))
 		if (in_array('website', $_POST['fields']))
 			$fields += array(7 => 'website_title', 'website_url');
 			$fields += array(7 => 'website_title', 'website_url');
@@ -545,7 +515,6 @@ function MLSearch()
 		$context['search_fields'] = array(
 		$context['search_fields'] = array(
 			'name' => $txt['mlist_search_name'],
 			'name' => $txt['mlist_search_name'],
 			'email' => $txt['mlist_search_email'],
 			'email' => $txt['mlist_search_email'],
-			'messenger' => $txt['mlist_search_messenger'],
 			'website' => $txt['mlist_search_website'],
 			'website' => $txt['mlist_search_website'],
 			'group' => $txt['mlist_search_group'],
 			'group' => $txt['mlist_search_group'],
 		);
 		);

+ 0 - 11
Sources/News.php

@@ -924,20 +924,9 @@ function getXmlProfile($xml_format)
 			$data['signature'] = cdata_parse($profile['signature']);
 			$data['signature'] = cdata_parse($profile['signature']);
 		if ($profile['blurb'] != '')
 		if ($profile['blurb'] != '')
 			$data['blurb'] = cdata_parse($profile['blurb']);
 			$data['blurb'] = cdata_parse($profile['blurb']);
-		if ($profile['location'] != '')
-			$data['location'] = cdata_parse($profile['location']);
 		if ($profile['title'] != '')
 		if ($profile['title'] != '')
 			$data['title'] = cdata_parse($profile['title']);
 			$data['title'] = cdata_parse($profile['title']);
 
 
-		if (!empty($profile['icq']['name']) && !$user_info['is_guest'])
-			$data['icq'] = $profile['icq']['name'];
-		if ($profile['aim']['name'] != '' && !$user_info['is_guest'])
-			$data['aim'] = $profile['aim']['name'];
-		if ($profile['yim']['name'] != '' && !$user_info['is_guest'])
-			$data['yim'] = $profile['yim']['name'];
-		if (!empty($profile['skype']['name']) && !$user_info['is_guest'])
-			$data['skype'] = $profile['skype']['name'];
-
 		if ($profile['website']['title'] != '')
 		if ($profile['website']['title'] != '')
 			$data['website'] = array(
 			$data['website'] = array(
 				'title' => cdata_parse($profile['website']['title']),
 				'title' => cdata_parse($profile['website']['title']),

+ 1 - 62
Sources/Profile-Modify.php

@@ -73,21 +73,6 @@ function loadProfileFields($force_reload = false)
 	*/
 	*/
 
 
 	$profile_fields = array(
 	$profile_fields = array(
-		'aim' => array(
-			'type' => 'text',
-			'label' => $txt['aim'],
-			'subtext' => $txt['your_aim'],
-			'size' => 24,
-			'value' => strtr(empty($cur_profile['aim']) ? '' : $cur_profile['aim'], '+', ' '),
-			'permission' => 'profile_extra',
-			'input_validate' => create_function('&$value', '
-				$value = strtr($value, \' \', \'+\');
-				if (strlen($value) > 32)
-					return \'aim_too_long\';
-
-				return true;
-			'),
-		),
 		'avatar_choice' => array(
 		'avatar_choice' => array(
 			'type' => 'callback',
 			'type' => 'callback',
 			'callback_func' => 'avatar_select',
 			'callback_func' => 'avatar_select',
@@ -211,13 +196,6 @@ function loadProfileFields($force_reload = false)
 				return $isValid;
 				return $isValid;
 			'),
 			'),
 		),
 		),
-		'gender' => array(
-			'type' => 'select',
-			'cast_type' => 'int',
-			'options' => 'return array(0 => \'\', 1 => $txt[\'male\'], 2 => $txt[\'female\']);',
-			'label' => $txt['gender'],
-			'permission' => 'profile_extra',
-		),
 		'hide_email' => array(
 		'hide_email' => array(
 			'type' => 'check',
 			'type' => 'check',
 			'value' => empty($cur_profile['hide_email']) ? true : false,
 			'value' => empty($cur_profile['hide_email']) ? true : false,
@@ -229,21 +207,6 @@ function loadProfileFields($force_reload = false)
 				return true;
 				return true;
 			'),
 			'),
 		),
 		),
-		'icq' => array(
-			'type' => 'text',
-			'label' => $txt['icq'],
-			'subtext' => $txt['your_icq'],
-			'size' => 24,
-			'permission' => 'profile_extra',
-			// Need to make sure ICQ doesn't equal 0.
-			'input_validate' => create_function('&$value', '
-				if (empty($value))
-					$value = \'\';
-				else
-					$value = (int) $value;
-				return true;
-			'),
-		),
 		// Selecting group membership is a complicated one so we treat it separate!
 		// Selecting group membership is a complicated one so we treat it separate!
 		'id_group' => array(
 		'id_group' => array(
 			'type' => 'callback',
 			'type' => 'callback',
@@ -338,13 +301,6 @@ function loadProfileFields($force_reload = false)
 				}
 				}
 			'),
 			'),
 		),
 		),
-		'location' => array(
-			'type' => 'text',
-			'label' => $txt['location'],
-			'log_change' => true,
-			'size' => 50,
-			'permission' => 'profile_other',
-		),
 		// The username is not always editable - so adjust it as such.
 		// The username is not always editable - so adjust it as such.
 		'member_name' => array(
 		'member_name' => array(
 			'type' => allowedTo('admin_forum') && isset($_GET['changeusername']) ? 'text' : 'label',
 			'type' => allowedTo('admin_forum') && isset($_GET['changeusername']) ? 'text' : 'label',
@@ -378,13 +334,6 @@ function loadProfileFields($force_reload = false)
 				return false;
 				return false;
 			'),
 			'),
 		),
 		),
-		'skype' => array(
-			'type' => 'text',
-			'label' => $txt['skype'],
-			'subtext' => $txt['skype_username'],
-			'size' => 24,
-			'permission' => 'profile_extra',
-		),
 		'passwrd1' => array(
 		'passwrd1' => array(
 			'type' => 'password',
 			'type' => 'password',
 			'label' => ucwords($txt['choose_pass']),
 			'label' => ucwords($txt['choose_pass']),
@@ -679,14 +628,6 @@ function loadProfileFields($force_reload = false)
 			'),
 			'),
 			'link_with' => 'website',
 			'link_with' => 'website',
 		),
 		),
-		'yim' => array(
-			'type' => 'text',
-			'label' => $txt['yim'],
-			'subtext' => $txt['your_yim'],
-			'size' => 24,
-			'input_attr' => array('maxlength="32"'),
-			'permission' => 'profile_extra',
-		),
 	);
 	);
 
 
 	call_integration_hook('integrate_load_profile_fields', array(&$profile_fields));
 	call_integration_hook('integrate_load_profile_fields', array(&$profile_fields));
@@ -1680,9 +1621,7 @@ function forumProfile($memID)
 	setupProfileContext(
 	setupProfileContext(
 		array(
 		array(
 			'avatar_choice', 'hr', 'personal_text', 'hr',
 			'avatar_choice', 'hr', 'personal_text', 'hr',
-			'bday1', 'location', 'gender', 'hr',
-			'icq', 'aim', 'yim', 'skype', 'hr',
-			'usertitle', 'signature', 'hr',
+			'bday1', 'usertitle', 'signature', 'hr',
 			'karma_good', 'hr',
 			'karma_good', 'hr',
 			'website_title', 'website_url',
 			'website_title', 'website_url',
 		)
 		)

+ 0 - 10
Sources/Register.php

@@ -325,16 +325,6 @@ function Register2($verifiedOpenID = false)
 	{
 	{
 		$reg_fields = explode(',', $modSettings['registration_fields']);
 		$reg_fields = explode(',', $modSettings['registration_fields']);
 
 
-		// Easy string fields first.
-		foreach (array('skype', 'aim', 'yim', 'location') as $field)
-			if (in_array($field, $reg_fields))
-				$possible_strings[] = $field;
-
-		// Then the easy numeric fields.
-		foreach (array('icq', 'gender') as $field)
-			if (in_array($field, $reg_fields))
-				$possible_ints[] = $field;
-
 		// Website is a little different
 		// Website is a little different
 		if (in_array('website', $reg_fields))
 		if (in_array('website', $reg_fields))
 			$possible_strings += array('website_url', 'website_title');
 			$possible_strings += array('website_url', 'website_title');

+ 2 - 11
Sources/Subs-Members.php

@@ -625,11 +625,6 @@ function registerMember(&$regOptions, $return_errors = false)
 		'pm_ignore_list' => '',
 		'pm_ignore_list' => '',
 		'website_title' => '',
 		'website_title' => '',
 		'website_url' => '',
 		'website_url' => '',
-		'location' => '',
-		'icq' => '',
-		'aim' => '',
-		'yim' => '',
-		'skype' => '',
 		'time_format' => '',
 		'time_format' => '',
 		'signature' => '',
 		'signature' => '',
 		'avatar' => '',
 		'avatar' => '',
@@ -684,10 +679,6 @@ function registerMember(&$regOptions, $return_errors = false)
 			$regOptions['register_vars']['id_group'] = 0;
 			$regOptions['register_vars']['id_group'] = 0;
 	}
 	}
 
 
-	// ICQ cannot be zero.
-	if (isset($regOptions['extra_register_vars']['icq']) && empty($regOptions['extra_register_vars']['icq']))
-		$regOptions['extra_register_vars']['icq'] = '';
-
 	// Integrate optional member settings to be set.
 	// Integrate optional member settings to be set.
 	if (!empty($regOptions['extra_register_vars']))
 	if (!empty($regOptions['extra_register_vars']))
 		foreach ($regOptions['extra_register_vars'] as $var => $value)
 		foreach ($regOptions['extra_register_vars'] as $var => $value)
@@ -702,7 +693,7 @@ function registerMember(&$regOptions, $return_errors = false)
 	// Right, now let's prepare for insertion.
 	// Right, now let's prepare for insertion.
 	$knownInts = array(
 	$knownInts = array(
 		'date_registered', 'posts', 'id_group', 'last_login', 'instant_messages', 'unread_messages',
 		'date_registered', 'posts', 'id_group', 'last_login', 'instant_messages', 'unread_messages',
-		'new_pm', 'pm_prefs', 'gender', 'hide_email', 'show_online', 'pm_email_notify', 'karma_good', 'karma_bad',
+		'new_pm', 'pm_prefs', 'hide_email', 'show_online', 'pm_email_notify', 'karma_good', 'karma_bad',
 		'notify_announcements', 'notify_send_body', 'notify_regularity', 'notify_types',
 		'notify_announcements', 'notify_send_body', 'notify_regularity', 'notify_types',
 		'id_theme', 'is_activated', 'id_msg_last_visit', 'id_post_group', 'total_time_logged_in', 'warning',
 		'id_theme', 'is_activated', 'id_msg_last_visit', 'id_post_group', 'total_time_logged_in', 'warning',
 	);
 	);
@@ -1320,7 +1311,7 @@ function list_getMembers($start, $items_per_page, $sort, $where, $where_params =
 
 
 	$request = $smcFunc['db_query']('', '
 	$request = $smcFunc['db_query']('', '
 		SELECT
 		SELECT
-			mem.id_member, mem.member_name, mem.real_name, mem.email_address, mem.icq, mem.aim, mem.yim, mem.skype, mem.member_ip, mem.member_ip2, mem.last_login,
+			mem.id_member, mem.member_name, mem.real_name, mem.email_address, mem.member_ip, mem.member_ip2, mem.last_login,
 			mem.posts, mem.is_activated, mem.date_registered, mem.id_group, mem.additional_groups, mg.group_name
 			mem.posts, mem.is_activated, mem.date_registered, mem.id_group, mem.additional_groups, mg.group_name
 		FROM {db_prefix}members AS mem
 		FROM {db_prefix}members AS mem
 			LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = mem.id_group)
 			LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = mem.id_group)

+ 5 - 22
Themes/default/Display.template.php

@@ -509,7 +509,7 @@ function template_single_post($message, $force_alternate = null)
 	echo '
 	echo '
 						<div class="poster">
 						<div class="poster">
 									<h4>';
 									<h4>';
-									
+
 	// Show online and offline buttons?
 	// Show online and offline buttons?
 	if (!empty($modSettings['onlineEnable']) && !$message['member']['is_guest'])
 	if (!empty($modSettings['onlineEnable']) && !$message['member']['is_guest'])
 		echo '
 		echo '
@@ -520,10 +520,10 @@ function template_single_post($message, $force_alternate = null)
 	echo '
 	echo '
 								', $message['member']['link'], '
 								', $message['member']['link'], '
 									</h4>';
 									</h4>';
-									
+
 	echo '
 	echo '
 								<ul>';
 								<ul>';
-								
+
 
 
 	// Show the user's avatar.
 	// Show the user's avatar.
 	if (!empty($settings['show_user_images']) && empty($options['show_no_avatars']) && !empty($message['member']['avatar']['image']))
 	if (!empty($settings['show_user_images']) && empty($options['show_no_avatars']) && !empty($message['member']['avatar']['image']))
@@ -577,11 +577,6 @@ function template_single_post($message, $force_alternate = null)
 									<a href="', $scripturl, '?action=modifykarma;sa=smite;uid=', $message['member']['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';m=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $modSettings['karmaSmiteLabel'], '</a>
 									<a href="', $scripturl, '?action=modifykarma;sa=smite;uid=', $message['member']['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';m=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $modSettings['karmaSmiteLabel'], '</a>
 								</li>';
 								</li>';
 
 
-		// Show the member's gender icon?
-		if (!empty($settings['show_gender']) && $message['member']['gender']['image'] != '' && !isset($context['disabled_fields']['gender']))
-			echo '
-								<li class="gender">', $txt['gender'], ': ', $message['member']['gender']['image'], '</li>';
-
 		// Show their personal text?
 		// Show their personal text?
 		if (!empty($settings['show_blurb']) && $message['member']['blurb'] != '')
 		if (!empty($settings['show_blurb']) && $message['member']['blurb'] != '')
 			echo '
 			echo '
@@ -612,18 +607,6 @@ function template_single_post($message, $force_alternate = null)
 								</li>';
 								</li>';
 		}
 		}
 
 
-		// This shows the popular messaging icons.
-		if ($message['member']['has_messenger'] && $message['member']['can_view_profile'])
-			echo '
-								<li class="im_icons">
-									<ol>
-										', !empty($message['member']['icq']['link']) ? '<li>' . $message['member']['icq']['link'] . '</li>' : '', '
-										', !empty($message['member']['skype']['link']) ? '<li>' . $message['member']['skype']['link'] . '</li>' : '', '
-										', !empty($message['member']['aim']['link']) ? '<li>' . $message['member']['aim']['link'] . '</li>' : '', '
-										', !empty($message['member']['yim']['link']) ? '<li>' . $message['member']['yim']['link'] . '</li>' : '', '
-									</ol>
-								</li>';
-
 		// Show the website and email address buttons.
 		// Show the website and email address buttons.
 		if ($message['member']['show_profile_buttons'])
 		if ($message['member']['show_profile_buttons'])
 		{
 		{
@@ -635,7 +618,7 @@ function template_single_post($message, $force_alternate = null)
 			if ($message['member']['website']['url'] != '' && !isset($context['disabled_fields']['website']))
 			if ($message['member']['website']['url'] != '' && !isset($context['disabled_fields']['website']))
 				echo '
 				echo '
 										<li><a href="', $message['member']['website']['url'], '" title="' . $message['member']['website']['title'] . '" target="_blank" class="new_win">', ($settings['use_image_buttons'] ? '<span class="generic_icons www centericon" title="' . $message['member']['website']['title'] . '"></span>' : $txt['www']), '</a></li>';
 										<li><a href="', $message['member']['website']['url'], '" title="' . $message['member']['website']['title'] . '" target="_blank" class="new_win">', ($settings['use_image_buttons'] ? '<span class="generic_icons www centericon" title="' . $message['member']['website']['title'] . '"></span>' : $txt['www']), '</a></li>';
-										
+
 			// Since we know this person isn't a guest, you *can* message them.
 			// Since we know this person isn't a guest, you *can* message them.
 			if ($context['can_send_pm'])
 			if ($context['can_send_pm'])
 				echo '
 				echo '
@@ -713,7 +696,7 @@ function template_single_post($message, $force_alternate = null)
 	// Because we insert into it through AJAX and we don't want to stop themers moving it around if they so wish so they can put it where they want it.
 	// Because we insert into it through AJAX and we don't want to stop themers moving it around if they so wish so they can put it where they want it.
 	echo '
 	echo '
 									<span class="smalltext modified" id="modified_', $message['id'], '">';
 									<span class="smalltext modified" id="modified_', $message['id'], '">';
-	
+
 	if ($settings['show_modify'] && !empty($message['modified']['name']))
 	if ($settings['show_modify'] && !empty($message['modified']['name']))
 		echo $message['modified']['last_edit_text'];
 		echo $message['modified']['last_edit_text'];
 	echo '</span>';
 	echo '</span>';

+ 0 - 20
Themes/default/ManageMembers.template.php

@@ -116,36 +116,16 @@ function template_search_members()
 								<dd>
 								<dd>
 									<input type="url" name="website" id="website" value="" class="input_text">
 									<input type="url" name="website" id="website" value="" class="input_text">
 								</dd>
 								</dd>
-								<dt class="righttext">
-									<strong><label for="location">', $txt['location'], ':</label></strong>
-								</dt>
-								<dd>
-									<input type="text" name="location" id="location" value="" class="input_text">
-								</dd>
 								<dt class="righttext">
 								<dt class="righttext">
 									<strong><label for="ip">', $txt['ip_address'], ':</label></strong>
 									<strong><label for="ip">', $txt['ip_address'], ':</label></strong>
 								</dt>
 								</dt>
 								<dd>
 								<dd>
 									<input type="text" name="ip" id="ip" value="" class="input_text">
 									<input type="text" name="ip" id="ip" value="" class="input_text">
 								</dd>
 								</dd>
-								<dt class="righttext">
-									<strong><label for="messenger">', $txt['messenger_address'], ':</label></strong>
-								</dt>
-								<dd>
-									<input type="text" name="messenger" id="messenger" value="" class="input_text">
-								</dd>
 							</dl>
 							</dl>
 						</div>
 						</div>
 					</div>
 					</div>
 					<div class="flow_hidden">
 					<div class="flow_hidden">
-						<div class="msearch_details floatleft">
-							<fieldset>
-								<legend>', $txt['gender'], '</legend>
-								<label for="gender-0"><input type="checkbox" name="gender[]" value="0" id="gender-0" checked class="input_check"> ', $txt['undefined_gender'], '</label>&nbsp;&nbsp;
-								<label for="gender-1"><input type="checkbox" name="gender[]" value="1" id="gender-1" checked class="input_check"> ', $txt['male'], '</label>&nbsp;&nbsp;
-								<label for="gender-2"><input type="checkbox" name="gender[]" value="2" id="gender-2" checked class="input_check"> ', $txt['female'], '</label>
-							</fieldset>
-						</div>
 						<div class="msearch_details floatright">
 						<div class="msearch_details floatright">
 							<fieldset>
 							<fieldset>
 								<legend>', $txt['activation_status'], '</legend>
 								<legend>', $txt['activation_status'], '</legend>

+ 0 - 20
Themes/default/Memberlist.template.php

@@ -77,26 +77,6 @@ function template_main()
 			echo '
 			echo '
 					<td class="centertext">', $member['website']['url'] != '' ? '<a href="' . $member['website']['url'] . '" target="_blank" class="new_win"><span class="generic_icons www" title="' . $member['website']['title'] . '"></span></a>' : '', '</td>';
 					<td class="centertext">', $member['website']['url'] != '' ? '<a href="' . $member['website']['url'] . '" target="_blank" class="new_win"><span class="generic_icons www" title="' . $member['website']['title'] . '"></span></a>' : '', '</td>';
 
 
-		// ICQ?
-		if (!isset($context['disabled_fields']['icq']))
-			echo '
-					<td class="centertext">', $member['icq']['link'], '</td>';
-
-		// AIM?
-		if (!isset($context['disabled_fields']['aim']))
-			echo '
-					<td class="centertext">', $member['aim']['link'], '</td>';
-
-		// YIM?
-		if (!isset($context['disabled_fields']['yim']))
-			echo '
-					<td class="centertext">', $member['yim']['link'], '</td>';
-
-		// Skype?
-		if (!isset($context['disabled_fields']['skype']))
-			echo '
-					<td class="centertext">', $member['skype']['link'], '</td>';
-
 		// Group and date.
 		// Group and date.
 		echo '
 		echo '
 					<td class="lefttext">', empty($member['group']) ? $member['post_group'] : $member['group'], '</td>
 					<td class="lefttext">', empty($member['group']) ? $member['post_group'] : $member['group'], '</td>

+ 0 - 17
Themes/default/PersonalMessage.template.php

@@ -284,11 +284,6 @@ function template_folder()
 					<a href="', $scripturl, '?action=modifykarma;sa=applaud;uid=', $message['member']['id'], ';f=', $context['folder'], ';start=', $context['start'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pm=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $modSettings['karmaApplaudLabel'], '</a> <a href="', $scripturl, '?action=modifykarma;sa=smite;uid=', $message['member']['id'], ';f=', $context['folder'], ';start=', $context['start'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pm=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $modSettings['karmaSmiteLabel'], '</a>
 					<a href="', $scripturl, '?action=modifykarma;sa=applaud;uid=', $message['member']['id'], ';f=', $context['folder'], ';start=', $context['start'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pm=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $modSettings['karmaApplaudLabel'], '</a> <a href="', $scripturl, '?action=modifykarma;sa=smite;uid=', $message['member']['id'], ';f=', $context['folder'], ';start=', $context['start'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pm=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $modSettings['karmaSmiteLabel'], '</a>
 				</li>';
 				</li>';
 
 
-				// Show the member's gender icon?
-				if (!empty($settings['show_gender']) && $message['member']['gender']['image'] != '' && !isset($context['disabled_fields']['gender']))
-					echo '
-				<li class="gender">', $txt['gender'], ': ', $message['member']['gender']['image'], '</li>';
-
 				// Show their personal text?
 				// Show their personal text?
 				if (!empty($settings['show_blurb']) && $message['member']['blurb'] != '')
 				if (!empty($settings['show_blurb']) && $message['member']['blurb'] != '')
 					echo '
 					echo '
@@ -318,18 +313,6 @@ function template_folder()
 				</li>';
 				</li>';
 				}
 				}
 
 
-				// This shows the popular messaging icons.
-				if ($message['member']['has_messenger'] && $message['member']['can_view_profile'])
-					echo '
-				<li class="im_icons">
-					<ol>
-						', !isset($context['disabled_fields']['icq']) && !empty($message['member']['icq']['link']) ? '<li>' . $message['member']['icq']['link'] . '</li>' : '', '
-						', !isset($context['disabled_fields']['skype']) && !empty($message['member']['skype']['link']) ? '<li>' . $message['member']['skype']['link'] . '</li>' : '', '
-						', !isset($context['disabled_fields']['aim']) && !empty($message['member']['aim']['link']) ? '<li>' . $message['member']['aim']['link'] . '</li>' : '', '
-						', !isset($context['disabled_fields']['yim']) && !empty($message['member']['yim']['link']) ? '<li>' . $message['member']['yim']['link'] . '</li>' : '', '
-					</ol>
-				</li>';
-
 				if ($message['can_report'])
 				if ($message['can_report'])
 					echo '
 					echo '
 				<li class="report_link"><a href="' . $scripturl . '?action=pm;sa=report;l=' . $context['current_label_id'] . ';pmsg=' . $message['id'] . '">' . $txt['pm_report_to_admin'] . '</a></li>';
 				<li class="report_link"><a href="' . $scripturl . '?action=pm;sa=report;l=' . $context['current_label_id'] . ';pmsg=' . $message['id'] . '">' . $txt['pm_report_to_admin'] . '</a></li>';

+ 5 - 34
Themes/default/Profile.template.php

@@ -120,7 +120,7 @@ function template_alerts_popup()
 				</div>
 				</div>
 				<br class="clear">
 				<br class="clear">
 			</div>';
 			</div>';
-		}	
+		}
 	}
 	}
 
 
 	echo '
 	echo '
@@ -185,10 +185,6 @@ function template_summary()
 	}
 	}
 
 
 	echo '
 	echo '
-				', !isset($context['disabled_fields']['icq']) && !empty($context['member']['icq']['link']) ? '<li>' . $context['member']['icq']['link'] . '</li>' : '', '
-				', !isset($context['disabled_fields']['skype']) && !empty($context['member']['skype']['link']) ? '<li>' . $context['member']['skype']['link'] . '</li>' : '', '
-				', !isset($context['disabled_fields']['aim']) && !empty($context['member']['aim']['link']) ? '<li>' . $context['member']['aim']['link'] . '</li>' : '', '
-				', !isset($context['disabled_fields']['yim']) && !empty($context['member']['yim']['link']) ? '<li>' . $context['member']['yim']['link'] . '</li>' : '', '
 			</ul>
 			</ul>
 			<span id="userstatus">', $context['can_send_pm'] ? '<a href="' . $context['member']['online']['href'] . '" title="' . $context['member']['online']['text'] . '" rel="nofollow">' : '', $settings['use_image_buttons'] ? '<img src="' . $context['member']['online']['image_href'] . '" alt="' . $context['member']['online']['text'] . '" class="centericon">' : $context['member']['online']['label'], $context['can_send_pm'] ? '</a>' : '', $settings['use_image_buttons'] ? '<span class="smalltext"> ' . $context['member']['online']['label'] . '</span>' : '';
 			<span id="userstatus">', $context['can_send_pm'] ? '<a href="' . $context['member']['online']['href'] . '" title="' . $context['member']['online']['text'] . '" rel="nofollow">' : '', $settings['use_image_buttons'] ? '<img src="' . $context['member']['online']['image_href'] . '" alt="' . $context['member']['online']['text'] . '" class="centericon">' : $context['member']['online']['label'], $context['can_send_pm'] ? '</a>' : '', $settings['use_image_buttons'] ? '<span class="smalltext"> ' . $context['member']['online']['label'] . '</span>' : '';
 
 
@@ -273,20 +269,10 @@ function template_summary()
 					<dt>', $modSettings['karmaLabel'], ' </dt>
 					<dt>', $modSettings['karmaLabel'], ' </dt>
 					<dd>+', $context['member']['karma']['good'], '/-', $context['member']['karma']['bad'], '</dd>';
 					<dd>+', $context['member']['karma']['good'], '/-', $context['member']['karma']['bad'], '</dd>';
 
 
-	if (!isset($context['disabled_fields']['gender']) && !empty($context['member']['gender']['name']))
-		echo '
-					<dt>', $txt['gender'], ': </dt>
-					<dd>', $context['member']['gender']['name'], '</dd>';
-
 	echo '
 	echo '
 					<dt>', $txt['age'], ':</dt>
 					<dt>', $txt['age'], ':</dt>
 					<dd>', $context['member']['age'] . ($context['member']['today_is_birthday'] ? ' &nbsp; <img src="' . $settings['images_url'] . '/cake.png" alt="">' : ''), '</dd>';
 					<dd>', $context['member']['age'] . ($context['member']['today_is_birthday'] ? ' &nbsp; <img src="' . $settings['images_url'] . '/cake.png" alt="">' : ''), '</dd>';
 
 
-	if (!isset($context['disabled_fields']['location']) && !empty($context['member']['location']))
-		echo '
-					<dt>', $txt['location'], ':</dt>
-					<dd>', $context['member']['location'], '</dd>';
-
 	echo '
 	echo '
 				</dl>';
 				</dl>';
 
 
@@ -606,7 +592,6 @@ function template_editBuddies()
 	global $context, $settings, $scripturl, $modSettings, $txt;
 	global $context, $settings, $scripturl, $modSettings, $txt;
 
 
 	$disabled_fields = isset($modSettings['disabled_profile_fields']) ? array_flip(explode(',', $modSettings['disabled_profile_fields'])) : array();
 	$disabled_fields = isset($modSettings['disabled_profile_fields']) ? array_flip(explode(',', $modSettings['disabled_profile_fields'])) : array();
-	$buddy_fields = array('icq', 'aim', 'yim', 'skype');
 
 
 	if (!empty($context['saved_successful']))
 	if (!empty($context['saved_successful']))
 		echo '
 		echo '
@@ -626,18 +611,11 @@ function template_editBuddies()
 			<tr class="catbg">
 			<tr class="catbg">
 				<th class="first_th" scope="col" width="20%">', $txt['name'], '</th>
 				<th class="first_th" scope="col" width="20%">', $txt['name'], '</th>
 				<th scope="col">', $txt['status'], '</th>';
 				<th scope="col">', $txt['status'], '</th>';
+
 	if ($context['can_send_email'])
 	if ($context['can_send_email'])
 		echo '
 		echo '
 				<th scope="col">', $txt['email'], '</th>';
 				<th scope="col">', $txt['email'], '</th>';
 
 
-	// don't show them if they are disabled
-	foreach ($buddy_fields as $key => $column)
-	{
-		if (!isset($disabled_fields[$column]))
-			echo '
-				<th scope="col">', $txt[$column], '</th>';
-	}
-
 	echo '
 	echo '
 				<th class="last_th" scope="col"></th>
 				<th class="last_th" scope="col"></th>
 			</tr>';
 			</tr>';
@@ -745,15 +723,12 @@ function template_editIgnoreList()
 			<tr class="catbg">
 			<tr class="catbg">
 				<th class="first_th" scope="col" width="20%">', $txt['name'], '</th>
 				<th class="first_th" scope="col" width="20%">', $txt['name'], '</th>
 				<th scope="col">', $txt['status'], '</th>';
 				<th scope="col">', $txt['status'], '</th>';
+
 	if ($context['can_send_email'])
 	if ($context['can_send_email'])
 		echo '
 		echo '
 				<th scope="col">', $txt['email'], '</th>';
 				<th scope="col">', $txt['email'], '</th>';
+
 	echo '
 	echo '
-				<th scope="col">', $txt['icq'], '</th>
-				<th scope="col">', $txt['aim'], '</th>
-				<th scope="col">', $txt['yim'], '</th>
-				<th scope="col">', $txt['skype'], '</th>
-				<th class="last_th" scope="col"></th>
 			</tr>';
 			</tr>';
 
 
 	// If they don't have anyone on their ignore list, don't list it!
 	// If they don't have anyone on their ignore list, don't list it!
@@ -775,10 +750,6 @@ function template_editIgnoreList()
 			echo '
 			echo '
 				<td align="center">', ($member['show_email'] == 'no' ? '' : '<a href="' . $scripturl . '?action=emailuser;sa=email;uid=' . $member['id'] . '" rel="nofollow"><span class="generic_icons mail icon" title="' . $txt['email'] . ' ' . $member['name'] . '"></span></a>'), '</td>';
 				<td align="center">', ($member['show_email'] == 'no' ? '' : '<a href="' . $scripturl . '?action=emailuser;sa=email;uid=' . $member['id'] . '" rel="nofollow"><span class="generic_icons mail icon" title="' . $txt['email'] . ' ' . $member['name'] . '"></span></a>'), '</td>';
 		echo '
 		echo '
-				<td align="center">', $member['icq']['link'], '</td>
-				<td align="center">', $member['aim']['link'], '</td>
-				<td align="center">', $member['yim']['link'], '</td>
-				<td align="center">', $member['skype']['link'], '</td>
 				<td align="center"><a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=lists;sa=ignore;remove=', $member['id'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons delete" title="', $txt['ignore_remove'], '"></span></a></td>
 				<td align="center"><a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=lists;sa=ignore;remove=', $member['id'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons delete" title="', $txt['ignore_remove'], '"></span></a></td>
 			</tr>';
 			</tr>';
 
 
@@ -1393,7 +1364,7 @@ function template_edit_options()
 				else
 				else
 					$type = $field['type'];
 					$type = $field['type'];
 				$step = $field['type'] == 'float' ? ' step="0.1"' : '';
 				$step = $field['type'] == 'float' ? ' step="0.1"' : '';
-					
+
 
 
 				echo '
 				echo '
 							<input type="', $type, '" name="', $key, '" id="', $key, '" size="', empty($field['size']) ? 30 : $field['size'], '" value="', $field['value'], '" ', $field['input_attr'], ' class="input_', $field['type'] == 'password' ? 'password' : 'text', '"', $step, '>';
 							<input type="', $type, '" name="', $key, '" id="', $key, '" size="', empty($field['size']) ? 30 : $field['size'], '" value="', $field['value'], '" ', $field['input_attr'], ' class="input_', $field['type'] == 'password' ? 'password' : 'text', '"', $step, '>';

+ 1 - 2
Themes/default/Who.template.php

@@ -59,13 +59,12 @@ function template_main()
 						<tr class="windowbg', $alternate ? '2' : '', '">
 						<tr class="windowbg', $alternate ? '2' : '', '">
 							<td>';
 							<td>';
 
 
-		// Guests don't have information like icq, skype, y!, and aim... and they can't be messaged.
+		// Guests can't be messaged.
 		if (!$member['is_guest'])
 		if (!$member['is_guest'])
 		{
 		{
 			echo '
 			echo '
 								<span class="contact_info floatright">
 								<span class="contact_info floatright">
 									', $context['can_send_pm'] ? '<a href="' . $member['online']['href'] . '" title="' . $member['online']['text'] . '">' : '', $settings['use_image_buttons'] ? '<img src="' . $member['online']['image_href'] . '" alt="' . $member['online']['text'] . '" align="bottom">' : $member['online']['label'], $context['can_send_pm'] ? '</a>' : '', '
 									', $context['can_send_pm'] ? '<a href="' . $member['online']['href'] . '" title="' . $member['online']['text'] . '">' : '', $settings['use_image_buttons'] ? '<img src="' . $member['online']['image_href'] . '" alt="' . $member['online']['text'] . '" align="bottom">' : $member['online']['label'], $context['can_send_pm'] ? '</a>' : '', '
-									', isset($context['disabled_fields']['icq']) ? '' : $member['icq']['link'] , ' ', isset($context['disabled_fields']['skype']) ? '' : $member['skype']['link'], ' ', isset($context['disabled_fields']['yim']) ? '' : $member['yim']['link'], ' ', isset($context['disabled_fields']['aim']) ? '' : $member['aim']['link'], '
 								</span>';
 								</span>';
 		}
 		}
 
 

+ 0 - 1
Themes/default/languages/Admin.english.php

@@ -283,7 +283,6 @@ $txt['activated'] = 'Activated';
 $txt['not_activated'] = 'Not activated';
 $txt['not_activated'] = 'Not activated';
 $txt['primary'] = 'Primary';
 $txt['primary'] = 'Primary';
 $txt['additional'] = 'Additional';
 $txt['additional'] = 'Additional';
-$txt['messenger_address'] = 'Messenger Address';
 $txt['wild_cards_allowed'] = 'wildcard characters * and ? are allowed';
 $txt['wild_cards_allowed'] = 'wildcard characters * and ? are allowed';
 $txt['search_for'] = 'Search for';
 $txt['search_for'] = 'Search for';
 $txt['search_match'] = 'Match';
 $txt['search_match'] = 'Match';

+ 0 - 1
Themes/default/languages/Errors.english.php

@@ -340,7 +340,6 @@ $txt['profile_error_password_chars'] = 'Your password must contain a mix of uppe
 $txt['profile_error_already_requested_group'] = 'You already have an outstanding request for this group!';
 $txt['profile_error_already_requested_group'] = 'You already have an outstanding request for this group!';
 $txt['profile_error_openid_in_use'] = 'Another user is already using that OpenID authentication URL';
 $txt['profile_error_openid_in_use'] = 'Another user is already using that OpenID authentication URL';
 $txt['profile_error_signature_not_yet_saved'] = 'The signature has not been saved.';
 $txt['profile_error_signature_not_yet_saved'] = 'The signature has not been saved.';
-$txt['profile_error_aim_too_long'] = 'The AIM nickname is too long.';
 $txt['profile_error_personal_text_too_long'] = 'The personal text is too long.';
 $txt['profile_error_personal_text_too_long'] = 'The personal text is too long.';
 $txt['profile_error_user_title_too_long'] = 'The custom title is too long.';
 $txt['profile_error_user_title_too_long'] = 'The custom title is too long.';
 
 

+ 2 - 2
Themes/default/languages/ManagePermissions.english.php

@@ -43,8 +43,8 @@ $txt['permissionname_profile_forum'] = 'Allow Forum Profile edits';
 $txt['permissionhelp_profile_forum'] = 'This option will allow a member to edit their Forum Profile';
 $txt['permissionhelp_profile_forum'] = 'This option will allow a member to edit their Forum Profile';
 $txt['permissionname_profile_forum_own'] = 'Own profile';
 $txt['permissionname_profile_forum_own'] = 'Own profile';
 $txt['permissionname_profile_forum_any'] = 'Any profile';
 $txt['permissionname_profile_forum_any'] = 'Any profile';
-$txt['permissionname_profile_other'] = 'Edit website and location';
-$txt['permissionhelp_profile_other'] = 'Allow the member to edit the website, and location fields in their profile';
+$txt['permissionname_profile_other'] = 'Edit website';
+$txt['permissionhelp_profile_other'] = 'Allow the member to edit the website fields in their profile';
 $txt['permissionname_profile_other_own'] = 'Own profile';
 $txt['permissionname_profile_other_own'] = 'Own profile';
 $txt['permissionname_profile_other_any'] = 'Any profile';
 $txt['permissionname_profile_other_any'] = 'Any profile';
 $txt['permissionname_profile_blurb'] = 'Edit personal text';
 $txt['permissionname_profile_blurb'] = 'Edit personal text';

+ 0 - 3
Themes/default/languages/Profile.english.php

@@ -43,9 +43,6 @@ $txt['dob_year'] = 'Year (YYYY)';
 $txt['password_strength'] = 'For best security, you should use eight or more characters with a combination of letters, numbers, and symbols.';
 $txt['password_strength'] = 'For best security, you should use eight or more characters with a combination of letters, numbers, and symbols.';
 $txt['include_website_url'] = 'This must be included if you specify a URL below.';
 $txt['include_website_url'] = 'This must be included if you specify a URL below.';
 $txt['complete_url'] = 'This must be a complete URL.';
 $txt['complete_url'] = 'This must be a complete URL.';
-$txt['your_icq'] = 'This is your ICQ number.';
-$txt['your_aim'] = 'This is your AOL Instant Messenger nickname.';
-$txt['your_yim'] = 'This is your Yahoo! Instant Messenger nickname.';
 $txt['sig_info'] = 'Signatures are displayed at the bottom of each post or personal message. BBCode and smileys may be used in your signature.';
 $txt['sig_info'] = 'Signatures are displayed at the bottom of each post or personal message. BBCode and smileys may be used in your signature.';
 $txt['no_signature_set'] = 'No signature set.';
 $txt['no_signature_set'] = 'No signature set.';
 $txt['max_sig_characters'] = 'Max characters: %1$d; characters remaining: ';
 $txt['max_sig_characters'] = 'Max characters: %1$d; characters remaining: ';

+ 0 - 11
Themes/default/languages/index.english.php

@@ -332,17 +332,6 @@ $txt['days_word'] = 'days';
 $txt['search_for'] = 'Search for';
 $txt['search_for'] = 'Search for';
 $txt['search_match'] = 'Match';
 $txt['search_match'] = 'Match';
 
 
-$txt['aim'] = 'AIM';
-// In this string, please use +'s for spaces.
-$txt['aim_default_message'] = 'Hi.+Are+you+there?';
-$txt['aim_title'] = 'AOL Instant Messenger';
-$txt['icq'] = 'ICQ';
-$txt['icq_title'] = 'ICQ Messenger';
-$txt['yim'] = 'YIM';
-$txt['yim_title'] = 'Yahoo Instant Messenger';
-
-$txt['skype'] = 'Skype';
-
 $txt['forum_in_maintainence'] = 'Your forum is in Maintenance Mode. Only administrators can currently log in.';
 $txt['forum_in_maintainence'] = 'Your forum is in Maintenance Mode. Only administrators can currently log in.';
 $txt['maintenance_page'] = 'You can turn off Maintenance Mode from the <a href="%1$s">Server Settings</a> area.';
 $txt['maintenance_page'] = 'You can turn off Maintenance Mode from the <a href="%1$s">Server Settings</a> area.';
 
 

+ 2 - 2
other/install.php

@@ -1463,7 +1463,7 @@ function AdminAccount()
 					'password_salt' => 'string', 'lngfile' => 'string', 'personal_text' => 'string', 'avatar' => 'string',
 					'password_salt' => 'string', 'lngfile' => 'string', 'personal_text' => 'string', 'avatar' => 'string',
 					'member_ip' => 'string', 'member_ip2' => 'string', 'buddy_list' => 'string', 'pm_ignore_list' => 'string',
 					'member_ip' => 'string', 'member_ip2' => 'string', 'buddy_list' => 'string', 'pm_ignore_list' => 'string',
 					'website_title' => 'string', 'website_url' => 'string', 'location' => 'string',
 					'website_title' => 'string', 'website_url' => 'string', 'location' => 'string',
-					'aim' => 'string', 'icq' => 'string', 'skype' => 'string', 'signature' => 'string', 'usertitle' => 'string', 'secret_question' => 'string',
+					'signature' => 'string', 'usertitle' => 'string', 'secret_question' => 'string',
 					'additional_groups' => 'string', 'ignore_boards' => 'string', 'openid_uri' => 'string',
 					'additional_groups' => 'string', 'ignore_boards' => 'string', 'openid_uri' => 'string',
 				),
 				),
 				array(
 				array(
@@ -1472,7 +1472,7 @@ function AdminAccount()
 					$incontext['member_salt'], '', '', '',
 					$incontext['member_salt'], '', '', '',
 					$ip, $ip, '', '',
 					$ip, $ip, '', '',
 					'', '', '',
 					'', '', '',
-					'', '', '', '', '', '',
+					'', '', '',
 					'', '', '',
 					'', '', '',
 				),
 				),
 				array('id_member')
 				array('id_member')

+ 0 - 7
other/install_2-1_mysql.sql

@@ -1224,15 +1224,9 @@ CREATE TABLE {$db_prefix}members (
   openid_uri text NOT NULL,
   openid_uri text NOT NULL,
   email_address varchar(255) NOT NULL default '',
   email_address varchar(255) NOT NULL default '',
   personal_text varchar(255) NOT NULL default '',
   personal_text varchar(255) NOT NULL default '',
-  gender tinyint(4) unsigned NOT NULL default '0',
   birthdate date NOT NULL default '0001-01-01',
   birthdate date NOT NULL default '0001-01-01',
   website_title varchar(255) NOT NULL default '',
   website_title varchar(255) NOT NULL default '',
   website_url varchar(255) NOT NULL default '',
   website_url varchar(255) NOT NULL default '',
-  location varchar(255) NOT NULL default '',
-  icq varchar(255) NOT NULL default '',
-  aim varchar(255) NOT NULL default '',
-  yim varchar(32) NOT NULL default '',
-  skype varchar(255) NOT NULL default '',
   hide_email tinyint(4) NOT NULL default '0',
   hide_email tinyint(4) NOT NULL default '0',
   show_online tinyint(4) NOT NULL default '1',
   show_online tinyint(4) NOT NULL default '1',
   time_format varchar(80) NOT NULL default '',
   time_format varchar(80) NOT NULL default '',
@@ -2032,7 +2026,6 @@ VALUES (1, 'name', '{$default_theme_name}'),
 	(1, 'show_modify', '1'),
 	(1, 'show_modify', '1'),
 	(1, 'show_user_images', '1'),
 	(1, 'show_user_images', '1'),
 	(1, 'show_blurb', '1'),
 	(1, 'show_blurb', '1'),
-	(1, 'show_gender', '0'),
 	(1, 'show_newsfader', '0'),
 	(1, 'show_newsfader', '0'),
 	(1, 'number_recent_posts', '0'),
 	(1, 'number_recent_posts', '0'),
 	(1, 'show_profile_buttons', '1'),
 	(1, 'show_profile_buttons', '1'),

+ 0 - 6
other/install_2-1_postgresql.sql

@@ -1623,15 +1623,10 @@ CREATE TABLE {$db_prefix}members (
   openid_uri text NOT NULL,
   openid_uri text NOT NULL,
   email_address varchar(255) NOT NULL,
   email_address varchar(255) NOT NULL,
   personal_text varchar(255) NOT NULL,
   personal_text varchar(255) NOT NULL,
-  gender smallint NOT NULL default '0',
   birthdate date NOT NULL default '0001-01-01',
   birthdate date NOT NULL default '0001-01-01',
   website_title varchar(255) NOT NULL,
   website_title varchar(255) NOT NULL,
   website_url varchar(255) NOT NULL,
   website_url varchar(255) NOT NULL,
   location varchar(255) NOT NULL,
   location varchar(255) NOT NULL,
-  icq varchar(255) NOT NULL,
-  aim varchar(255) NOT NULL default '',
-  yim varchar(32) NOT NULL default '',
-  skype varchar(255) NOT NULL default '',
   hide_email smallint NOT NULL default '0',
   hide_email smallint NOT NULL default '0',
   show_online smallint NOT NULL default '1',
   show_online smallint NOT NULL default '1',
   time_format varchar(80) NOT NULL default '',
   time_format varchar(80) NOT NULL default '',
@@ -2565,7 +2560,6 @@ INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_late
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_modify', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_modify', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_user_images', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_user_images', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_blurb', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_blurb', '1');
-INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_gender', '0');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_newsfader', '0');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_newsfader', '0');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'number_recent_posts', '0');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'number_recent_posts', '0');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_profile_buttons', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_profile_buttons', '1');

+ 0 - 7
other/install_2-1_sqlite.sql

@@ -1324,15 +1324,9 @@ CREATE TABLE {$db_prefix}members (
   openid_uri text NOT NULL,
   openid_uri text NOT NULL,
   email_address varchar(255) NOT NULL,
   email_address varchar(255) NOT NULL,
   personal_text varchar(255) NOT NULL,
   personal_text varchar(255) NOT NULL,
-  gender smallint NOT NULL default '0',
   birthdate date NOT NULL default '0001-01-01',
   birthdate date NOT NULL default '0001-01-01',
   website_title varchar(255) NOT NULL,
   website_title varchar(255) NOT NULL,
   website_url varchar(255) NOT NULL,
   website_url varchar(255) NOT NULL,
-  location varchar(255) NOT NULL,
-  icq varchar(255) NOT NULL,
-  aim varchar(255) NOT NULL default '',
-  yim varchar(32) NOT NULL default '',
-  skype varchar(255) NOT NULL default '',
   hide_email smallint NOT NULL default '0',
   hide_email smallint NOT NULL default '0',
   show_online smallint NOT NULL default '1',
   show_online smallint NOT NULL default '1',
   time_format varchar(80) NOT NULL default '',
   time_format varchar(80) NOT NULL default '',
@@ -2184,7 +2178,6 @@ INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_late
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_modify', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_modify', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_user_images', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_user_images', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_blurb', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_blurb', '1');
-INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_gender', '0');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_newsfader', '0');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_newsfader', '0');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'number_recent_posts', '0');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'number_recent_posts', '0');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_profile_buttons', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_profile_buttons', '1');

+ 0 - 7
other/install_2-1_sqlite3.sql

@@ -1324,15 +1324,9 @@ CREATE TABLE {$db_prefix}members (
   openid_uri text NOT NULL,
   openid_uri text NOT NULL,
   email_address varchar(255) NOT NULL,
   email_address varchar(255) NOT NULL,
   personal_text varchar(255) NOT NULL,
   personal_text varchar(255) NOT NULL,
-  gender smallint NOT NULL default '0',
   birthdate date NOT NULL default '0001-01-01',
   birthdate date NOT NULL default '0001-01-01',
   website_title varchar(255) NOT NULL,
   website_title varchar(255) NOT NULL,
   website_url varchar(255) NOT NULL,
   website_url varchar(255) NOT NULL,
-  location varchar(255) NOT NULL,
-  icq varchar(255) NOT NULL,
-  aim varchar(255) NOT NULL default '',
-  yim varchar(32) NOT NULL default '',
-  skype varchar(255) NOT NULL default '',
   hide_email smallint NOT NULL default '0',
   hide_email smallint NOT NULL default '0',
   show_online smallint NOT NULL default '1',
   show_online smallint NOT NULL default '1',
   time_format varchar(80) NOT NULL default '',
   time_format varchar(80) NOT NULL default '',
@@ -2184,7 +2178,6 @@ INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_late
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_modify', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_modify', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_user_images', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_user_images', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_blurb', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_blurb', '1');
-INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_gender', '0');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_newsfader', '0');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_newsfader', '0');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'number_recent_posts', '0');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'number_recent_posts', '0');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_profile_buttons', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_profile_buttons', '1');

+ 64 - 8
other/upgrade_2-1_mysql.sql

@@ -334,14 +334,6 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}background_tasks (
 ) ENGINE=MyISAM;
 ) ENGINE=MyISAM;
 ---#
 ---#
 
 
-/******************************************************************************/
----- Replacing MSN with Skype
-/******************************************************************************/
----# Modifying the "msn" column...
-ALTER TABLE {$db_prefix}members
-CHANGE msn skype varchar(255) NOT NULL DEFAULT '';
----#
-
 /******************************************************************************/
 /******************************************************************************/
 --- Adding support for deny boards access
 --- Adding support for deny boards access
 /******************************************************************************/
 /******************************************************************************/
@@ -568,6 +560,70 @@ if (file_exists($GLOBALS['boarddir'] . '/Themes/core'))
 ---}
 ---}
 ---#
 ---#
 
 
+/******************************************************************************/
+--- Messenger fields
+/******************************************************************************/
+---# Insert fields
+INSERT INTO `{$db_prefix}custom_fields` (`col_name`, `field_name`, `field_desc`, `field_type`, `field_length`, `field_options`, `mask`, `show_reg`, `show_display`, `show_profile`, `private`, `active`, `bbc`, `can_search`, `default_value`, `enclose`, `placement`) VALUES
+('cust_aolins', 'AOL Instant Messenger', 'This is your AOL Instant Messenger nickname.', 'text', 50, '', 'regex~[a-z][0-9a-z.-]{1,31}~i', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="aim" href="aim:goim?screenname={INPUT}&message=Hello!+Are+you+there?" target="_blank" title="AIM - {INPUT}"><img src="{IMAGES_URL}/fields/aim.gif" alt="AIM - {INPUT}"></a>', 1),
+('cust_icq', 'ICQ', 'This is your ICQ number.', 'text', 12, '', 'regex~[1-9][0-9]{4,9}~i', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="icq" href="http://www.icq.com/whitepages/about_me.php?uin={INPUT}" target="_blank" title="ICQ - {INPUT}"><img src="http://status.icq.com/online.gif?img=5&icq={INPUT}" alt="ICQ - {INPUT}" width="18" height="18"></a>', 1),
+('cust_skype', 'Skype', 'Your Skype name', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="skype new_win" href="skype:{INPUT}?chat" title="Live - {INPUT}"><img src="{IMAGES_URL}/skype.png" alt="Live - {INPUT}"></a>', 1),
+('cust_yahoo', 'Yahoo! Messenger', 'This is your Yahoo! Instant Messenger nickname.', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="yim" href="http://edit.yahoo.com/config/send_webmesg?.target={INPUT}" target="_blank" title="Yahoo! Messenger - {INPUT}"><img src="http://opi.yahoo.com/online?m=g&t=0&u={INPUT}" alt="Yahoo! Messenger - {INPUT}"></a>', 1);
+('cust_loca', 'Location', 'Geographic location.', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '', 1);
+('cust_gender', 'Gender', 'Your gender.', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '', 1);
+---#
+
+---# Converting member values...
+---{
+// We cannot do this twice
+if (@$modSettings['smfVersion'] < '2.2')
+{
+	$request = upgrade_query("
+		SELECT id_member, aim, icq, msn, yim, location, gender
+		FROM {$db_prefix}members");
+	$inserts = array();
+	while ($row = mysql_fetch_assoc($request))
+	{
+		if (!empty($row[aim]))
+			$inserts[] = "($row[id_member], -1, 'cust_aolins', $row[aim])";
+
+		if (!empty($row[icq]))
+			$inserts[] = "($row[id_member], -1, 'cust_icq', $row[icq])";
+
+		if (!empty($row[msn]))
+			$inserts[] = "($row[id_member], -1, 'cust_skype', $row[msn])";
+
+		if (!empty($row[yim]))
+			$inserts[] = "($row[id_member], -1, 'cust_yahoo', $row[yim])";
+
+		if (!empty($row[location]))
+			$inserts[] = "($row[id_member], -1, 'cust_loca', $row[location])";
+
+		if (!empty($row[gender]))
+			$inserts[] = "($row[id_member], -1, 'cust_gender', $row[gender])";
+	}
+	mysql_free_result($request);
+
+	if (!empty($inserts))
+		upgrade_query("
+			INSERT INTO {$db_prefix}themes
+				(id_member, id_theme, variable, value)
+			VALUES
+				" . implode(',', $inserts));
+}
+---}
+---#
+
+---# Dropping old fields
+ALTER TABLE `{$db_prefix}members`
+  DROP `icq`,
+  DROP `aim`,
+  DROP `yim`,
+  DROP `msn`;
+  DROP `location`;
+  DROP `gender`;
+---#
+
 /******************************************************************************/
 /******************************************************************************/
 --- Adding support for drafts
 --- Adding support for drafts
 /******************************************************************************/
 /******************************************************************************/

+ 64 - 8
other/upgrade_2-1_postgresql.sql

@@ -391,14 +391,6 @@ CREATE TABLE {$db_prefix}background_tasks (
 );
 );
 ---#
 ---#
 
 
-/******************************************************************************/
----- Replacing MSN with Skype
-/******************************************************************************/
----# Modifying the "msn" column...
-ALTER TABLE {$db_prefix}members
-RENAME msn TO skype;
----#
-
 /******************************************************************************/
 /******************************************************************************/
 --- Adding support for deny boards access
 --- Adding support for deny boards access
 /******************************************************************************/
 /******************************************************************************/
@@ -638,6 +630,70 @@ if (file_exists($GLOBALS['boarddir'] . '/Themes/core'))
 ---}
 ---}
 ---#
 ---#
 
 
+/******************************************************************************/
+--- Messenger fields
+/******************************************************************************/
+---# Insert fields
+INSERT INTO `{$db_prefix}custom_fields` (`col_name`, `field_name`, `field_desc`, `field_type`, `field_length`, `field_options`, `mask`, `show_reg`, `show_display`, `show_profile`, `private`, `active`, `bbc`, `can_search`, `default_value`, `enclose`, `placement`) VALUES
+('cust_aolins', 'AOL Instant Messenger', 'This is your AOL Instant Messenger nickname.', 'text', 50, '', 'regex~[a-z][0-9a-z.-]{1,31}~i', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="aim" href="aim:goim?screenname={INPUT}&message=Hello!+Are+you+there?" target="_blank" title="AIM - {INPUT}"><img src="{IMAGES_URL}/fields/aim.gif" alt="AIM - {INPUT}"></a>', 1),
+('cust_icq', 'ICQ', 'This is your ICQ number.', 'text', 12, '', 'regex~[1-9][0-9]{4,9}~i', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="icq" href="http://www.icq.com/whitepages/about_me.php?uin={INPUT}" target="_blank" title="ICQ - {INPUT}"><img src="http://status.icq.com/online.gif?img=5&icq={INPUT}" alt="ICQ - {INPUT}" width="18" height="18"></a>', 1),
+('cust_skype', 'Skype', 'Your Skype name', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="skype new_win" href="skype:{INPUT}?chat" title="Live - {INPUT}"><img src="{IMAGES_URL}/skype.png" alt="Live - {INPUT}"></a>', 1),
+('cust_yahoo', 'Yahoo! Messenger', 'This is your Yahoo! Instant Messenger nickname.', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="yim" href="http://edit.yahoo.com/config/send_webmesg?.target={INPUT}" target="_blank" title="Yahoo! Messenger - {INPUT}"><img src="http://opi.yahoo.com/online?m=g&t=0&u={INPUT}" alt="Yahoo! Messenger - {INPUT}"></a>', 1);
+('cust_loca', 'Location', 'Geographic location.', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '', 1);
+('cust_gender', 'Gender', 'Your gender.', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '', 1);
+---#
+
+---# Converting member values...
+---{
+// We cannot do this twice
+if (@$modSettings['smfVersion'] < '2.2')
+{
+	$request = upgrade_query("
+		SELECT id_member, aim, icq, msn, yim, location, gender
+		FROM {$db_prefix}members");
+	$inserts = array();
+	while ($row = mysql_fetch_assoc($request))
+	{
+		if (!empty($row[aim]))
+			$inserts[] = "($row[id_member], -1, 'cust_aolins', $row[aim])";
+
+		if (!empty($row[icq]))
+			$inserts[] = "($row[id_member], -1, 'cust_icq', $row[icq])";
+
+		if (!empty($row[msn]))
+			$inserts[] = "($row[id_member], -1, 'cust_skype', $row[msn])";
+
+		if (!empty($row[yim]))
+			$inserts[] = "($row[id_member], -1, 'cust_yahoo', $row[yim])";
+
+		if (!empty($row[location]))
+			$inserts[] = "($row[id_member], -1, 'cust_loca', $row[location])";
+
+		if (!empty($row[gender]))
+			$inserts[] = "($row[id_member], -1, 'cust_gender', $row[gender])";
+	}
+	mysql_free_result($request);
+
+	if (!empty($inserts))
+		upgrade_query("
+			INSERT INTO {$db_prefix}themes
+				(id_member, id_theme, variable, value)
+			VALUES
+				" . implode(',', $inserts));
+}
+---}
+---#
+
+---# Dropping old fields
+ALTER TABLE `{$db_prefix}members`
+  DROP `icq`,
+  DROP `aim`,
+  DROP `yim`,
+  DROP `msn`;
+  DROP `location`;
+  DROP `gender`;
+---#
+
 /******************************************************************************/
 /******************************************************************************/
 --- Adding support for drafts
 --- Adding support for drafts
 /******************************************************************************/
 /******************************************************************************/

+ 64 - 8
other/upgrade_2-1_sqlite.sql

@@ -354,14 +354,6 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}background_tasks (
 );
 );
 ---#
 ---#
 
 
-/******************************************************************************/
----- Replacing MSN with Skype
-/******************************************************************************/
----# Modifying the "msn" column...
-ALTER TABLE {$db_prefix}members
-CHANGE msn skype varchar(255) NOT NULL DEFAULT '';
----#
-
 /******************************************************************************/
 /******************************************************************************/
 --- Adding support for deny boards access
 --- Adding support for deny boards access
 /******************************************************************************/
 /******************************************************************************/
@@ -634,6 +626,70 @@ if (file_exists($GLOBALS['boarddir'] . '/Themes/core'))
 	}
 	}
 }
 }
 
 
+/******************************************************************************/
+--- Messenger fields
+/******************************************************************************/
+---# Insert fields
+INSERT INTO `{$db_prefix}custom_fields` (`col_name`, `field_name`, `field_desc`, `field_type`, `field_length`, `field_options`, `mask`, `show_reg`, `show_display`, `show_profile`, `private`, `active`, `bbc`, `can_search`, `default_value`, `enclose`, `placement`) VALUES
+('cust_aolins', 'AOL Instant Messenger', 'This is your AOL Instant Messenger nickname.', 'text', 50, '', 'regex~[a-z][0-9a-z.-]{1,31}~i', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="aim" href="aim:goim?screenname={INPUT}&message=Hello!+Are+you+there?" target="_blank" title="AIM - {INPUT}"><img src="{IMAGES_URL}/fields/aim.gif" alt="AIM - {INPUT}"></a>', 1),
+('cust_icq', 'ICQ', 'This is your ICQ number.', 'text', 12, '', 'regex~[1-9][0-9]{4,9}~i', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="icq" href="http://www.icq.com/whitepages/about_me.php?uin={INPUT}" target="_blank" title="ICQ - {INPUT}"><img src="http://status.icq.com/online.gif?img=5&icq={INPUT}" alt="ICQ - {INPUT}" width="18" height="18"></a>', 1),
+('cust_skype', 'Skype', 'Your Skype name', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="skype new_win" href="skype:{INPUT}?chat" title="Live - {INPUT}"><img src="{IMAGES_URL}/skype.png" alt="Live - {INPUT}"></a>', 1),
+('cust_yahoo', 'Yahoo! Messenger', 'This is your Yahoo! Instant Messenger nickname.', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="yim" href="http://edit.yahoo.com/config/send_webmesg?.target={INPUT}" target="_blank" title="Yahoo! Messenger - {INPUT}"><img src="http://opi.yahoo.com/online?m=g&t=0&u={INPUT}" alt="Yahoo! Messenger - {INPUT}"></a>', 1);
+('cust_loca', 'Location', 'Geographic location.', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '', 1);
+('cust_gender', 'Gender', 'Your gender.', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '', 1);
+---#
+
+---# Converting member values...
+---{
+// We cannot do this twice
+if (@$modSettings['smfVersion'] < '2.2')
+{
+	$request = upgrade_query("
+		SELECT id_member, aim, icq, msn, yim, location, gender
+		FROM {$db_prefix}members");
+	$inserts = array();
+	while ($row = mysql_fetch_assoc($request))
+	{
+		if (!empty($row[aim]))
+			$inserts[] = "($row[id_member], -1, 'cust_aolins', $row[aim])";
+
+		if (!empty($row[icq]))
+			$inserts[] = "($row[id_member], -1, 'cust_icq', $row[icq])";
+
+		if (!empty($row[msn]))
+			$inserts[] = "($row[id_member], -1, 'cust_skype', $row[msn])";
+
+		if (!empty($row[yim]))
+			$inserts[] = "($row[id_member], -1, 'cust_yahoo', $row[yim])";
+
+		if (!empty($row[location]))
+			$inserts[] = "($row[id_member], -1, 'cust_loca', $row[location])";
+
+		if (!empty($row[gender]))
+			$inserts[] = "($row[id_member], -1, 'cust_gender', $row[gender])";
+	}
+	mysql_free_result($request);
+
+	if (!empty($inserts))
+		upgrade_query("
+			INSERT INTO {$db_prefix}themes
+				(id_member, id_theme, variable, value)
+			VALUES
+				" . implode(',', $inserts));
+}
+---}
+---#
+
+---# Dropping old fields
+ALTER TABLE `{$db_prefix}members`
+  DROP `icq`,
+  DROP `aim`,
+  DROP `yim`,
+  DROP `msn`;
+  DROP `location`;
+  DROP `gender`;
+---#
+
 /******************************************************************************/
 /******************************************************************************/
 --- Adding support for drafts
 --- Adding support for drafts
 /******************************************************************************/
 /******************************************************************************/