s4
changeset 37:5cfad2c7eef8
group-id based argument handling
| author | HIROSE Yuuji <yuuji@gentei.org> |
|---|---|
| date | Wed, 22 Jul 2015 13:28:11 +0900 |
| parents | 2c392d4c2a36 |
| children | 1f04814e7dad |
| files | s4.cgi |
| diffstat | 1 files changed, 8 insertions(+), 6 deletions(-) [+] |
line diff
1.1 --- a/s4.cgi Wed Jul 22 13:27:25 2015 +0900 1.2 +++ b/s4.cgi Wed Jul 22 13:28:11 2015 +0900 1.3 @@ -63,13 +63,15 @@ 1.4 gname=`getpar gname` 1.5 if [ -n "$gname" ]; then 1.6 #gname=${gname%%[!-A-Z0-9a-z_.!#$%^&()=:/*]*} 1.7 - newgname=`echo "$gname"|tr -dc '\-0-9A-Za-z#=:/_.,'` 1.8 + #newgname=`echo "$gname"|tr -dc '\-0-9A-Za-z#=:/_.,'` 1.9 + newgname=`echo "$gname"|tr -d '\"'` 1.10 + newgname=$gname 1.11 if [ x"$newgname" != x"$gname" ]; then 1.12 err NewGNAME: gname=$newgname 1.13 echo "<p>使用禁止文字を除去し $gname としました。</p>" 1.14 gname=$newgname 1.15 + replpar gname string "$gname" 1.16 fi 1.17 - replpar gname string "$gname" 1.18 par2table $formdir/grp.def 1.19 joingrp "$gname" "$user" yes "$user" as-admin 1.20 fi 1.21 @@ -119,7 +121,7 @@ 1.22 $layout/html.m4.html \ 1.23 $layout/groupman.m4.html 1.24 ;; 1.25 - "grp") # $2=group 1.26 + "grp") # $2=group-rowid 1.27 contenttype; echo 1.28 gpg=`getpar grp` 1.29 grp=${2:-$gpg} 1.30 @@ -134,15 +136,15 @@ 1.31 fi 1.32 m4 -D_TITLE_="グループ $grp" \ 1.33 $layout/html.m4.html 1.34 - showgroup "$grp" 1.35 + showgroup "$2" 1.36 1.37 ;; 1.38 "commission") 1.39 - # $2=grp $3=user-rowid 1.40 + # $2=grp-rowid $3=user-rowid 1.41 contenttype; echo 1.42 err commission: "$@" 1.43 m4 -D_TITLE_="グループ $2 管理者委任" $layout/html.m4.html 1.44 - shift # $1=grp $2=user-rowid 1.45 + shift # $1=grp-rowid $2=user-rowid 1.46 if [ -n "$2" ]; then 1.47 grp_reg_adm "$@" 1.48 else