Index: openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.tcl	31 Jan 2002 22:43:54 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.tcl	26 May 2002 04:36:50 -0000	1.4
@@ -1,5 +1,3 @@
-# spam-3.tcl
-
 ad_page_contract { 
     @param spam_id
     @param subject
@@ -19,8 +17,9 @@
 
     @author
     @creation-date
-    @cvs-id spam-3.tcl,v 3.2.2.9 2000/09/22 01:34:54 kevin Exp
     @author ported by Jerry Asher (jerry@theashergroup.com)
+    @author revised by Bart Teeuwisse <bart.teeuwisse@7-sisters.com>
+
 } { 
     spam_id:notnull
     subject:trim,notnull
@@ -42,34 +41,36 @@
 ad_require_permission [ad_conn package_id] admin
 
 set issue_type_list $issue_type
-# no confirm page because they were just sent through the spell
+
+# No confirm page because they were just sent through the spell
 # checker (that's enough submits to push)
 
 set expires_to_insert [ec_decode $expires "" "null" $expires]
 
-# get rid of stupid ^Ms
+# Get rid of stupid ^Ms
+
 regsub -all "\r" $message "" message
 
+# Doubleclick protection
 
-# doubleclick protection
-if { [db_string get_log_entries_cnt "select count(*) from ec_spam_log where spam_id=:spam_id"] > 0 } {
+if { [db_string get_log_entries_cnt "
+    select count(*) 
+    from ec_spam_log
+    where spam_id = :spam_id"] > 0 } {
     
-    append doc_body "[ad_admin_header "Spam Sent"]
-    <h2>Spam Sent</h2>
-    [ad_admin_context_bar [list "../index.tcl" "Ecommerce([ec_system_name])"] [list "index.tcl" "Customer Service Administration"] "Spam Sent"]
-    <hr>
-    You are seeing this page because you probably either hit reload or pushed the Submit button twice.
-    <p>
-    If you wonder whether the users got the spam, just check the customer service issues for one of the users (all mail sent to a user is recorded as a customer service issue).
-    [ad_admin_footer]
-    "
+    append doc_body "
+	[ad_admin_header "Spam Sent"]
+	<h2>Spam Sent</h2>
+	[ad_admin_context_bar [list "../index.tcl" "Ecommerce([ec_system_name])"] [list "index.tcl" "Customer Service Administration"] "Spam Sent"]
+	<hr>
+	<p>You are seeing this page because you probably either hit reload or pushed the Submit button twice.</p>
+	<p>If you wonder whether the users got the spam, just check the customer service issues for one of the users (all mail sent to a user is recorded as a customer service issue).</p>
+	[ad_admin_footer]"
     return
 }
 
 set return_url "[ad_conn url]?[export_entire_form_as_url_vars]"
-
 set customer_service_rep [ad_get_user_id]
-
 if {$customer_service_rep == 0} {
     ad_returnredirect "/register.tcl?[export_url_vars return_url]"
     return
@@ -90,54 +91,42 @@
 
 if { [info exists user_id_list] } {
     set users_query [db_map users_list]
-    # select user_id, email from cc_users where user_id in ([join $user_id_list ", "])
 } elseif { [info exists mailing_list] } {
     if { [llength $mailing_list] == 0 } {
 	set search_criteria [db_map null_categories]
-	# (category_id is null and subcategory_id is null and subsubcategory_id is null)
     } elseif { [llength $mailing_list] == 1 } {
 	set search_criteria [db_map null_subcategory]
-	# (category_id=:mailing_list and subcategory_id is null)
 	set mailing_list_category_id $mailing_list
     } elseif { [llength $mailing_list] == 2 } {
 	set search_criteria [db_map null_subsubcategory]
-	# (subcategory_id=[lindex $mailing_list 1] and subsubcategory_id is null)
 	set mailing_list_category_id [lindex $mailing_list 0]
 	set mailing_list_subcategory_id [lindex $mailing_list 1]
     } else {
 	set search_criteria [db_map null_subsubcategory]
-	# subsubcategory_id=[lindex $mailing_list 2]
 	set mailing_list_category_id [lindex $mailing_list 0]
 	set mailing_list_subcategory_id [lindex $mailing_list 1]
 	set mailing_list_subsubcategory_id [lindex $mailing_list 2]
     }
-
     set users_query "[db_map users_email] and $search_criteria"
-    # select users.user_id as user_id, email from cc_users, ec_cat_mailing_lists where users.user_id=ec_cat_mailing_lists.user_id 
-
 } elseif { [info exists user_class_id] } {
     if { ![empty_string_p $user_class_id]} {
 	set users_query [db_map user_class]
-	# select u.user_id as user_id, first_names, last_name, email from cc_users u, ec_user_class_user_map m where m.user_class_id=:user_class_id and m.user_id=u.user_id
     } else {
 	set users_query [db_map all_users]
-	# select user_id, first_names, last_name, email from cc_users
     }
 } elseif { [info exists product_sku] } {
     set users_query [db_map bought_product]
-    # select unique u.user_id as user_id, first_names, last_name, email from cc_users u, ec_items 1, ec_orders o, ec_products p where i.order_id=o.order_id and o.user_id=u.user_id and i_items.product_id=p.product_id and p.sku=:product_sku
 } elseif { [info exists viewed_product_sku] } {
     set users_query 
-    # select unique u.user_id as user_id, first_names, last_name, email from cc_users u, ec_user_session_info ui, ec_user_sessions us, ec_products p where us.user_session_id=ui.user_session_id and us.user_id=u.user_id and ui.product_id=p.product_ud and p.sku=:viewed_product_sku
 } elseif { [info exists category_id] } {
     set users_query [db_map viewed_category]
-    # select unique u.user_id as user_id, first_names, last_name, email from cc_users u, ec_user_session_info ui, ec_user_sessions us where us.user_session_id=ui.user_session_id and us.user_id=u.user_id and ui.category_id=:category_id
 } elseif { [info exists start] } {
     set users_query [db_map last_visit]
-    # select user_id, first_names, last_name, email from cc_users where last_visit >= to_date(:start,'YYYY-MM-DD HH24:MI:SS') and last_visit <= to_date(:end,'YYYY-MM-DD HH24:MI:SS')
 }
 
-# have to make all variables exist that will be inserted into ec_spam_log
+# Have to make all variables exist that will be inserted into
+# ec_spam_log
+
 if { ![info exists mailing_list_category_id] } {
     set mailing_list_category_id ""
 }
@@ -173,62 +162,52 @@
          :mailing_list_subcategory_id, :mailing_list_subsubcategory_id, 
          :user_class_id, :product_id, 
          to_date(:start,'YYYY-MM-DD HH24:MI:SS'), 
-         to_date(:end,'YYYY-MM-DD HH24:MI:SS'))
-    "
+         to_date(:end,'YYYY-MM-DD HH24:MI:SS'))"
 
     set sql $users_query
 
-    append doc_body "[ad_admin_header "Spamming Users..."]
-<h2>Spamming Users...</h2>
+    append doc_body "
+	[ad_admin_header "Spamming Users..."]
+	<h2>Spamming Users...</h2>
 
-[ad_admin_context_bar [list "../index.tcl" "Ecommerce([ec_system_name])"] [list "index.tcl" "Customer Service Administration"] "Spamming Users..."]
+	[ad_admin_context_bar [list "../index.tcl" "Ecommerce([ec_system_name])"] [list "index.tcl" "Customer Service Administration"] "Spamming Users..."]
 
-<hr>
-<ul>
-"
+	<hr>
+	<ul>"
 
-db_foreach get_users_for_spam $sql {
-    
-    # create a customer service issue/interaction/action
-    set user_identification_and_issue_id [ec_customer_service_simple_issue "" "automatic" "email" "To: $email\nFrom: [ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce]\nSubject: $subject" "" $issue_type_list $message $user_id "" "f"]
-    
-    set user_identification_id [lindex $user_identification_and_issue_id 0]
-    set issue_id [lindex $user_identification_and_issue_id 1]
-    
-    set email_from [ec_customer_service_email_address $user_identification_id $issue_id]
-    
-    ec_sendmail_from_service "$email" "$email_from" "$subject" "$message"
+    db_foreach get_users_for_spam $sql {
+	
+	# Create a customer service issue/interaction/action
 
-    if { ![empty_string_p $amount] && $amount > 0 } {
-	# put a record into ec_gift_certificates
-	# and add the amount to the user's gift certificate account
+	set user_identification_and_issue_id [ec_customer_service_simple_issue "" "automatic" "email" "To: $email\nFrom: [ad_parameter -package_id [ec_id] CustomerServiceEmailAddress ecommerce]\nSubject: $subject" "" $issue_type_list $message $user_id "" "f"]
+	
+	set user_identification_id [lindex $user_identification_and_issue_id 0]
+	set issue_id [lindex $user_identification_and_issue_id 1]
+	set email_from [ec_customer_service_email_address $user_identification_id $issue_id]
+	
+	ec_sendmail_from_service "$email" "$email_from" "$subject" "$message"
 
-	db_dml insert_record_for_gift_certificates "
-        insert into ec_gift_certificates
-	     (gift_certificate_id, user_id, amount, 
-              expires, 
-              issue_date, issued_by, gift_certificate_state, 
-              last_modified, last_modifying_user, modified_ip_address)
-	values
-	     (ec_gift_cert_id_sequence.nextval, :user_id, :amount, 
-              $expires_to_insert, 
-              sysdate, :customer_service_rep, 'authorized', 
-              sysdate, :customer_service_rep, '[ns_conn peeraddr]')
-	"
+	if { ![empty_string_p $amount] && $amount > 0 } {
+
+	    # Put a record into ec_gift_certificates and add the amount to
+	    # the user's gift certificate account
+
+	    db_dml insert_record_for_gift_certificates "
+		insert into ec_gift_certificates
+		(gift_certificate_id, user_id, amount, expires, issue_date, issued_by, gift_certificate_state, last_modified, last_modifying_user, modified_ip_address)
+		values
+		(ec_gift_cert_id_sequence.nextval, :user_id, :amount, $expires_to_insert, sysdate, :customer_service_rep, 'authorized', sysdate, :customer_service_rep, '[ns_conn peeraddr]') "
+	}
+	
+	append doc_body "<li>Email has been sent to $email</li>"
     }
-    
-    append doc_body "<li>Email has been sent to $email\n"
-}
 
 }
 
-append doc_body "</ul>
+append doc_body "
+    </ul>
+    [ad_admin_footer]"
 
-[ad_admin_footer]"
-
-
-
-
 doc_return  200 text/html $doc_body