EmailListAdministration change in MESSAGE_BODY handling

1 files changed, 6 insertions, 6 deletions

diff --git a/firma b/firma
index de6f3e0..749c270 100755
--- a/firma
+++ b/firma
@@ -1790,7 +1790,7 @@ function AdminLog {
 
   if [ "$MODE" == "admin-interactive" ]; then
     echo >&2 "$*"
-  elif [ "$MODE" == "admin-non-interactive" ]; then
+  # elif [ "$MODE" == "admin-non-interactive" ]; then
     ADMIN_MESSAGE="$ADMIN_MESSAGE\n$*"
   else
     echo $*
@@ -1808,7 +1808,6 @@ function EmailListAdministration {
   #          1 on failure  :/
   #-------------------------------------------------------------
 
-  local -i return_code=0
   local sender found
   local command
 
@@ -1822,14 +1821,15 @@ function EmailListAdministration {
   if [ "$found" == "1" ]; then
     # message was sent by an admin
     #+then, parse and process admin tasks
-    echo -e "$DECRYPTED_MESSAGE" | while read command; do
+    MESSAGE_BODY="\
+    `echo -e "$DECRYPTED_MESSAGE" | while read command; do
       if [ ! -z "$command" ]; then
         AdminLog "Command> $command"
         ListAdministration $command
       fi
-    done
+    done`"
     # TODO: send encrypted
-    MESSAGE_BODY="`echo -e "$ADMIN_MESSAGE"`"
+    # MESSAGE_BODY="`echo -e "$ADMIN_MESSAGE"`"
     ComposeAndSendBounceMessage
   else
     # message was sent by a normal subscriber
@@ -1840,7 +1840,7 @@ function EmailListAdministration {
     ComposeAndSendBounceMessage
   fi
 
-  return $return_code
+  return $?
 }