X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fupload_image.ml;h=238b5a253112817343ccfadc79f753a66d380f0f;hb=89e8d5757ca111d16ce3dfcc1ce4f2c00a119c85;hp=5b74bb998533231286072a2a70ab8cefa036adea;hpb=2faa766a005f4fc4f1fd48a36185452f77ceb2b9;p=cocanwiki.git

diff --git a/scripts/upload_image.ml b/scripts/upload_image.ml
index 5b74bb9..238b5a2 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 <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: upload_image.ml,v 1.8 2004/10/21 19:54:29 rich Exp $
+ * $Id: upload_image.ml,v 1.11 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
@@ -30,12 +30,10 @@ open Cocanwiki
 open Cocanwiki_ok
 open Cocanwiki_emailnotify
 open Cocanwiki_images
-
-let is_ws_re = Pcre.regexp "^\\s*$"
-let is_whitespace str = Pcre.pmatch ~rex:is_ws_re str
+open Cocanwiki_strings
 
 (* 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
@@ -47,7 +45,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
   (* See if there was an upload. *)
   let image =
     try
-      let upload = q#upload "image" in
+      let upload = q#upload "file" in
       upload.upload_value
     with
 	Not_found ->
@@ -59,7 +57,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 ()
   );
@@ -95,7 +94,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
   );
 
   (* Check some ALT text was supplied. *)
-  if is_whitespace alt then (
+  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 " ^
@@ -103,14 +102,38 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
     return ()
   );
 
-  let title = if is_whitespace title then `Null else `String title in
-  let longdesc = if is_whitespace longdesc then `Null else `String longdesc in
-  let clazz = if is_whitespace clazz then `Null else `String clazz in
+  let title = if string_is_whitespace title then `Null else `String 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
 
   (* Make a thumbnail of this image. *)
   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