-(* Easy Web Pages (EWP) scripts.
+(* 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.2 2004/09/09 09:35:33 rich Exp $
+ * $Id: logout.ml,v 1.10 2006/12/06 09:46:57 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*)
open Apache
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 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, _, _) ->
- let sth = dbh#prepare_cached "delete from usercookies
- where userid = ?" in
- sth#execute [`Int userid];
-
- dbh#commit ()
+ | User (userid, _, _, _) ->
+ PGSQL(dbh) "delete from usercookies where userid = $userid";
+ PGOCaml.commit dbh
);
- 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."
+ r dbh hostid q "You have been logged out."
let () =
register_script run