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

diff --git a/scripts/contact.ml b/scripts/contact.ml
index ba88f1d..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.3 2004/09/23 11:56:47 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
@@ -39,22 +39,25 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user =
     return ()
   in
 
-  (* Get the id field. *)
-  let id =
-    try int_of_string (q#param "id")
+  (* Get the name field. *)
+  let name =
+    try q#param "id"
     with
-	Not_found -> fail "The 'id' field is missing in that form."
-      | Failure "int_of_string" ->
-	  fail "The 'id' field in that form is not a number." 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 subject from contacts
-                                 where hostid = ? and id = ?" in
-  sth#execute [`Int hostid; `Int id];
-
-  let subject =
-    try sth#fetch1string ()
-    with Not_found -> fail "There is no such contact id in the database." in
+  let sth = dbh#prepare_cached "select id, subject from contacts
+                                 where hostid = ? and name = ?" in
+  sth#execute [`Int hostid; `String name];
+
+  let id, subject =
+    try
+      (match sth#fetch1 () with
+	   [ `Int id; `String subject ] -> id, subject
+	 | _ -> assert false
+      )
+    with Not_found -> fail "There is no such contact form in the database." in
 
   let sth = dbh#prepare_cached "select email from contact_emails
                                  where contactid = ?" in
@@ -114,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;
@@ -135,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 ->
@@ -145,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. *)
@@ -154,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