changeset 775:2c5a8c5dd1ee

Fix sending message of joingrp()
author HIROSE Yuuji <yuuji@gentei.org>
date Thu, 11 Jun 2020 10:35:19 +0900
parents 8a7d5326055d
children d773042e923d e9e86a1fc1f3
files s4-funcs.sh
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/s4-funcs.sh	Thu Jun 11 10:18:36 2020 +0900
+++ b/s4-funcs.sh	Thu Jun 11 10:35:19 2020 +0900
@@ -3296,14 +3296,13 @@
   gid=$(query "select rowid from grp where gname=`sqlquote \"$t_grp\"`;")
   rcpts="`getgroupadminmails "$t_grp"` $user"
   ## err admit: msgdir=$msgdir, rcpts="["$rcpts"]"
-  body="グループ <a href=\"?grp+$gid\">$t_grp</a>
-に
+  body="に
 $t_usr
 `[ x$1 = xyes ] && echo 'を追加' || echo 'の解除操作を'`
 しました。"
-  (echo "$body"; echo; echo "$url?grp+$gid") | smail "$rcpts" "joingrp $1"
+  echo "$t_grp$nl$body$nl$nl$url?grp+$gid" | smail "$rcpts" "joingrp $1"
   query "delete from session where id='$2';"
-  echo "$body" | html p
+  echo "グループ <a href=\"?grp+$gid\">$t_grp</a>$nl$body" | html p
 }
 
 joingrprequest() {

yatex.org