Index: openacs-4/packages/forums/forums.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/forums.info,v
diff -u -r1.33 -r1.34
--- openacs-4/packages/forums/forums.info	8 Aug 2006 21:26:50 -0000	1.33
+++ openacs-4/packages/forums/forums.info	12 Sep 2006 18:12:36 -0000	1.34
@@ -7,20 +7,20 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="1.3d1" url="http://openacs.org/repository/download/apm/forums-1.3d1.apm">
+    <version name="1.3d2" url="http://openacs.org/repository/download/apm/forums-1.3d2.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Online discussion forums.</summary>
         <release-date>2006-05-10</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/plain">This online discussion board software is the successor of the original bboard package. The biggest improvement is a scalable datamodel. Forums supports threaded and flat view, moderation, a stand alone search function as well as integration with the OpenACS search package and integration with the notifications package for email alerts. It also supports reply via email.</description>
         <maturity>0</maturity>
 
-        <provides url="forums" version="1.3d1"/>
+        <provides url="forums" version="1.3d2"/>
         <requires url="acs-kernel" version="5.2.2"/>
-        <requires url="acs-subsite" version="5.2.2"/>
+        <requires url="acs-subsite" version="5.3.0d1"/>
         <requires url="acs-mail-lite" version="0.1d"/>
         <requires url="attachments" version="0.5"/>
-        <requires url="notifications" version="5.1.1"/>
+        <requires url="notifications" version="5.3.0d1"/>
 
         <callbacks>
             <callback type="after-install"  proc="forum::install::package_install"/>
Index: openacs-4/packages/forums/www/admin/forum-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/forum-edit.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/forums/www/admin/forum-edit.adp	17 Dec 2003 15:45:31 -0000	1.9
+++ openacs-4/packages/forums/www/admin/forum-edit.adp	12 Sep 2006 18:12:36 -0000	1.10
@@ -8,7 +8,7 @@
 </if>
 <else>
 #forums.This_forum_is# <b>#forums.disabled#</b>. #forums.You_may# <a href="forum-enable?forum_id=@forum.forum_id@">#forums.enable_it#</a>.
-</else>
+</else>#forums.You_can# <a href="subscribe-others?forum_id=@forum.forum_id@">#forums.subscribe_others#</a>.
 <p>
 
 <include src="/packages/forums/lib/forums/edit" &forum="forum" return_url="@return_url@">
Index: openacs-4/packages/forums/www/admin/subscribe-others-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/subscribe-others-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums/www/admin/subscribe-others-2.tcl	8 Aug 2006 21:26:53 -0000	1.2
+++ openacs-4/packages/forums/www/admin/subscribe-others-2.tcl	12 Sep 2006 18:12:36 -0000	1.3
@@ -13,7 +13,8 @@
     {return_url "."}
     interval:notnull
     delivery_method:notnull
-    emails:notnull
+    {emails ""}
+    {subscriber_ids:integer,multiple}
     {create_new_users_p "f"}
 }
 
@@ -41,6 +42,21 @@
 
 db_transaction {
 
+    # Delete all old requests of this type
+    foreach request_id [notification::request::request_ids -object_id $forum_id -type_id $type_id] {
+	notification::request::delete -request_id $request_id
+    }
+
+    foreach subscriber_id $subscriber_ids {
+	ns_write "subscribing [party::name -party_id $subscriber_id]<br />"
+	notification::request::new \
+	    -type_id $type_id \
+	    -user_id $subscriber_id \
+	    -object_id $forum_id \
+	    -interval_id $interval \
+	    -delivery_method_id $delivery_method
+    }
+
     foreach line $lines {
 	
 	set rows [split $line ","]
Index: openacs-4/packages/forums/www/admin/subscribe-others.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/subscribe-others.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums/www/admin/subscribe-others.adp	8 Aug 2006 21:26:53 -0000	1.2
+++ openacs-4/packages/forums/www/admin/subscribe-others.adp	12 Sep 2006 18:12:36 -0000	1.3
@@ -5,7 +5,6 @@
 <form method="post" action="subscribe-others-2.tcl">
 
 #forums.Enter_a_list_of_email#
-
 <pre>
 user@example.com, Jane, Austin
 user2@example.com, Emily, Dickinson
@@ -16,7 +15,10 @@
 #forums.If_checked_create_users#
 <input type="checkbox" value="t" name="create_new_users_p">
 
-<br>
+<p>
+Additionally you can choose from any of the members below:
+<p>@member_html;noquote@
+<p>
 #notifications.Frequency#: @interval_html;noquote@
 
 <br>
Index: openacs-4/packages/forums/www/admin/subscribe-others.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/subscribe-others.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums/www/admin/subscribe-others.tcl	8 Aug 2006 21:26:53 -0000	1.2
+++ openacs-4/packages/forums/www/admin/subscribe-others.tcl	12 Sep 2006 18:12:36 -0000	1.3
@@ -13,6 +13,15 @@
 
 # Select the info
 set package_id [ad_conn package_id]
+set subsite_id [ad_conn subsite_id]
+set group_id [application_group::group_id_from_package_id -package_id $subsite_id]
+
+set member_ids [group::get_members -group_id $group_id]
+set member_html ""
+foreach member_id $member_ids {
+    append member_html "<input type=\"checkbox\" name=\"subscriber_ids\" value=\"$member_id\" id=\"subscriber,$member_id\" title=\"\"> [party::name -party_id $member_id]<br>\n"
+}
+
 forum::get -forum_id $forum_id -array forum
 
 # Proper scoping?
@@ -27,9 +36,25 @@
 set type forums_forum_notif
 set type_id [notification::type::get_type_id -short_name $type]
 
-set hidden_vars [export_vars -form {forum_id type_id}]
+# Get the list for the members and the ones already subscribed
+set subscribed_members_list [notification::request::subscribers -type_id $type_id -object_id $forum_id]
+set member_ids [group::get_members -group_id $group_id]
+set member_ids [lsort -integer -unique [concat $subscribed_members_list $member_ids]]
 
+set member_html ""
+foreach member_id $member_ids {
+    if {[lsearch $subscribed_members_list $member_id] > -1} {
+	set checked_html "checked"
+    } else {
+	set checked_html ""
+    }
 
+    append member_html "<input type=\"checkbox\" name=\"subscriber_ids\" value=\"$member_id\" id=\"subscriber,$member_id\" $checked_html> [party::name -party_id $member_id]<br>\n"
+}
+
+
+set hidden_vars [export_vars -form {forum_id type_id}]
+
 set intervals [notification::get_intervals -type_id $type_id]
 set interval_html "<select name=\"interval\">"
 foreach interval $intervals {