# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1589163485 -32400
# Node ID d6f464f0a2128f4e84bb92c7b61b7d445718a5f3
# Parent  22f4f91656a8fb41c51cd23aa972c28fa2038316
Include more chars into htmlescape for m4 processing

diff -r 22f4f91656a8 -r d6f464f0a212 s4-funcs.sh
--- a/s4-funcs.sh	Sun May 10 15:28:40 2020 +0900
+++ b/s4-funcs.sh	Mon May 11 11:18:05 2020 +0900
@@ -948,7 +948,7 @@
 }
 htmlescape() {
   sed -e 's/\&/\&amp;/g' -e 's/"/\&quot;/g' -e "s/'/\&apos;/g" \
-      -e "s/</\&lt;/g; s/>/\&gt;/g"
+      -e "s/</\&lt;/g; s/>/\&gt;/g" -e 's/`/\&#096;/g' -e 's/(/\&#040;/g'
 }
 enascii() {
   if [ -z "$enascii" ]; then
@@ -2411,6 +2411,7 @@
   fi
   grp=`getgroupbyid $grid`
   qgrp=`sqlquote "$grp"`
+  htmlgrp=`echo "$grp"|htmlescape`
   ## err showgroup2: grid=$grid grp=$grp qgrp="[$qgrp]"
   if isgroup "$grp"; then
     tf=$tmpd/title.$$
@@ -2419,14 +2420,13 @@
 	       WHERE gname=$qgrp AND key='regmode';"`
     if ismember "$user" "$grp"; then
       ismember="ismember"
-      qgrp=`sqlquote "$grp"`
       bodyclass="$bodyclass${bodyclass:+ }ismember"
     else
       ismember="" # bodyclass="group"
     fi
     bodyclass="$bodyclass grouphome"
-    echo "<div class=\"search\">`search_form grp=\"$grp\"`</div>"> $sf
-    echo "グループ $grp" > $tf
+    echo "<div class=\"search\">`search_form grp=\"$htmlgrp\"`</div>"> $sf
+    echo "グループ $htmlgrp" > $tf
 
     showgroupsub $formdir/grp.def "$grid" | \
 	_m4 -D_TITLE_="syscmd(\`cat $tf')" \