# HG changeset patch
# User Adam Chlipala <adam@chlipala.net>
# Date 1311519095 14400
# Node ID a984dc1c8954825d9682633a2b03452fa0ced56b
# Parent  328a429dfedb543e5fe4c6143f0b9c1a5431b5d4# Parent  9c83592de90855e711fe10226c1be16db795d92c
Merge

diff -r 328a429dfedb -r a984dc1c8954 src/ur/openidUser.ur
--- a/src/ur/openidUser.ur	Sun Jul 24 10:23:50 2011 -0400
+++ b/src/ur/openidUser.ur	Sun Jul 24 10:51:35 2011 -0400
@@ -9,7 +9,7 @@
 
 signature CTLDISPLAY = sig
     val formatUser : xbody -> xbody
-    val formatLogout : url -> xbody
+    val formatLogout : ($([]) -> transaction page) -> xbody
     val formatSignup : url -> xbody
     val formatLogon : ({User : string} -> transaction page) -> xbody
 end
@@ -18,8 +18,10 @@
     fun formatUser user =
         <xml>You are logged in as {user}.</xml>
 
-    fun formatLogout url =
-        <xml><a href={url}>Log Out</a></xml>
+    fun formatLogout handler =
+        <xml>
+	  <form><submit value="Logout" action={handler}/></form>
+	</xml>
 
     fun formatSignup url =
         <xml><a href={url}>Sign Up</a></xml>
@@ -127,7 +129,14 @@
     fun main wrap =
         let
             fun logout () =
+		login <- getCookie auth;
                 clearCookie auth;
+		(case login of
+		    Some (LoggedIn login) =>
+		    dml (DELETE FROM session
+                         WHERE Id = {[login.Session]}
+                           AND Key = {[login.Key]})
+		  | _ => return ());
                 redirect M.afterLogout
 
             fun newSession identO =
@@ -346,10 +355,10 @@
 
             case cur of
                 Some cur => return {Status = (M.CtlDisplay.formatUser <xml>{[cur]}</xml>),
-                                    Other = {Url = (url (logout ())), 
-                                             Xml = (M.CtlDisplay.formatLogout (url (logout ())))}}
+                                    Other = {Url = None,
+                                             Xml = (M.CtlDisplay.formatLogout logout)}}
               | None => return {Status = (M.CtlDisplay.formatLogon (logon (show here))),
-                                Other = {Url = (url (signup (show here))),
+                                Other = {Url = Some (url (signup (show here))),
                                          Xml = (M.CtlDisplay.formatSignup (url (signup (show here))))}}
         end
 
diff -r 328a429dfedb -r a984dc1c8954 src/ur/openidUser.urs
--- a/src/ur/openidUser.urs	Sun Jul 24 10:23:50 2011 -0400
+++ b/src/ur/openidUser.urs	Sun Jul 24 10:51:35 2011 -0400
@@ -15,8 +15,8 @@
     val formatUser : xbody -> xbody
     (* Format the display of the logged on user *)
                               
-    val formatLogout : url -> xbody
-    (* Format the logout link *)
+    val formatLogout : ($([]) -> transaction page) -> xbody
+    (* Format the logout button *)
 
     val formatSignup : url -> xbody
     (* Format the signup link *)
@@ -111,14 +111,15 @@
 
 
     val main : (string -> xbody -> transaction page) -> transaction {Status : xbody,
-                                                                     Other : {Url : url, Xml : xbody}}
+                                                                     Other : {Url : option url, Xml : xbody}}
 
     (* Pass in your generic page template; get out the HTML snippet for user
      * management, suitable for, e.g., inclusion in your standard page
      * header.  The output gives a "status" chunk, which will either be a login
      * form or a message about which user is logged in; and an "other" chunk,
-     * which will be a log out or sign up link. In the case "other", the link
-     * itself is also provided for cases when one format is not enough. *)
+     * which will be a log out button or sign up link. In the case of "other",
+     * the link itself (if available) is also provided for cases when one
+     * format is not enough. *)
                              
 end