From 8a275ce2e495551b537c6d6d46d9d8e0078697e0 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto>
Date: Thu, 12 Oct 2006 14:13:46 +0000
Subject: moved some code from EmailListAdministration to MimeWrapMessage

---
 firma | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'firma')

diff --git a/firma b/firma
index aef2b31..0a7c1b1 100755
--- a/firma
+++ b/firma
@@ -1826,16 +1826,7 @@ function EmailListAdministration {
         ListAdministration $command
       fi
     done`"
-
-    # this is the body of the message to be sent, so no indentation here
-    MESSAGE_BODY="\
-Content-Type: text/plain; charset=iso-8859-1
-Content-Disposition: inline
-Content-Transfer-Encoding: quoted-printable
-
-$MESSAGE_BODY"
-
-    GPG_MESSAGE="`echo -e "${PASSPHRASE}\n${MESSAGE_BODY}" | $GPG_ENCRYPT --recipient $SENDER_ADDRESS`"
+    # send a message back to the administrator
     RECIPIENTS="$SENDER_ADDRESS"
     SUBJECT="admin request results"
     MimeWrapMessage
@@ -1913,6 +1904,16 @@ Content-Type: multipart/encrypted;
   boundary=\"${boundary}\"
 Content-Disposition: inline"
 
+  # this is the body of the message to be sent, so no indentation here
+  MESSAGE_BODY="\
+Content-Type: text/plain; charset=iso-8859-1
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+$MESSAGE_BODY"
+
+  GPG_MESSAGE="`echo -e "${PASSPHRASE}\n${MESSAGE_BODY}" | $GPG_ENCRYPT --recipient $RECIPIENTS`"
+
   # this is the body of the message to be sent, so no indentation here
   MESSAGE_BODY="\
 This is an OpenPGP/MIME encrypted message (RFC 2440 and 3156)
-- 
cgit v1.2.3