Index: openacs-4/packages/sloan-bboard/www/forum-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/forum-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/sloan-bboard/www/forum-oracle.xql	15 Feb 2002 21:27:07 -0000	1.1
+++ openacs-4/packages/sloan-bboard/www/forum-oracle.xql	18 Feb 2002 13:21:06 -0000	1.2
@@ -12,6 +12,7 @@
           as category_create_p
       from bboard_forums
      where forum_id = :forum_id
+        and bboard_id= :package_id
 
       </querytext>
 </fullquery>
Index: openacs-4/packages/sloan-bboard/www/forum-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/forum-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/sloan-bboard/www/forum-postgresql.xql	15 Feb 2002 21:27:07 -0000	1.1
+++ openacs-4/packages/sloan-bboard/www/forum-postgresql.xql	18 Feb 2002 13:21:06 -0000	1.2
@@ -12,6 +12,7 @@
           as category_create_p
       from bboard_forums
      where forum_id = :forum_id
+        and bboard_id= :package_id
 
       </querytext>
 </fullquery>
Index: openacs-4/packages/sloan-bboard/www/forum.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/forum.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/sloan-bboard/www/forum.tcl	15 Feb 2002 21:27:07 -0000	1.1
+++ openacs-4/packages/sloan-bboard/www/forum.tcl	18 Feb 2002 13:21:06 -0000	1.2
@@ -26,6 +26,7 @@
 }
 
 set user_id [ad_verify_and_get_user_id]
+set package_id [ad_conn package_id]
 
 ad_require_permission $forum_id bboard_read_forum
 
@@ -36,6 +37,7 @@
           as category_create_p
       from bboard_forums
      where forum_id = :forum_id
+     and bboard_id= :package_id
 }
 
 set moderator_p 0
Index: openacs-4/packages/sloan-bboard/www/subscriptions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/subscriptions.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/sloan-bboard/www/subscriptions.tcl	15 Feb 2002 21:27:07 -0000	1.1
+++ openacs-4/packages/sloan-bboard/www/subscriptions.tcl	18 Feb 2002 13:21:06 -0000	1.2
@@ -13,6 +13,7 @@
 
 ad_maybe_redirect_for_registration
 
+set package_id [ad_conn package_id]
 set user_id [ad_verify_and_get_user_id]
 
 # three sorts of subscriptions:
@@ -23,15 +24,18 @@
       from bboard_forum_subscribers bfs, bboard_forums bf
       where bfs.forum_id = bf.forum_id
             and bfs.subscriber_id = :user_id
+            and bf.bboard_id= :package_id
       order by forum_id asc
 }
 
 #  categories
 db_multirow category_subs get_category_subs {
     select bcs.category_id, short_name as name, forum_id
-      from bboard_category_subscribers bcs, bboard_categories bc
+      from bboard_category_subscribers bcs, bboard_categories bc, bboard_forums bf
       where bcs.category_id = bc.category_id
             and bcs.subscriber_id = :user_id
+            and bc.forum_id = bf.forum_id
+            and bf.bboard_id= :package_id
       order by category_id asc
 }
 
@@ -40,8 +44,10 @@
 
 db_multirow thread_subs get_thread_subs {
     select thread_id, title as name, forum_id
-      from bboard_thread_subscribers bts, bboard_messages_all bma
+      from bboard_thread_subscribers bts, bboard_messages_all bma, bboard_forums bf
       where bts.thread_id = bma.message_id
             and bts.subscriber_id = :user_id
+            and bma.forum_id= bf.forum_id
+            and bf.bboard_id= :package_id
       order by thread_id asc
-}
\ No newline at end of file
+}
Index: openacs-4/packages/sloan-bboard/www/subscriptions.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/subscriptions.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/sloan-bboard/www/subscriptions.xql	15 Feb 2002 21:27:07 -0000	1.1
+++ openacs-4/packages/sloan-bboard/www/subscriptions.xql	18 Feb 2002 13:21:06 -0000	1.2
@@ -8,6 +8,7 @@
       from bboard_forum_subscribers bfs, bboard_forums bf
       where bfs.forum_id = bf.forum_id
             and bfs.subscriber_id = :user_id
+            and bf.bboard_id= :package_id
       order by forum_id asc
 
       </querytext>
@@ -18,9 +19,11 @@
       <querytext>
       
     select bcs.category_id, short_name as name, forum_id
-      from bboard_category_subscribers bcs, bboard_categories bc
+      from bboard_category_subscribers bcs, bboard_categories bc, bboard_forums bf
       where bcs.category_id = bc.category_id
             and bcs.subscriber_id = :user_id
+            and bc.forum_id = bf.forum_id
+            and bf.bboard_id= :package_id
       order by category_id asc
 
       </querytext>