Mercurial > hgrepos > hgweb.cgi > s4
changeset 684:8091eb177596
Sender address set to $user in email-mode
author | HIROSE Yuuji <yuuji@gentei.org> |
---|---|
date | Fri, 15 May 2020 10:20:36 +0900 |
parents | c4beaec80322 |
children | a13f49da8788 |
files | s4-funcs.sh |
diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/s4-funcs.sh Thu May 14 22:39:17 2020 +0900 +++ b/s4-funcs.sh Fri May 15 10:20:36 2020 +0900 @@ -2657,6 +2657,8 @@ fromad=`myemail4group "$grp"` ###mail_from="$safegc <$fromad>" mail_from="$safegc <$user>" # TEST: 2020/5/13 + test -n `getpar sender` && + export SENDER=$user # TEST: 2020/5/15 replyto=$fromad ## Start parse of attachment files @@ -2685,7 +2687,6 @@ EOF ) fi - ## SENDER=$noreply \ # Should not SENDER be set to $noreply?? rcpts="`email4groupbyuid "$grp" $usel` $supprcpt" subj="${subj:-$gecos さんからのメッセージ}" REPLYTO=$replyto @@ -2851,7 +2852,10 @@ >email書式を使う</label> <div class="folded"> <table> -<tr><td>From: </td><td>`myemail4group "$grp"`</td></tr> +<tr><td>From: </td><td>$user</td></tr> +<tr><td>このFrom:で送る</td> +<td>`cgi_checkbox sender yes 'checked'`<small>送信できない場合はチェックを外す</small> +</td></tr> <tr><td>Subject: </td><td>`cgi_text subject`</td></tr> <tr><td>追加宛先(通常空欄): </td><td>`cgi_text supprcpt ""`</td></tr> <tr><td>ファイル添付: </td>