s4
changeset 100:8dc950197939
"radio" and "checkbox"
| author | HIROSE Yuuji <yuuji@gentei.org> |
|---|---|
| date | Tue, 04 Aug 2015 06:15:14 +0900 |
| parents | 1bc7cc7487dc |
| children | 4aefd0ddf88b |
| files | s4-funcs.sh |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line diff
1.1 --- a/s4-funcs.sh Mon Aug 03 18:40:56 2015 +0900 1.2 +++ b/s4-funcs.sh Tue Aug 04 06:15:14 2015 +0900 1.3 @@ -931,8 +931,10 @@ 1.4 #encpswd=`mycrypt "$newpswd" "$newsalt"` 1.5 encpswd=`echo $newpswd|mypwhash` 1.6 dbsetbyid user $user pswd "$encpswd" 1.7 - m4 -D_USER_="$user" -D_PSWD_="$newpswd" -D_URL_="$url" \ 1.8 + # Avoid $user substitution with m4, because $url comes from user input. 1.9 + m4 -D_PSWD_="$newpswd" -D_URL_="$url" -D_ADMIN_="$admin" \ 1.10 $msg/mail-newaccount.m4 \ 1.11 + | sed "s/_USER_/$user/g" \ 1.12 | smail $user "New Account" 1.13 } 1.14 checkauth() { 1.15 @@ -2228,9 +2230,12 @@ 1.16 fi 1.17 ;; 1.18 [Rr][Aa][Dd][Ii][Oo]) 1.19 - fh="<input type=\"radio\" name=\"$name\"" 1.20 + fh="<label><input type=\"radio\" name=\"$name\"" 1.21 form="`echo $args|sed -e \ 1.22 -\"s,\([^=][^=]*\)=\([^= ][^= ]*\),$fh value=\\"\2\\">\1,g\"`" 1.23 +\"s,\([^ =][^=]*\)=\([^= ][^= ]*\),$fh value=\\"\2\\">\1</label>,g\"`" 1.24 + ;; 1.25 + [Cc][Hh][Ee][Cc][Kk][Bb][Oo][Xx]) 1.26 + form="<label><input type=\"checkbox\" value=\"${args#*=}\">${args%=*}</label>" 1.27 ;; 1.28 [Ss][Ee][Ll][Ee][Cc][Tt]) 1.29 fh="<select name=\"$name\">$nl"