aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhatto <rhatto>2006-10-12 14:13:46 +0000
committerrhatto <rhatto>2006-10-12 14:13:46 +0000
commit8a275ce2e495551b537c6d6d46d9d8e0078697e0 (patch)
treeaaa13da7c9eee8fe538473299d4f9fba986a85fb
parent0411b154ddde53a3d0b5c8fed2774a0a3fa391f6 (diff)
downloadfirma-8a275ce2e495551b537c6d6d46d9d8e0078697e0.tar.gz
firma-8a275ce2e495551b537c6d6d46d9d8e0078697e0.tar.bz2
moved some code from EmailListAdministration to MimeWrapMessage
-rwxr-xr-xfirma21
1 files changed, 11 insertions, 10 deletions
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
@@ -1915,6 +1906,16 @@ 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)
--$boundary
Content-Type: application/pgp-encrypted