X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fdelete_file.ml;h=209afc6a30539285bc672024b019dd7c28d9f744;hb=89e8d5757ca111d16ce3dfcc1ce4f2c00a119c85;hp=21847ec79f2218d007786e836889407e7a83488b;hpb=1f125fd7a6794f352f30de71a3905d5356a07008;p=cocanwiki.git

diff --git a/scripts/delete_file.ml b/scripts/delete_file.ml
index 21847ec..209afc6 100644
--- a/scripts/delete_file.ml
+++ b/scripts/delete_file.ml
@@ -1,7 +1,22 @@
-(* COCANWIKI scripts.
+(* COCANWIKI - a wiki written in Objective CAML.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: delete_file.ml,v 1.5 2004/09/09 09:35:33 rich Exp $
+ * $Id: delete_file.ml,v 1.8 2004/11/01 17:05:14 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  *)
 
 open Apache
@@ -13,10 +28,17 @@ open Cocanwiki
 open Cocanwiki_ok
 open Cocanwiki_emailnotify
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
   let id = int_of_string (q#param "id") in
 
   if q#param_true "yes" then (
+    (* Get the name. *)
+    let sth = dbh#prepare_cached "select coalesce (name, name_deleted)
+                                    from files
+                                   where hostid = ? and id = ?" in
+    sth#execute [`Int hostid; `Int id];
+    let name = sth#fetch1string () in
+
     (* Delete the file. *)
     let sth = dbh#prepare_cached "update files
                                      set name_deleted = name, name = null
@@ -27,11 +49,12 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
     dbh#commit ();
 
     (* Email notify. *)
-    let subject = "File #" ^ string_of_int id ^ " has been deleted." in
+    let subject = "File " ^ name ^ "#" ^ string_of_int id ^
+		  " has been deleted." in
     let body = fun () ->
       "Page: http://" ^ hostname ^ "/_files?deleted=1" in
 
-    email_notify ~body ~subject dbh hostid;
+    email_notify ~body ~subject ~user dbh hostid;
 
     (* Done. *)
     let buttons = [ ok_button "/_files" ] in