Mercurial > hgrepos > hgweb.cgi > s4

changeset 630:8874225971ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test of setting Reply-to header
author HIROSE Yuuji <yuuji@gentei.org>
date Fri, 24 Apr 2020 20:59:23 +0900
parents b1ddb2559d77
children 574529409c72
files examples/common/msg/mail-header.m4 s4-funcs.sh
diffstat 2 files changed, 14 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/examples/common/msg/mail-header.m4	Thu Apr 23 08:14:09 2020 +0900
+++ b/examples/common/msg/mail-header.m4	Fri Apr 24 20:59:23 2020 +0900
@@ -3,4 +3,5 @@
 From: _FROM_
 MIME-Version: 1.0
 Content-type: text/plain; charset=iso-2022-jp
+_REPLYTO_
 
--- a/s4-funcs.sh	Thu Apr 23 08:14:09 2020 +0900
+++ b/s4-funcs.sh	Fri Apr 24 20:59:23 2020 +0900
@@ -1146,8 +1146,10 @@
   from=`echo "${MAIL_FROM:-$admin}"|nkf -jM|tr -d '\n'`
   rcpt=`echo $1|tr ' ' '\n'|sort -u|tr '\n' ' '` # uniq and strip newlines
   subj=`echo $2|nkf -jM|tr -d '\n'`
-  (_m4 -D_RCPT_="${SMAIL_TO:-$rcpt}" -D_SUBJ_="\`$subj'" -D_FROM_="$from" $msgdir/mail-header.m4
-   cat $3 | nkf -jd ) | sendmail -f $admin $rcpt
+  sender=${SENDER:-$admin}
+  replyto=${REPLYTO:+"Reply-to: $REPLYTO$LF"}
+  (_m4 -D_RCPT_="${SMAIL_TO:-$rcpt}" -D_REPLYTO_="$replyto" -D_SUBJ_="\`$subj'" -D_FROM_="$from" $msgdir/mail-header.m4
+   cat $3 | nkf -jd ) | sendmail -f $sender $rcpt
 }
 smail_queue_flush() {
   # $1=timelimit
@@ -2617,9 +2619,12 @@
 	myuid=`query "SELECT rowid FROM user WHERE name='$user';"`
 	fromad=`email4groupbyuid "$grp" "$myuid" | sed -e 1q -e 's/[ ,].*//'`
 	mail_from="$safegc <$fromad>"
+	replyto=$fromad
       else
 	mail_from="$noreply_from"
       fi
+      ## SENDER=$noreply \ # Should not SENDER be set to $noreply??
+      REPLYTO=$replyto \
       MAIL_FROM=$mail_from \
 	       smail "`email4groupbyuid "$grp" $usel` $user" \
 	       "$gecos さんからのメッセージ" <<EOF
@@ -3013,8 +3018,13 @@
   fi
   grp=`getgroupbyid $rowid`
   members=`collectemail $grp`
+  myuid=`query "SELECT rowid FROM user WHERE name='$user';"`
+  mailfrom=`email4groupbyuid "$grp" "$myuid" | sed -e 1q -e 's/[ ,].*//'`
   # smail rcpt subj (file)
-  SMAIL_TO="`echo "$grp" | nkf -jM | tr -d '\n'` readers <$admin>" \
+  MAIL_FROM=$mailfrom \
+  SENDER=$noreply \
+  REPLYTO=$mailfrom \
+  SMAIL_TO="`echo "$grp" | nkf -jM | tr -d '\n'` readers <$noreply>" \
 	  smail "$members" "グループ $grp 宛メッセージ(from `gecos $user`)" <<EOF
 $urlbase?grp+$rowid
 グループ $grp に所属する

yatex.org