# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1589505636 -32400
# Node ID 8091eb17759636f4da9a24ad6bd3143c24d52c54
# Parent  c4beaec803221dc56ffc62f9a22a129c1fdba404
Sender address set to $user in email-mode

diff -r c4beaec80322 -r 8091eb177596 s4-funcs.sh
--- 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>