COCANWIKI is now ~95% UTF-8 safe.

[cocanwiki.git] / scripts / mailing_list_send.ml

diff --git a/scripts/mailing_list_send.ml b/scripts/mailing_list_send.ml
index 35c50d2..1ea0bae 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.6 2005/11/24 14:54:12 rich Exp $
+ * $Id: mailing_list_send.ml,v 1.9 2006/07/31 09:49:43 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
@@ -42,18 +42,16 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
   );
 
   (* 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
@@ -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;
@@ -87,7 +84,13 @@ 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 ~to_addr:[email] body;
+
+  let content_type =
+    "text/plain", ["charset", Mimestring.mk_param "UTF-8"] in
+  let to_addrs = [ "", email ] in
+
+  let msg = Netsendmail.compose ~subject ~to_addrs ~content_type body in
+  Netsendmail.sendmail msg;
 
   (* Finish up. *)
   let buttons = [ ok_button "/" ] in