Index: openacs-4/packages/ecommerce/www/admin/customer-service/spam.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/spam.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/admin/customer-service/spam.tcl	9 Mar 2004 00:59:47 -0000	1.5
+++ openacs-4/packages/ecommerce/www/admin/customer-service/spam.tcl	25 Aug 2008 00:34:18 -0000	1.6
@@ -1,5 +1,4 @@
 # spam.tcl
-
 ad_page_contract {
     @author
     @creation-date
@@ -13,116 +12,32 @@
 set return_url "[ad_conn url]"
 
 set customer_service_rep [ad_get_user_id]
-
 if {$customer_service_rep == 0} {
     ad_returnredirect "/register.tcl?[export_url_vars return_url]"
     ad_script_abort
 }
 
-# this proc uses uplevel and assumes the existence of
-# it sets the variables start_date and end_date
+# this proc uses uplevel and assumes the existence of start_date and end_date
+# or sets them if they do not exist
 ec_report_get_start_date_and_end_date
 
-append doc_body "[ad_admin_header "Spam Users"]
-<h2>Spam Users</h2>
+set title  "Spam Users"
+set context [list [list index "Customer Service"] $title]
 
-[ad_context_bar [list "../index.tcl" "Ecommerce([ec_system_name])"] [list "index.tcl" "Customer Service Administration"] "Spam Users"]
+set report_date_range_widget_html [ec_report_date_range_widget $start_date(date) $end_date(date)]
 
-<hr>
-<form method=post action=spam-log>
-<p>
-<input type=\"submit\" value=\"View spam log\">
-[ec_report_date_range_widget $start_date(date) $end_date(date)]
-</p>
-</form>
-"
-
 set mailing_list_widget  [ec_mailing_list_widget]
 set user_class_widget    [ec_user_class_widget]
 set only_category_widget [ec_only_category_widget]
 
 foreach {v name widget} [list ml_body {Mailing lists} $mailing_list_widget uc_body {User classes} $user_class_widget c_body {Category} $only_category_widget] {
     if {[string equal [string trim $widget] "<b>none</b>"]} {
-        set $v  "
-        <p>$name: $widget - No one to spam
-        <p>
-        "
+        set $v  "$name: $widget - No one to spam.\n"
     } else {
-        set $v "
-<form method=post action=spam-2>
-$name: $widget<br>
-<input type=checkbox name=show_users_p value=\"t\" checked>Show me the users who will be spammed.<br>
-<p>
-<center>
-<input type=submit value=\"Continue\">
-</center>
-</form>
-"        
+        set $v "<form method=post action=spam-2>
+<p>$name: $widget <br><input type=checkbox name=show_users_p value=\"t\" checked>Show me the users who will be spammed.</p>
+ <center><input type=submit value=\"Continue\"></center></form>\n"        
     }
 }
 
-append doc_body "<ol>
-
-<b><li>Spam all users in a mailing list:</b>
-
-$ml_body
-
-<b><li>Spam all members of a user class:</b>
-
-$uc_body
-
-<p>
-
-<b><li>Spam all users who bought this product:</b>
-
-<form method=post action=spam-2>
-Product SKU: <input type=text name=product_sku size=5><br>
-<input type=checkbox name=show_users_p value=\"t\" checked>Show me the users who will be spammed.<br>
-<p>
-<center>
-<input type=submit value=\"Continue\">
-</center>
-</form>
-
-<p>
-
-<b><li>Spam all users who viewed this product:</b>
-
-<form method=post action=spam-2>
-Product SKU: <input type=text name=viewed_product_sku size=5><br>
-<input type=checkbox name=show_users_p value=\"t\" checked>Show me the users who will be spammed.<br>
-<p>
-<center>
-<input type=submit value=\"Continue\">
-</center>
-</form>
-
-<p>
-
-<b><li>Spam all users who viewed this category:</b>
-
-$c_body
-
-<p>
-
-<b><li>Spam all users whose last visit was:</b>
-
-<form method=post action=spam-2>
-"
-
-append doc_body "
-[ec_report_date_range_widget $start_date(date) $end_date(date)]<br>
-<input type=checkbox name=show_users_p value=\"t\" checked>Show me the users who will be spammed.<br>
-<p>
-<center>
-<input type=submit value=\"Continue\">
-</center>
-</form>
-
-</ol>
-
-[ad_admin_footer]
-"
-
-doc_return  200 text/html $doc_body
-
+set report_date_range_widget_html [ec_report_date_range_widget $start_date(date) $end_date(date)]