X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fcontact.ml;h=3dd454b9d4153db03e6e14c897ff46ec4ba47262;hb=295f2cde3f43ccf7f775d39b95925e10aa4c37cb;hp=7cf8ac56e3ac4595e01b5735f350240f410d1a2e;hpb=232d52d33fe530971f81b57bbc8b024fb259c4fd;p=cocanwiki.git

diff --git a/scripts/contact.ml b/scripts/contact.ml
index 7cf8ac5..3dd454b 100644
--- 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.5 2004/09/27 12:37:54 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
@@ -117,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;
@@ -138,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 ->
@@ -148,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. *)
@@ -157,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