1.1 --- a/s4-blog.sh	Mon Jun 08 06:31:37 2020 +0900
     1.2 +++ b/s4-blog.sh	Mon Jun 08 20:23:42 2020 +0900
     1.3 @@ -25,7 +25,7 @@
     1.4  )
     1.5  blog_readable() {
     1.6    # $1=articleid $2=user
     1.7 -  mode=`getgroupattr $grp regmode`
     1.8 +  mode=`getgroupattr "$grp" regmode`
     1.9  }
    1.10  blog_getteam() {
    1.11    # $1=rowid of blog
    1.12 @@ -49,9 +49,9 @@
    1.13    case $mode in
    1.14      admin)
    1.15        if $_isgroup; then
    1.16 -	emails=`getgroupadminmails $blogowner`
    1.17 +	emails=`getgroupadminmails "$blogowner"`
    1.18        else
    1.19 -	emails=`collectemail $blogowner`
    1.20 +	emails=`collectemail "$blogowner"`
    1.21        fi
    1.22        notifyto=`getpar notifyto`
    1.23        if [ -n "$notifyto" ]; then
    1.24 @@ -61,7 +61,7 @@
    1.25      no)		emails="" ;;
    1.26      *) team=`blog_getteam "$blogid"`
    1.27         # team cannot get by `getvalbyid blog team "$blogid"`
    1.28 -       emails=`TEAM=$team collectemail $blogowner` ;;
    1.29 +       emails=`TEAM=$team collectemail "$blogowner"` ;;
    1.30    esac
    1.31    ## 2017-0210 Respond to the direct reply mark such as: >#1234
    1.32    replymark=`echo "$3"|nkf -w -Z0|grep '^ *>#'`
    1.33 @@ -93,7 +93,7 @@
    1.34      [ x"$2" = x"$blogowner" ] && return # If author=blogowner, unnecessary
    1.35    fi
    1.36    test -z "$emails" && return
    1.37 -  err notify: user=$user Admins=`getgroupadmins $blogowner` Mode=$mode Emails="[$emails]"
    1.38 +  err notify: user=$user Admins=`getgroupadmins "$blogowner"` Mode=$mode Emails="[$emails]"
    1.39    quotedowner=`echo $blogowner | nkf -jM | tr -d '\n"'`
    1.40    MAIL_FROM=$noreply_from \
    1.41    SMAIL_TO="\"$quotedowner\" readers <$noreply>" \
    1.42 @@ -158,7 +158,7 @@
    1.43    if ! $iswritable; then
    1.44      # err blogowner=$blogowner
    1.45      if $isgroup; then
    1.46 -      regmode=`getgroupattr $blogowner regmode`
    1.47 +      regmode=`getgroupattr "$blogowner" regmode`
    1.48        # err regmode=$regmode
    1.49        if [ x"$regmode" = x"moderated" ]; then
    1.50  	# if ! ismember $user $blogowner; then
    1.51 @@ -838,6 +838,7 @@
    1.52      query <<-EOF > $bd/$rid/all-text-1stline-$rid.csv
    1.53  	.mode csv
    1.54  	.head 1
    1.55 +	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_q("user", "TEXT");
    1.56  	.import $outcsv tmp_q
    1.57  	SELECT * FROM tmp_q;
    1.58  	.mode list

     2.1 --- a/s4-funcs.sh	Mon Jun 08 06:31:37 2020 +0900
     2.2 +++ b/s4-funcs.sh	Mon Jun 08 20:23:42 2020 +0900
     2.3 @@ -492,7 +492,7 @@
     2.4  )
     2.5  getgroupadminmails() {
     2.6    # $1=group
     2.7 -  for i in $(getgroupadmins $1); do
     2.8 +  for i in $(getgroupadmins "$1"); do
     2.9      email4group "$1" "$i" ;
    2.10    done
    2.11  }
    2.12 @@ -2210,7 +2210,7 @@
    2.13  
    2.14    tf=$tmpd/title.$$ pf=$tmpd/profile.$$ bf=$tmpd/blogs.$$ sf=$tmpd/search.$$
    2.15    search_form "$search_form_args"	> $sf
    2.16 -  printf "%s さん" "$gecos"		> $tf
    2.17 +  printf "%s さん" "$gecos"|htmlescape	> $tf
    2.18    { echo "<div class=\"noprofimg\">"
    2.19      viewtable $formdir/user.def user $1
    2.20      echo "</div>"
    2.21 @@ -2761,7 +2761,7 @@
    2.22  </table>
    2.23  `cgi_hidden grp $rowid`
    2.24  EOF
    2.25 -  if [ x`getgroupattr $grp regmode` = x'moderated' -a -z "$ismem" ]; then
    2.26 +  if [ x`getgroupattr "$grp" regmode` = x'moderated' -a -z "$ismem" ]; then
    2.27      echo "moderated (承認加入の)グループなので実際に参加できるのは
    2.28  グループ管理者が承認操作をした後になります。" | html p 'class="warn"'
    2.29    fi
    2.30 @@ -3414,7 +3414,7 @@
    2.31        return ;;
    2.32    esac
    2.33    gid=$(query "select rowid from grp where gname=`sqlquote \"$t_grp\"`;")
    2.34 -  rcpts="`getgroupadminmails $t_grp` $user"
    2.35 +  rcpts="`getgroupadminmails "$t_grp"` $user"
    2.36    ## err admit: msgdir=$msgdir, rcpts="["$rcpts"]"
    2.37    body="グループ <a href=\"?grp+$gid\">$t_grp</a>
    2.38  に
    2.39 @@ -3430,9 +3430,10 @@
    2.40    # $1=group $2=user $3=yes/no $4=email(if any $5=AsAdmin) 
    2.41    jss="joingrp-`date +%s`-`genrandom 12`"
    2.42    addsession $jss +${memoplimitdays}days
    2.43 +  grpadmins=`getgroupadmins "$1"`
    2.44    query "replace into par values('$jss', 'group', 'string', `sqlquote \"$1\"`),
    2.45  ('$jss', 'adduser', 'string', `sqlquote \"$user\"`);"
    2.46 -  smail "$(collectemail `getgroupadmins $1`)" "Join request to $1"<<EOF
    2.47 +  smail "$(collectemail $grpadmins)" "Join request to $1"<<EOF
    2.48  $url
    2.49  $user さんから
    2.50  グループ $1
    2.51 @@ -3469,7 +3470,7 @@
    2.52    elif [ x"$3" = x"yes" ] && ismember "$user" "$grp"; then
    2.53      : # Member can change own email address for the joining moderated group
    2.54    else				# adding user is $user itself
    2.55 -    case `getgroupattr $1 regmode` in
    2.56 +    case `getgroupattr "$1" regmode` in
    2.57        moderated)
    2.58  	joingrprequest "$@"	# Request only
    2.59  	return