(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: page_email_send.ml,v 1.5 2006/03/27 18:09:46 rich Exp $
+ * $Id: page_email_send.ml,v 1.7 2006/07/31 09:49:43 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
);
(* Good a place as any to delete old, unconfirmed emails. *)
- let sth = dbh#prepare_cached "delete from page_emails
- where pending is not null
- and entry_date < current_date - 7" in
- sth#execute [];
+ PGSQL(dbh)
+ "delete from page_emails
+ where pending is not null
+ and entry_date < current_date - 7";
+
PGOCaml.commit dbh;
+ PGOCaml.begin_work dbh;
(* Is that email address already registered in the database? *)
- let sth = dbh#prepare_cached "select 1 from page_emails where hostid = ?
- and url = ? and email = ?" in
- sth#execute [Some hostid; Some page; Some email];
+ let rows = PGSQL(dbh)
+ "select 1 from page_emails where hostid = $hostid
+ and url = $page and email = $email" in
- let registered = try sth#fetch1int () = 1 with Not_found -> false in
+ let registered = rows = [Some 1l] in
if registered then (
error ~title:"Email address already used" ~back_button:true
let opt_out = random_sessionid () in
(* Insert into the database. *)
- let sth = dbh#prepare_cached "insert into page_emails (hostid, url, email,
- pending, opt_out) values (?, ?, ?, ?, ?)" in
- sth#execute [Some hostid; Some page; Some email; Some pending;
- Some opt_out];
+ PGSQL(dbh)
+ "insert into page_emails (hostid, url, email, pending, opt_out)
+ values ($hostid, $page, $email, $pending, $opt_out)";
PGOCaml.commit dbh;
let body = template#to_string in
let subject = "Site notice: " ^ hostname ^ ": Confirm your email address" in
- Sendmail.send_mail ~subject ~to_addr:[email] body;
+
+ let content_type =
+ "text/plain", ["charset", Mimestring.mk_param "UTF-8"] in
+ let to_addrs = [ "", email ] in
+
+ let msg = Netsendmail.compose ~subject ~to_addrs ~content_type body in
+ Netsendmail.sendmail msg;
(* Finish up. *)
let buttons = [ ok_button ("/" ^ page) ] in