More thorough inclusion of the page bug. This should mean the page bug appears just...

[cocanwiki.git] / scripts / contact.ml

diff --git a/scripts/contact.ml b/scripts/contact.ml
index 16db870..4ec8e5e 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.7 2004/10/30 10:16:09 rich Exp $
+ * $Id: contact.ml,v 1.9 2005/11/24 14:54:11 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
@@ -35,7 +35,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
 
   let fail msg =
     error ~back_button:true ~title:"Bad form"
-      q (msg ^ "  Please contact the owner of the site by email.");
+      dbh hostid q (msg ^ "  Please contact the owner of the site by email.");
     return ()
   in
 
@@ -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,13 +148,12 @@ 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. *)
   ok ~title:"Thank you for your contact" ~buttons:[ok_button "/"]
-    q "An email was sent and you should receive a reply shortly."
+    dbh hostid q "An email was sent and you should receive a reply shortly."
 
 let () =
   register_script ~restrict:[CanView] run