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 wrap: on
line diff
--- a/s4-funcs.sh	Sun Jun 21 17:44:18 2020 +0900
+++ b/s4-funcs.sh	Sun Jun 21 19:46:12 2020 +0900
@@ -1975,7 +1975,7 @@
   esac
   _m4 -D_TITLE_="グループ一覧" -D_BODYCLASS_=listgroup $layout/html.m4.html
   kwd=`getpar kwd`
-  listgroup $kwd \
+  listgroup "$kwd" \
       | _m4 -D_DUMPTABLE_="syscmd(cat)" \
 	    -D_TITLE_="グループ関連操作" \
 	    -D_FORM_="${LINK_NEWGRP}${NEWGRP_GUIDE}" \
@@ -2446,8 +2446,9 @@
   if [ ! -s $dir/$deficon ]; then
     convert -geometry $thumbxy $imgdir/$deficon $dir/$deficon
   fi
-  if [ -n "$2" ]; then
-    kwd=`echo $2 | tr -d '";\n' | tr -d "'"`
+  kwd=${2:-`getpar kwd`}
+  if [ -n "$kwd" ]; then
+    kwd=`echo $kwd | tr -d '";\n' | tr -d "'"`
     case "$kwd" in
       mem:*@*)
 	byuser=${kwd#*mem:}
@@ -2537,7 +2538,6 @@
   # Show owner/member filter button
   METHOD=GET
   hiddens="$hiddens
-	`cgi_hidden kwd \"$kwd\"`
 	`cgi_hidden stage \"$stage\"`"
   if [ x"$tbl" = x"grp" ]; then
     args=`grep "^種別:"  $formdir/grp.def | cut -d: -f5`
@@ -2577,6 +2577,7 @@
   else
     echo $selectedtags | html p
   fi
+  test -n "$kwd" && hiddens="$hiddens$nl`cgi_hidden kwd \"$kwd\"`"
   cat<<EOF
   <form action="$myname" method="$METHOD">
   <p>${total}件中の<input class="hidesub" type="text" name="start"

yatex.org