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

[cocanwiki.git] / scripts / invite_user_confirm.ml

diff --git a/scripts/invite_user_confirm.ml b/scripts/invite_user_confirm.ml
index ad51a49..89fb904 100644 (file)
--- a/scripts/invite_user_confirm.ml
+++ b/scripts/invite_user_confirm.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: invite_user_confirm.ml,v 1.3 2005/03/31 14:24:04 rich Exp $
+ * $Id: invite_user_confirm.ml,v 1.7 2006/03/28 16:24:07 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
@@ -29,53 +29,49 @@ open Cocanwiki_ok
 open Cocanwiki_strings
 open Cocanwiki_template
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
+let run r (q : cgi) dbh hostid { hostname = hostname } _ =
   let template = _get_template "invite_user_confirm.txt" in
 
   let username = q#param "username" in
   let invite = q#param "invite" in
 
   (* Verify the username, invite combination. *)
-  let sth = dbh#prepare_cached "select email, id from users
-                                 where hostid = ? and
-                                       name = ? and invite = ?" in
-  sth#execute [`Int hostid; `String username; `String invite];
+  let rows = PGSQL(dbh) "select email, id from users
+                          where hostid = $hostid and
+                                name = $username and invite = $invite" in
 
   let email, userid =
-    try
-      match sth#fetch1 () with
-         [ `String email; `Int userid ] -> Some email, userid
-       | [ `Null; `Int userid ] -> None, userid
-       | _ -> assert false
-    with Not_found ->
-      error ~title:"Already signed up"
-        q "It looks like you have already used your invitation.";
-      return () in
+    match rows with
+    | [ Some email, userid ] -> Some email, userid
+    | [ None, userid ] -> None, userid
+    | [] ->
+       error ~title:"Already signed up"
+          dbh hostid q "It looks like you have already used your invitation.";
+       return ()
+    | _ -> assert false in
 
   let password1 = q#param "password1" in
   let password2 = q#param "password2" in
 
   if password1 = "" || password2 = "" then (
     error ~back_button:true ~title:"Bad password"
-      q "The password you gave is empty.";
+      dbh hostid q "The password you gave is empty.";
     return ()
   );
 
   if password1 <> password2 then (
     error ~back_button:true ~title:"Passwords don't match"
-      q "The two passwords you gave aren't identical.";
+      dbh hostid q "The two passwords you gave aren't identical.";
     return ()
   );
 
   let password = password1 in
 
   (* Change the password. *)
-  let sth =
-    dbh#prepare_cached
-      "update users set password = ?, invite = null,
-                        force_password_change = false
-        where hostid = ? and id = ?" in
-  sth#execute [`String password; `Int hostid; `Int userid];
+  PGSQL(dbh)
+    "update users set password = $password, invite = null,
+                      force_password_change = false
+      where hostid = $hostid and id = $userid";
 
   (* Send email to this user. *)
   (match email with
@@ -89,7 +85,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
         let subject = "Your new account details" in
         Sendmail.send_mail ~to_addr:[email] ~subject body);
 
-  dbh#commit ();
+  PGOCaml.commit dbh;
 
   (* Redirect to the login page. *)
   let redirect =