Updated MANIFEST. Bumped version for release.

[cocanwiki.git] / scripts / login.ml

diff --git a/scripts/login.ml b/scripts/login.ml
index 01d325c..4594e6b 100644 (file)
--- a/scripts/login.ml
+++ b/scripts/login.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: login.ml,v 1.3 2004/09/09 12:21:22 rich Exp $
+ * $Id: login.ml,v 1.7 2005/11/21 15:28:35 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
@@ -35,13 +35,17 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   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 from users
+  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];
 
   try
-    let userid = sth#fetch1int () in
+    let userid, force_password_change =
+      match sth#fetch1 () with
+         [ `Int userid; `Bool force_password_change ] ->
+           userid, force_password_change
+       | _ -> assert false in
 
     (* Create a cookie. *)
     let cookie = random_sessionid () in
@@ -51,14 +55,31 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
 
     dbh#commit ();
 
+    (* 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 ~name:"auth" ~value:cookie ~path:"/" ~expires ()
+       Cookie.cookie "auth" cookie ~path:"/" ~expires
       else
-       Cookie.cookie ~name:"auth" ~value:cookie ~path:"/" () in
+       Cookie.cookie "auth" cookie ~path:"/" in
+
+    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:[ok_button redirect] ~cookie
-      q ("Welcome back " ^ username ^ ".")
+    ok ~title:"Logged in" ~buttons ~cookie
+      q ("Welcome " ^ username ^ "." ^
+        if force_password_change then "  Please change your password now."
+        else "")
   with
       Not_found ->
        error