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

diff --git a/scripts/page_email_send.ml b/scripts/page_email_send.ml
index 49b0b28..4e18374 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.3 2005/03/31 14:24:04 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
@@ -29,7 +29,7 @@ open Cocanwiki_ok
 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
@@ -37,7 +37,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
 
   if email = "" then (
     error ~title:"No email address" ~back_button:true
-      q "You must give an email address.";
+      dbh hostid q "You must give an email address.";
     return ()
   );
 
@@ -46,18 +46,18 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
                                  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
 
   if registered then (
     error ~title:"Email address already used" ~back_button:true
-      q
+      dbh hostid q
       ("That email address is already used for notifications from this page. "^
        "If you are not receiving updates for this page, then you will " ^
        "need to confirm that address. If you continue to have problems " ^
@@ -75,10 +75,10 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
   (* 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;
@@ -93,9 +93,10 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
   (* Finish up. *)
   let buttons = [ ok_button ("/" ^ page) ] in
   ok ~buttons ~title:"Confirmation email sent"
-    q ("Please check your email now.  You have been sent a confirmation " ^
-       "email so we can verify the email address is yours.  Click on the " ^
-       "first link in that email to confirm.")
+    dbh hostid q
+    ("Please check your email now.  You have been sent a confirmation " ^
+     "email so we can verify the email address is yours.  Click on the " ^
+     "first link in that email to confirm.")
 
 let () =
   register_script ~restrict:[CanView] run