s4

changeset 58:ccd0c6736215

Argument order reversed on email4group
author HIROSE Yuuji <yuuji@gentei.org>
date Thu, 23 Jul 2015 11:35:05 +0900
parents 7c61a80051f5
children 916d81b9c4fc
files s4-blog.sh s4-funcs.sh
diffstat 2 files changed, 10 insertions(+), 8 deletions(-) [+]
line diff
     1.1 --- a/s4-blog.sh	Thu Jul 23 11:09:09 2015 +0900
     1.2 +++ b/s4-blog.sh	Thu Jul 23 11:35:05 2015 +0900
     1.3 @@ -23,7 +23,7 @@
     1.4        if isgroup "$blogowner"; then
     1.5  	emails=`for i in $(getgroupadmins $blogowner); do\
     1.6  	  [ x"$i" = x"$user" ] && continue;\
     1.7 -	  email4group "$i" "$blogowner";\
     1.8 +	  email4group "$blogowner" "$i" ;\
     1.9  	done`
    1.10        else
    1.11  	emails=`collectemail $blogowner`
     2.1 --- a/s4-funcs.sh	Thu Jul 23 11:09:09 2015 +0900
     2.2 +++ b/s4-funcs.sh	Thu Jul 23 11:35:05 2015 +0900
     2.3 @@ -1019,16 +1019,18 @@
     2.4        ;;
     2.5    esac
     2.6  }
     2.7 -email4group() (
     2.8 -  # Get $1=user email address(es) for group $2=group
     2.9 -  qgrp=`sqlquote "$2"`
    2.10 +email4group() {
    2.11 +  # Get for-$1=group email address(es) for $2=user
    2.12 +  qgrp=`sqlquote "$1"`; shift
    2.13 +  users=`for i; do sqlquote "$i"; done`
    2.14 +  users=`echo $users|tr ' ' ','`
    2.15    sql="select coalesce(s.val, g.user) from grp_mem g
    2.16 -	join grp_mem_s s on g.gname=s.gname and g.user=s.user
    2.17 -	and s.key='email' and g.user='$1'
    2.18 -	where g.gname=$qgrp;"
    2.19 +	left join grp_mem_s s on g.gname=s.gname and g.user=s.user
    2.20 +	and s.key='email'
    2.21 +	where g.gname=$qgrp and g.user in ($users);"
    2.22    err `echo $sql`
    2.23    query "$sql"
    2.24 -)
    2.25 +}
    2.26  collectemail() (
    2.27    # Collect email addresses for group $1
    2.28    for e; do