Added a "side-by-side" mode using ''diff -y''. Disabled by default,

[cocanwiki.git] / scripts / forgot_password.ml

diff --git a/scripts/forgot_password.ml b/scripts/forgot_password.ml
index 6b99594..20608b7 100644 (file)
--- a/scripts/forgot_password.ml
+++ b/scripts/forgot_password.ml
@@ -1,7 +1,22 @@
-(* COCANWIKI scripts.
+(* 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.2 2004/09/08 09:13:02 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
+ * 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
@@ -13,18 +28,19 @@ open Cocanwiki
 open Cocanwiki_ok
 open Cocanwiki_strings
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
   let name = trim (q#param "name") in
 
   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
+    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];