Index: openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml,v
diff -u -r1.4.8.2 -r1.4.8.3
--- openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml 13 Oct 2013 10:33:55 -0000 1.4.8.2
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml 2 Dec 2013 08:14:29 -0000 1.4.8.3
@@ -1243,11 +1243,11 @@
# Send email verification email to user
set confirmation_url "[ad_url]/register/email-confirm?[export_vars { row_id }]"
with_catch errmsg {
- ns_sendmail \
- $email \
- $notification_address \
- "[_ acs-subsite.lt_Welcome_to_system_nam]" \
- "[_ acs-subsite.lt_To_confirm_your_regis]"
+ acs_mail_lite::send \
+ -to_addr $email \
+ -from_addr $notification_address \
+ -subject "[_ acs-subsite.lt_Welcome_to_system_nam]" \
+ -body "[_ acs-subsite.lt_To_confirm_your_regis]"
} {
ns_returnerror "500" "$errmsg"
ns_log Warning "Error sending email verification email to $email. Error: $errmsg"
@@ -1259,11 +1259,11 @@
if { [parameter::get -parameter RegistrationProvidesRandomPasswordP -default 0] || \
[parameter::get -parameter EmailRegistrationConfirmationToUserP -default 0] } {
with_catch errmsg {
- ns_sendmail \
- $email \
- $notification_address \
- "[_ acs-subsite.lt_Welcome_to_system_nam]" \
- "[_ acs-subsite.lt_Thank_you_for_visitin]"
+ acs_mail_lite::send \
+ -to_addr $email \
+ -from_addr $notification_address \
+ -subject "[_ acs-subsite.lt_Welcome_to_system_nam]" \
+ -body "[_ acs-subsite.lt_Thank_you_for_visitin]"
} {
ns_returnerror "500" "$errmsg"
ns_log Warning "Error sending registration confirmation to $email. Error: $errmsg"
@@ -1272,11 +1272,11 @@
# Notify admin on new registration
if {[parameter::get -parameter NotifyAdminOfNewRegistrationsP -default 0]} {
with_catch errmsg {
- ns_sendmail \
- $notification_address \
- $email \
- "[_ acs-subsite.lt_New_registration_at_s]" \
- "[_ acs-subsite.lt_first_names_last_name]"
+ acs_mail_lite::send \
+ -to_addr $notification_address \
+ -from_addr $email \
+ -subject "[_ acs-subsite.lt_New_registration_at_s]" \
+ -body "[_ acs-subsite.lt_first_names_last_name]"
} {
ns_returnerror "500" "$errmsg"
ns_log Warning "Error sending admin notification to $notification_address. Error: $errmsg"
@@ -1654,7 +1654,7 @@
# Should make use of auth::password::RetrievePassword
set body "[_ acs-subsite.lt_Please_follow_the_fol]"
# 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]} {
ad_return_error \
"[_ acs-subsite.Error_sending_mail]" \
"[_ acs-subsite.lt_Now_were_really_in_tr]
@@ -1852,7 +1852,7 @@
set subject "some other i18n key msg"
set body "some other i18n key msg"
# 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]} {
ad_return_error \
"[_ acs-subsite.Error_sending_mail]" \
"[_ acs-subsite.lt_Now_were_really_in_tr]
Index: openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-init.tcl,v
diff -u -r1.13 -r1.13.6.1
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-init.tcl 16 Mar 2010 12:10:27 -0000 1.13
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-init.tcl 2 Dec 2013 08:14:30 -0000 1.13.6.1
@@ -28,9 +28,6 @@
# Redefine ns_sendmail as a wrapper for acs_mail_lite::send
-
-
-ns_log Notice "acs-mail-lite: renaming acs_mail_lite::sendmail to ns_sendmail"
-
-rename ns_sendmail _old_ns_sendmail
-rename acs_mail_lite::sendmail ns_sendmail
+#ns_log Notice "acs-mail-lite: renaming acs_mail_lite::sendmail to ns_sendmail"
+#rename ns_sendmail _old_ns_sendmail
+#rename acs_mail_lite::sendmail ns_sendmail
Index: openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl,v
diff -u -r1.90.2.2 -r1.90.2.3
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl 2 Oct 2013 10:02:28 -0000 1.90.2.2
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl 2 Dec 2013 08:14:30 -0000 1.90.2.3
@@ -587,7 +587,7 @@
#---------------------------------------
- ad_proc -public -deprecated sendmail {
+ ad_proc -public -deprecated ::ns_sendmail {
to
from
subject
@@ -600,7 +600,6 @@
} {
-
ns_log Warning "ns_sendmail is no longer supported in OpenACS. Use acs_mail_lite::send instead."
set extraheaders_list [list]
Index: openacs-4/packages/acs-subsite/www/admin/users/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/users/new.tcl,v
diff -u -r1.12.6.6 -r1.12.6.7
--- openacs-4/packages/acs-subsite/www/admin/users/new.tcl 27 Oct 2013 14:26:47 -0000 1.12.6.6
+++ openacs-4/packages/acs-subsite/www/admin/users/new.tcl 2 Dec 2013 08:14:30 -0000 1.12.6.7
@@ -231,11 +231,12 @@
}]
# we're supposed to notify the administrator when someone new registers
- acs_mail_lite::send -send_immediately \
- -to_addr $notification_address \
- -from_addr [template::element::get_value add_user email] \
- -subject "New registration at [ad_url]" \
- -body "[template::element::get_value add_user first_names] [template::element::get_value add_user last_name] ([template::element::get_value add_user email]) was added as a registered as a user of
+ acs_mail_lite::send \
+ -send_immediately \
+ -to_addr $notification_address \
+ -from_addr [template::element::get_value add_user email] \
+ -subject "New registration at [ad_url]" \
+ -body "[template::element::get_value add_user first_names] [template::element::get_value add_user last_name] ([template::element::get_value add_user email]) was added as a registered as a user of
[ad_url]
The user was added by $creation_name from [ad_conn url]."
@@ -247,24 +248,27 @@
set row_id [db_string user_new_2_rowid_for_email "select rowid from users where user_id = :user_id"]
# the user has to come back and activate their account
- ns_sendmail [template::element::get_value add_user email] \
- $notification_address \
- "Welcome to [ad_system_name]" \
- "To confirm your registration, please go to [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL]/register/email-confirm?[export_vars -url {row_id}]
+ acs_mail_lite::send \
+ -to_addr [template::element::get_value add_user email] \
+ -from_addr $notification_address \
+ -subject "Welcome to [ad_system_name]" \
+ -body "To confirm your registration, please go to [parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL]/register/email-confirm?[export_vars -url {row_id}]
After confirming your email, here's how you can log in at [ad_url]:
Username: [template::element::get_value add_user email]
Password: $password
"
+
} else {
with_catch errmsg {
# ns_log Notice "sending mail from $notification_address to [template::element::get_value add_user email]"
- ns_sendmail [template::element::get_value add_user email] \
- $notification_address \
- "Thank you for visiting [ad_system_name]" \
- "Here's how you can log in at [ad_url]:
+ acs_mail_lite::send \
+ -to_addr [template::element::get_value add_user email] \
+ -from_addr $notification_address \
+ -subject "Thank you for visiting [ad_system_name]" \
+ -body "Here's how you can log in at [ad_url]:
Username: [template::element::get_value add_user email]
Password: $password