More thorough inclusion of the page bug. This should mean the page bug appears just...

[cocanwiki.git] / scripts / upload_file.ml

diff --git a/scripts/upload_file.ml b/scripts/upload_file.ml
index 5642cd7..6776ee0 100644 (file)
--- 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.9 2004/11/01 16:24:50 rich Exp $
+ * $Id: upload_file.ml,v 1.11 2005/11/24 14:54:13 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]*$"
@@ -50,21 +48,22 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
     with
        Not_found ->
          error ~title:"No file" ~back_button:true
-           q "No file was uploaded.";
+           dbh hostid q "No file was uploaded.";
          return () in
 
   (* Check the name is valid. *)
   if not (Pcre.pmatch ~rex:file_ok_re name) then (
     error ~title:"Bad File Name" ~back_button:true
-      q ("The File Name must contain only lowercase English letters, " ^
-        "numbers, dots, dashes and underscore.");
+      dbh hostid q
+      ("The File Name must contain only lowercase English letters, " ^
+       "numbers, dots, dashes and underscore.");
     return ()
   );
 
   (* 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.
@@ -79,7 +78,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
   if exists then (
     if not replace then (
       error ~title:"File already exists" ~back_button:true
-       q ("An file with the same name already exists.");
+       dbh hostid q "An file with the same name already exists.";
     return ()
     ) else (
       let sth = dbh#prepare_cached "update files
@@ -108,7 +107,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
 
   let buttons = [ ok_button "/_files" ] in
   ok ~title:"File uploaded" ~buttons
-    q "File was uploaded successfully."
+    dbh hostid q "File was uploaded successfully."
 
 let () =
   register_script ~restrict:[CanEdit] run