X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fpage_email_send.ml;h=42ca71b08a95dae671aedf496755cc48736c75e6;hb=cd059731a60fd3d4dcf426430ad26ff227b91910;hp=4e18374ce8103680ddd85d767e090056536cecb7;hpb=bfa88724ee152ba00c2b2fca881dd78a6599820a;p=cocanwiki.git

diff --git a/scripts/page_email_send.ml b/scripts/page_email_send.ml
index 4e18374..42ca71b 100644
--- a/scripts/page_email_send.ml
+++ b/scripts/page_email_send.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: page_email_send.ml,v 1.5 2006/03/27 18:09:46 rich Exp $
+ * $Id: page_email_send.ml,v 1.6 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
@@ -42,18 +42,20 @@ let run r (q : cgi) dbh hostid { hostname = hostname } _ =
   );
 
   (* 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
@@ -73,10 +75,9 @@ let run r (q : cgi) dbh hostid { hostname = hostname } _ =
   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;