X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fupload_file.ml;h=fc567b0f41823900afcddcf631acb73ae8888c66;hb=295f2cde3f43ccf7f775d39b95925e10aa4c37cb;hp=543cd666864e6425347c59399f3f1e1da92619fa;hpb=2faa766a005f4fc4f1fd48a36185452f77ceb2b9;p=cocanwiki.git

diff --git a/scripts/upload_file.ml b/scripts/upload_file.ml
index 543cd66..fc567b0 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 <rich@merjis.com>.
  * 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.10 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
@@ -31,9 +31,7 @@ open Cocanwiki_template
 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 file names. *)
 let file_ok_re = Pcre.regexp "^[a-z0-9][-._a-z0-9]*$"
@@ -64,7 +62,30 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
   (* Identify the MIME type from the extension. *)
   let mime_type = mime_type_of_filename name in
 
-  let title = if is_whitespace title then `Null else `String title in
+  let title = if string_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 =