Index: openacs-4/packages/dotlrn-admin/www/admin/password-update-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/password-update-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-admin/www/admin/password-update-2.tcl 20 Aug 2004 14:44:22 -0000 1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/password-update-2.tcl 2 Dec 2013 09:25:24 -0000 1.2
@@ -34,7 +34,7 @@
set email [acs_user::get_element -user_id $user_id -element email]
# Send email
-if [catch {ns_sendmail $email $system_owner $subject $body} errmsg] {
+if [catch {acs_mail_lite::send -to_addr $email -from_addr $system_owner -subject $subject -body $body} errmsg] {
ns_log Error "[_ dotlrn.lt_Error_sending_email_t]" $errmsg
ad_return_error \
"[_ dotlrn.Error_sending_mail]" \
@@ -46,7 +46,7 @@
set admin_message "[_ dotlrn.lt_The_following_email_w_1]"
- if [catch {ns_sendmail $system_owner $system_owner $admin_subject $admin_message} errmsg] {
+ if [catch {acs_mail_lite::send -to_addr $system_owner -from_addr $system_owner -subject $admin_subject -body $admin_message} errmsg] {
ns_log Error "Error sending email from password-update-2.tcl" $errmsg
ad_return_error \
Index: openacs-4/packages/dotlrn-admin/www/admin/user-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/user-new-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-admin/www/admin/user-new-2.tcl 8 Aug 2006 21:26:31 -0000 1.2
+++ openacs-4/packages/dotlrn-admin/www/admin/user-new-2.tcl 2 Dec 2013 09:25:24 -0000 1.3
@@ -100,7 +100,7 @@
}
- if [catch {ns_sendmail $email $email_from $subject $message} errmsg] {
+ if [catch {acs_mail_lite::send -to_addr $email -from_addr $email_from -subject $subject -body $message} errmsg] {
ns_log Error "Error sending email from user-new-2.tcl" $errmsg
ad_return_error \
@@ -118,7 +118,7 @@
Message: $message"
- if [catch {ns_sendmail $email_from $email_from $admin_subject $admin_message} errmsg] {
+ if [catch {acs_mail_lite::send -to_addr $email_from -from_addr $email_from -subject $admin_subject -body $admin_message} errmsg] {
ns_log Error "Error sending email from user-new-2.tcl" $errmsg
ad_return_error \
Index: openacs-4/packages/dotlrn-admin/www/admin/users-bulk-upload-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/users-bulk-upload-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-admin/www/admin/users-bulk-upload-2.tcl 1 Mar 2005 00:01:28 -0000 1.2
+++ openacs-4/packages/dotlrn-admin/www/admin/users-bulk-upload-2.tcl 2 Dec 2013 09:25:24 -0000 1.3
@@ -117,7 +117,7 @@
set subject [_ dotlrn.user_add_confirm_email_subject $msg_subst_list]
# Send note to new user
- if [catch {ns_sendmail "$row(email)" "$admin_email" "$subject" "$message"} errmsg] {
+ if [catch {acs_mail_lite::send -to_addr $row(email) -from_addr $admin_email -subject $subject -body $message} errmsg] {
doc_body_append "[_ dotlrn.lt_emailing_this_user_fa]"
set fail_p 1
} else {
@@ -148,7 +148,7 @@
Password: $password
"
# Send note to new user
- if [catch {ns_sendmail "$email" "$admin_email" "You have been added as a user to [ad_system_name] at [ad_parameter -package_id [ad_acs_kernel_id] SystemURL]" "$message"} errmsg] {
+ if [catch {acs_mail_lite::send -to_addr $email -from_addr $admin_email -subject "You have been added as a user to [ad_system_name] at [ad_parameter -package_id [ad_acs_kernel_id] SystemURL]" -body $message} errmsg] {
doc_body_append "emailing \"$email\" failed!
"
set fail_p 1
} else {
Index: openacs-4/packages/email-handler/tcl/email-util-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/email-handler/tcl/email-util-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/email-handler/tcl/email-util-procs.tcl 10 Sep 2002 22:22:53 -0000 1.2
+++ openacs-4/packages/email-handler/tcl/email-util-procs.tcl 2 Dec 2013 09:16:43 -0000 1.3
@@ -58,7 +58,7 @@
return $result
}
-ad_proc send_email_attachment_from_file {{-to "" -from "" -subject "" -msg "" -src_pathname "" -dst_filename ""}} {Send an email message using ns_sendmail, with a MIME base64 encoded attachment of the file src_pathname. src_pathname is an absolute pathname to a file in the local server filesystem. dst_filename is the name given to the file attachment part in the email message.} {
+ad_proc send_email_attachment_from_file {{-to "" -from "" -subject "" -msg "" -src_pathname "" -dst_filename ""}} {Send an email message using sendmail, with a MIME base64 encoded attachment of the file src_pathname. src_pathname is an absolute pathname to a file in the local server filesystem. dst_filename is the name given to the file attachment part in the email message.} {
set fd [open $src_pathname r]
fconfigure $fd -encoding binary
@@ -69,10 +69,6 @@
set mime_boundary "__==NAHDHDH2.28ABSDJxjhkjhsdkjhd___"
- set extra_headers [ns_set create]
- ns_set update $extra_headers "Mime-Version" "1.0"
- ns_set update $extra_headers "Content-Type" "multipart/mixed; boundary=\"$mime_boundary\""
-
append body "--$mime_boundary
Content-Type: text/plain; charset=\"us-ascii\"
@@ -86,6 +82,9 @@
"
append body $encoded_data
append body "\n--[set mime_boundary]--\n"
- ns_sendmail $to $from $subject $body $extra_headers
+ acs_mail_lite::send -to_addr $to -from_addr $from -subject $subject -body $body -extraheaders [list \
+ "Mime-Version" "1.0" \
+ "Content-Type" "multipart/mixed; boundary=\"$mime_boundary\"" \
+ ]
}
\ No newline at end of file
Index: openacs-4/packages/spam/www/doc/spam-design.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/doc/spam-design.html,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/spam/www/doc/spam-design.html 13 Sep 2002 16:46:40 -0000 1.2
+++ openacs-4/packages/spam/www/doc/spam-design.html 2 Dec 2013 09:16:42 -0000 1.3
@@ -32,7 +32,7 @@
content, so all spam content also ends up in the
acs_contents; the acs-mail package also handles the
generation of multipart/alternative e-mail for us, and the actual
-transport of outgoing message via ns_sendmail.
+transport of outgoing message via acs_mail_lite::send .
The spam package is intended to be used as a singleton service, so
other applications can link to a single instance of the spam package.