- Update to OpenACS 5.9.1

bulk-mail.info

@@ -7,17 +7,17 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="2.9.0" url="http://openacs.org/repository/download/apm/bulk-mail-2.9.0.apm">
+    <version name="2.9.1" url="http://openacs.org/repository/download/apm/bulk-mail-2.9.1.apm">
         <owner url="http://openacs.org">OpenACS</owner>
-        <release-date>2015-10-04</release-date>
+        <release-date>2017-08-06</release-date>
         <vendor url="http://dotlrn.org">DotLRN Consortium</vendor>
         <maturity>2</maturity>
         <summary>Mailing form letters to groups of users.</summary>
         <description format="text/html">Provides an API for sending messages to a collection of users (which can be chosen via arbitrary sql).  Mails can be personalized and can be scheduled for a later date.</description>
 
 
-        <provides url="bulk-mail" version="2.9.0"/>
-        <requires url="acs-mail-lite" version="5.9.0"/>
+        <provides url="bulk-mail" version="2.9.1"/>
+        <requires url="acs-mail-lite" version="5.9.1"/>
 
         <callbacks>
         </callbacks>

catalog/bulk-mail.pl_PL.utf-8.xml

 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="bulk-mail" package_version="0.5.1d5" locale="pl_PL" charset="utf-8">
+<message_catalog package_key="bulk-mail" locale="pl_PL" charset="utf-8">
 
+  <msg key="Cancelled">Anulowano</msg>
   <msg key="Extra_Headers">Dodatkowe Nagłówki</msg>
   <msg key="From">Od</msg>
   <msg key="lt_No_bulk_mail_messages">Brak komunikatów do wyświetlenia.</msg>
   <msg key="Message">Komunikat</msg>
+  <msg key="Message_not_sent_yet">Nie wysłano jeszcze tego komunikatu. Możesz go &lt;a href=&quot;cancel?bulk_mail_id=%bulk_mail_id%&quot;&gt; anulowaćl&lt;/a&gt;.</msg>
   <msg key="No">Nie</msg>
+  <msg key="Pending">Oczekujący</msg>
   <msg key="pretty_name">Poczta Hurtowa</msg>
   <msg key="Query">Pytanie</msg>
   <msg key="Reply_To">Odpowiedz</msg>
   <msg key="Send_Date">Data Wysłania</msg>
   <msg key="Sent">Wysłać?</msg>
+  <msg key="Status">Status</msg>
   <msg key="Subject">Temat</msg>
   <msg key="Yes">Tak</msg>
 </message_catalog>

tcl/bulk-mail-procs.tcl

@@ -200,21 +200,21 @@ namespace eval bulk_mail {
                 }
 
                 # it's possible that someone may want to override the from
-                # address on a per recepient basis
+                # address on a per recipient basis
                 set from_addr [ns_set get $bulk_mail from_addr]
                 if {[ns_set find $recipient from_addr] > -1} {
                     set from_addr [ns_set get $recipient from_addr]
                 }
 
                 # it's possible that someone may want to override the
-                # reply_to address on a per recepient basis
+                # reply_to address on a per recipient basis
                 set reply_to [ns_set get $bulk_mail reply_to]
                 if {[ns_set find $recipient reply_to] > -1} {
                     set reply_to [ns_set get $recipient reply_to]
                 }
 
                 # it's possible that someone may want to override the
-                # subject on a per recepient basis
+                # subject on a per recipient basis
                 # create the new bulk_mail message
                 set subject [ns_set get $bulk_mail subject]
                 if {[ns_set find $recipient subject] > -1} {
@@ -226,7 +226,7 @@ namespace eval bulk_mail {
                 set subject [interpolate -values $pairs -text $subject]
 
                 # it's possible that someone may want to override the
-                # message on a per recepient basis
+                # message on a per recipient basis
                 set message [ns_set get $bulk_mail message]
                 if {[ns_set find $recipient message] > -1} {
                     set message [ns_set get $recipient message]
@@ -235,7 +235,7 @@ namespace eval bulk_mail {
                 # mohan's hack to fix the passing of message type for the
                 # mail.
                 # Comment: I have to ask Caroline or Andrew if itis ok to 
-                # change bulk-mail datamodel to accomodate message_type.
+                # change bulk-mail datamodel to accommodate message_type.
 
                 set extra_headers [util_list_to_ns_set [ns_set get $bulk_mail extra_headers]]
                 set message_type  [ns_set get $extra_headers bulk-mail-type]
@@ -276,7 +276,9 @@ namespace eval bulk_mail {
                     -mime_type $mime_type \
                     -reply_to $reply_to \
                     -extraheaders $extra_headers \
-                    -use_sender
+                    -use_sender \
+                    -package_id [ns_set get $bulk_mail package_id] \
+                    -object_id [ns_set get $bulk_mail bulk_mail_id]
             }
 
             # mark the bulk_mail as sent so that we don't process it again

www/index.tcl

@@ -5,7 +5,7 @@ ad_page_contract {
     @cvs-id $Id$
 
 } -query {
-    {orderby "send_date"}
+    {orderby:token "send_date"}
 } -properties {
     title:onevalue
     context:onevalue