s4: s4-blog.sh comparison

comparison s4-blog.sh @ 942:5d70fa029f8d draft

Support MathJax rendering

author	HIROSE Yuuji <yuuji@gentei.org>
date	Mon, 25 Oct 2021 18:39:44 +0900
parents	6c2f8bb3cc6e
children	420ad90116e6

comparison

equal deleted inserted replaced

-:79c7e64884c4
+:5d70fa029f8d
 fi
 err "blog_showentry  Entered: `gdate +%S.%03N` blogrowid=$rowid"
 blog_notify=`getvalbyid blog notify "$rowid"`
 blog_team=`blog_getteam "$rowid"`
 blog_mode=`getvalbyid blog mode "$rowid"`
+blog_math=`getvalbyid blog mathjax "$rowid"`
 case "$blog_notify" in # "all", "admin" or "no" (or NULL)
 admin)	notifyto=adm ;;
 *)		notifyto="" ;;
 esac
 case $blog_mode in
 	    ;;
 	esac
 	;;
 esac
 fi
-href4="<a href=\"#bottom\" accesskey=\"b\" title=\"Shortcut: B${nl}to the Bottom\"> 末尾へ</a>"
+href4="${blog_math:+Math} <a href=\"#bottom\" accesskey=\"b\" title=\"Shortcut: B${nl}to the Bottom\"> 末尾へ</a>"
 $isgrpadmin &&
 href5="<a href=\"?blogseen+$rowid\" accesskey=\"s\" title=\"Shortcut: S${nl}State of Accesses\"> 読刻</a>"
 quizmodefile=$tmpd/quiz; rm -f "$quizmodefile"	# XXX: Global state
 midfile=$tmpd/midfile
 EOF
 if [ $? -ne 0 -a ! -s $midfile ]; then
 echo "時間をおいてください(Visit later please)." | html p
 return
 fi
+echo "${blog_math:+$mathjax}"
 echo '<table class="blog_replies"> <!-- blog:blog_showentry() main table -->'
 # If, nLimit = 50
 # show article:1, hide(2, 3), show(4, ...)
 # Therefore hide 2 or more article when narts>53
 narts=`wc -l < $midfile`
 CAT=cat
 fi
 err "blog_showentry  Started: `gdate +%S.%03N` ${fetch_ajax:+ajax}"
 # Start blog_replies table
 $CAT $midfile |
-while IFS='|' read id edit notify uid author uname icon aid \
+while IFS='|' read -r id edit notify uid author uname icon aid \
 	   tm reki new hte fa imgids
 do
 if [ -n "$omitline" ]; then
 n=$((n+1))
 if [ $n -eq 1 ]; then
 fi
 time=`getvalbyid blog ctime $1|colrm 11`
 owner=`getvalbyid blog owner $1`
 title=`getvalbyid blog title $1`
 ge=`gecos "$owner"`
-htmlowner=`echo ${ge:-$owner}|htmlescape`
+htmlowner=`printf '%s' "${ge:-$owner}"|htmlescape`
 fh=$tmpd/formhead
 echo "$time [$title]@$htmlowner" > $fh
 lshandoutsub "$owner" "$@" \
 |_m4 -D_TITLE_="提出状況" \
 	   -D_H1_="提出状況" \
 	   -D_FORMHEAD_="syscmd(cat $fh)" \
 	   -D_FORM_="syscmd(cat)" -D_DUMPHEAD_= -D_DUMPTABLE_= \
 	   $layout/html.m4.html $layout/form+dump-whead.m4.html
-gn=`echo $owner|htmlescape`
+gn=`printf '%s' "$owner"|htmlescape`
 echo "<p><a href=\"?lshandoutall+$1\">グループ $gn すべてのレポート板集計</a></p>"
 }
 gethandoutcsv() {
 # contenttype; echo
 CATCSV=1 lshandoutall "$1"
 	EOF
 if [ -z "$CATCSV" ]; then
 _m4 -D_TITLE_="提出状況" $layout/html.m4.html
 ge=`gecos "$owner"`
 tbls=""
-grptxt=`echo "${ge:-$owner}"|htmlescape`
+grptxt=`printf '%s' "${ge:-$owner}"|htmlescape`
 echo "<h1>$grptxt 書き込み状況一覧</h1>"
 fi
 if [ -z "$SQL" ]; then
 bridlist=`query "SELECT brid FROM report_type_blogs;"`
 for brid in $bridlist; do	# Skip this loop if $SQL set
 brid=$(($brid + 0))		# Ensure to be a number
 [ $brid = 0 ] && continue
 time=`getvalbyid blog ctime $brid|colrm 11`
 title=`getvalbyid blog title $brid`
-titleH=`echo "$title"|htmlescape`
+titleH=`printf '%s' "$title"|htmlescape`
 state=`getvalbyid blog state $brid|htmlescape`
 tt="handout_$brid"
 [ "$state" = "frozen" ] && frozen=" $FROZEN_TAG" || frozen=""
 if [ -z "$CATCSV" ]; then
 	echo "<h2>$time - <a href=\"?replyblog+$brid\">$titleH</a>$frozen</h2>"
 td=${time:+"<td>"}			# If the variable time is set, td=<td>
 td=${td:-"<td$warn>"}		# else td=<td class="warn">
 cat <<-EOF
 	<tr>
 	 <td><a href="?home+$uid">`echo "$hexge"|unhexize|htmlescape`</a></td>
-	 <td>`echo ${u%%@*}|htmlescape`</td>
+	 <td>`printf '%s' "${u%%@*}"|htmlescape`</td>
 	 $td${time:----}</td></tr>
 	EOF
 done
 cat <<-EOF
 	</table>
 if expr x"$kwd" : 'x#[1-9][0-9]*$' >/dev/null 1>&2; then
 # Like '#1234', assume as artID
 rowid=$((${kwd#\#} + 0))	# Force to be a number
 kc="ar.rowid = $rowid"
 else
-for k in `echo "$kwd" | sed "s/'/''/g"`; do		# With wrap quotes
+for k in `printf '%s' "$kwd" | sed "s/'/''/g"`; do	# With wrap quotes
 ctime=""
 if expr x"$k" : 'x@[><= ]*[1-9][][0-9]*-[][0-9:-]*$' >/dev/null >&2; then
 	# '@<2016-10-10'	-> ctime < '2016-10-10'
 	# '@>=2016-10-10'	-> ctime >= '2016-10-10'
 	# '@2016-10-10'		-> ctime GLOB '@2016-10-10'
 	kc=$kc${kc:+" AND "}"ctime > '${ctime}'"
 else
 	e=""
 	case "$k" in
 	  *${likeesc}*) e="" ;;		# Giving up char-escaping
-	  *%*|*_*) k=`echo "$k"|sed "s/\([%_]\)/${likeesc}\1/g"`
+	  *%*|*_*) k=`printf '%s' "$k"|sed "s/\([%_]\)/${likeesc}\1/g"`
 	       e=" ESCAPE '$likeesc'" ;;
 	esac
 	kc=$kc${kc:+" AND "}"content LIKE '%$k%'$e"
 fi
 done
 fi
-kwd=`echo "$kwd"|htmlescape`
+kwd=`printf '%s' "$kwd"|htmlescape`
 owner=`getpar owner`
 owner=${owner:-$1}
 grid=`getpar grid`
 msg=""
 if [ -n "$grid" ]; then
 fi
 # echo "{\"code\": $code, \"message\": \"foo\"}"; exit
 newval=`getvalbyid blog "$2" "$1"`
 alert="${msg:+, \"alert\": \"$msg\"}"
 json=$(cat <<-EOF
-	{"code": $code, "$2": "`echo "$newval"|sed 's/"/\\\\"/g'`"$alert}
+	{"code": $code, "$2": "`printf '%s' "$newval"|sed 's/"/\\\\"/g'`"$alert}
 	EOF
 )
 err blog_setval: returning JSON: "$json"
-echo "$json"
+printf '%s\n' "$json"
 exit
 }
 blog_setfrozen() {
 # $1=GRProwID $2=val={ "frozen" | "" }
 if [ -n "$grprowid" ]; then
 owner=`getgroupbyid $grprowid`
 else
 owner=`getpar owner`
 fi
-htmlowner=`echo $owner|htmlescape`
+htmlowner=`printf '%s' $owner|htmlescape`
 err blog-add: \$1=$grprowid rowid=$rowid owner=$owner
 if isgroup "$owner"; then
 if [ -z "$grprowid" ]; then
 qgrp=`sqlquote "$owner"`	# Inefficient...
 grprowid=`query "SELECT rowid FROM grp WHERE gname=$qgrp;"`
 echo "表示する日記番号が未指定です。" | html p
 return
 fi
 title=`getvalbyid blog title $rowid`
 owner=`getvalbyid blog owner $rowid`
-htmlowner=`echo $owner|htmlescape`
+htmlowner=`printf '%s' $owner|htmlescape`
 qowner=`sqlquotestr "$owner"`
 if [ -z "$title" ]; then
 echo "日記番号指定が無効です。" | html p
 return
 fi

Mercurial > hgrepos > hgweb.cgi > s4

comparison s4-blog.sh @ 942:5d70fa029f8d draft