Index: openacs-4/packages/acs-mail-lite/acs-mail-lite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/acs-mail-lite.info,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-mail-lite/acs-mail-lite.info 31 Jul 2006 18:04:04 -0000 1.21
+++ openacs-4/packages/acs-mail-lite/acs-mail-lite.info 19 Oct 2006 07:18:34 -0000 1.22
@@ -7,15 +7,15 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="1.3b3" url="http://openacs.org/repository/download/apm/acs-mail-lite-1.3b3.apm">
+ <version name="1.3b5" url="http://openacs.org/repository/download/apm/acs-mail-lite-1.3b5.apm">
<owner url="mailto:eric@openforce.biz">Eric Lorenzo</owner>
<owner url="mailto:timo@studio-k4.de">Timo Hentschel</owner>
<summary>Simplified reliable email transmission with bounce management.</summary>
<release-date>2005-10-19</release-date>
<description format="text/html">This package provides a simple ns_sendmail-like interface for sending messages, but queues messages in the database to ensure reliable sending and make sending a message 'transactional'. Prefered over acs-messaging or acs-mail.</description>
<maturity>0</maturity>
- <provides url="acs-mail-lite" version="1.3b3"/>
+ <provides url="acs-mail-lite" version="1.3b5"/>
<callbacks>
</callbacks>
@@ -35,6 +35,11 @@
<parameter datatype="string" min_n_values="1" max_n_values="1" name="SendmailBin" default="/usr/sbin/sendmail" description="Location of sendmail binary on your system (Set to SMTP to use SMTP server)" section_name="email"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="send_immediately" default="0" description="Boolean value to say whether new mails should be send out immediately or stored in the db before send out." section_name="email"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="FolderID" default="" description="Folder ID of a folder in the content repository that contains files that can be included using checkboxes in each e-mail send out of the system. This effects /lib/email" section_name="email"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="SMTPHost" default="localhost" description="SMTP Host to be used for sending emails" section_name="SMTP"/>
+ <parameter datatype="number" min_n_values="1" max_n_values="1" name="SMTPPort" default="25" description="SMTP Port to be used for sending emails" section_name="SMTP"/>
+ <parameter datatype="number" min_n_values="1" max_n_values="1" name="SMTPTimeout" default="60" description="SMTP Timeout. Waiting time until we give up with the mailserver." section_name="SMTP"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="SMTPUser" default="" description="SMTP User to be used for sending emails" section_name="SMTP"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="SMTPPassword" default="" description="SMTP Password to be used for sending emails" section_name="SMTP"/>
</parameters>
</version>
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.55 -r1.56
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl 15 Oct 2006 07:21:04 -0000 1.55
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl 19 Oct 2006 07:18:35 -0000 1.56
@@ -304,6 +304,7 @@
callback acs_mail_lite::incoming_email -array email
+
# } else {
# ns_log Notice "load_mails: prefix not found. Doing nothing."
# }
@@ -1090,38 +1091,171 @@
@param alternative_part_p Boolean whether or not the code generates a multipart/alternative mail (text/html)
} {
+ # check, if send_immediately is set
+ # if not, take global parameter
+ if {$send_immediately_p} {
+ set send_p $send_immediately_p
+ } else {
+ # if parameter is not set, get the global setting
+ set send_p [parameter::get -package_id [get_package_id] -parameter "send_immediately" -default 0]
+ }
+
+ # if send_p true, then start acs_mail_lite::send_immediately, so mail is not stored in the db before delivery
+ if { $send_p } {
+ acs_mail_lite::complex_send_immediately \
+ -to_party_ids $to_party_ids \
+ -cc_party_ids $cc_party_ids \
+ -bcc_party_ids $bcc_party_ids \
+ -to_group_ids $to_group_ids \
+ -cc_group_ids $cc_group_ids \
+ -bcc_group_ids $bcc_group_ids \
+ -to_addr $to_addr \
+ -cc_addr $cc_addr \
+ -bcc_addr $bcc_addr \
+ -from_addr $from_addr \
+ -subject $subject \
+ -body $body \
+ -package_id $package_id \
+ -files $files \
+ -file_ids $file_ids \
+ -folder_ids $folder_ids \
+ -mime_type $mime_type \
+ -object_id $object_id \
+ -single_email_p $single_email_p \
+ -no_callback_p $no_callback_p \
+ -extraheaders $extraheaders \
+ -alternative_part_p $alternative_part_p \
+ -use_sender_p $use_sender_p
+ } else {
+ # else, store it in the db and let the sweeper deliver the mail
+ db_dml create_queue_entry {}
+ }
+ }
+
+ # complex_send
+ # created ... by ...
+ # modified 2006/07/25 by nfl: new param. alternative_part_p
+ # and creation of multipart/alternative
+ ad_proc -public complex_send_immediately {
+ -valid_email:boolean
+ {-to_party_ids ""}
+ {-cc_party_ids ""}
+ {-bcc_party_ids ""}
+ {-to_group_ids ""}
+ {-cc_group_ids ""}
+ {-bcc_group_ids ""}
+ {-to_addr ""}
+ {-cc_addr ""}
+ {-bcc_addr ""}
+ -from_addr:required
+ {-subject ""}
+ -body:required
+ {-package_id ""}
+ {-files ""}
+ {-file_ids ""}
+ {-folder_ids ""}
+ {-mime_type "text/plain"}
+ {-object_id ""}
+ {-single_email_p ""}
+ {-no_callback_p ""}
+ {-extraheaders ""}
+ {-alternative_part_p ""}
+ {-use_sender_p ""}
+ } {
+
+ Prepare an email to be send immediately with the option to pass in a list
+ of file_ids as well as specify an html_body and a mime_type. It also supports multiple "TO" recipients as well as CC
+ and BCC recipients. Runs entirely off MIME and SMTP to achieve this.
+ For backward compatibility a switch "single_email_p" is added.
+
+
+ @param to_party_ids list of party ids to whom we send this email
+
+ @param cc_party_ids list of party ids to whom we send this email in "CC"
+
+ @param bcc_party_ids list of party ids to whom we send this email in "BCC"
+
+ @param to_party_ids list of group_ids to whom we send this email
+
+ @param cc_party_ids list of group_ids to whom we send this email in "CC"
+
+ @param bcc_party_ids list of group_ids to whom we send this email in "BCC"
+
+ @param to_addr List of e-mail addresses to send this mail to. We will figure out the name if possible.
+
+ @param from_addr E-Mail address of the sender. We will try to figure out the name if possible.
+
+ @param subject of the email
+
+ @param body Text body of the email
+
+ @param cc_addr List of CC Users e-mail addresses to send this mail to. We will figure out the name if possible. Only useful if single_email is provided. Otherwise the CC users will be send individual emails.
+
+ @param bcc_addr List of CC Users e-mail addresses to send this mail to. We will figure out the name if possible. Only useful if single_email is provided. Otherwise the CC users will be send individual emails.
+
+ @param package_id Package ID of the sending package
+
+ @param files List of file_title, mime_type, file_path (as in full path to the file) combination of files to be attached
+
+ @param folder_ids ID of the folder who's content will be send along with the e-mail.
+
+ @param file_ids List of file ids (items or revisions) to be send as attachments. This will only work with files stored in the file system.
+
+ @param mime_type MIME Type of the mail to send out. Can be "text/plain", "text/html".
+
+ @param object_id The ID of the object that is responsible for sending the mail in the first place
+
+ @param extraheaders List of keywords and their values passed in for headers. Interesting ones are: "Precedence: list" to disable autoreplies and mark this as a list message. This is as list of lists !!
+
+ @param single_email Boolean that indicates that only one mail will be send (in contrast to one e-mail per recipient).
+
+ @param no_callback Boolean that indicates if callback should be executed or not. If you don't provide it it will execute callbacks
+ @param single_email_p Boolean that indicates that only one mail will be send (in contrast to one e-mail per recipient). Used so we can set a variable in the callers environment to call complex_send.
+
+ @param no_callback_p Boolean that indicates if callback should be executed or not. If you don't provide it it will execute callbacks. Used so we can set a variable in the callers environment to call complex_send.
+
+ @param use_sender Boolean indicating that from_addr should be used regardless of fixed-sender parameter
+
+ @param alternative_part_p Boolean whether or not the code generates a multipart/alternative mail (text/html)
+ } {
+
+ set mail_package_id [apm_package_id_from_key "acs-mail-lite"]
if {[empty_string_p $package_id]} {
- set package_id [apm_package_id_from_key "acs-mail-lite"]
+ set package_id $mail_package_id
}
# We check if the parameter
set fixed_sender [parameter::get -parameter "FixedSenderEmail" \
- -package_id [apm_package_id_from_key "acs-mail-lite"]]
+ -package_id $mail_package_id]
if { ![empty_string_p $fixed_sender] && !$use_sender_p} {
set sender_addr $fixed_sender
} else {
set sender_addr $from_addr
}
- set smtp [ns_config ns/parameters smtphost]
+ # Get the SMTP Parameters
+ set smtp [parameter::get -parameter "SMTPHost" \
+ -package_id $mail_package_id -default [ns_config ns/parameters mailhost]]
if {[empty_string_p $smtp]} {
- set smtp [ns_config ns/parameters mailhost]
- }
- if {[empty_string_p $smtp]} {
set smtp localhost
}
- set timeout [ns_config ns/parameters smtptimeout]
+
+ set timeout [parameter::get -parameter "SMTPTimeout" \
+ -package_id $mail_package_id -default [ns_config ns/parameters smtptimeout]]
if {[empty_string_p $timeout]} {
set timeout 60
}
- set smtpport [ns_config ns/parameters smtpport]
- if {[empty_string_p $smtpport]} {
- set smtpport 25
- }
- set smtpuser [ns_config ns/parameters smtpuser]
- set smtppassword [ns_config ns/parameters smtppassword]
+ set smtpport [parameter::get -parameter "SMTPPort" \
+ -package_id [apm_package_id_from_key "acs-mail-lite"] -default 25]
+
+ set smtpuser [parameter::get -parameter "SMTPUser" \
+ -package_id [apm_package_id_from_key "acs-mail-lite"]]
+
+ set smtppassword [parameter::get -parameter "SMTPPassword" \
+ -package_id [apm_package_id_from_key "acs-mail-lite"]]
+
# default values for alternative_part_p
# TRUE on mime_type text/html
# FALSE on mime_type text/plain
@@ -1217,7 +1351,7 @@
# Set the message_id
set message_id "[mime::uniqueID]"
- mime::setheader $multi_token "message_id" "[mime::uniqueID]"
+ mime::setheader $multi_token "message-id" "[mime::uniqueID]"
# Set the date
mime::setheader $multi_token date "[mime::parsedatetime -now proper]"