Don't forget the date\!

[cocanwiki.git] / scripts / delete_user.ml

diff --git a/scripts/delete_user.ml b/scripts/delete_user.ml
index 9e4cffd..653e7ed 100644 (file)
--- a/scripts/delete_user.ml
+++ b/scripts/delete_user.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_user.ml,v 1.6 2006/03/27 18:09:46 rich Exp $
+ * $Id: delete_user.ml,v 1.8 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
@@ -28,11 +28,9 @@ open Cocanwiki
 open Cocanwiki_ok
 
 let run r (q : cgi) dbh hostid {hostname = hostname} self =
-  if q#param_true "cancel" then (
+  if q#param_true "cancel" then
     (* Request cancelled. *)
     q#redirect ("http://" ^ hostname ^ "/_users");
-    return ()
-  );
 
   let userid = Int32.of_string (q#param "userid") in
 
@@ -48,7 +46,7 @@ let run r (q : cgi) dbh hostid {hostname = hostname} self =
     match self with
       | User (id, _, _, _) when id = userid ->
          error ~back_button:true ~title:"Delete own account"
-           dbh hostid q "You cannot delete your own user account.";
+           r dbh hostid q "You cannot delete your own user account.";
          return ()
       | _ -> () in
 
@@ -65,7 +63,7 @@ let run r (q : cgi) dbh hostid {hostname = hostname} self =
   PGOCaml.commit dbh;
 
   ok ~title:"Account deleted" ~buttons:[ok_button "/_users"]
-    dbh hostid q "That user account was deleted."
+    r dbh hostid q "That user account was deleted."
 
 let () =
   register_script ~restrict:[CanManageUsers] run