(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: upload_image.ml,v 1.11 2004/11/01 17:05:14 rich Exp $
+ * $Id: upload_image.ml,v 1.15 2006/12/06 09:46:57 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
(* Valid image names. *)
let image_ok_re = Pcre.regexp "^[a-z0-9][-._a-z0-9]*\\.(jpg|jpeg|gif|ico|png)$"
-let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
+let run r (q : cgi) dbh hostid { hostname = hostname } user=
let name = q#param "name" in
let alt = q#param "alt" in
let title = q#param "title" in
with
Not_found ->
error ~title:"No image" ~back_button:true
- q "No image was uploaded.";
+ r dbh hostid q "No image was uploaded.";
return () in
(* Check the name is valid. *)
if not (Pcre.pmatch ~rex:image_ok_re name) then (
error ~title:"Bad Image Name" ~back_button:true
- q ("The Image Name must contain only lowercase English letters, " ^
- "numbers, dots, dashes and underscore. " ^
- "It must end with .jpg, .gif or .png " ^
- "depending on the image format.");
+ r dbh hostid q
+ ("The Image Name must contain only lowercase English letters, " ^
+ "numbers, dots, dashes and underscore. " ^
+ "It must end with .jpg, .gif or .png " ^
+ "depending on the image format.");
return ()
);
with
Invalid_argument _ ->
error ~title:"Bad image" ~back_button:true
- q ("Unknown image type. Is the file you uploaded really an " ^
- "image?");
+ r dbh hostid q
+ ("Unknown image type. Is the file you uploaded really an " ^
+ "image?");
return () in
(* Check the image filename extension matches the MIME type. *)
| _ -> assert false in
if not ext_ok then (
error ~title:"Bad Image Name" ~back_button:true
- q ("The Image Name extension has to match the image format. " ^
- "For example if the image is in JPEG format, the name must " ^
- "be 'something.jpg'. I detected the following image type " ^
- "in the file you uploaded: " ^ mime_type);
+ r dbh hostid q
+ ("The Image Name extension has to match the image format. " ^
+ "For example if the image is in JPEG format, the name must " ^
+ "be 'something.jpg'. I detected the following image type " ^
+ "in the file you uploaded: " ^ mime_type);
return ()
);
(* Check some ALT text was supplied. *)
if string_is_whitespace alt then (
error ~title:"Missing Alt text" ~back_button:true
- q ("You must supply Alt text describing the image. This is required " ^
- "by accessibility laws and to allow search engines to discover the " ^
- "content of images.");
+ r dbh hostid q
+ ("You must supply Alt text describing the image. This is required " ^
+ "by accessibility laws and to allow search engines to discover the " ^
+ "content of images.");
return ()
);
- let title = if string_is_whitespace title then `Null else `String title in
+ let title = if string_is_whitespace title then None else Some title in
let longdesc =
- if string_is_whitespace longdesc then `Null else `String longdesc in
- let clazz = if string_is_whitespace clazz then `Null else `String clazz in
+ if string_is_whitespace longdesc then None else Some longdesc in
+ let clazz = if string_is_whitespace clazz then None else Some clazz in
(* Make a thumbnail of this image. *)
let thumbnail, tn_mime_type, tn_width, tn_height =
* then we can replace it, otherwise we must present an error message.
*)
let replace = q#param_true "replace" in
- let sth = dbh#prepare_cached "select 1 from images
- where hostid = ? and name = ?" in
- sth#execute [`Int hostid; `String name];
-
- let exists = try sth#fetch1int () = 1 with Not_found -> false in
+ let rows = PGSQL(dbh) "select 1 from images
+ where hostid = $hostid and name = $name" in
+ let exists = rows = [Some 1l] in
if exists then (
if not replace then (
error ~title:"Image already exists" ~back_button:true
- q ("An image with the same name already exists.");
+ r dbh hostid q "An image with the same name already exists.";
return ()
) else (
- let sth = dbh#prepare_cached "update images
- set name_deleted = name, name = null
- where hostid = ? and name = ?" in
- sth#execute [`Int hostid; `String name];
+ PGSQL(dbh) "update images
+ set name_deleted = name, name = null
+ where hostid = $hostid and name = $name"
)
);
(* Put the image into the database. *)
- let sth =
- dbh#prepare_cached
- "insert into images (hostid, name, image, width, height, alt,
- title, longdesc, class, thumbnail, tn_width,
- tn_height, mime_type, tn_mime_type)
- values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" in
- sth#execute [`Int hostid; `String name; `Binary image; `Int width;
- `Int height; `String alt; title; longdesc; clazz;
- `Binary thumbnail; `Int tn_width; `Int tn_height;
- `String mime_type; `String tn_mime_type];
-
- dbh#commit ();
+ let width = Int32.of_int width in
+ let height = Int32.of_int height in
+ let tn_width = Int32.of_int tn_width in
+ let tn_height = Int32.of_int tn_height in
+ PGSQL(dbh)
+ "insert into images (hostid, name, image, width, height, alt,
+ title, longdesc, class, thumbnail, tn_width,
+ tn_height, mime_type, tn_mime_type)
+ values ($hostid, $name, $image, $width, $height, $alt, $?title,
+ $?longdesc, $?clazz, $thumbnail, $tn_width, $tn_height,
+ $mime_type, $tn_mime_type)";
+
+ PGOCaml.commit dbh;
(* Email notify. *)
let subject = "Image " ^ name ^ " has been uploaded." in
let buttons = [ ok_button "/_images" ] in
ok ~title:"Image uploaded" ~buttons
- q "Image was uploaded successfully."
+ r dbh hostid q "Image was uploaded successfully."
let () =
register_script ~restrict:[CanEdit] run
git.annexia.org / cocanwiki.git / blobdiff