Fixed to match ChriS's API changes to mod_caml.

[cocanwiki.git] / scripts / send_feedback.ml

diff --git a/scripts/send_feedback.ml b/scripts/send_feedback.ml
index 3dc1a1e..a2929a1 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.1 2004/09/20 17:18:26 rich Exp $
+ * $Id: send_feedback.ml,v 1.5 2005/03/31 14:24:04 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
@@ -36,7 +36,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
   if q#param_true "cancel" then (
     (* Request cancelled. *)
     q#redirect ("http://" ^ hostname);
-    raise CgiExit
+    return ()
   );
 
   (* Get the feedback email for this host. *)
@@ -71,7 +71,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
   let username =
     match user with
        Anonymous -> "anonymous"
-      | User (userid, username, _) ->
+      | User (userid, username, _, _) ->
          sprintf "%s (%d)" username userid in
 
   template#set "ip" ip;
@@ -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."
 
 let () =
-  register_script run
+  register_script ~restrict:[CanView] run