Merge pull request #1085 from Arantor/release-2.1

More settings we don't use any more

Sources/ModerationCenter.php

@@ -2144,7 +2144,7 @@ function ModerationSettings()
 	{
 		$mod_blocks = 'n' . ($context['can_moderate_boards'] ? 'wr' : '') . ($context['can_moderate_groups'] ? 'g' : '');
 		$pref_binary = 5;
-		$show_reports = 1;
+		$show_reports = 0;
 	}
 	else
 	{
@@ -2185,16 +2185,8 @@ function ModerationSettings()
 		if ($context['can_moderate_approvals'] && !empty($_POST['mod_notify_approval']))
 			$pref_binary |= 4;
 
-		if ($context['can_moderate_boards'])
-		{
-			if (!empty($_POST['mod_notify_report']))
-				$pref_binary |= ($_POST['mod_notify_report'] == 2 ? 1 : 2);
-
-			$show_reports = !empty($_POST['mod_show_reports']) ? 1 : 0;
-		}
-
 		// Put it all together.
-		$mod_prefs = $show_reports . '|' . $mod_blocks . '|' . $pref_binary;
+		$mod_prefs = '0|' . $mod_blocks . '|' . $pref_binary;
 		updateMemberData($user_info['id'], array('mod_prefs' => $mod_prefs));
 	}
 

Themes/default/ModerationCenter.template.php

@@ -516,23 +516,6 @@ function template_moderation_settings()
 	echo '
 						</dd>';
 
-	// If they can moderate boards they have more options!
-	if ($context['can_moderate_boards'])
-	{
-		echo '
-						<dt>
-							<strong><label for="mod_notify_report">', $txt['mc_prefs_notify_report'], '</label>:</strong>
-						</dt>
-						<dd>
-							<select id="mod_notify_report" name="mod_notify_report">
-								<option value="0" ', $context['mod_settings']['notify_report'] == 0 ? 'selected="selected"' : '', '>', $txt['mc_prefs_notify_report_never'], '</option>
-								<option value="1" ', $context['mod_settings']['notify_report'] == 1 ? 'selected="selected"' : '', '>', $txt['mc_prefs_notify_report_moderator'], '</option>
-								<option value="2" ', $context['mod_settings']['notify_report'] == 2 ? 'selected="selected"' : '', '>', $txt['mc_prefs_notify_report_always'], '</option>
-							</select>
-						</dd>';
-
-	}
-
 	if ($context['can_moderate_approvals'])
 	{
 		echo '

Themes/default/languages/Help.english.php

@@ -409,9 +409,6 @@ $helptxt['emailmembers'] = 'In this message you can use a few "variables&qu
 	{$latest_member.link} - The most recently registered member\'s link.<br />
 	{$latest_member.id} - The most recently registered member\'s id.<br />
 	{$latest_member.name} - The most recently registered member\'s name.';
-$helptxt['attachmentEncryptFilenames'] = 'Encrypting attachment filenames allows you to have more than one attachment of the
-	same name, to safely use .php files for attachments, and heightens security.  It, however, could make it more
-	difficult to rebuild your database if something drastic happened.';
 
 $helptxt['failed_login_threshold'] = 'Set the number of failed login attempts before directing the user to the password reminder screen.';
 $helptxt['loginHistoryDays'] = 'The number of days to keep login history under user profile tracking. Default is 30 days.';

Themes/default/languages/ModerationCenter.english.php

@@ -142,10 +142,7 @@ $txt['mc_prefs_title'] = 'Moderation Preferences';
 $txt['mc_prefs_desc'] = 'This section allows you to set some personal preferences for moderation related activities such as email notifications.';
 $txt['mc_prefs_homepage'] = 'Items to show on moderation homepage';
 $txt['mc_prefs_latest_news'] = 'SM News';
-$txt['mc_prefs_notify_report'] = 'Notify of topic reports';
-$txt['mc_prefs_notify_report_never'] = 'Never';
-$txt['mc_prefs_notify_report_moderator'] = 'Only if it\'s a board I moderate';
-$txt['mc_prefs_notify_report_always'] = 'Always';
+
 $txt['mc_prefs_notify_approval'] = 'Notify of items awaiting approval';
 $txt['mc_logoff'] = 'End Moderator Session';
 

other/install_2-1_mysql.sql

@@ -1727,7 +1727,6 @@ VALUES ('smfVersion', '{$smf_version}'),
 	('attachmentCheckExtensions', '0'),
 	('attachmentShowImages', '1'),
 	('attachmentEnable', '1'),
-	('attachmentEncryptFilenames', '1'),
 	('attachmentThumbnails', '1'),
 	('attachmentThumbWidth', '150'),
 	('attachmentThumbHeight', '150'),

other/install_2-1_postgresql.sql

@@ -2238,7 +2238,6 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentExtensions
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentCheckExtensions', '0');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentShowImages', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentEnable', '1');
-INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentEncryptFilenames', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentThumbnails', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentThumbWidth', '150');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentThumbHeight', '150');

other/install_2-1_sqlite.sql

@@ -1870,7 +1870,6 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentExtensions
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentCheckExtensions', '0');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentShowImages', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentEnable', '1');
-INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentEncryptFilenames', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentThumbnails', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentThumbWidth', '150');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentThumbHeight', '150');

other/install_2-1_sqlite3.sql

@@ -1870,7 +1870,6 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentExtensions
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentCheckExtensions', '0');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentShowImages', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentEnable', '1');
-INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentEncryptFilenames', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentThumbnails', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentThumbWidth', '150');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentThumbHeight', '150');

other/upgrade_2-1_mysql.sql

@@ -553,7 +553,7 @@ WHERE variable LIKE 'integrate_%';
 /******************************************************************************/
 ---# Showing contact details to guests should never happen.
 DELETE FROM {$db_prefix}settings
-WHERE variable IN ('enableStickyTopics', 'guest_hideContacts', 'notify_new_registration');
+WHERE variable IN ('enableStickyTopics', 'guest_hideContacts', 'notify_new_registration', 'attachmentEncryptFilenames');
 ---#
 
 ---# Cleaning up old theme settings.

other/upgrade_2-1_postgresql.sql

@@ -633,7 +633,7 @@ WHERE variable LIKE 'integrate_%';
 /******************************************************************************/
 ---# Showing contact details to guests should never happen.
 DELETE FROM {$db_prefix}settings
-WHERE variable IN ('enableStickyTopics', 'guest_hideContacts', 'notify_new_registration');
+WHERE variable IN ('enableStickyTopics', 'guest_hideContacts', 'notify_new_registration', 'attachmentEncryptFilenames');
 ---#
 
 ---# Cleaning up old theme settings.

other/upgrade_2-1_sqlite.sql

@@ -624,7 +624,7 @@ WHERE variable LIKE 'integrate_%';
 /******************************************************************************/
 ---# Showing contact details to guests should never happen.
 DELETE FROM {$db_prefix}settings
-WHERE variable IN ('enableStickyTopics', 'guest_hideContacts', 'notify_new_registration');
+WHERE variable IN ('enableStickyTopics', 'guest_hideContacts', 'notify_new_registration', 'attachmentEncryptFilenames');
 ---#
 
 ---# Cleaning up old theme settings.