git.annexia.org
/
cocanwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
+csv dep for PG'OCaml.
[cocanwiki.git]
/
scripts
/
page_email_send.ml
diff --git
a/scripts/page_email_send.ml
b/scripts/page_email_send.ml
index
42ca71b
..
ead1787
100644
(file)
--- 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.
(* 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.
6 2006/03/28 16:24:0
7 rich Exp $
+ * $Id: page_email_send.ml,v 1.
8 2006/12/06 09:46:5
7 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
*
* 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,14
+30,14
@@
open Cocanwiki_template
open Cocanwiki_strings
let run r (q : cgi) dbh hostid { hostname = hostname } _ =
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
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 ()
);
return ()
);
@@
-59,7
+59,7
@@
let run r (q : cgi) dbh hostid { hostname = hostname } _ =
if registered then (
error ~title:"Email address already used" ~back_button:true
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 " ^
("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 " ^
@@
-89,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
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"
(* 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.")
("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.")