(* 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.4 2005/11/24 14:54:12 rich Exp $
+ * $Id: page_email_send.ml,v 1.5 2006/03/27 18:09:46 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
open Cocanwiki_template
open Cocanwiki_strings
-let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
+let run r (q : cgi) dbh hostid { hostname = hostname } _ =
let template = get_template dbh hostid "page_email_send.txt" in
let page = q#param "page" in
where pending is not null
and entry_date < current_date - 7" in
sth#execute [];
- dbh#commit ();
+ PGOCaml.commit 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 [`Int hostid; `String page; `String email];
+ sth#execute [Some hostid; Some page; Some email];
let registered = try sth#fetch1int () = 1 with Not_found -> false in
(* Insert into the database. *)
let sth = dbh#prepare_cached "insert into page_emails (hostid, url, email,
pending, opt_out) values (?, ?, ?, ?, ?)" in
- sth#execute [`Int hostid; `String page; `String email; `String pending;
- `String opt_out];
+ sth#execute [Some hostid; Some page; Some email; Some pending;
+ Some opt_out];
- dbh#commit ();
+ PGOCaml.commit dbh;
(* Send the initial email to the user. *)
template#set "hostname" hostname;