X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fdelete_image.ml;h=ee62ea20c906a37953170f9393a45eb7d75d47f1;hb=65966a769fea12308cf5a1bccee53d80483ee444;hp=dcb45225f25b8bccebc23c501537109d62253eac;hpb=11b93485a29771f4d826c50d9efc6d3607dfa50f;p=cocanwiki.git

diff --git a/scripts/delete_image.ml b/scripts/delete_image.ml
index dcb4522..ee62ea2 100644
--- a/scripts/delete_image.ml
+++ b/scripts/delete_image.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_image.ml,v 1.6 2004/09/09 12:21:22 rich Exp $
+ * $Id: delete_image.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
@@ -28,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 images
+                                   where hostid = ? and id = ?" in
+    sth#execute [`Int hostid; `Int id];
+    let name = sth#fetch1string () in
+
     (* Delete the image. *)
     let sth = dbh#prepare_cached "update images
                                      set name_deleted = name, name = null
@@ -42,11 +49,13 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
     dbh#commit ();
 
     (* Email notify. *)
-    let subject = "Image #" ^ string_of_int id ^ " has been deleted." in
+    let subject = "Image " ^ name ^ "#" ^ string_of_int id ^
+		  " has been deleted." in
     let body = fun () ->
       "Page: http://" ^ hostname ^ "/_images?deleted=1" in
 
-    email_notify ~body ~subject dbh hostid;
+    email_notify ~body ~subject ~user dbh hostid;
+
     (* Done. *)
     let buttons = [ ok_button "/_images" ] in
     ok ~title:"Image deleted" ~buttons