Mercurial > hgrepos > hgweb.cgi > s4

changeset 37:5cfad2c7eef8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 wrap: on
line diff
--- a/s4.cgi	Wed Jul 22 13:27:25 2015 +0900
+++ b/s4.cgi	Wed Jul 22 13:28:11 2015 +0900
@@ -63,13 +63,15 @@
     gname=`getpar gname`
     if [ -n "$gname" ]; then
       #gname=${gname%%[!-A-Z0-9a-z_.!#$%^&()=:/*]*}
-      newgname=`echo "$gname"|tr -dc '\-0-9A-Za-z#=:/_.,'`
+      #newgname=`echo "$gname"|tr -dc '\-0-9A-Za-z#=:/_.,'`
+      newgname=`echo "$gname"|tr -d '\"'`
+      newgname=$gname
       if [ x"$newgname" != x"$gname" ]; then
 	err NewGNAME: gname=$newgname
 	echo "<p>使用禁止文字を除去し $gname としました。</p>"
 	gname=$newgname
+	replpar gname string "$gname"
       fi
-      replpar gname string "$gname"
       par2table $formdir/grp.def
       joingrp "$gname" "$user" yes "$user" as-admin
     fi
@@ -119,7 +121,7 @@
        $layout/html.m4.html \
        $layout/groupman.m4.html
     ;;
-  "grp") # $2=group
+  "grp") # $2=group-rowid
     contenttype; echo
     gpg=`getpar grp`
     grp=${2:-$gpg}
@@ -134,15 +136,15 @@
     fi
     m4 -D_TITLE_="グループ $grp" \
        $layout/html.m4.html
-    showgroup "$grp"
+    showgroup "$2"
     
     ;;
   "commission")
-    # $2=grp $3=user-rowid
+    # $2=grp-rowid $3=user-rowid
     contenttype; echo
 err commission: "$@"
     m4 -D_TITLE_="グループ $2 管理者委任" $layout/html.m4.html
-    shift			# $1=grp $2=user-rowid
+    shift			# $1=grp-rowid $2=user-rowid
     if [ -n "$2" ]; then
       grp_reg_adm "$@"
     else

yatex.org