+csv dep for PG'OCaml.

[cocanwiki.git] / scripts / send_feedback.ml

diff --git a/scripts/send_feedback.ml b/scripts/send_feedback.ml
index ffe7c7c..1dbb5d5 100644 (file)
--- a/scripts/send_feedback.ml
+++ b/scripts/send_feedback.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: send_feedback.ml,v 1.9 2006/07/26 13:12:10 rich Exp $
+ * $Id: send_feedback.ml,v 1.11 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
@@ -31,7 +31,7 @@ open Cocanwiki_template
 open Cocanwiki_ok
 
 let run r (q : cgi) dbh hostid {hostname = hostname} user =
-  let template = get_template dbh hostid "send_feedback.txt" in
+  let template = get_template r dbh hostid "send_feedback.txt" in
 
   if q#param_true "cancel" then
     (* Request cancelled. *)
@@ -80,11 +80,17 @@ let run r (q : cgi) dbh hostid {hostname = hostname} user =
   (* Send the feedback email. *)
   let subject = "Wiki feedback: Feedback about " ^ page ^ " page" in
   let body = template#to_string in
-  Sendmail.send_mail ~subject ~to_addr:[to_addr] body;
+
+  let to_addrs = [ "", to_addr ] in
+  let content_type =
+    "text/plain", ["charset", Mimestring.mk_param "UTF-8"] in
+
+  let msg = Netsendmail.compose ~subject ~to_addrs ~content_type body in
+  Netsendmail.sendmail msg;
 
   (* Confirm. *)
   ok ~title:"Thank you for your feedback" ~buttons:[ok_button "/"]
-    dbh hostid q "An email has been sent to the site administrators."
+    r dbh hostid q "An email has been sent to the site administrators."
 
 let () =
   register_script ~restrict:[CanView] run