Mercurial > hgrepos > hgweb.cgi > s4

changeset 436:e1bdad674c09

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Quote arguments that hold group name.
author HIROSE Yuuji <yuuji@gentei.org>
date Sat, 24 Jun 2017 08:00:56 +0859
parents 9f7b97c8b694
children e7ed6fa0b0d4
files s4-blog.sh s4-funcs.sh
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/s4-blog.sh	Fri Jun 23 23:23:40 2017 +0859
+++ b/s4-blog.sh	Sat Jun 24 08:00:56 2017 +0859
@@ -133,7 +133,7 @@
   if ! $iswritable; then
     blogowner=`getvalbyid blog owner "$2"`
     # err blogowner=$blogowner
-    if isgroup $blogowner; then
+    if isgroup "$blogowner"; then
       regmode=`getgroupattr $blogowner regmode`
       # err regmode=$regmode
       if [ x"$regmode" = x"moderated" ]; then
@@ -522,7 +522,7 @@
 lshandoutsub() {
   # $1=owner $2=rowid of blog &optional $3=temp_table name
   qgname=`sqlquote "$1"`
-  if isgroup $1; then
+  if isgroup "$1"; then
     sample="(select user from grp_mem where gname=$qgname)"
   else
     sample="(select distinct author as user from arts)"
@@ -794,7 +794,7 @@
     owner=`getpar owner`
   fi
   err blog-add: \$1=$1 rowid=$rowid owner=$owner
-  if isgroup $owner; then
+  if isgroup "$owner"; then
     groupmode=1 listing=$owner guide="[${owner}]" GF_OWNER=$owner
   else
     usermode=1 listing=$user guide="[個人]"
--- a/s4-funcs.sh	Fri Jun 23 23:23:40 2017 +0859
+++ b/s4-funcs.sh	Sat Jun 24 08:00:56 2017 +0859
@@ -2702,7 +2702,7 @@
   title=`getvalbyid blog title $blogrowid`
   author=`getvalbyid article author $rowid`
   ## err EDITart: owner=$owner, author=$author
-  if isgrpowner $user $owner; then
+  if isgrpowner "$user" "$owner"; then
     : EDIT OK
   elif [ x"$owner" != x"$user" -a x"$author" != x"$user" ]; then
     echo "本人か所有者しか編集できません." | html p
@@ -2765,7 +2765,7 @@
 他の管理者がいる場合は処理済みの可能性があります。" | html p
     return
   fi
-  if ! isgrpowner "$user" $t_grp; then
+  if ! isgrpowner "$user" "$t_grp"; then
     echo "グループ管理者のみの機能です。" | html p; return
   fi
   case $1 in
@@ -2935,7 +2935,7 @@
   if [ -z "$grp" ]; then
     echo "無効なグループIDです" | html p; return
   fi
-  if ! isgrpowner $user "$grp"; then
+  if ! isgrpowner "$user" "$grp"; then
     echo "$grp グループの管理者しかこの操作はできません。" | html p; return
   fi
   shift
@@ -3081,7 +3081,7 @@
     elif [ x"$tbl" = x"grp" ]; then
       sql="select gname from $tbl where rowid=$rowid;"
       ##err p2t:grp:q $sql
-      isgrpowner $user "`query $sql`" && rowowner=$user
+      isgrpowner "$user" "`query $sql`" && rowowner=$user
     else
       # 2016-12-05 There's no owner column in $tbl (need confirmation)
       rowowner=`query "SELECT author FROM $tbl WHERE rowid=$rowid;"`

yatex.org