(* 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.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
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
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
let username =
match user with
Anonymous -> "anonymous"
- | User (userid, username, _) ->
+ | User (userid, username, _, _) ->
sprintf "%s (%d)" username userid in
template#set "ip" ip;
(* 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 ->
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 run
+ register_script ~restrict:[CanView] run