Change subject line so it shows the name of the site.

[cocanwiki.git] / scripts / forgot_password.ml

diff --git a/scripts/forgot_password.ml b/scripts/forgot_password.ml
index f496944..e51e998 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.8 2005/11/24 14:54:12 rich Exp $
+ * $Id: forgot_password.ml,v 1.10 2006/03/27 19:10:29 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
@@ -28,7 +28,7 @@ open Cocanwiki
 open Cocanwiki_ok
 open Cocanwiki_strings
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
+let run r (q : cgi) dbh hostid { hostname = hostname } _ =
   let name = trim (q#param "name") in
 
   if name = "" then (
@@ -38,16 +38,16 @@ 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];
+  let rows = PGSQL(dbh)
+    "select email, name, password from users
+      where hostid = $hostid
+        and email is not null
+        and (lower (name) = lower ($name) or lower (email) = lower ($name))" in
 
   try
-    let email, name, password = match sth#fetch1 () with
-       [ `String email; `String name; `String password ] ->
+    let email, name, password =
+      match rows with
+      | [ Some email, name, password ] ->
          email, name, password
       | _ -> assert false in