! Why, exactly, do we have 'Allow viewable email addresses'? This is just not a good idea any more.

Signed-off-by: Peter Spicer <[email protected]>

Sources/ManageServer.php

@@ -342,8 +342,6 @@ function ModifyGeneralSecuritySettings($return_config = false)
 	global $txt, $scripturl, $context, $settings, $sc, $modSettings;
 
 	$config_vars = array(
-			array('check', 'make_email_viewable'),
-		'',
 			array('int', 'failed_login_threshold'),
 			array('int', 'loginHistoryDays'),
 		'',

Sources/Security.php

@@ -1171,8 +1171,6 @@ function showEmailAddress($userProfile_hideEmail, $userProfile_id)
 		return 'yes_permission_override';
 	elseif ($userProfile_hideEmail)
 		return 'no';
-	elseif (!empty($modSettings['make_email_viewable']) )
-		return 'yes';
 	else
 		return 'no_through_forum';
 }

Themes/default/languages/Help.english.php

@@ -505,7 +505,6 @@ $helptxt['coppaType'] = 'If age restrictions are enabled, then this setting will
 $helptxt['coppaPost'] = 'The contact boxes are required so that forms granting permission for underage registration can be sent to the forum administrator. These details will be shown to all new minors, and are required for parent/guardian approval. At the very least a postal address or fax number must be provided.';
 
 $helptxt['allow_hideOnline'] = 'With this option enabled all members will be able to hide their online status from other users (except administrators). If disabled only users who can moderate the forum can hide their presence. Note that disabling this option will not change any existing member\'s status - it just stops them from hiding themselves in the future.';
-$helptxt['make_email_viewable'] = 'If this option is enabled instead of users email addresses being hidden to normal members and guests they will be publicly viewable on the forum. Enabling this will put your users at greater risk of being victims of spam as a result of email harvesters visiting your forum. Note this setting does not override the user setting for hiding their email address from users. Enabling this setting is <strong>not</strong> recommended.';
 $helptxt['meta_keywords'] = 'These keywords are sent in the output of every page to indicate to search engines (etc) the key content of your site. They should be a comma separated list of words, and should not use HTML.';
 
 $helptxt['latest_packages'] = 'Here you can see some of the most popular and some random packages or mods, with quick and easy installations.<br /><br />If this section doesn\'t show up, your computer probably cannot connect to <a href="http://www.simplemachines.org/" target="_blank" class="new_win">www.simplemachines.org</a>.';

Themes/default/languages/ManageSettings.english.php

@@ -88,7 +88,6 @@ $txt['defaultMaxMembers'] = 'Members per page in member list';
 $txt['timeLoadPageEnable'] = 'Display time taken to create every page';
 $txt['disableHostnameLookup'] = 'Disable hostname lookups';
 $txt['who_enabled'] = 'Enable who\'s online list';
-$txt['make_email_viewable'] = 'Allow viewable email addresses';
 $txt['meta_keywords'] = 'Meta keywords associated with forum';
 $txt['meta_keywords_note'] = 'For search engines. Leave blank for default.';
 $txt['settings_error'] = 'Warning: Updating of Settings.php failed, the settings cannot be saved.';