X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fupload_file.ml;h=fc567b0f41823900afcddcf631acb73ae8888c66;hb=e336401181f56f19ec18175d47462e7a5d5f07e2;hp=5642cd7c1ffca204c6802a0489f22018a4cef551;hpb=5292c2362fb54524b8ec7877ee15c79596429491;p=cocanwiki.git diff --git a/scripts/upload_file.ml b/scripts/upload_file.ml index 5642cd7..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 . * 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.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,7 @@ 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.