Index: openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.tcl	26 May 2002 04:36:49 -0000	1.6
+++ openacs-4/packages/ecommerce/tcl/ecommerce-email-procs.tcl	4 Oct 2002 06:55:20 -0000	1.7
@@ -11,14 +11,18 @@
     @revision-date April 2002
 }
 
-ad_proc ec_sendmail_from_service { 
+ad_proc -deprecated ec_sendmail_from_service { 
     email_to 
     reply_to 
     email_subject
     email_body
     {additional_headers ""} 
     {bcc ""} 
 } {
+    This is deprecated. It is qmail-specific. See acs-mail-lite package.
+    
+    @see acs_mail_lite::send
+
     Use this when you're sending out customer service emails.  It's
     invoked just like ns_sendmail, except that the email will always
     be from the customer service email address.  The reply-to field
@@ -101,9 +105,10 @@
 
 	    # 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: $email_subject" \
-						      $order_id $issue_type_list $email_body $user_id]
+	    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: $email_subject" \
+			      $order_id $issue_type_list $email_body $user_id]
 
 	    set user_identification_id [lindex $user_identification_and_issue_id 0]
 	    set issue_id [lindex $user_identification_and_issue_id 1]
@@ -121,8 +126,9 @@
 	}
 
 	set email_from [ec_customer_service_email_address $user_identification_id $issue_id]
-	
-	ec_sendmail_from_service "$email" "$email_from" "$email_subject" "$email_body"
+	set from_name "\"[ad_parameter -package_id [ec_id] CustomerServiceEmailDescription ecommerce]\" <$email_from>"
+	acs_mail_lite::send -to_addr "$email" -from_addr "$from_name" -subject "$email_subject" -body "$email_body"
+
 	ec_email_product_notification $order_id
     }
 }
@@ -144,7 +150,8 @@
 	group by ep.email_on_purchase_list, ep.product_name
     } {
 	set email_from [ec_customer_service_email_address]
-	ec_sendmail_from_service $email_on_purchase_list $email_from "An order for $product_name" "
+	set from_name "\"[ad_parameter -package_id [ec_id] CustomerServiceEmailDescription ecommerce]\" <$email_from>"
+	acs_mail_lite::send -to_addr $email_on_purchase_list -from_addr $from_name -subject "An order for $product_name" -body "
 A order for $product_name has been placed at [ec_system_name].
 
 The order can be viewed at:
@@ -210,7 +217,8 @@
 
 	}
 	set email_from [ec_customer_service_email_address $user_identification_id $issue_id]
-	ec_sendmail_from_service "$email" "$email_from" "$email_subject" "$email_body"
+	set from_name "\"[ad_parameter -package_id [ec_id] CustomerServiceEmailDescription ecommerce]\" <$email_from>"
+        acs_mail_lite::send -to_addr "$email" -from_addr "$from_name" -subject "$email_subject" -body "$email_body"
     }
 }
 
@@ -302,7 +310,8 @@
 		(:user_identification_id, 2, :order_id, :shipment_id, sysdate)"
 	}
 	set email_from [ec_customer_service_email_address $user_identification_id $issue_id]
-	ec_sendmail_from_service "$email" "$email_from" "$email_subject" "$email_body"
+	set from_name "\"[ad_parameter -package_id [ec_id] CustomerServiceEmailDescription ecommerce]\" <$email_from>"
+        acs_mail_lite::send -to_addr "$email" -from_addr "$from_name" -subject "$email_subject" -body "$email_body"
     }	
 }
 
@@ -368,8 +377,8 @@
 	}
 
 	set email_from [ec_customer_service_email_address $user_identification_id $issue_id]
-	
-	ec_sendmail_from_service "$email" "$email_from" "$email_subject" "$email_body"
+	set from_name "\"[ad_parameter -package_id [ec_id] CustomerServiceEmailDescription ecommerce]\" <$email_from>"
+        acs_mail_lite::send -to_addr "$email" -from_addr "$from_name" -subject "$email_subject" -body "$email_body"
     }
 }
 
@@ -451,7 +460,8 @@
 	}
 
 	set email_from [ec_customer_service_email_address $user_identification_id $issue_id]
-	ec_sendmail_from_service "$email" "$email_from" "$email_subject" "$email_body"
+	set from_name "\"[ad_parameter -package_id [ec_id] CustomerServiceEmailDescription ecommerce]\" <$email_from>"
+        acs_mail_lite::send -to_addr "$email" -from_addr "$from_name" -subject "$email_subject" -body "$email_body"
     }
 }
 
@@ -564,6 +574,7 @@
 		(:user_identification_id, 5, :gift_certificate_id, sysdate)"
 	}
 	set email_from [ec_customer_service_email_address $user_identification_id $issue_id]
-	ec_sendmail_from_service "$email" "$email_from" "$email_subject" "$email_body"
+	set from_name "\"[ad_parameter -package_id [ec_id] CustomerServiceEmailDescription ecommerce]\" <$email_from>"
+        acs_mail_lite::send -to_addr "$email" -from_addr "$from_name" -subject "$email_subject" -body "$email_body"
     }
 }