Mercurial > hgrepos > hgweb.cgi > 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 wrap: on
line diff
--- a/s4-funcs.sh Mon Aug 03 18:40:56 2015 +0900 +++ b/s4-funcs.sh Tue Aug 04 06:15:14 2015 +0900 @@ -931,8 +931,10 @@ #encpswd=`mycrypt "$newpswd" "$newsalt"` encpswd=`echo $newpswd|mypwhash` dbsetbyid user $user pswd "$encpswd" - m4 -D_USER_="$user" -D_PSWD_="$newpswd" -D_URL_="$url" \ + # Avoid $user substitution with m4, because $url comes from user input. + m4 -D_PSWD_="$newpswd" -D_URL_="$url" -D_ADMIN_="$admin" \ $msg/mail-newaccount.m4 \ + | sed "s/_USER_/$user/g" \ | smail $user "New Account" } checkauth() { @@ -2228,9 +2230,12 @@ fi ;; [Rr][Aa][Dd][Ii][Oo]) - fh="<input type=\"radio\" name=\"$name\"" + fh="<label><input type=\"radio\" name=\"$name\"" form="`echo $args|sed -e \ -\"s,\([^=][^=]*\)=\([^= ][^= ]*\),$fh value=\\"\2\\">\1,g\"`" +\"s,\([^ =][^=]*\)=\([^= ][^= ]*\),$fh value=\\"\2\\">\1</label>,g\"`" + ;; + [Cc][Hh][Ee][Cc][Kk][Bb][Oo][Xx]) + form="<label><input type=\"checkbox\" value=\"${args#*=}\">${args%=*}</label>" ;; [Ss][Ee][Ll][Ee][Cc][Tt]) fh="<select name=\"$name\">$nl"
