From 5292c2362fb54524b8ec7877ee15c79596429491 Mon Sep 17 00:00:00 2001 From: rich Date: Mon, 1 Nov 2004 16:24:50 +0000 Subject: [PATCH] Allow images and files to be replaced. Allow - and . to appear in image names. --- scripts/lib/wikilib.ml | 4 ++-- scripts/upload_file.ml | 25 ++++++++++++++++++++++++- scripts/upload_image.ml | 30 +++++++++++++++++++++++++++--- 3 files changed, 53 insertions(+), 6 deletions(-) diff --git a/scripts/lib/wikilib.ml b/scripts/lib/wikilib.ml index 7916201..22f6506 100644 --- a/scripts/lib/wikilib.ml +++ b/scripts/lib/wikilib.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: wikilib.ml,v 1.2 2004/10/24 17:32:55 rich Exp $ + * $Id: wikilib.ml,v 1.3 2004/11/01 16:24:50 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 @@ -106,7 +106,7 @@ let markup_re = let link_re = Pcre.regexp "\\[\\[\\s*(.+?)\\s*(?:\\|(.+?)\\s*)?\\]\\]" let image_re = - Pcre.regexp "^(image|thumb(?:nail)?):\\s*([a-z0-9][_a-z0-9]*\\.(?:jpg|jpeg|gif|ico|png))$" + Pcre.regexp "^(image|thumb(?:nail)?):\\s*([a-z0-9][-._a-z0-9]*\\.(?:jpg|jpeg|gif|ico|png))$" let file_re = Pcre.regexp "^file:\\s*([a-z0-9][-._a-z0-9]*)$" diff --git a/scripts/upload_file.ml b/scripts/upload_file.ml index 543cd66..5642cd7 100644 --- a/scripts/upload_file.ml +++ b/scripts/upload_file.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: upload_file.ml,v 1.8 2004/10/21 19:54:29 rich Exp $ + * $Id: upload_file.ml,v 1.9 2004/11/01 16:24:50 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 @@ -66,6 +66,29 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user= let title = if is_whitespace title then `Null else `String title in + (* Check if something with the same name already exists. If replace=1 + * 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 files + where hostid = ? and name = ?" in + sth#execute [`Int hostid; `String name]; + + let exists = try sth#fetch1int () = 1 with Not_found -> false in + + if exists then ( + if not replace then ( + error ~title:"File already exists" ~back_button:true + q ("An file with the same name already exists."); + return () + ) else ( + let sth = dbh#prepare_cached "update files + set name_deleted = name, name = null + where hostid = ? and name = ?" in + sth#execute [`Int hostid; `String name]; + ) + ); + (* Put the file into the database. *) let sth = dbh#prepare_cached diff --git a/scripts/upload_image.ml b/scripts/upload_image.ml index 5e206a5..170c400 100644 --- a/scripts/upload_image.ml +++ b/scripts/upload_image.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: upload_image.ml,v 1.9 2004/11/01 16:05:27 rich Exp $ + * $Id: upload_image.ml,v 1.10 2004/11/01 16:24:50 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 @@ -35,7 +35,7 @@ let is_ws_re = Pcre.regexp "^\\s*$" let is_whitespace str = Pcre.pmatch ~rex:is_ws_re str (* Valid image names. *) -let image_ok_re = Pcre.regexp "^[a-z0-9][_a-z0-9]*\\.(jpg|jpeg|gif|ico|png)$" +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 name = q#param "name" in @@ -59,7 +59,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user= 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 and underscore. It must end with .jpg, .gif or .png " ^ + "numbers, dots, dashes and underscore. " ^ + "It must end with .jpg, .gif or .png " ^ "depending on the image format."); return () ); @@ -111,6 +112,29 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user= let thumbnail, tn_mime_type, tn_width, tn_height = image_thumbnail image 120 120 in + (* Check if something with the same name already exists. If replace=1 + * 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 + + if exists then ( + if not replace then ( + error ~title:"Image already exists" ~back_button:true + 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]; + ) + ); + (* Put the image into the database. *) let sth = dbh#prepare_cached -- 1.8.3.1