Index: openacs-4/contrib/packages/mailing-lists/www/madmin/jobs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/mailing-lists/www/madmin/jobs.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/contrib/packages/mailing-lists/www/madmin/jobs.tcl	2 Sep 2004 14:38:23 -0000	1.2.2.1
+++ openacs-4/contrib/packages/mailing-lists/www/madmin/jobs.tcl	19 Apr 2005 08:43:57 -0000	1.2.2.2
@@ -4,12 +4,12 @@
     class_id:integer
     {list_id:integer,optional ""}
     {selection_id:integer,optional ""}
+    {category_ids:optional,multiple ""}
+    {category_join:optional or}
     delete_files:optional,multiple
     bind_var:array,optional
 }
 
-ns_log debug "jobs: $list_id and class_id=$class_id"
-
 set user_id [ad_maybe_redirect_for_registration]
 set package_id [ad_conn package_id]
 permission::require_permission -object_id $package_id -privilege mailing_list_admin
@@ -80,7 +80,7 @@
 	{list_name:text(inform) {label "Mailing List"}}
     }
     set allowed_variables [list user_id user_first_names user_last_name user_email link view_mail_link]
-} else {
+} elseif {[exists_and_not_null selection_id]} {
     # spamming an user-selection
     ad_form -extend -name mail_job_form -form {
 	{selection_id:text(hidden)}
@@ -109,6 +109,22 @@
     }
     set allowed_variables [user_selection::get_field_names -query $query_string]
     lappend allowed_variables link view_mail_link
+} elseif {[exists_and_not_null category_ids]} {
+    # spamming user categories
+    ad_form -extend -name mail_job_form -form {
+	{category_ids:text(hidden)}
+	{category_join:text(hidden)}
+	{category_names:text(inform) {label "User Categories"}}
+	{category_joined:text(inform) {label "Joined with"}}
+    }
+
+    set category_names [category::list::get_pretty_list $category_ids]
+    if {$category_join == "or"} {
+	set category_joined "OR"
+    } else {
+	set category_joined "AND"
+    }
+    set allowed_variables [list user_id user_first_names user_last_name user_email link view_mail_link]
 }
 
 ad_form -extend -name mail_job_form -form {
@@ -307,7 +323,7 @@
     permission::require_permission -object_id $class_id -privilege read
     if {[exists_and_not_null list_id]} {
 	permission::require_permission -object_id $list_id -privilege read
-    } else {
+    } elseif {[exists_and_not_null selection_id]} {
 	permission::require_permission -object_id $selection_id -privilege read
     }
 
@@ -360,6 +376,7 @@
 } -new_data {
     set mail_job_id [mail_job::add -class_id $class_id -list_id $list_id \
 			 -selection_id $selection_id -locale $locale \
+			 -category_ids $category_ids -category_join $category_join \
 			 -sender_email $sender_email -track_links_p $track_links_p \
 			 -subject $subject -text_header $text_header -text_body $text_body \
 			 -text_footer $text_footer -html_header $html_header \