# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1644496617 -32400
# Node ID 8afc139044f1b3d9da402eaa56f6eb08330085c2
# Parent  10d8e4c3ec6aa98a738231b4eb229727f82c2460
Add gecos to joingrprequest()

diff -r 10d8e4c3ec6a -r 8afc139044f1 s4-funcs.sh
--- a/s4-funcs.sh	Mon Jan 31 19:28:16 2022 +0900
+++ b/s4-funcs.sh	Thu Feb 10 21:36:57 2022 +0900
@@ -3627,13 +3627,14 @@
 joingrprequest() {
   # $1=group $2=user $3=yes/no $4=email(if any $5=AsAdmin) 
   jss="joingrp-`date +%s`-`genrandom 12`"
+  gecos=`gecos "$user"`
   addsession $jss +${memoplimitdays}days
   grpadmins=`getgroupadmins "$1"`
   query "replace into par values('$jss', 'group', 'string', `sqlquote \"$1\"`),
 ('$jss', 'adduser', 'string', `sqlquote \"$user\"`);"
   smail "$(collectemail $grpadmins)" "Join request to $1"<<EOF
 $url
-$user さんから
+$user ${gecos:+($gecos)}さんから
 グループ $1
 に加入依頼がありました。