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

[cocanwiki.git] / scripts / forgot_password.ml

diff --git a/scripts/forgot_password.ml b/scripts/forgot_password.ml
index 0c2ea5f..f496944 100644 (file)
--- a/scripts/forgot_password.ml
+++ b/scripts/forgot_password.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: forgot_password.ml,v 1.4 2004/09/09 12:21:22 rich Exp $
+ * $Id: forgot_password.ml,v 1.8 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
@@ -33,13 +33,14 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
 
   if name = "" then (
     error ~back_button:true ~title:"No username or email address"
-      q "You didn't give a username or email address";
-    raise CgiExit
+      dbh hostid q "You didn't give a username or email address";
+    return ()
   );
 
   (* Look it up in the database. *)
   let sth = dbh#prepare_cached "select email, name, password from users
                                  where hostid = ?
+                                   and email is not null
                                    and (lower (name) = lower (?)
                                         or lower (email) = lower (?))" in
   sth#execute [`Int hostid; `String name; `String name];
@@ -64,11 +65,11 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
       "\n" ^
       "IP address of request: " ^ ip ^ "\n" in
 
-    Sendmail.send_mail ~subject ~to_addr:[ email ] ~body ();
+    Sendmail.send_mail ~subject ~to_addr:[ email ] body;
 
     let buttons = [ ok_button "/_login" ] in
     ok ~buttons ~title:"Password sent by email"
-      q
+      dbh hostid q
       ("Your password was sent by email.  If you don't receive the password " ^
        "within an hour, please notify the site's administrator.")
   with
@@ -79,7 +80,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
        Unix.sleep 10;
 
        error ~back_button:true ~title:"Nothing known"
-         q "Sorry, don't know anyone with that name or email address."
+         dbh hostid q
+         "Sorry, don't know anyone with that name or email address."
 
 let () =
   register_script run