Don't forget the date\!

[cocanwiki.git] / scripts / delete_contact.ml

diff --git a/scripts/delete_contact.ml b/scripts/delete_contact.ml
index 07758f1..0e211a9 100644 (file)
--- a/scripts/delete_contact.ml
+++ b/scripts/delete_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: delete_contact.ml,v 1.5 2006/03/27 18:09:46 rich Exp $
+ * $Id: delete_contact.ml,v 1.7 2006/12/06 09:46:57 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
@@ -29,19 +29,15 @@ open Cocanwiki_ok
 
 let run r (q : cgi) dbh hostid { hostname = hostname } _ =
   (* Cancel? *)
-  if q#param_true "cancel" then (
+  if q#param_true "cancel" then
     q#redirect ("http://" ^ hostname ^ "/_bin/contacts.cmo");
-    return ()
-  );
 
   (* We can delete multiple contact forms from this script, which is
    * quite unusual.
    *)
   let ids = List.map Int32.of_string (q#param_all "delete") in
-  if ids = [] then (
+  if ids = [] then
     q#redirect ("http://" ^ hostname ^ "/_bin/contacts.cmo");
-    return ()
-  );
 
   (* Need to check the contact emails all belong to this host. *)
   let rows = PGSQL(dbh)
@@ -57,7 +53,7 @@ let run r (q : cgi) dbh hostid { hostname = hostname } _ =
   PGOCaml.commit dbh;
 
   ok ~title:"Contact form(s) deleted" ~buttons:[ok_button "/_bin/contacts.cmo"]
-    dbh hostid q "Those contact form(s) were deleted."
+    r dbh hostid q "Those contact form(s) were deleted."
 
 let () =
   register_script ~restrict:[CanManageContacts] run