Fixed to match ChriS's API changes to mod_caml.

[cocanwiki.git] / scripts / contact.ml

diff --git a/scripts/contact.ml b/scripts/contact.ml
index 436ee35..3dd454b 100644 (file)
--- a/scripts/contact.ml
+++ b/scripts/contact.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: contact.ml,v 1.4 2004/09/25 12:53:55 rich Exp $
+ * $Id: contact.ml,v 1.8 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
@@ -43,7 +43,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
   let name =
     try q#param "id"
     with
-       Not_found -> fail "The 'name' field is missing in that form." in
+       Not_found ->
+         fail "The 'name' field is missing in that form." in
 
   (* Get the contacts / emails from the database. *)
   let sth = dbh#prepare_cached "select id, subject from contacts
@@ -116,7 +117,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;
@@ -137,7 +138,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
 
   (* Send the initial email. *)
   let body = template#to_string in
-  Sendmail.send_mail ~subject ~to_addr:emails ~body ();
+  Sendmail.send_mail ~subject ~to_addr:emails body;
 
   (* Send the following uploads by email. *)
   List.iter (fun name ->
@@ -147,8 +148,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
               let content_type = upload.upload_content_type in
               let body = upload.upload_value in
 
-              Sendmail.send_mail ~subject ~to_addr:emails ~content_type
-                ~body ())
+              Sendmail.send_mail ~subject ~to_addr:emails ~content_type body)
     uploads;
 
   (* Confirm. *)
@@ -156,4 +156,4 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
     q "An email was sent and you should receive a reply shortly."
 
 let () =
-  register_script run
+  register_script ~restrict:[CanView] run