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 -N -r1.16 -r1.17
--- openacs-4/packages/acs-mail-lite/acs-mail-lite.info	29 Nov 2005 11:28:25 -0000	1.16
+++ openacs-4/packages/acs-mail-lite/acs-mail-lite.info	3 May 2006 10:41:13 -0000	1.17
@@ -7,15 +7,15 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="1.0b7" url="http://openacs.org/repository/download/apm/acs-mail-lite-1.0b7.apm">
+    <version name="1.2b1" url="http://openacs.org/repository/download/apm/acs-mail-lite-1.2b1.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.0b7"/>
+        <provides url="acs-mail-lite" version="1.2b1"/>
 
         <callbacks>
             <callback type="after-install"  proc="acs_mail_lite::after_install"/>
@@ -35,6 +35,7 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="NotificationSender"  default="reminder@openacs.org" description="Sender of the notification email" section_name="email"/>
             <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"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/acs-mail-lite/lib/email.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/lib/Attic/email.tcl,v
diff -u -N -r1.22 -r1.23
--- openacs-4/packages/acs-mail-lite/lib/email.tcl	10 Apr 2006 11:26:57 -0000	1.22
+++ openacs-4/packages/acs-mail-lite/lib/email.tcl	3 May 2006 10:41:13 -0000	1.23
@@ -128,6 +128,21 @@
     }
 }
 
+# Get the list of files from the file storage folder
+set file_folder_id [parameter::get_from_package_key -package_key "acs-mail-lite" -parameter "FolderID"]
+if {![string eq "" $file_folder_id]} {
+    # get the list of files in an option
+    set file_options [db_list_of_lists files "select name, item_id from cr_items where parent_id = :file_folder_id and content_type = 'file_storage_object'"]
+    if {![string eq "" $file_options]} {
+	append form_elements {
+	    {files_extend:text(checkbox),optional 
+		{label "[_ acs-mail-lite.Additional_files]"}
+		{options $file_options}
+	    }
+	}
+    }
+}
+
 foreach var $export_vars {
     upvar $var var_value
 
@@ -236,6 +251,13 @@
 	    }
 	}
 
+	# Append the additional files
+	if {[exists_and_not_null files_extend]} {
+	    foreach file_id $files_extend {
+		lappend file_ids $file_id
+	    }
+	}
+
 	# Send the mail to all parties.
 	foreach party_id $to {
 	    if { $contacts_p } {