Browse Source

fix commit 9667f1554bb2483a63b8f7ef01a49e0cd7e95e6a

Pi 1 year ago
parent
commit
43b85ed33c
2 changed files with 20 additions and 0 deletions
  1. 12 0
      cropswap-sendmail.sh
  2. 8 0
      filters/cropswap@shandan.one

+ 12 - 0
cropswap-sendmail.sh

@@ -78,6 +78,18 @@ then
 	reformail \
 		-I "To: ${TOALIAS:-} <${MAILGROUP}>" \
 	< mail | rm_list_headers | "$SENDMAIL" -F "$FROM" -f "$MAILGROUP" "$CROPSWAPARCHIVE"
+elif [ "${MAILGROUP}" == "${ORGANIZERGROUP:-x}" ] && [ "$TO" != "" ] && $DELIVERED
+then
+	mapfile -t SUBSCRIBED < <("${ITER_SUBS}" "${MLIST}" "${SLIST%/*}/alist" "${NOFORWARD}" "")
+
+	for addr in "${SUBSCRIBED[@]}"; do
+		echo "CC admin: "
+		echo "From: ${FROM} <${MAILGROUP}>"
+		echo "To: $addr"
+		reformail \
+			-I "To: ${TOALIAS:-} <${MAILGROUP}>" \
+		< mail | "$SENDMAIL" -F "${FROM}" -f "${MAILGROUP}" "$addr"
+	done
 fi
 
 "$DEBUGMAIL" "delivered:$DELIVERED" < mail || true

+ 8 - 0
filters/cropswap@shandan.one

@@ -16,6 +16,7 @@ if ($DISPATCH)
    SUBJECT="Crop Swap Query"
 
    gdbmopen($MLIST, "R")
+   TO=gdbmfetch(tolower($TOALIAS))
    ALIAS=gdbmfetch(tolower($FROM))
    gdbmclose
 
@@ -24,6 +25,7 @@ if ($DISPATCH)
       #
       # TODO: test this works at all
       # should at least drop list headers
+      TO=""
       SLIST="$LISTDIR/alist"
       REPLYTO=$FROM
       if (/^From:\s*("(.*)"|(.*))\s*\<.*\>$/)
@@ -49,6 +51,7 @@ if ($DISPATCH)
       #
       # TODO: test this works at all
       # should at least drop list headers
+      TO=""
       SLIST="$LISTDIR/alist"
       REPLYTO=$FROM
       FROM=$ALIAS
@@ -59,10 +62,15 @@ if ($DISPATCH)
    MLIST="$LISTDIR/alist"
    gdbmopen($MLIST, "R")
    ORGANIZER=gdbmfetch(tolower($FROM))
+   if (gdbmfetch(tolower($TO)) ne "")
+   {
+      TO=""
+   }
    gdbmclose
 
    if ($ORGANIZER eq "NONE" || $ORGANIZER eq "")
    {
+      TO=""
       MLIST="$LISTDIR/mlist"
       SLIST="$LISTDIR/alist"
       FROM=$ALIAS