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

[cocanwiki.git] / scripts / invite_user_confirm.ml

diff --git a/scripts/invite_user_confirm.ml b/scripts/invite_user_confirm.ml
index 45374c5..691aaed 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.2 2004/10/23 15:00:15 rich Exp $
+ * $Id: invite_user_confirm.ml,v 1.4 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
@@ -49,7 +49,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
        | _ -> assert false
     with Not_found ->
       error ~title:"Already signed up"
-        q "It looks like you have already used your invitation.";
+        dbh hostid q "It looks like you have already used your invitation.";
       return () in
 
   let password1 = q#param "password1" in
@@ -57,13 +57,13 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
 
   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 ()
   );
 
@@ -87,7 +87,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
         let body = template#to_string in
 
         let subject = "Your new account details" in
-        Sendmail.send_mail ~to_addr:[email] ~subject ~body ());
+        Sendmail.send_mail ~to_addr:[email] ~subject body);
 
   dbh#commit ();