1.1 --- a/s4-funcs.sh	Sat Jun 30 15:46:59 2018 +0900
     1.2 +++ b/s4-funcs.sh	Mon Jan 14 02:10:34 2019 +0900
     1.3 @@ -476,6 +476,9 @@
     1.4    #   **Word**		- <strong>Word</strong>
     1.5    #   __Word__		- <strong>Word</strong>
     1.6    #   SPC+SPC+$		- <br>
     1.7 +  cb='<input type="checkbox" class="s4-checkbox" disabled'
     1.8 +  checkboxON="${cb} checked>"
     1.9 +  checkboxOFF="${cb}>"
    1.10    _hrefptn="[-A-Za-z0-9,.:;/~_%#&+?=@!]*"
    1.11    _hrefptn="[A-Za-z0-9/~%+?=@!.][^][()<> ]*"	# URL should start with ASCII
    1.12    sed -e "s|\[\[\#\([0-9][0-9]*\)\]\]|<a href=\"?aid\1\">#\1</a>|g" \
    1.13 @@ -497,7 +500,10 @@
    1.14        -e 's, __\([^_ |][^_]*[^ ]\)__ ,<strong>\1</strong>,g' \
    1.15        -e 's, \*\([^* |][^*|]*[^ |]\)\* ,<em>\1</em>,g' \
    1.16        -e 's, _\([^_ ][^_]*[^ ]\)_ ,<em>\1</em>,g' \
    1.17 -      -e 's,  $,<br>,'
    1.18 +      -e 's,  $,<br>,' \
    1.19 +      -e "s,- \[  *\]\([^|-]*\),${checkboxOFF}<label>\\1</label>,g" \
    1.20 +      -e "s,- \[[^ ]\]\([^|-]*\),${checkboxON}<label>\\1</label>,g" \
    1.21 +      
    1.22  }
    1.23  minitbl() {
    1.24    sed -n '
    1.25 @@ -1150,15 +1156,15 @@
    1.26    if [ -z "$dbuser" ]; then
    1.27      return 1
    1.28    elif [ x"$pswd" = x"wasureta" ]; then
    1.29 -    wasureta $user
    1.30 +    wasureta "$user"
    1.31      return 1		# wasureta error
    1.32    fi
    1.33   # dbpswd="`sq $db \"select pswd from passwd where name='$user'\"`"
    1.34    # putheader; echo; echo user=$user, db=$dbpswd, enc=$encpswd
    1.35    if pwcheck "$pswd"; then
    1.36      newsession=`genrandom 50`
    1.37 -    dbsetbyid user $user skey "$newsession"
    1.38 -    dbsetbyid user $user login "`date '+%F %T'`"
    1.39 +    dbsetbyid user "$user" skey "$newsession"
    1.40 +    dbsetbyid user "$user" login "`date '+%F %T'`"
    1.41      gencookie "user=$user" "skey=$newsession"
    1.42      return 0
    1.43    fi
    1.44 @@ -1367,8 +1373,8 @@
    1.45  }
    1.46  invite() {
    1.47    email=`getpar email`
    1.48 -  case $email in
    1.49 -    *@*@*)  repo="無効なアドレスです" ;;
    1.50 +  case "$email" in
    1.51 +    *@*@*|*\ *)  repo="無効なアドレスです" ;;
    1.52      *@*)
    1.53        local=${email%@*} domain=${email#*@}
    1.54        if ! repo=`emaildomaincheck $email`; then