s4
changeset 831:0ec2df3e879a
Hidden variable of kwd should not appear in type="text" form
| author | HIROSE Yuuji <yuuji@gentei.org> |
|---|---|
| date | Sun, 21 Jun 2020 19:46:12 +0900 |
| parents | 0f947210a094 |
| children | 45be82d614ef |
| files | s4-funcs.sh |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line diff
1.1 --- a/s4-funcs.sh Sun Jun 21 17:44:18 2020 +0900 1.2 +++ b/s4-funcs.sh Sun Jun 21 19:46:12 2020 +0900 1.3 @@ -1975,7 +1975,7 @@ 1.4 esac 1.5 _m4 -D_TITLE_="グループ一覧" -D_BODYCLASS_=listgroup $layout/html.m4.html 1.6 kwd=`getpar kwd` 1.7 - listgroup $kwd \ 1.8 + listgroup "$kwd" \ 1.9 | _m4 -D_DUMPTABLE_="syscmd(cat)" \ 1.10 -D_TITLE_="グループ関連操作" \ 1.11 -D_FORM_="${LINK_NEWGRP}${NEWGRP_GUIDE}" \ 1.12 @@ -2446,8 +2446,9 @@ 1.13 if [ ! -s $dir/$deficon ]; then 1.14 convert -geometry $thumbxy $imgdir/$deficon $dir/$deficon 1.15 fi 1.16 - if [ -n "$2" ]; then 1.17 - kwd=`echo $2 | tr -d '";\n' | tr -d "'"` 1.18 + kwd=${2:-`getpar kwd`} 1.19 + if [ -n "$kwd" ]; then 1.20 + kwd=`echo $kwd | tr -d '";\n' | tr -d "'"` 1.21 case "$kwd" in 1.22 mem:*@*) 1.23 byuser=${kwd#*mem:} 1.24 @@ -2537,7 +2538,6 @@ 1.25 # Show owner/member filter button 1.26 METHOD=GET 1.27 hiddens="$hiddens 1.28 - `cgi_hidden kwd \"$kwd\"` 1.29 `cgi_hidden stage \"$stage\"`" 1.30 if [ x"$tbl" = x"grp" ]; then 1.31 args=`grep "^種別:" $formdir/grp.def | cut -d: -f5` 1.32 @@ -2577,6 +2577,7 @@ 1.33 else 1.34 echo $selectedtags | html p 1.35 fi 1.36 + test -n "$kwd" && hiddens="$hiddens$nl`cgi_hidden kwd \"$kwd\"`" 1.37 cat<<EOF 1.38 <form action="$myname" method="$METHOD"> 1.39 <p>${total}件中の<input class="hidesub" type="text" name="start"