Index: openacs-4/packages/forums/forums.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/forums.info,v
diff -u -r1.56.2.12 -r1.56.2.13
--- openacs-4/packages/forums/forums.info	6 Oct 2020 08:23:19 -0000	1.56.2.12
+++ openacs-4/packages/forums/forums.info	29 Apr 2021 14:03:42 -0000	1.56.2.13
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
 
-    <version name="1.4.0d3" url="http://openacs.org/repository/download/apm/forums-1.4.0d3.apm">
+    <version name="1.4.0d4" url="http://openacs.org/repository/download/apm/forums-1.4.0d4.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Online discussion forums.</summary>
         <release-date>2017-08-06</release-date>
@@ -19,7 +19,7 @@
         <maturity>2</maturity>
         <package_instance_name>#forums.Forums#</package_instance_name>
 
-        <provides url="forums" version="1.4.0d3"/>
+        <provides url="forums" version="1.4.0d4"/>
         <requires url="acs-kernel" version="5.9.1"/>
         <requires url="acs-tcl" version="5.10.0d39"/>
         <requires url="acs-mail-lite" version="5.9.1"/>
Index: openacs-4/packages/forums/sql/postgresql/forums-sc-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/postgresql/forums-sc-create.sql,v
diff -u -r1.7 -r1.7.6.1
--- openacs-4/packages/forums/sql/postgresql/forums-sc-create.sql	12 Aug 2013 09:34:30 -0000	1.7
+++ openacs-4/packages/forums/sql/postgresql/forums-sc-create.sql	29 Apr 2021 14:03:42 -0000	1.7.6.1
@@ -9,11 +9,29 @@
 -- change to the thread.
 
 CREATE OR REPLACE FUNCTION forums_message_search__itrg () RETURNS trigger AS $$
+DECLARE
+    v_root_message_id forums_messages.message_id%TYPE;
+    v_is_approved     boolean;
 BEGIN
-    if new.parent_id is null then
+    if new.parent_id is null and new.state = 'approved' then
+        -- New threads are indexed only if they are approved.
         perform search_observer__enqueue(new.message_id,'INSERT');
     else
-        perform search_observer__enqueue(forums_message__root_message_id(new.parent_id),'UPDATE');
+        -- Non-root messages trigger the indexing of the whole thread,
+        -- but only if the thread (the root message) has been
+        -- approved.
+        -- We do not care about the approval of the message itself in
+        -- this case, as the datasource callback will take care of not
+        -- rendering any unapproved non-root message.
+        v_root_message_id := forums_message__root_message_id(new.parent_id);
+
+        select state = 'approved' into v_is_approved
+          from forums_messages
+         where message_id = v_root_message_id;
+
+        if v_is_approved then
+            perform search_observer__enqueue(v_root_message_id,'UPDATE');
+        end if;
     end if;
     return new;
 END;
@@ -28,15 +46,27 @@
 
 ) RETURNS trigger AS $$
 DECLARE
-     v_root_message_id          forums_messages.message_id%TYPE;
+    v_root_message_id forums_messages.message_id%TYPE;
+    v_is_approved     boolean;
 BEGIN
     -- if the deleted msg has a parent then its an UPDATE to a thread, otherwise a DELETE.
 
     if old.parent_id is null then
         perform search_observer__enqueue(old.message_id,'DELETE');
     else
-        v_root_message_id := forums_message__root_message_id(old.parent_id);
-        if not v_root_message_id is null then
+        -- Deleting non-root messages triggers the indexing of the
+        -- whole thread, but only if the thread (the root message) has
+        -- been approved.
+        -- We do not care about the approval of the message itself in
+        -- this case, as the datasource callback will take care of not
+        -- rendering any unapproved non-root message.
+        v_root_message_id := forums_message__root_message_id(new.parent_id);
+
+        select state = 'approved' into v_is_approved
+          from forums_messages
+         where message_id = v_root_message_id;
+
+        if v_is_approved then
             perform search_observer__enqueue(v_root_message_id,'UPDATE');
         end if;
     end if;
@@ -46,8 +76,31 @@
 $$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION forums_message_search__utrg () RETURNS trigger AS $$
+DECLARE
+    v_root_message_id forums_messages.message_id%TYPE;
+    v_is_approved     boolean;
 BEGIN
-    perform search_observer__enqueue(forums_message__root_message_id (old.message_id),'UPDATE');
+    if old.parent_id is null and new.state <> 'approved' then
+         -- New threads that have been revoked approval should be
+         -- removed from the search results.
+         perform search_observer__enqueue(old.message_id,'DELETE');
+    else
+        -- Non-root messages trigger the indexing of the whole thread,
+        -- but only if the thread (the root message) has been
+        -- approved.
+        -- We do not care about the approval of the message itself in
+        -- this case, as the datasource callback will take care of not
+        -- rendering any unapproved non-root message.
+        v_root_message_id := forums_message__root_message_id(new.parent_id);
+
+        select state = 'approved' into v_is_approved
+          from forums_messages
+         where message_id = v_root_message_id;
+
+        if v_is_approved then
+            perform search_observer__enqueue(v_root_message_id,'UPDATE');
+        end if;
+    end if;
     return old;
 END;
 $$ LANGUAGE plpgsql;
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/sql/postgresql/upgrade/upgrade-1.4.0d3-1.4.0d4.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/forums/tcl/forums-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-callback-procs.tcl,v
diff -u -r1.12.2.6 -r1.12.2.7
--- openacs-4/packages/forums/tcl/forums-callback-procs.tcl	1 Feb 2021 11:01:48 -0000	1.12.2.6
+++ openacs-4/packages/forums/tcl/forums-callback-procs.tcl	29 Apr 2021 14:03:42 -0000	1.12.2.7
@@ -170,18 +170,21 @@
     array set forum [forum::get -forum_id $message(forum_id) -array forum]
     set package_id $forum(package_id)
 
+    # We only render the content of approved messages.
     db_foreach messages {
         with recursive thread(message_id, parent_id, subject, content, format) as (
             select message_id, parent_id, subject, content, format
             from forums_messages
             where message_id = :message_id
+              and m.state = 'approved'
 
             union all
 
             select m.message_id, m.parent_id, m.subject, m.content, m.format
             from forums_messages m,
                  thread t
             where m.parent_id = t.message_id
+              and m.state = 'approved'
         ) select subject, content, format from thread
     } {