X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fdelete_user.ml;h=bcb52c61a4dbec7b109aeee1e778d9d98b8eb311;hb=65966a769fea12308cf5a1bccee53d80483ee444;hp=782c6b0dc8f192a2fa7f8d3fb896f636d6cdeb45;hpb=867889b6d04b6381c74974e338672ee02d61920e;p=cocanwiki.git

diff --git a/scripts/delete_user.ml b/scripts/delete_user.ml
index 782c6b0..bcb52c6 100644
--- 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.1 2004/09/21 13:01:15 rich Exp $
+ * $Id: delete_user.ml,v 1.4 2004/10/30 10:16:10 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
@@ -31,7 +31,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} self =
   if q#param_true "cancel" then (
     (* Request cancelled. *)
     q#redirect ("http://" ^ hostname ^ "/_users");
-    raise CgiExit
+    return ()
   );
 
   let userid = int_of_string (q#param "userid") in
@@ -48,13 +48,24 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} self =
   (* Can't delete self! *)
   let () =
     match self with
-      | User (id, _, _) when id = userid ->
+      | User (id, _, _, _) when id = userid ->
 	  error ~back_button:true ~title:"Delete own account"
 	    q "You cannot delete your own user account.";
-	  raise CgiExit
+	  return ()
       | _ -> () in
 
   (* Delete the user. *)
+  let sth =
+    dbh#prepare_cached "delete from recently_visited
+                         where userid = ? and hostid = ?" in
+  sth#execute [`Int userid; `Int hostid];
+
+  let sth =
+    dbh#prepare_cached "delete from pending_email_changes
+                         where userid = ?" in
+  sth#execute [`Int userid];
+
+
   let sth = dbh#prepare_cached "delete from usercookies where userid = ?" in
   sth#execute [`Int userid];