Merge pull request #492 from Oldiesmann/release-2.1

Minor enhancements to drafts

Themes/default/PersonalMessage.template.php

@@ -1025,6 +1025,7 @@ function template_send()
 		echo '
 				<div id="draft_section" class="infobox"', isset($context['draft_saved']) ? '' : ' style="display: none;"', '>',
 					sprintf($txt['draft_pm_saved'], $scripturl . '?action=pm;sa=showpmdrafts'), '
+					', (!empty($modSettings['drafts_keep_days']) ? ' <strong>' . sprintf($txt['draft_save_warning'], $modSettings['drafts_keep_days']) . '</strong>' : ''), '
 				</div>';
 
 	echo '

Themes/default/Post.template.php

@@ -128,6 +128,7 @@ function template_main()
 		echo '
 				<div id="draft_section" class="infobox"', isset($context['draft_saved']) ? '' : ' style="display: none;"', '>',
 					sprintf($txt['draft_saved'], $scripturl . '?action=profile;u=' . $context['user']['id'] . ';area=showdrafts'), '
+					', (!empty($modSettings['drafts_keep_days']) ? ' <strong>' . sprintf($txt['draft_save_warning'], $modSettings['drafts_keep_days']) . '</strong>' : ''), '
 				</div>';
 
 	// The post header... important stuff

Themes/default/languages/Drafts.english.php

@@ -23,6 +23,7 @@ $txt['draft_retain'] = 'this will be retained for %s more days';
 $txt['draft_remove'] = 'Remove this draft';
 $txt['draft_saved'] = 'The contents have been saved as a draft, and will be accessible from the <a href="%1$s">Show Drafts area</a> of your profile.';
 $txt['draft_pm_saved'] = 'The contents have been saved as a draft, and will be accessible from the <a href="%1$s">Show Drafts area</a> of your message center.';
+$txt['draft_save_warning'] = 'Please note that all drafts will be automatically deleted after %1$d days.';
 
 // Admin options
 $txt['drafts_autosave_enabled'] = 'Enable automatic saving of drafts';

other/install_2-1_mysql.sql

@@ -1857,7 +1857,8 @@ VALUES ('smfVersion', '{$smf_version}'),
 	('avatar_paranoid', '0'),
 	('enable_disregard', '0'),
 	('drafts_autosave_enabled', '1'),
-	('drafts_show_saved_enabled', '1');
+	('drafts_show_saved_enabled', '1'),
+	('drafts_keep_days', '7');
 # --------------------------------------------------------
 
 #

other/install_2-1_postgresql.sql

@@ -2347,6 +2347,7 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('avatar_paranoid', '0
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('enable_disregard', '0');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_autosave_enabled', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_show_saved_enabled', '1');
+INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_keep_days', '7');
 # --------------------------------------------------------
 
 #

other/install_2-1_sqlite.sql

@@ -2003,6 +2003,7 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('avatar_paranoid', '0
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('enable_disregard', '0');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_autosave_enabled', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_show_saved_enabled', '1');
+INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_keep_days', '7');
 COMMIT;
 
 # --------------------------------------------------------

other/upgrade_2-1_mysql.sql

@@ -294,7 +294,8 @@ INSERT INTO {$db_prefix}settings
 	(variable, value)
 VALUES
 	('drafts_autosave_enabled', '1'),
-	('drafts_show_saved_enabled', '1');
+	('drafts_show_saved_enabled', '1'),
+	('drafts_keep_days', '7');
 
 INSERT INTO {$db_prefix}themes
 	(id_theme, variable, value)

other/upgrade_2-1_postgresql.sql

@@ -356,6 +356,7 @@ if (@$modSettings['smfVersion'] < '2.1')
 ---}
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_autosave_enabled', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_show_saved_enabled', '1');
+INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_keep_days', '7');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES ('1', 'drafts_autosave_enabled', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES ('1', 'drafts_show_saved_enabled', '1');
 ---#

other/upgrade_2-1_sqlite.sql

@@ -340,6 +340,7 @@ if (@$modSettings['smfVersion'] < '2.1')
 ---}
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_autosave_enabled', '1');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_show_saved_enabled', '1');
+INSERT INTO {$db_prefix}settings (variable, value) VALUES ('drafts_keep_days', '7');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES ('1', 'drafts_autosave_enabled', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES ('1', 'drafts_show_saved_enabled', '1');
 ---#