From: rich <rich>
Date: Sat, 9 Oct 2004 12:20:57 +0000 (+0000)
Subject: Forgot password script shouldn't fail if the user doesn't have an email address.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=eda77418966602066497894634af29e9353700ab;p=cocanwiki.git

Forgot password script shouldn't fail if the user doesn't have an email address.
---

diff --git a/scripts/forgot_password.ml b/scripts/forgot_password.ml
index daa6ebb..20608b7 100644
--- 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.5 2004/09/23 11:56:47 rich Exp $
+ * $Id: forgot_password.ml,v 1.6 2004/10/09 12:20: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
@@ -40,6 +40,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
   (* 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];