Merge commit '46cfaab0ad63961e6d918ae5df596814fb344b4e'

[serve0] / cgilite / users.sh

diff --git a/cgilite/users.sh b/cgilite/users.sh
index 1959e9de4b757084fad3d850b1b7b771517cb3c3..4c730ee3753367567f6e08e527df6bd9da4f85a0 100755 (executable)
--- a/cgilite/users.sh
+++ b/cgilite/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"
 }
 
@@ -338,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