From: Ben Schmidt <none@none>
Date: Sun, 19 Sep 2010 16:52:22 +0000 (+1000)
Subject: Richer MIME list texts with inline messages (English only so far)
X-Git-Tag: RELEASE_1_2_18a1~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a53a2c4b09b947401aa3db013e0f5bf9a2563cfa;p=thirdparty%2Fmlmmj.git

Richer MIME list texts with inline messages (English only so far)
---

diff --git a/ChangeLog b/ChangeLog
index 7d10da18..08041ce6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+ o Richer MIME list texts with inline messages (English only so far)
  o Add $random0$ through $random5$ substitutions
  o Add a $subject$ substitution for list texts
  o Changes to how $originalmail$ works -- existing installations will change
diff --git a/listtexts/en/access b/listtexts/en/access
index 90c1989a..3ca380c7 100644
--- a/listtexts/en/access
+++ b/listtexts/en/access
@@ -1,14 +1,32 @@
 Subject: Post to $listaddr$ denied
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="=_$random0$$random1$_="
+Content-Transfer-Encoding: 8bit
+
+--=_$random0$$random1$_=
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
 
 Hi, this is the mlmmj program managing the mailinglist
 
 $listaddr$
 
-I'm sorry to inform you that your message could not be delivered to the
-list. Your mail was rejected because it matched a rule set up by the
-list administrator.
+I'm sorry to inform you that your message with subject line
+
+$subject$
+
+could not be delivered to the list. Your mail was rejected because it
+matched a rule set up by the list administrator.
 
 Thanks.
 
---- Below this line are the first 100 lines of the denied message --->
- $originalmail$
+(The denied message is below.)
+
+--=_$random0$$random1$_=
+Content-Type: message/rfc822
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="message.eml"
+
+$originalmail1000000000$
+--=_$random0$$random1$_=--
diff --git a/listtexts/en/maxmailsize b/listtexts/en/maxmailsize
index 3925f1b0..ee78adbc 100644
--- a/listtexts/en/maxmailsize
+++ b/listtexts/en/maxmailsize
@@ -1,4 +1,12 @@
 Subject: Post to $listaddr$ denied due to size limit
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="=_$random0$$random1$_="
+Content-Transfer-Encoding: 8bit
+
+--=_$random0$$random1$_=
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
 
 Hi, this is the mlmmj program managing the mailinglist
 
@@ -9,5 +17,12 @@ list. Your mail was rejected due to the size limit of $maxmailsize$ bytes.
 
 Thanks.
 
---- Below this line are the first 100 lines of the denied message --->
- $originalmail$
+(The beginning of the denied message is below.)
+
+--=_$random0$$random1$_=
+Content-Type: message/rfc822
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="message.eml"
+
+$originalmail$
+--=_$random0$$random1$_=--
diff --git a/listtexts/en/moderation b/listtexts/en/moderation
index 7a7d9df6..c7d658c5 100644
--- a/listtexts/en/moderation
+++ b/listtexts/en/moderation
@@ -1,4 +1,12 @@
 Subject: Moderation needed for $listaddr$
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="=_$random0$$random1$_="
+Content-Transfer-Encoding: 8bit
+
+--=_$random0$$random1$_=
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
 
 Hello,
 
@@ -6,6 +14,12 @@ Someone has submitted a message for moderation to:
 
 $listaddr$
 
+with subject line:
+
+$subject$
+
+It is below.
+
 To accept it send a message to:
 
 $moderateaddr$
@@ -18,5 +32,10 @@ The following moderators have received this mail:
 
 $moderators$
 
---- Below this line are the first 100 lines of the message up for moderation --->
- $originalmail$
+--=_$random0$$random1$_=
+Content-Type: message/rfc822
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="message.eml"
+
+$originalmail1000000000$
+--=_$random0$$random1$_=--
diff --git a/listtexts/en/moderation-poster b/listtexts/en/moderation-poster
index a4a9fe47..8583388f 100644
--- a/listtexts/en/moderation-poster
+++ b/listtexts/en/moderation-poster
@@ -1,11 +1,30 @@
 Subject: Post waiting for approval
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="=_$random0$$random1$_="
+Content-Transfer-Encoding: 8bit
+
+--=_$random0$$random1$_=
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
 
 Hi, this is the mlmmj program managing the mailinglist
 
 $listaddr$
 
-This list is configured to have moderated posts, the post has been queued
-for approval.
+This list is configured to have moderated posts. Your post with subject
+line
+
+$subject$
+
+has been queued for approval.
+
+(The queued message is below.)
+
+--=_$random0$$random1$_=
+Content-Type: message/rfc822
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="message.eml"
 
---- Below this line are the first 100 lines of the message up for moderation --->
- $originalmail$
+$originalmail1000000000$
+--=_$random0$$random1$_=--
diff --git a/listtexts/en/notintocc b/listtexts/en/notintocc
index 841168e9..8c2f052f 100644
--- a/listtexts/en/notintocc
+++ b/listtexts/en/notintocc
@@ -1,16 +1,34 @@
 Subject: Posts to $listaddr$ denied
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="=_$random0$$random1$_="
+Content-Transfer-Encoding: 8bit
+
+--=_$random0$$random1$_=
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
 
 Hi, this is the mlmmj program managing the mailinglist
 
 $listaddr$
 
-I'm sorry to inform you that your message could not be delivered to the
-list.
+I'm sorry to inform you that your message with subject line
+
+$subject$
+
+could not be delivered to the list.
 
 In order to post to this list, the list address must be contained
 in either the To: or Cc: header.
 
 Thanks.
 
---- Below this line are the first 100 lines of the denied message --->
- $originalmail$
+(The denied message is below.)
+
+--=_$random0$$random1$_=
+Content-Type: message/rfc822
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="message.eml"
+
+$originalmail1000000000$
+--=_$random0$$random1$_=--
diff --git a/listtexts/en/subonlypost b/listtexts/en/subonlypost
index 8dc146d3..f647a934 100644
--- a/listtexts/en/subonlypost
+++ b/listtexts/en/subonlypost
@@ -1,14 +1,26 @@
 Subject: $listaddr$ is a subscribers only list
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="=_$random0$$random1$_="
+Content-Transfer-Encoding: 8bit
+
+--=_$random0$$random1$_=
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
 
 Hi, this is the mlmmj program managing the mailinglist
 
 $listaddr$
 
-You have tried to post from this email address:
+Your post with subject line
+
+$subject$
+
+came from the email address
 
 $posteraddr$
 
-But this address is not subscribed, and only subscribers may post to
+but this address is not subscribed, and only subscribers may post to
 the list.
 
 If you believe you are correctly subscribed, please check the email address
@@ -18,5 +30,12 @@ any message to the mailinglist.
 If you want to be able to post from more than one email address, you
 can subscribe the other addresses to the nomail version of the list.
 
---- Below this line are the first 100 lines of the denied message --->
- $originalmail$
+(The denied message is below.)
+
+--=_$random0$$random1$_=
+Content-Type: message/rfc822
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline; filename="message.eml"
+
+$originalmail1000000000$
+--=_$random0$$random1$_=--