Merge pull request #474 from Oldiesmann/release-2.1

Finish up draft stuff (fixes #139)

Sources/Themes.php

@@ -48,6 +48,7 @@ function ThemesMain()
 	// Load the important language files...
 	loadLanguage('Themes');
 	loadLanguage('Settings');
+	loadLanguage('Drafts');
 
 	// No funny business - guests only.
 	is_not_guest();

Themes/default/Settings.template.php

@@ -149,6 +149,16 @@ function template_options()
 			),
 			'default' => true,
 		),
+		array(
+			'id' => 'drafts_autosave_enable',
+			'label'  => $txt['drafts_autosave_enabled'],
+			'default' => true,
+		),
+		array(
+			'id' => 'drafts_show_saved_enable',
+			'label'  => $txt['drafts_show_saved_enabled'],
+			'default' => true,
+		)
 	);
 }
 

other/install_2-1_mysql.sql

@@ -1855,7 +1855,9 @@ VALUES ('smfVersion', '{$smf_version}'),
 	('attachment_thumb_png', '1'),
 	('avatar_reencode', '1'),
 	('avatar_paranoid', '0'),
-	('enable_disregard', '0');
+	('enable_disregard', '0'),
+	('drafts_autosave_enabled', '1'),
+	('drafts_show_saved_enabled', '1');
 # --------------------------------------------------------
 
 #
@@ -2015,7 +2017,9 @@ VALUES (1, 'name', '{$default_theme_name}'),
 	(1, 'additional_options_collapsable', '1'),
 	(1, 'use_image_buttons', '1'),
 	(1, 'enable_news', '1'),
-	(1, 'forum_width', '90%');
+	(1, 'forum_width', '90%'),
+	(1, 'drafts_autosave_enabled', '1'),
+	(1, 'drafts_show_saved_enabled', '1');
 
 INSERT INTO {$db_prefix}themes (id_member, id_theme, variable, value) VALUES (-1, 1, 'display_quick_reply', '2');
 INSERT INTO {$db_prefix}themes (id_member, id_theme, variable, value) VALUES (-1, 1, 'posts_apply_ignore_list', '1');

other/install_2-1_postgresql.sql

@@ -2345,6 +2345,8 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachment_thumb_png
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('avatar_reencode', '1');
 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');
 # --------------------------------------------------------
 
 #
@@ -2527,6 +2529,8 @@ INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'additiona
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'use_image_buttons', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'enable_news', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'forum_width', '90%');
+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');
 INSERT INTO {$db_prefix}themes (id_member, id_theme, variable, value) VALUES (-1, 1, 'display_quick_reply', '2');
 INSERT INTO {$db_prefix}themes (id_member, id_theme, variable, value) VALUES (-1, 1, 'posts_apply_ignore_list', '1');
 # --------------------------------------------------------

other/install_2-1_sqlite.sql

@@ -2001,6 +2001,8 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachment_thumb_png
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('avatar_reencode', '1');
 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');
 COMMIT;
 
 # --------------------------------------------------------
@@ -2167,6 +2169,8 @@ INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'additiona
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'use_image_buttons', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'enable_news', '1');
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'forum_width', '90%');
+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');
 INSERT INTO {$db_prefix}themes (id_member, id_theme, variable, value) VALUES (-1, 1, 'display_quick_reply', '2');
 INSERT INTO {$db_prefix}themes (id_member, id_theme, variable, value) VALUES (-1, 1, 'posts_apply_ignore_list', '1');
 COMMIT;

other/upgrade_2-1_mysql.sql

@@ -290,6 +290,17 @@ if (@$modSettings['smfVersion'] < '2.1')
 				" . implode(',', $inserts));
 }
 ---}
+INSERT INTO {$db_prefix}settings
+	(variable, value)
+VALUES
+	('drafts_autosave_enabled', '1'),
+	('drafts_show_saved_enabled', '1');
+
+INSERT INTO {$db_prefix}themes
+	(id_theme, variable, value)
+VALUES
+	('1', 'drafts_autosave_enabled', '1'),
+	('1', 'drafts_show_saved_enabled', '1');
 ---#
 
 /******************************************************************************/

other/upgrade_2-1_postgresql.sql

@@ -317,11 +317,16 @@ if (@$modSettings['smfVersion'] < '2.1')
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($inserts))
-		upgrade_query("
-			INSERT IGNORE INTO {$db_prefix}board_permissions
-				(id_group, id_board, permission, add_deny)
-			VALUES
-				" . implode(',', $inserts));
+	{
+		foreach ($inserts AS $insert)
+		{
+			upgrade_query("
+				INSERT INTO {$db_prefix}board_permissions
+					(id_group, id_board, permission, add_deny)
+				VALUES
+					" . $insert);
+		}
+	}
 
 	// Next we find people who can send PMs, and assume they can save pm_drafts as well
 	$request = upgrade_query("
@@ -337,13 +342,22 @@ if (@$modSettings['smfVersion'] < '2.1')
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($inserts))
-		upgrade_query("
-			INSERT IGNORE INTO {$db_prefix}permissions
-				(id_group, permission, add_deny)
-			VALUES
-				" . implode(',', $inserts));
+	{
+		foreach ($inserts AS $insert)
+		{
+			upgrade_query("
+				INSERT INTO {$db_prefix}permissions
+					(id_group, permission, add_deny)
+				VALUES
+					" . $insert);
+		}
+	}
 }
 ---}
+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}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

@@ -301,11 +301,16 @@ if (@$modSettings['smfVersion'] < '2.1')
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($inserts))
-		upgrade_query("
-			INSERT IGNORE INTO {$db_prefix}board_permissions
-				(id_group, id_board, permission, add_deny)
-			VALUES
-				" . implode(',', $inserts));
+	{
+		foreach ($inserts AS $insert)
+		{
+			upgrade_query("
+				INSERT INTO {$db_prefix}board_permissions
+					(id_group, id_board, permission, add_deny)
+				VALUES
+					" . $insert);
+		}
+	}
 
 	// Next we find people who can send PMs, and assume they can save pm_drafts as well
 	$request = upgrade_query("
@@ -321,13 +326,22 @@ if (@$modSettings['smfVersion'] < '2.1')
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($inserts))
-		upgrade_query("
-			INSERT IGNORE INTO {$db_prefix}permissions
-				(id_group, permission, add_deny)
-			VALUES
-				" . implode(',', $inserts));
+	{
+		foreach ($inserts AS $insert)
+		{
+			upgrade_query("
+				INSERT INTO {$db_prefix}permissions
+					(id_group, permission, add_deny)
+				VALUES
+					" . $insert);
+		}
+	}
 }
 ---}
+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}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');
 ---#
 
 /******************************************************************************/