Change subject line so it shows the name of the site.

[cocanwiki.git] / scripts / mailing_list_send.ml

diff --git a/scripts/mailing_list_send.ml b/scripts/mailing_list_send.ml
index 623cfff..b576d56 100644 (file)
--- a/scripts/mailing_list_send.ml
+++ b/scripts/mailing_list_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: mailing_list_send.ml,v 1.5 2005/03/31 14:24:04 rich Exp $
+ * $Id: mailing_list_send.ml,v 1.8 2006/03/28 13:20:00 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 "mailing_list_send.txt" in
 
   let email = trim (q#param "email") in
@@ -37,27 +37,25 @@ 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 mailing_lists
-                                 where pending is not null
-                                   and entry_date < current_date - 7" in
-  sth#execute [];
-  dbh#commit ();
+  PGSQL(dbh) "delete from mailing_lists
+               where pending is not null
+                 and entry_date < current_date - 7";
+  PGOCaml.commit dbh;
+  PGOCaml.begin_work dbh;  (* We do some more writes below. *)
 
   (* Is that email address already registered in the database? *)
-  let sth = dbh#prepare_cached "select 1 from mailing_lists where hostid = ?
-                                  and email = ?" in
-  sth#execute [`Int hostid; `String email];
-
-  let registered = try sth#fetch1int () = 1 with Not_found -> false in
+  let rows = PGSQL(dbh)
+    "select 1 from mailing_lists where hostid = $hostid and email = $email" 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 on our mailing list. "^
        "If you are not receiving mailing list messages, then you will " ^
        "need to confirm that address. If you continue to have problems " ^
@@ -73,12 +71,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 mailing_lists (hostid, email, name,
-                                  pending, opt_out) values (?, ?, ?, ?, ?)" in
-  sth#execute [`Int hostid; `String email; `String name;
-              `String pending; `String opt_out];
+  PGSQL(dbh) "insert into mailing_lists (hostid, email, name,
+                pending, opt_out)
+              values ($hostid, $email, $name, $pending, $opt_out)";
 
-  dbh#commit ();
+  PGOCaml.commit dbh;
 
   (* Send the initial email to the user. *)
   template#set "hostname" hostname;
@@ -92,9 +89,10 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
   (* Finish up. *)
   let buttons = [ ok_button "/" ] 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