1.1 --- a/s4-funcs.sh	Wed Jul 22 18:16:37 2015 +0900
     1.2 +++ b/s4-funcs.sh	Wed Jul 22 18:16:53 2015 +0900
     1.3 @@ -542,6 +542,7 @@
     1.4  	       file:*)
     1.5  		 #file=$td/$val
     1.6  		 file=$td/`query "select val from $cond $slice;"`
     1.7 +		 # FOR SPEED: Skip file generation if imgcache exists
     1.8  		 [ -s $file -a -s $td/$fn.rowid ] && continue
     1.9  		 sq $db<<EOF | unhexize > $file
    1.10  .output $td/$fn.rowid
    1.11 @@ -1013,12 +1014,13 @@
    1.12        ;;
    1.13    esac
    1.14  }
    1.15 -collectemail() {
    1.16 +collectemail() (
    1.17    # Collect email addresses for group $1
    1.18 -  if isuser "$1"; then
    1.19 -    em=`query "select val from user_m where name='$1' and key='email';"`
    1.20 -    [ -n "$em" ] && echo "$em" || echo "$1"
    1.21 -  else
    1.22 +  for e; do
    1.23 +    if isuser "$e"; then
    1.24 +    em=`query "select val from user_m where name='$e' and key='email';"`
    1.25 +    [ -n "$em" ] && echo "$em" || echo "$e"
    1.26 +    else
    1.27   #    sql="with recursive allmem as
    1.28   #        (select gname,val from grp_m where gname='$1'
    1.29   #         union all select grp_m.gname,grp_m.val from grp_m,allmem
    1.30 @@ -1027,15 +1029,16 @@
    1.31   #        from allmem a left join grp_mem_s b
    1.32   #        on a.gname=b.gname and a.val=b.user and b.key='email'
    1.33   # where a.val in (select name from user) limit 10000;"
    1.34 -    # tmp tmp tmp tmp tmp tmp tmp
    1.35 -    qgrp=`sqlquote $1`
    1.36 -    sql="select coalesce(s.val,g.user) from grp_mem g left join grp_mem_s s
    1.37 +      # tmp tmp tmp tmp tmp tmp tmp
    1.38 +      qgrp=`sqlquote $e`
    1.39 +      sql="select coalesce(s.val,g.user) from grp_mem g left join grp_mem_s s
    1.40  	 on g.gname=s.gname and g.user=s.user and s.key='email'
    1.41  	 where g.gname=$qgrp;"
    1.42 -    err CollectEmail: `echo "$sql"`
    1.43 -    query "$sql"
    1.44 -  fi
    1.45 -}
    1.46 +      err CollectEmail: `echo "$sql"`
    1.47 +      query "$sql"
    1.48 +    fi
    1.49 +  done
    1.50 +)
    1.51  sendinvitation() (
    1.52    # $1=email
    1.53    iss="invite-`date +%s`-$user"
    1.54 @@ -1741,8 +1744,8 @@
    1.55  	       if pwcheck "$pswd"; then
    1.56  		 if [ x"$p1" = x"$p2" ]; then
    1.57  		   case "$p1" in
    1.58 -		     ????????*) ;;
    1.59 -		     *) echo "<p>8字以上にしてください。</p>"
    1.60 +		     ??????????*) ;;
    1.61 +		     *) echo "<p>10字以上にしてください。</p>"
    1.62  			return ;;
    1.63  		   esac
    1.64  		   val="\"`echo $p1|mypwhash`\""