(* 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.7 2006/03/28 16:24:07 rich Exp $
+ * $Id: invite_user_confirm.ml,v 1.9 2006/12/06 09:46: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
| [ None, userid ] -> None, userid
| [] ->
error ~title:"Already signed up"
- dbh hostid q "It looks like you have already used your invitation.";
+ r dbh hostid q
+ "It looks like you have already used your invitation.";
return ()
| _ -> assert false in
if password1 = "" || password2 = "" then (
error ~back_button:true ~title:"Bad password"
- dbh hostid q "The password you gave is empty.";
+ r dbh hostid q "The password you gave is empty.";
return ()
);
if password1 <> password2 then (
error ~back_button:true ~title:"Passwords don't match"
- dbh hostid q "The two passwords you gave aren't identical.";
+ r dbh hostid q "The two passwords you gave aren't identical.";
return ()
);
let body = template#to_string in
let subject = "Your new account details" in
- Sendmail.send_mail ~to_addr:[email] ~subject body);
+
+ let to_addrs = [ "", email ] in
+ let content_type =
+ "text/plain", ["charset", Mimestring.mk_param "UTF-8"] in
+
+ let msg = Netsendmail.compose ~to_addrs ~subject ~content_type body in
+ Netsendmail.sendmail msg);
PGOCaml.commit dbh;