(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: login.ml,v 1.6 2005/03/31 14:24:04 rich Exp $
+ * $Id: login.ml,v 1.12 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
let expires = "Wed, 18-May-2033 04:33:20 GMT"
-let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
+let run r (q : cgi) dbh hostid _ _ =
let username = q#param "username" in
let password = q#param "password" in
let permanent = try "1" = q#param "permanent" with Not_found -> false in
let redirect = try q#param "redirect" with Not_found -> "/" in
- let sth = dbh#prepare_cached "select id, force_password_change from users
- where name = ? and password = ?
- and hostid = ?" in
- sth#execute [`String username; `String password; `Int hostid];
+ let rows = PGSQL(dbh)
+ "select id, force_password_change from users
+ where name = $username and password = $password and hostid = $hostid" in
- try
- let userid, force_password_change =
- match sth#fetch1 () with
- [ `Int userid; `Bool force_password_change ] ->
- userid, force_password_change
- | _ -> assert false in
+ let userid, force_password_change =
+ match rows with
+ | [] ->
+ error
+ ~title:"Bad name or password"
+ ~back_button:true
+ r dbh hostid q "The name or password was wrong.";
+ return ()
+ | [ row ] -> row
+ | _ -> assert false in
- (* Create a cookie. *)
- let cookie = random_sessionid () in
- let sth = dbh#prepare_cached "insert into usercookies (userid, cookie)
- values (?, ?)" in
- sth#execute [`Int userid; `String cookie];
+ (* Create a cookie. *)
+ let cookie = random_sessionid () in
+ PGSQL(dbh) "insert into usercookies (userid, cookie)
+ values ($userid, $cookie)";
- dbh#commit ();
+ PGOCaml.commit dbh;
- (* Force password change? *)
- let redirect =
- if force_password_change then "/_bin/change_password_form.cmo"
- else redirect in
+ (* Force password change? *)
+ let redirect =
+ if force_password_change then "/_bin/change_password_form.cmo"
+ else redirect in
- let cookie =
- if permanent then
- Cookie.cookie "auth" cookie ~path:"/" ~expires
- else
- Cookie.cookie "auth" cookie ~path:"/" in
+ let cookie =
+ if permanent then
+ Cookie.cookie "auth" cookie ~path:"/" ~expires
+ else
+ Cookie.cookie "auth" cookie ~path:"/" in
- ok ~title:"Logged in" ~buttons:[ok_button redirect] ~cookie
- q ("Welcome " ^ username ^ "." ^
- if force_password_change then " Please change your password now."
- else "")
- with
- Not_found ->
- error
- ~title:"Bad name or password"
- ~back_button:true
- q "The name or password was wrong."
+ let ok_button = ok_button redirect in
+ let buttons =
+ if redirect <> "/" && redirect <> "/index" then (
+ ok_button ::
+ [ { Template.StdPages.label = " Home Page ";
+ Template.StdPages.link = "/";
+ Template.StdPages.method_ = None;
+ Template.StdPages.params = [] } ]
+ ) else [ ok_button ] in
+
+ ok ~title:"Logged in" ~buttons ~cookie
+ r dbh hostid q
+ ("Welcome " ^ username ^ "." ^
+ if force_password_change then " Please change your password now."
+ else "")
let () =
register_script run