s4
changeset 737:441768a11b84
Joingrp use var-name adduser instead of user
author | HIROSE Yuuji <yuuji@gentei.org> |
---|---|
date | Thu, 04 Jun 2020 06:56:20 +0900 |
parents | 1ab3cc61a462 |
children | d78944aa1cd2 b5df3b16c9d8 |
files | s4-funcs.sh |
diffstat | 1 files changed, 11 insertions(+), 8 deletions(-) [+] |
line diff
1.1 --- a/s4-funcs.sh Wed Jun 03 21:33:25 2020 +0900 1.2 +++ b/s4-funcs.sh Thu Jun 04 06:56:20 2020 +0900 1.3 @@ -54,6 +54,8 @@ 1.4 blogreadflagrowid=0 1.5 blogcutoffflagrowid=-1 1.6 whatsnewdays=${WHATS_NEW_DAYS:-14} 1.7 +main_session=`date +%F-$$` 1.8 +session=$main_session 1.9 1.10 tconfs="" 1.11 imgcached=cache/img.`date +%Y/%m` 1.12 @@ -664,10 +666,12 @@ 1.13 ) 1.14 setpar() { 1.15 # 2020/5/14 Add dirty code to cache essential params 1.16 - case "$1" in 1.17 - user) _user="$v" ;; 1.18 - skey) _skey="$v" ;; 1.19 - esac 1.20 + if [ x"$session" = x"$main_session" ]; then 1.21 + case "$1" in 1.22 + user) _user="$v" ;; 1.23 + skey) _skey="$v" ;; 1.24 + esac 1.25 + fi 1.26 query "replace into par values('$session', '$1', '$2', \"$3\");" 1.27 } 1.28 replpar() { 1.29 @@ -676,7 +680,7 @@ 1.30 getpar() { 1.31 # err GETPAR=$1, _user=$_user 1.32 val="" 1.33 - if false; then # 2020/6/3 Temporary disabled for joingrp() 1.34 + if [ x"$session" = x"$main_session" ]; then 1.35 case "$1" in # Dirty cache mechanism for high-load average 1.36 user) val=$_user ;; 1.37 skey) val=$_skey ;; 1.38 @@ -1404,7 +1408,6 @@ 1.39 } 1.40 1.41 cgiinit() { 1.42 - session=`date +%F-$$` 1.43 tmpd=`tmpd=$tmpdir mktempd` 1.44 tmpf=$tmpd/stream.$$ 1.45 tmpfiles=$tmpfiles" $tmpd" 1.46 @@ -3252,7 +3255,7 @@ 1.47 if [ -z "$2" ]; then 1.48 echo "bye bye" | html p; return 1.49 fi 1.50 - t_usr=`session=$2 getpar user` 1.51 + t_usr=`session=$2 getpar adduser` 1.52 t_grp=`session=$2 getpar group` 1.53 ## err joingrpadmit: t_usr=$t_usr, t_grp=$t_grp 1.54 _m4 -D_TITLE_="joingrp" $layout/html.m4.html 1.55 @@ -3290,7 +3293,7 @@ 1.56 jss="joingrp-`date +%s`-`genrandom 12`" 1.57 addsession $jss +${memoplimitdays}days 1.58 query "replace into par values('$jss', 'group', 'string', `sqlquote \"$1\"`), 1.59 -('$jss', 'user', 'string', `sqlquote \"$user\"`);" 1.60 +('$jss', 'adduser', 'string', `sqlquote \"$user\"`);" 1.61 smail "$(collectemail `getgroupadmins $1`)" "Join request to $1"<<EOF 1.62 $url 1.63 $user さんから