]> gitweb.fluxo.info Git - firma.git/commitdiff
EmailListAdministration updated to old version
authorrhatto <rhatto>
Wed, 11 Oct 2006 23:24:27 +0000 (23:24 +0000)
committerrhatto <rhatto>
Wed, 11 Oct 2006 23:24:27 +0000 (23:24 +0000)
firma

diff --git a/firma b/firma
index 6067cb21211feab7373f4f18dac572ede1e5df99..de6f3e0cfb7fc6cbb62fb1e96b894e2026ad53d1 100755 (executable)
--- 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