X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fsend_feedback.ml;h=1de626e94a5742656d75adc1bbeb522095af5770;hb=cd059731a60fd3d4dcf426430ad26ff227b91910;hp=682b8f6569a281d0d76b7883cbb2b0d2fc390c86;hpb=50799fee9a4c3906fe0ab9988df83af2109fa269;p=cocanwiki.git

diff --git a/scripts/send_feedback.ml b/scripts/send_feedback.ml
index 682b8f6..1de626e 100644
--- 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.3 2004/10/04 15:19:56 rich Exp $
+ * $Id: send_feedback.ml,v 1.8 2006/03/28 16:24:08 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,7 +30,7 @@ open Cocanwiki
 open Cocanwiki_template
 open Cocanwiki_ok
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
+let run r (q : cgi) dbh hostid {hostname = hostname} user =
   let template = get_template dbh hostid "send_feedback.txt" in
 
   if q#param_true "cancel" then (
@@ -40,11 +40,11 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
   );
 
   (* Get the feedback email for this host. *)
-  let sth =
-    dbh#prepare_cached "select feedback_email from hosts where id = ?" in
-  sth#execute [`Int hostid];
-
-  let to_addr = sth#fetch1string () in
+  let to_addr = List.hd (
+    PGSQL(dbh)
+      "select feedback_email from hosts where id = $hostid"
+  ) in
+  let to_addr = Option.get to_addr in
 
   (* Get the fields. *)
   let page = q#param "page" in
@@ -71,8 +71,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
   let username =
     match user with
 	Anonymous -> "anonymous"
-      | User (userid, username, _) ->
-	  sprintf "%s (%d)" username userid in
+      | User (userid, username, _, _) ->
+	  sprintf "%s (%ld)" username userid in
 
   template#set "ip" ip;
   template#set "ua" ua;
@@ -82,11 +82,11 @@ let run r (q : cgi) (dbh : Dbi.connection) 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 ();
+  Sendmail.send_mail ~subject ~to_addr:[to_addr] body;
 
   (* Confirm. *)
   ok ~title:"Thank you for your feedback" ~buttons:[ok_button "/"]
-    q "An email has been sent to the site administrators."
+    dbh hostid q "An email has been sent to the site administrators."
 
 let () =
   register_script ~restrict:[CanView] run