More thorough inclusion of the page bug. This should mean the page bug appears just...

[cocanwiki.git] / scripts / logout.ml

diff --git a/scripts/logout.ml b/scripts/logout.ml
index eb32e85..b955f53 100644 (file)
--- a/scripts/logout.ml
+++ b/scripts/logout.ml
@@ -1,7 +1,7 @@
 (* COCANWIKI - a wiki written in Objective CAML.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: logout.ml,v 1.3 2004/09/09 12:21:22 rich Exp $
+ * $Id: logout.ml,v 1.6 2005/11/24 14:54:12 rich Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,14 +29,14 @@ open Cocanwiki_ok
 
 let expires = "Sun, 09-Sep-2001 02:46:40 GMT"
 
-let run r (q : cgi) (dbh : Dbi.connection) _ _ user =
+let run r (q : cgi) (dbh : Dbi.connection) hostid _ user =
   (* The logout function removes all of the associated cookies from the
    * database.  This isn't required, but is nice semantics, and also helps
    * to reduce the size of the usercookies table in the database.
    *)
   (match user with
        Anonymous -> ()
-     | User (userid, _, _) ->
+     | User (userid, _, _, _) ->
         let sth = dbh#prepare_cached "delete from usercookies
                                         where userid = ?" in
         sth#execute [`Int userid];
@@ -44,11 +44,10 @@ let run r (q : cgi) (dbh : Dbi.connection) _ _ user =
         dbh#commit ()
   );
 
-  let cookie =
-    Cookie.cookie ~name:"auth" ~value:"none" ~path:"/" ~expires () in
+  let cookie = Cookie.cookie "auth" "none" ~path:"/" ~expires in
 
   ok ~title:"Logged out" ~buttons:[ok_button "/"] ~cookie
-    q "You have been logged out."
+    dbh hostid q "You have been logged out."
 
 let () =
   register_script run