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

diff --git a/scripts/page_email_send.ml b/scripts/page_email_send.ml
index 9fa7318..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.1 2004/09/24 15:53:57 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
@@ -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,27 +37,29 @@ 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 ()
   );
 
   (* 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 [];
-  dbh#commit ();
+  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 [`Int hostid; `String page; `String 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
-      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 " ^
@@ -73,12 +75,11 @@ let run r (q : cgi) (dbh : Dbi.connection) 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 [`Int hostid; `String page; `String email; `String pending;
-	       `String opt_out];
+  PGSQL(dbh)
+    "insert into page_emails (hostid, url, email, pending, opt_out)
+     values ($hostid, $page, $email, $pending, $opt_out)";
 
-  dbh#commit ();
+  PGOCaml.commit dbh;
 
   (* Send the initial email to the user. *)
   template#set "hostname" hostname;
@@ -88,14 +89,15 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
 
   let body = template#to_string in
   let subject = "Site notice: " ^ hostname ^ ": Confirm your email address" in
-  Sendmail.send_mail ~subject ~body ~to_addr:[email] ();
+  Sendmail.send_mail ~subject ~to_addr:[email] body;
 
   (* 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 run
+  register_script ~restrict:[CanView] run