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(-) [+]
[-]

s4-funcs.sh 8 s4-funcs.sh 8
s4-funcs.sh 8
     1.1 --- a/s4-funcs.sh	Thu May 14 22:39:17 2020 +0900
     1.2 +++ b/s4-funcs.sh	Fri May 15 10:20:36 2020 +0900
     1.3 @@ -2657,6 +2657,8 @@
     1.4        fromad=`myemail4group "$grp"`
     1.5        ###mail_from="$safegc <$fromad>"
     1.6        mail_from="$safegc <$user>"	# TEST: 2020/5/13
     1.7 +      test -n `getpar sender` &&
     1.8 +	export SENDER=$user		# TEST: 2020/5/15
     1.9        replyto=$fromad
    1.10        
    1.11        ## Start parse of attachment files
    1.12 @@ -2685,7 +2687,6 @@
    1.13  	EOF
    1.14  	)
    1.15        fi
    1.16 -      ## SENDER=$noreply \ # Should not SENDER be set to $noreply??
    1.17        rcpts="`email4groupbyuid "$grp" $usel` $supprcpt"
    1.18        subj="${subj:-$gecos さんからのメッセージ}"
    1.19        REPLYTO=$replyto
    1.20 @@ -2851,7 +2852,10 @@
    1.21  >email書式を使う</label>
    1.22  <div class="folded">
    1.23  <table>
    1.24 -<tr><td>From: </td><td>`myemail4group "$grp"`</td></tr>
    1.25 +<tr><td>From: </td><td>$user</td></tr>
    1.26 +<tr><td>このFrom:で送る</td>
    1.27 +<td>`cgi_checkbox sender yes 'checked'`<small>送信できない場合はチェックを外す</small>
    1.28 +</td></tr>
    1.29  <tr><td>Subject: </td><td>`cgi_text subject`</td></tr>
    1.30  <tr><td>追加宛先(通常空欄): </td><td>`cgi_text supprcpt ""`</td></tr>
    1.31  <tr><td>ファイル添付: </td>