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

diff --git a/scripts/page_email_send.ml b/scripts/page_email_send.ml
index 4e18374..ead1787 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.8 2006/12/06 09:46:57 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
@@ -30,34 +30,36 @@ open Cocanwiki_template
 open Cocanwiki_strings
 
 let run r (q : cgi) dbh hostid { hostname = hostname } _ =
-  let template = get_template dbh hostid "page_email_send.txt" in
+  let template = get_template r dbh hostid "page_email_send.txt" in
 
   let page = q#param "page" in
   let email = trim (q#param "email") in
 
   if email = "" then (
     error ~title:"No email address" ~back_button:true
-      dbh hostid q "You must give an email address.";
+      r 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 [];
+  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
-      dbh hostid q
+      r 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,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;
 
@@ -88,12 +89,18 @@ let run r (q : cgi) dbh 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 ("/" ^ page) ] in
   ok ~buttons ~title:"Confirmation email sent"
-    dbh hostid q
+    r 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.")