EmailListAdministration third fix

1 files changed, 11 insertions, 5 deletions

diff --git a/firma b/firma
index 0427e77..6067cb2 100755
--- a/firma
+++ b/firma
@@ -1783,15 +1783,23 @@ function AdminLog {
   #+or email and then log a message according to the
   #+display mode
   #
-  # parameter(s): string
+  # parameter(s): string / --send (to send a message back)
   # depends on function(s): none
   # returns: 0
   #-------------------------------------------------------------
 
   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
   else
-    ADMIN_MESSAGE="`echo -e "$ADMIN_MESSAGE\n$*"`"
+    echo $*
   fi
 }
 
@@ -1826,9 +1834,7 @@ function EmailListAdministration {
         ListAdministration $command
       fi
     done
-    # TODO: send encrypted
-    MESSAGE_BODY="$ADMIN_MESSAGE"
-    ComposeAndSendBounceMessage
+    AdminLog --send
   else
     # message was sent by a normal subscriber
     # this is the body of the message to be sent, so no indentation here