[feature/soft-delete] Implement the ability to soft-delete and restore posts

The soft delete feature seems to work. Tests are pending. A real icon is pending. Add the permissions and the interface to soft-delete posts. Also able to restore posts via the MCP queue PHPBB3-9657
2025-07-31 22:10:45 +02:00 · 2010-06-27 14:22:36 -05:00
parent c32d760806
commit fb13ab83e4
20 changed files with 553 additions and 197 deletions
--- a/phpBB/styles/prosilver/imageset/icon_topic_deleted.png
+++ b/phpBB/styles/prosilver/imageset/icon_topic_deleted.png
--- a/phpBB/styles/prosilver/imageset/imageset.cfg
+++ b/phpBB/styles/prosilver/imageset/imageset.cfg
@@ -0,0 +1,117 @@
+#
+# phpBB Imageset Configuration File
+#
+# @package phpBB3
+# @copyright (c) 2006 phpBB Group
+# @license http://opensource.org/licenses/gpl-license.php GNU Public License
+#
+#
+# At the left is the name, please do not change this
+# At the right the value is entered
+# For on/off options the valid values are on, off, 1, 0, true and false
+#
+# Values get trimmed, if you want to add a space in front or at the end of
+# the value, then enclose the value with single or double quotes.
+# Single and double quotes do not need to be escaped.
+#
+#
+
+# General Information about this style
+name = prosilver
+copyright = &copy; phpBB Group, 2007
+version = 3.0.7
+
+# Images
+img_site_logo = site_logo.gif*52*139
+img_poll_left =
+img_poll_center =
+img_poll_right =
+img_icon_friend =
+img_icon_foe =
+
+img_forum_link = forum_link.gif*27*27
+img_forum_read = forum_read.gif*27*27
+img_forum_read_locked = forum_read_locked.gif*27*27
+img_forum_read_subforum = forum_read_subforum.gif*27*27
+img_forum_unread = forum_unread.gif*27*27
+img_forum_unread_locked = forum_unread_locked.gif*27*27
+img_forum_unread_subforum = forum_unread_subforum.gif*27*27
+
+img_topic_moved = topic_moved.gif*27*27
+
+img_topic_read = topic_read.gif*27*27
+img_topic_read_mine = topic_read_mine.gif*27*27
+img_topic_read_hot = topic_read_hot.gif*27*27
+img_topic_read_hot_mine = topic_read_hot_mine.gif*27*27
+img_topic_read_locked = topic_read_locked.gif*27*27
+img_topic_read_locked_mine = topic_read_locked_mine.gif*27*27
+
+img_topic_unread = topic_unread.gif*27*27
+img_topic_unread_mine = topic_unread_mine.gif*27*27
+img_topic_unread_hot = topic_unread_hot.gif*27*27
+img_topic_unread_hot_mine = topic_unread_hot_mine.gif*27*27
+img_topic_unread_locked = topic_unread_locked.gif*27*27
+img_topic_unread_locked_mine = topic_unread_locked_mine.gif*27*27
+
+img_sticky_read = sticky_read.gif*27*27
+img_sticky_read_mine = sticky_read_mine.gif*27*27
+img_sticky_read_locked = sticky_read_locked.gif*27*27
+img_sticky_read_locked_mine = sticky_read_locked_mine.gif*27*27
+img_sticky_unread = sticky_unread.gif*27*27
+img_sticky_unread_mine = sticky_unread_mine.gif*27*27
+img_sticky_unread_locked = sticky_unread_locked.gif*27*27
+img_sticky_unread_locked_mine = sticky_unread_locked_mine.gif*27*27
+
+img_announce_read = announce_read.gif*27*27
+img_announce_read_mine = announce_read_mine.gif*27*27
+img_announce_read_locked = announce_read_locked.gif*27*27
+img_announce_read_locked_mine = announce_read_locked_mine.gif*27*27
+img_announce_unread = announce_unread.gif*27*27
+img_announce_unread_mine = announce_unread_mine.gif*27*27
+img_announce_unread_locked = announce_unread_locked.gif*27*27
+img_announce_unread_locked_mine = announce_unread_locked_mine.gif*27*27
+
+img_global_read = announce_read.gif*27*27
+img_global_read_mine = announce_read_mine.gif*27*27
+img_global_read_locked = announce_read_locked.gif*27*27
+img_global_read_locked_mine = announce_read_locked_mine.gif*27*27
+img_global_unread = announce_unread.gif*27*27
+img_global_unread_mine = announce_unread_mine.gif*27*27
+img_global_unread_locked = announce_unread_locked.gif*27*27
+img_global_unread_locked_mine = announce_unread_locked_mine.gif*27*27
+
+img_subforum_read = subforum_read.gif*9*11
+img_subforum_unread = subforum_unread.gif*9*11
+
+img_pm_read = topic_read.gif*27*27
+img_pm_unread = topic_unread.gif*27*27
+
+img_icon_back_top = icon_back_top.gif*11*11
+
+img_icon_contact_aim = icon_contact_aim.gif*20*20
+img_icon_contact_email = icon_contact_email.gif*20*20
+img_icon_contact_icq = icon_contact_icq.gif*20*20
+img_icon_contact_jabber = icon_contact_jabber.gif*20*20
+img_icon_contact_msnm = icon_contact_msnm.gif*20*20
+
+img_icon_contact_www = icon_contact_www.gif*20*20
+img_icon_contact_yahoo = icon_contact_yahoo.gif*20*20
+
+img_icon_post_delete = icon_post_delete.gif*20*20
+
+img_icon_post_info = icon_post_info.gif*20*20
+
+img_icon_post_report = icon_post_report.gif*20*20
+img_icon_post_target = icon_post_target.gif*9*11
+img_icon_post_target_unread = icon_post_target_unread.gif*9*11
+
+img_icon_topic_attach = icon_topic_attach.gif*10*7
+img_icon_topic_latest = icon_topic_latest.gif*9*11
+img_icon_topic_newest = icon_topic_newest.gif*9*11
+img_icon_topic_reported = icon_topic_reported.gif*14*16
+img_icon_topic_unapproved = icon_topic_unapproved.gif*14*16
+img_icon_topic_deleted = icon_topic_deleted.png*16*16
+
+img_icon_user_profile =
+
+img_icon_user_warn = icon_user_warn.gif*20*20
--- a/phpBB/styles/prosilver/template/mcp_queue.html
+++ b/phpBB/styles/prosilver/template/mcp_queue.html
@@ -94,8 +94,13 @@

 <!-- IF .postrow -->
 	<fieldset class="display-actions">
+		<!-- IF S_RESTORE -->
+		<input class="button2" type="submit" name="action[disapprove]" value="{L_DELETE}" />&nbsp;
+		<input class="button1" type="submit" name="action[restore]" value="{L_RESTORE}" />
+		<!-- ELSE -->
 		<input class="button2" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" />&nbsp;
 		<input class="button1" type="submit" name="action[approve]" value="{L_APPROVE}" />
+		<!-- ENDIF -->
 		<div><a href="#" onclick="marklist('mcp', 'post_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'post_id_list', false); return false;">{L_UNMARK_ALL}</a></div>
 	</fieldset>
 <!-- ENDIF -->
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -83,6 +83,13 @@
 	</dl>
 	<!-- ENDIF -->

+	<!-- IF (S_SOFT_DELETE_ALLOWED and not S_IS_DELETED) or (S_RESTORE_ALLOWED and S_IS_DELETED) -->
+	<dl>
+		<dt><label for="soft_delete">{L_SOFT_DELETE_POST}:</label></dt>
+		<dd><label for="soft_delete"><input type="checkbox" name="soft_delete"{S_SOFT_DELETE_CHECKED} id="soft_delete" /> {L_SOFT_DELETE_POST_EXPLAIN}</label></dd>
+	</dl>
+	<!-- ENDIF -->
+
 	<!-- IF S_SHOW_TOPIC_ICONS or S_SHOW_PM_ICONS -->
 	<dl>
 		<dt><label for="icon">{L_ICON}:</label></dt>
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -144,7 +144,7 @@
 			<dl class="icon {topicrow.TOPIC_IMG_STYLE}">
 				<dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
 					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
-					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
+					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><!-- IF topicrow.DELETED_IMG --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.DELETED_IMG}</a><!-- ENDIF --><br />
 					<!-- IF .topicrow.pagination -->
 					<div class="pagination">
 						<ul>
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -138,6 +138,7 @@
 			<h3 <!-- IF postrow.S_FIRST_ROW -->class="first"<!-- ENDIF -->><!-- IF postrow.POST_ICON_IMG --><img src="{T_ICONS_PATH}{postrow.POST_ICON_IMG}" width="{postrow.POST_ICON_IMG_WIDTH}" height="{postrow.POST_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="#p{postrow.POST_ID}">{postrow.POST_SUBJECT}</a></h3>
 			<p class="author"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF -->{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> &raquo; {postrow.POST_DATE} </p>

+<<<<<<< HEAD
 			<!-- IF postrow.S_POST_UNAPPROVED or postrow.S_POST_REPORTED -->
 			<form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}" data-ajax="post_approve">
 				<p class="rules">
@@ -148,6 +149,7 @@
 						<input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}" />
 						{S_FORM_TOKEN}
 					<br /><!-- ENDIF -->
+					<!-- IF postrow.S_POST_DELETED -->{DELETED_IMG} <a href="{postrow.U_MCP_APPROVE}"><strong>{L_POST_DELETED_RESTORE}</strong></a><br /><!-- ENDIF -->
 					<!-- IF postrow.S_POST_REPORTED -->{REPORTED_IMG} <a href="{postrow.U_MCP_REPORT}"><strong>{L_POST_REPORTED}</strong></a><!-- ENDIF -->
 				</p>
 			</form>