X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fdelete_image_form.ml;h=955b46ae4e922c79c8ec088a11a7f5ecabb4c7e5;hb=262f6a0c34949247ba6b78399b787e693da38d86;hp=3c87e2775e2d36b8e231889863ea6d44dba0ea06;hpb=714e5e5b4b585da1eca55274e3903ee9a1dbf0d6;p=cocanwiki.git

diff --git a/scripts/delete_image_form.ml b/scripts/delete_image_form.ml
index 3c87e27..955b46a 100644
--- a/scripts/delete_image_form.ml
+++ b/scripts/delete_image_form.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_image_form.ml,v 1.2 2004/09/07 13:40:10 rich Exp $
+ * $Id: delete_image_form.ml,v 1.8 2006/03/27 18:09:46 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
@@ -9,34 +24,31 @@ open Registry
 open Cgi
 open Printf
 
-open Merjisforwiki
-
 open Cocanwiki
 open Cocanwiki_template
 
-let template = get_template "delete_image_form.html"
+let run r (q : cgi) dbh hostid _ _ =
+  let template = get_template dbh hostid "delete_image_form.html" in
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
-  let id = int_of_string (q#param "id") in
+  let id = Int32.of_string (q#param "id") in
 
-  let sth = dbh#prepare_cached "select name, width, height, alt
-                                  from images
-                                 where hostid = ? and id = ?" in
-  sth#execute [`Int hostid; `Int id];
+  let rows = PGSQL(dbh)
+    "select name, width, height, alt
+       from images
+      where hostid = $hostid and id = $id" in
 
   let name, width, height, alt =
-    match sth#fetch1 () with
-	[ `String name; `Int width; `Int height; `String alt] ->
-	  name, width, height, alt
-      | _ -> assert false in
-
-  template#set "id" (string_of_int id);
-  template#set "name" name;
-  template#set "width" (string_of_int width);
-  template#set "height" (string_of_int height);
+    match rows with
+    | [row] -> row
+    | _ -> assert false in
+
+  template#set "id" (Int32.to_string id);
+  template#set "name" (Option.get name);
+  template#set "width" (Int32.to_string width);
+  template#set "height" (Int32.to_string height);
   template#set "alt" alt;
 
   q#template template
 
 let () =
-  register_script run
+  register_script ~restrict:[CanEdit] run