aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhatto <rhatto>2006-10-11 23:24:27 +0000
committerrhatto <rhatto>2006-10-11 23:24:27 +0000
commit0e61d16546d9b0257fe73bfee88c6409962a26d8 (patch)
tree67d7a0cbe2d70984e9e325a8c5b294a15de6396d
parent16ae399ecb31cfe4d9f7dbb1093f21c304ba03d8 (diff)
downloadfirma-0e61d16546d9b0257fe73bfee88c6409962a26d8.tar.gz
firma-0e61d16546d9b0257fe73bfee88c6409962a26d8.tar.bz2
EmailListAdministration updated to old version
-rwxr-xr-xfirma14
1 files changed, 5 insertions, 9 deletions
diff --git a/firma b/firma
index 6067cb2..de6f3e0 100755
--- a/firma
+++ b/firma
@@ -1783,7 +1783,7 @@ function AdminLog {
#+or email and then log a message according to the
#+display mode
#
- # parameter(s): string / --send (to send a message back)
+ # parameter(s): string
# depends on function(s): none
# returns: 0
#-------------------------------------------------------------
@@ -1791,13 +1791,7 @@ function AdminLog {
if [ "$MODE" == "admin-interactive" ]; then
echo >&2 "$*"
elif [ "$MODE" == "admin-non-interactive" ]; then
- if [ "$1" == "--send" ]; then
- # TODO: send encrypted
- MESSAGE_BODY="`echo -e "$ADMIN_MESSAGE"`"
- ComposeAndSendBounceMessage
- else
- ADMIN_MESSAGE="$ADMIN_MESSAGE\n$*"
- fi
+ ADMIN_MESSAGE="$ADMIN_MESSAGE\n$*"
else
echo $*
fi
@@ -1834,7 +1828,9 @@ function EmailListAdministration {
ListAdministration $command
fi
done
- AdminLog --send
+ # TODO: send encrypted
+ MESSAGE_BODY="`echo -e "$ADMIN_MESSAGE"`"
+ ComposeAndSendBounceMessage
else
# message was sent by a normal subscriber
# this is the body of the message to be sent, so no indentation here