# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1591221380 -32400
# Node ID 441768a11b84642e4eaa4884e8f0e3728f75c4f6
# Parent  1ab3cc61a462e7cce8948d08d9e4ef79ebf38ff4
Joingrp use var-name adduser instead of user

diff -r 1ab3cc61a462 -r 441768a11b84 s4-funcs.sh
--- a/s4-funcs.sh	Wed Jun 03 21:33:25 2020 +0900
+++ b/s4-funcs.sh	Thu Jun 04 06:56:20 2020 +0900
@@ -54,6 +54,8 @@
 blogreadflagrowid=0
 blogcutoffflagrowid=-1
 whatsnewdays=${WHATS_NEW_DAYS:-14}
+main_session=`date +%F-$$`
+session=$main_session
 
 tconfs=""
 imgcached=cache/img.`date +%Y/%m`
@@ -664,10 +666,12 @@
 )
 setpar() {
   # 2020/5/14 Add dirty code to cache essential params
-  case "$1" in
-    user)	_user="$v" ;;
-    skey)	_skey="$v" ;;
-  esac
+  if [ x"$session" = x"$main_session" ]; then
+    case "$1" in
+      user)	_user="$v" ;;
+      skey)	_skey="$v" ;;
+    esac
+  fi
   query "replace into par values('$session', '$1', '$2', \"$3\");"
 }
 replpar() {
@@ -676,7 +680,7 @@
 getpar() {
   # err GETPAR=$1, _user=$_user
   val=""
-  if false; then	# 2020/6/3 Temporary disabled for joingrp()
+  if [ x"$session" = x"$main_session" ]; then
     case "$1" in	# Dirty cache mechanism for high-load average
       user)	val=$_user ;;
       skey)	val=$_skey ;;
@@ -1404,7 +1408,6 @@
 }
 
 cgiinit() {
-  session=`date +%F-$$`
   tmpd=`tmpd=$tmpdir mktempd`
   tmpf=$tmpd/stream.$$
   tmpfiles=$tmpfiles" $tmpd"
@@ -3252,7 +3255,7 @@
   if [ -z "$2" ]; then
     echo "bye bye" | html p; return
   fi
-  t_usr=`session=$2 getpar user`
+  t_usr=`session=$2 getpar adduser`
   t_grp=`session=$2 getpar group`
   ## err joingrpadmit: t_usr=$t_usr, t_grp=$t_grp
   _m4 -D_TITLE_="joingrp" $layout/html.m4.html
@@ -3290,7 +3293,7 @@
   jss="joingrp-`date +%s`-`genrandom 12`"
   addsession $jss +${memoplimitdays}days
   query "replace into par values('$jss', 'group', 'string', `sqlquote \"$1\"`),
-('$jss', 'user', 'string', `sqlquote \"$user\"`);"
+('$jss', 'adduser', 'string', `sqlquote \"$user\"`);"
   smail "$(collectemail `getgroupadmins $1`)" "Join request to $1"<<EOF
 $url
 $user さんから