s4

changeset 963:8afc139044f1

Add gecos to joingrprequest()
author HIROSE Yuuji <yuuji@gentei.org>
date Thu, 10 Feb 2022 21:36:57 +0900
parents 10d8e4c3ec6a
children 759070ee3d20
files s4-funcs.sh
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line diff
     1.1 --- a/s4-funcs.sh	Mon Jan 31 19:28:16 2022 +0900
     1.2 +++ b/s4-funcs.sh	Thu Feb 10 21:36:57 2022 +0900
     1.3 @@ -3627,13 +3627,14 @@
     1.4  joingrprequest() {
     1.5    # $1=group $2=user $3=yes/no $4=email(if any $5=AsAdmin) 
     1.6    jss="joingrp-`date +%s`-`genrandom 12`"
     1.7 +  gecos=`gecos "$user"`
     1.8    addsession $jss +${memoplimitdays}days
     1.9    grpadmins=`getgroupadmins "$1"`
    1.10    query "replace into par values('$jss', 'group', 'string', `sqlquote \"$1\"`),
    1.11  ('$jss', 'adduser', 'string', `sqlquote \"$user\"`);"
    1.12    smail "$(collectemail $grpadmins)" "Join request to $1"<<EOF
    1.13  $url
    1.14 -$user さんから
    1.15 +$user ${gecos:+($gecos)}さんから
    1.16  グループ $1
    1.17  に加入依頼がありました。
    1.18