1.1 --- a/s4-funcs.sh	Wed Dec 02 19:10:52 2020 +0859
     1.2 +++ b/s4-funcs.sh	Tue Dec 08 12:11:30 2020 +0900
     1.3 @@ -3104,7 +3104,7 @@
     1.4  	  GROUP BY author
     1.5  	), teams AS (
     1.6  	  SELECT user, group_concat(val, ', ') team
     1.7 -	  FROM grp_mem_m
     1.8 +	  FROM mems m LEFT JOIN grp_mem_m gm ON m.name=gm.user
     1.9  	  WHERE gname=(SELECT gname FROM grp WHERE rowid=$grid)
    1.10  	  AND key='team'
    1.11  	  GROUP BY user
    1.12 @@ -3121,11 +3121,13 @@
    1.13  		AND user=up.name) IS NOT NULL
    1.14  	      then 'k'
    1.15  	  ELSE ''
    1.16 -	  END || rowid || ',' || gecos NAME,
    1.17 +	  END || rowid || ','
    1.18 +	  || rtrim(substr(name, 1, instr(name, '@')), '@') || ','
    1.19 +	  || gecos NAME,
    1.20  	  post POST, team _TEAM_
    1.21  	FROM user_post up LEFT JOIN teams t
    1.22  	ON up.name=t.user
    1.23 -	ORDER BY gecos;"
    1.24 +	ORDER BY name;"
    1.25    ## err grpaction: "`echo \"$sql\"`"
    1.26    tf=$tmpd/title.$$
    1.27    echo "グループ[<a href=\"?grp+$grid\">$htmlgrp</a>]参加メンバーに対する操作" > $tf
    1.28 @@ -3170,11 +3172,13 @@
    1.29    #b2='"> <span>' b3='</span></label>'
    1.30    #    	| sed  -e "s|^\(<TR><TD>\)k\([0-9]*\),\([^<]*\)|\1$ba\2$b2\3$b3|" \
    1.31    #	       -e "s|^\(<TR><TD>\)\([0-9]*\),\([^<]*\)|\1$b1\2$b2\3$b3|" \
    1.32 -  lnk='"> <span>\3</span></label> [<a href="?home+\2">HOME</a>]'
    1.33 +  lnk='"> <span>\5</span></label> [<a href="?home+\3">HOME</a>]'
    1.34 +#-e "s|^\(<TR><TD>\)k\([0-9]*\),\([^<]*\)|\1$ba\2$lnk|" \
    1.35    cgi_form grpaction<<EOF \
    1.36 -      	| sed  -e "s|^\(<TR><TD>\)k\([0-9]*\),\([^<]*\)|\1$ba\2$lnk|" \
    1.37 -	       -e "s|^\(<TR><TD>\)\([0-9]*\),\([^<]*\)|\1$b1\2$lnk|" \
    1.38 -	       -e "s|^\(<TR><TH>\)\(NAME\)|\1$br \2|" \
    1.39 +      	| sed  -E \
    1.40 +	       -e "s|^(<TR><TD)>(k?)([0-9]*),([^,]+),([^<]*)|\1 title=\"\4\">\2$b1\4$lnk|" \
    1.41 +	       -e 's/^(<TR><TD[^>]*>)k(<label)/\1\2 class="admin"/' \
    1.42 +	       -e "s|^(<TR><TH>)(NAME)|\1$br \2|" \
    1.43  	| _m4 -D_TITLE_="spaste(\`$tf')" \
    1.44  	      -D_SUBTITLE_="チェック後操作ボタン" \
    1.45  	      -D_FORM_="syscmd(cat)" -D_DUMPTABLE_="" \