X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=users.sh;h=4c730ee3753367567f6e08e527df6bd9da4f85a0;hb=af27357b013bf25c762dabe45733b9402ad581f8;hp=33f0062d7832d510b8db9d25d2cb1fdcd9b20bec;hpb=5d5fc0f5791de8dfd7641eedfd3fa83ae840d20a;p=cgilite diff --git a/users.sh b/users.sh index 33f0062..4c730ee 100755 --- a/users.sh +++ b/users.sh @@ -226,8 +226,8 @@ user_logout(){ # destroy cookie, destroy session # keep device cookie new_session - SET_COOKIE 0 session="" - SET_COOKIE 0 user_id="" + SESSION_COOKIE new + SET_COOKIE 0 user_id="" Path="/${_BASE#/}" SameSite=Strict HttpOnly REDIRECT "${_BASE}${PATH_INFO}#USER_LOGGED_OUT" } @@ -259,7 +259,9 @@ user_init esac w_user_register(){ - if [ "$USER_REGISTRATION" != true ]; then + if [ "$(GET user_confirm)" ]; then + w_user_confirm + elif [ "$USER_REGISTRATION" != true ]; then cat <<-EOF [div #user_register .disabled User Registration is disabled. @@ -336,7 +338,7 @@ w_user_login(){ elif [ "$USER_ID" ]; then cat <<-EOF [form #user_login .logout method=POST - [p You are currently logged in as "${USER_NAME}"] + [p Logged in as [span . $(HTML ${USER_NAME})]] [submit "action" "user_logout" Logout] ] EOF