Forum: group together consecutive deleted posts by the same user

Bug #1127801

Unfortunately this patch doesn't do anything about the issue of making it so that
deleted messages don't affect pagination. That one turns out to be non-trivial.

Change-Id: I8b4d9d02dfdad9998fcfd84be147422becfad132
Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>

htdocs/interaction/forum/lang/en.utf8/interaction.forum.php

@@ -118,6 +118,7 @@ $string['orderdescription'] = 'Choose where you want the forum to be ordered com
 $string['Post'] = 'Post';
 $string['postaftertimeout'] = 'You have submitted your change after timeout of %s minutes. Your change has not been applied.';
 $string['postbyuserwasdeleted'] = 'A post by %s was deleted';
+$string['postsbyuserweredeleted'] = '%s posts by %s were deleted';
 $string['postdelay'] = 'Post delay';
 $string['postdelaydescription'] = 'The minimum time (in minutes) that must pass before a new post can be mailed out to forum subscribers. The author of a post may make edits during this time.';
 $string['postedin'] = '%s posted in %s';

htdocs/interaction/forum/theme/raw/post.tpl

 {if $post->deleted}
-<h5 class="deletedpost">{str tag="postbyuserwasdeleted" section="interaction.forum" args=display_name($post->poster)}</h5>
+<h5 class="deletedpost">
+{if $post->deletedcount > 1}
+{str tag="postsbyuserweredeleted" section="interaction.forum" args=array($post->deletedcount,display_name($post->poster))}
+{else}
+{str tag="postbyuserwasdeleted" section="interaction.forum" args=display_name($post->poster)}
+{/if}
+</h5>
 {else}
 <div style="margin-left:auto; margin-right:0px; width:{$width}%">
 {if $post->parent}

htdocs/interaction/forum/topic.php

@@ -131,8 +131,10 @@ $posts = get_records_sql_array(
     $offset,
     $limit
 );
+
 // Get extra info of posts
-foreach ($posts as $post) {
+$prevdeletedid = false;
+foreach ($posts as $postid => $post) {
     // Get the number of posts
     $post->postcount = get_postcount($post->poster);
 
@@ -144,7 +146,23 @@ foreach ($posts as $post) {
     $post->moderator = is_moderator($post->poster)? $post->poster : null;
     // Update the subject of posts
     $post->subject = !empty($post->subject) ? $post->subject : get_string('re', 'interaction.forum', get_ancestorpostsubject($post->id));
+
+    // Consolidate deleted message posts by the same author into one "X posts by Spammer Joe were deleted"
+    if ($post->deleted) {
+        if ($prevdeletedid && $posts[$prevdeletedid]->poster == $post->poster) {
+            $posts[$prevdeletedid]->deletedcount++;
+            unset($posts[$postid]);
+        }
+        else {
+            $prevdeletedid = $postid;
+            $post->deletedcount = 1;
+        }
+    }
+    else {
+        $prevdeletedid = false;
+    }
 }
+
 // If the user has internal notifications for this topic, mark them
 // all as read.  Obviously there's no guarantee the user will actually
 // read all the posts on this page, but better than letting the unread