Index: openacs-4/packages/adserver/tcl/adserver-ad-monitor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/tcl/adserver-ad-monitor-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/adserver/tcl/adserver-ad-monitor-procs.tcl 1 Nov 2003 08:45:37 -0000 1.3
+++ openacs-4/packages/adserver/tcl/adserver-ad-monitor-procs.tcl 2 Dec 2013 09:35:45 -0000 1.4
@@ -28,7 +28,11 @@
if { [ns_time] > [expr $ad_host_administrator_last_notified + 900] } {
# more than 15 minutes have elapsed since last note
set ad_host_administrator_last_notified [ns_time]
- if [catch { ns_sendmail [ad_host_administrator] [ad_system_owner] $subject $body } errmsg] {
+ if [catch { acs_mail_lite::send \
+ -to_addr [ad_host_administrator] \
+ -from_addr [ad_system_owner] \
+ -subject $subject \
+ --body $body } errmsg] {
ns_log Error "ad_notify_host_administrator: failed sending email note to [ad_host_administrator]: $subject\n\n$body\n\n "
}
}
Index: openacs-4/packages/cards/www/student_card.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/student_card.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cards/www/student_card.tcl 22 Jun 2006 13:00:54 -0000 1.1
+++ openacs-4/packages/cards/www/student_card.tcl 2 Dec 2013 09:33:38 -0000 1.2
@@ -59,7 +59,7 @@
db_1row get_teacher_mail { *SQL* }
db_1row get_student_mail { *SQL* }
- ns_sendmail $student_email $teacher_email $mail_subject $mail_body
+ acs_mail_lite::send -to_addr $student_email -from_addr $teacher_email -subject $mail_subject -body $mail_body
set mode ""
set datetime [clock_to_ansi [clock seconds]]
append comment "-> " $datetime ": " $mail_subject "
" $mail_body
Index: openacs-4/packages/cards/www/student_notes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/student_notes.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cards/www/student_notes.tcl 22 Jun 2006 13:00:54 -0000 1.1
+++ openacs-4/packages/cards/www/student_notes.tcl 2 Dec 2013 09:33:38 -0000 1.2
@@ -69,7 +69,7 @@
db_1row get_teacher_mail { *SQL* }
db_1row get_student_mail { *SQL* }
- ns_sendmail $student_email $teacher_email $mail_subject $mail_body
+ acs_mail_lite::send -to_addr $student_email -from_addr $teacher_email -subject $mail_subject -body $mail_body
set mode ""
set datetime [clock_to_ansi [clock seconds]]
append comment "-> " $datetime ": " $mail_subject "
" $mail_body
Index: openacs-4/packages/cronjob/tcl/cronjob-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/tcl/cronjob-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/cronjob/tcl/cronjob-procs.tcl 29 May 2009 09:02:11 -0000 1.8
+++ openacs-4/packages/cronjob/tcl/cronjob-procs.tcl 2 Dec 2013 09:33:38 -0000 1.9
@@ -71,9 +71,10 @@
if {![string match "" $email]} {
ns_log Debug "sending cronjob email to $email"
- set headers [ns_set create]
- ns_set put $headers "Content-Type" "text/html"
- ns_sendmail $email [ad_host_administrator] "Cronjob $cronjob_id" "Description:
$description
$table" $headers
+ acs_mail_lite::send -to_addr $email -from_addr [ad_host_administrator] \
+ -subject "Cronjob $cronjob_id" \
+ -body "Description:
$description
$table" \
+ -extraheaders [list [list "Content-Type" "text/html"]]
}
return
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.3 -r1.4
--- openacs-4/packages/email-handler/tcl/email-util-procs.tcl 2 Dec 2013 09:16:43 -0000 1.3
+++ openacs-4/packages/email-handler/tcl/email-util-procs.tcl 2 Dec 2013 09:33:38 -0000 1.4
@@ -83,8 +83,8 @@
append body $encoded_data
append body "\n--[set mime_boundary]--\n"
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\"" \
+ [list "Mime-Version" "1.0"] \
+ [list "Content-Type" "multipart/mixed; boundary=\"$mime_boundary\""] \
]
}
\ No newline at end of file