Index: openacs-4/packages/forums-portlet/www/forums-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-portlet-oracle.xql,v
diff -u -r1.1 -r1.1.10.1
--- openacs-4/packages/forums-portlet/www/forums-portlet-oracle.xql	21 Jul 2002 20:13:29 -0000	1.1
+++ openacs-4/packages/forums-portlet/www/forums-portlet-oracle.xql	30 Sep 2004 19:54:02 -0000	1.1.10.1
@@ -17,6 +17,7 @@
             acs_objects
             where acs_objects.object_id = forums_forums.forum_id and 
             forums_forums.package_id in ([join $list_of_package_ids ,])
+            $private_data_restriction
              order by parent_name,
              forums_forums.name
         </querytext>
Index: openacs-4/packages/forums-portlet/www/forums-portlet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-portlet-postgresql.xql,v
diff -u -r1.3 -r1.3.6.1
--- openacs-4/packages/forums-portlet/www/forums-portlet-postgresql.xql	29 May 2003 18:05:39 -0000	1.3
+++ openacs-4/packages/forums-portlet/www/forums-portlet-postgresql.xql	30 Sep 2004 19:54:03 -0000	1.3.6.1
@@ -17,6 +17,7 @@
             acs_objects
             where acs_objects.object_id = forums_forums.forum_id and 
             forums_forums.package_id in ([join $list_of_package_ids ,])
+            $private_data_restriction
              order by parent_name,
              forums_forums.name
         </querytext>
Index: openacs-4/packages/forums-portlet/www/forums-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-portlet.adp,v
diff -u -r1.14 -r1.14.6.1
--- openacs-4/packages/forums-portlet/www/forums-portlet.adp	4 Sep 2003 10:09:42 -0000	1.14
+++ openacs-4/packages/forums-portlet/www/forums-portlet.adp	30 Sep 2004 19:54:03 -0000	1.14.6.1
@@ -18,48 +18,25 @@
 
 %>
 
-<if @can_read_private_data_p@>
+<if @forums:rowcount@>
 <if @shaded_p@ false>
 
-  <if @forums:rowcount@ gt 0>
-
-<%
-    set new_package_id ""
-    set old_package_id ""
-%>
-
 <multiple name="forums">
 
-<% set new_package_id $forums(package_id) %>
-
-  <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@ and @old_package_id@ ne "">
-    </ul>
-  </if>
-
-  <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@>
-    @forums.parent_name@
-    <ul>
-  </if>
-
+<if @one_instance_p@ false>@forums.parent_name@</if>
+  <ul>
+<group column="package_id">
     <li>
       <a href="@forums.url@forum-view?forum_id=@forums.forum_id@">@forums.name@</a>
-<if @forums.new_p@ eq t><span class="new_flag"><img src="/resources/acs-subsite/new.gif" align="absmiddle" border="0" alt="#forums-portlet.New#" align="baseline"></span></if>
+      <if @forums.new_p@ eq t><span class="new_flag"><img src="/resources/acs-subsite/new.gif" align="absmiddle" border="0" alt="#forums-portlet.New#" align="baseline"></span></if>
     </li>
+</group>
+  </ul>
 
-<%
-    set old_package_id $new_package_id
-%>
-
 </multiple>
 
+</if>
   </if>
   <else>
     <small>#forums-portlet.No_Forums#</small>
   </else>
-
-</if>
-<else>
-  &nbsp;
-</else>
-</if>
-
Index: openacs-4/packages/forums-portlet/www/forums-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-portlet.tcl,v
diff -u -r1.10.2.1 -r1.10.2.1.4.1
--- openacs-4/packages/forums-portlet/www/forums-portlet.tcl	21 Feb 2004 02:36:51 -0000	1.10.2.1
+++ openacs-4/packages/forums-portlet/www/forums-portlet.tcl	30 Sep 2004 19:54:03 -0000	1.10.2.1.4.1
@@ -19,8 +19,15 @@
 set shaded_p $config(shaded_p)
 set list_of_package_ids $config(package_id)
 set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0]
-set can_read_private_data_p [acs_privacy::user_can_read_private_data_p -object_id [ad_conn package_id]]
 
 set query select_forums
 
+if { [acs_privacy::privacy_control_enabled_p] } {
+    set private_data_restriction [db_map dbqd.forums-portlet.www.forums-portlet.restrict_by_private_data_priv]
+} else {
+    set private_data_restriction ""
+}
+
+set user_id [ad_conn user_id]
+
 db_multirow forums $query {}
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/forums-portlet/www/forums-portlet.xql'.
Fisheye: No comparison available.  Pass `N' to diff?