git.annexia.org
/
cocanwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split the 'page' template into two halves to enable pipelining. The
[cocanwiki.git]
/
scripts
/
delete_file.ml
diff --git
a/scripts/delete_file.ml
b/scripts/delete_file.ml
index
fbfacff
..
209afc6
100644
(file)
--- a/
scripts/delete_file.ml
+++ b/
scripts/delete_file.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.
(* 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.
6 2004/09/09 12:21:22
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
*
* 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
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 (
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
(* Delete the file. *)
let sth = dbh#prepare_cached "update files
set name_deleted = name, name = null
@@
-42,11
+49,12
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
dbh#commit ();
(* Email notify. *)
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
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
(* Done. *)
let buttons = [ ok_button "/_files" ] in