1.1 --- a/s4-blog.sh	Fri Jun 23 23:23:40 2017 +0859
     1.2 +++ b/s4-blog.sh	Sat Jun 24 08:00:56 2017 +0859
     1.3 @@ -133,7 +133,7 @@
     1.4    if ! $iswritable; then
     1.5      blogowner=`getvalbyid blog owner "$2"`
     1.6      # err blogowner=$blogowner
     1.7 -    if isgroup $blogowner; then
     1.8 +    if isgroup "$blogowner"; then
     1.9        regmode=`getgroupattr $blogowner regmode`
    1.10        # err regmode=$regmode
    1.11        if [ x"$regmode" = x"moderated" ]; then
    1.12 @@ -522,7 +522,7 @@
    1.13  lshandoutsub() {
    1.14    # $1=owner $2=rowid of blog &optional $3=temp_table name
    1.15    qgname=`sqlquote "$1"`
    1.16 -  if isgroup $1; then
    1.17 +  if isgroup "$1"; then
    1.18      sample="(select user from grp_mem where gname=$qgname)"
    1.19    else
    1.20      sample="(select distinct author as user from arts)"
    1.21 @@ -794,7 +794,7 @@
    1.22      owner=`getpar owner`
    1.23    fi
    1.24    err blog-add: \$1=$1 rowid=$rowid owner=$owner
    1.25 -  if isgroup $owner; then
    1.26 +  if isgroup "$owner"; then
    1.27      groupmode=1 listing=$owner guide="[${owner}]" GF_OWNER=$owner
    1.28    else
    1.29      usermode=1 listing=$user guide="[個人]"

     2.1 --- a/s4-funcs.sh	Fri Jun 23 23:23:40 2017 +0859
     2.2 +++ b/s4-funcs.sh	Sat Jun 24 08:00:56 2017 +0859
     2.3 @@ -2702,7 +2702,7 @@
     2.4    title=`getvalbyid blog title $blogrowid`
     2.5    author=`getvalbyid article author $rowid`
     2.6    ## err EDITart: owner=$owner, author=$author
     2.7 -  if isgrpowner $user $owner; then
     2.8 +  if isgrpowner "$user" "$owner"; then
     2.9      : EDIT OK
    2.10    elif [ x"$owner" != x"$user" -a x"$author" != x"$user" ]; then
    2.11      echo "本人か所有者しか編集できません." | html p
    2.12 @@ -2765,7 +2765,7 @@
    2.13  他の管理者がいる場合は処理済みの可能性があります。" | html p
    2.14      return
    2.15    fi
    2.16 -  if ! isgrpowner "$user" $t_grp; then
    2.17 +  if ! isgrpowner "$user" "$t_grp"; then
    2.18      echo "グループ管理者のみの機能です。" | html p; return
    2.19    fi
    2.20    case $1 in
    2.21 @@ -2935,7 +2935,7 @@
    2.22    if [ -z "$grp" ]; then
    2.23      echo "無効なグループIDです" | html p; return
    2.24    fi
    2.25 -  if ! isgrpowner $user "$grp"; then
    2.26 +  if ! isgrpowner "$user" "$grp"; then
    2.27      echo "$grp グループの管理者しかこの操作はできません。" | html p; return
    2.28    fi
    2.29    shift
    2.30 @@ -3081,7 +3081,7 @@
    2.31      elif [ x"$tbl" = x"grp" ]; then
    2.32        sql="select gname from $tbl where rowid=$rowid;"
    2.33        ##err p2t:grp:q $sql
    2.34 -      isgrpowner $user "`query $sql`" && rowowner=$user
    2.35 +      isgrpowner "$user" "`query $sql`" && rowowner=$user
    2.36      else
    2.37        # 2016-12-05 There's no owner column in $tbl (need confirmation)
    2.38        rowowner=`query "SELECT author FROM $tbl WHERE rowid=$rowid;"`