moved some code from EmailListAdministration to MimeWrapMessage

diff --git a/firma b/firma
index aef2b311f5740b775b4ca2595c95fac8bc569f4a..0a7c1b100077763e6e9b07ff93359451ef9aa2aa 100755 (executable)
--- 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)