s4
changeset 120:d870eaf0e4dd
Revert to "sq $db"
| author | HIROSE Yuuji <yuuji@gentei.org> |
|---|---|
| date | Wed, 05 Aug 2015 10:31:12 +0900 |
| parents | 0d613e71c32b |
| children | 34b72806cd22 |
| files | s4-funcs.sh |
| diffstat | 1 files changed, 8 insertions(+), 5 deletions(-) [+] |
line diff
1.1 --- a/s4-funcs.sh Tue Aug 04 23:19:49 2015 +0900 1.2 +++ b/s4-funcs.sh Wed Aug 05 10:31:12 2015 +0900 1.3 @@ -40,9 +40,12 @@ 1.4 レポート提出管理 1.5 ひとつのarticleをheadingにして新規ツリーを作成、あるといいかも。 1.6 1.7 -8/2 ○s4.cgi生成系 → index.cgi生成 1.8 +8/4 ○グループに承認加入モードを追加 1.9 + ○グループに参加していない場合は grpaction できない 1.10 Web 1.11 締切設定 1.12 + 1.13 +8/2 ○s4.cgi生成系 → index.cgi生成 1.14 ○自分の提出物リスト 1.15 1.16 7/19 ○設置 1.17 @@ -1766,7 +1769,7 @@ 1.18 `cgi_textarea text "" cols=40` 1.19 </div> 1.20 </div> 1.21 -${isowner:+\"$excmsg\"} 1.22 +${isowner:+"$excmsg"} 1.23 <h4>$grp 参加者一覧</h4> 1.24 <table> 1.25 `sq $db -html "$sql"` 1.26 @@ -1913,12 +1916,12 @@ 1.27 isgrpowner "$user" "$1" && isowner="yes" || isowner="" 1.28 err jg:isgrpowner: isowner="$isowner" 1.29 if [ -n "$isowner" ]; then 1.30 - # GROUP OWNER CAN DO EVERYTHING ABOUT REGISTRATION/RETIREMENT 1.31 + : # GROUP OWNER CAN DO EVERYTHING ABOUT REGISTRATION/RETIREMENT 1.32 elif [ x"$2" != x"$user" ]; then # if user is not login user 1.33 echo "本人か、グループ管理者しか加入操作はできません。" | html p 1.34 return 1.35 elif [ x"$3" = x"no" ]; then 1.36 - # Do not pursue those who leave 1.37 + : # Do not pursue those who leave 1.38 else # adding user is $user itself 1.39 case `getgroupattr $1 regmode` in 1.40 moderated) 1.41 @@ -2257,7 +2260,7 @@ 1.42 err p2t: "replace into $tb2 values($pval, \"$col\", $type, $val, bin...);" 1.43 #query "replace into $tb2 values($pval, \"$col\", $type, $val, $bin);" 1.44 echo "replace into $tb2 values($pval, \"$col\", $type, $val, $bin);" \ 1.45 - | querycat 1.46 + | sq $db 1.47 err p2t done 1.48 done 1.49 done