s4
changeset 654:d6f464f0a212
Include more chars into htmlescape for m4 processing
author | HIROSE Yuuji <yuuji@gentei.org> |
---|---|
date | Mon, 11 May 2020 11:18:05 +0900 |
parents | 22f4f91656a8 |
children | a049d3cb0389 |
files | s4-funcs.sh |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line diff
1.1 --- a/s4-funcs.sh Sun May 10 15:28:40 2020 +0900 1.2 +++ b/s4-funcs.sh Mon May 11 11:18:05 2020 +0900 1.3 @@ -948,7 +948,7 @@ 1.4 } 1.5 htmlescape() { 1.6 sed -e 's/\&/\&/g' -e 's/"/\"/g' -e "s/'/\'/g" \ 1.7 - -e "s/</\</g; s/>/\>/g" 1.8 + -e "s/</\</g; s/>/\>/g" -e 's/`/\`/g' -e 's/(/\(/g' 1.9 } 1.10 enascii() { 1.11 if [ -z "$enascii" ]; then 1.12 @@ -2411,6 +2411,7 @@ 1.13 fi 1.14 grp=`getgroupbyid $grid` 1.15 qgrp=`sqlquote "$grp"` 1.16 + htmlgrp=`echo "$grp"|htmlescape` 1.17 ## err showgroup2: grid=$grid grp=$grp qgrp="[$qgrp]" 1.18 if isgroup "$grp"; then 1.19 tf=$tmpd/title.$$ 1.20 @@ -2419,14 +2420,13 @@ 1.21 WHERE gname=$qgrp AND key='regmode';"` 1.22 if ismember "$user" "$grp"; then 1.23 ismember="ismember" 1.24 - qgrp=`sqlquote "$grp"` 1.25 bodyclass="$bodyclass${bodyclass:+ }ismember" 1.26 else 1.27 ismember="" # bodyclass="group" 1.28 fi 1.29 bodyclass="$bodyclass grouphome" 1.30 - echo "<div class=\"search\">`search_form grp=\"$grp\"`</div>"> $sf 1.31 - echo "グループ $grp" > $tf 1.32 + echo "<div class=\"search\">`search_form grp=\"$htmlgrp\"`</div>"> $sf 1.33 + echo "グループ $htmlgrp" > $tf 1.34 1.35 showgroupsub $formdir/grp.def "$grid" | \ 1.36 _m4 -D_TITLE_="syscmd(\`cat $tf')" \