# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1438738272 -32400
# Node ID d870eaf0e4dd522a67bd3bcf80a42177c9e6a528
# Parent  0d613e71c32bc468c240383f945ce1d73ed0c1ff
Revert to "sq $db"

diff -r 0d613e71c32b -r d870eaf0e4dd s4-funcs.sh
--- a/s4-funcs.sh	Tue Aug 04 23:19:49 2015 +0900
+++ b/s4-funcs.sh	Wed Aug 05 10:31:12 2015 +0900
@@ -40,9 +40,12 @@
     レポート提出管理
 ひとつのarticleをheadingにして新規ツリーを作成、あるといいかも。
 
-8/2	○s4.cgi生成系 → index.cgi生成
+8/4	○グループに承認加入モードを追加
+	○グループに参加していない場合は grpaction できない
 	Web
 	締切設定
+
+8/2	○s4.cgi生成系 → index.cgi生成
 	○自分の提出物リスト
 
 7/19	○設置
@@ -1766,7 +1769,7 @@
 `cgi_textarea text "" cols=40`
 </div>
 </div>
-${isowner:+\"$excmsg\"}
+${isowner:+"$excmsg"}
 <h4>$grp 参加者一覧</h4>
 <table>
 `sq $db -html "$sql"`
@@ -1913,12 +1916,12 @@
   isgrpowner "$user" "$1" && isowner="yes" || isowner=""
   err jg:isgrpowner: isowner="$isowner"
   if [ -n "$isowner" ]; then
-    # GROUP OWNER CAN DO EVERYTHING ABOUT REGISTRATION/RETIREMENT
+    : # GROUP OWNER CAN DO EVERYTHING ABOUT REGISTRATION/RETIREMENT
   elif [ x"$2" != x"$user" ]; then # if user is not login user
     echo "本人か、グループ管理者しか加入操作はできません。" | html p
     return
   elif [ x"$3" = x"no" ]; then
-    # Do not pursue those who leave
+    : # Do not pursue those who leave
   else				# adding user is $user itself
     case `getgroupattr $1 regmode` in
       moderated)
@@ -2257,7 +2260,7 @@
 	 err p2t: "replace into $tb2 values($pval, \"$col\", $type, $val, bin...);"
 	 #query "replace into $tb2 values($pval, \"$col\", $type, $val, $bin);"
 	 echo "replace into $tb2 values($pval, \"$col\", $type, $val, $bin);" \
-	      | querycat
+	      | sq $db
 	 err p2t done
        done
      done