X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fupload_file.ml;h=a6ed439b6d1f4d454c7abbb3e24af24b7dede322;hb=6b0b6830a2e784eee99dcd1b1a3cb8b44e27c765;hp=debe893f2fee4f1815c87d973ac82140c4886cbb;hpb=11b93485a29771f4d826c50d9efc6d3607dfa50f;p=cocanwiki.git diff --git a/scripts/upload_file.ml b/scripts/upload_file.ml index debe893..a6ed439 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.6 2004/09/09 12:21:22 rich Exp $ + * $Id: upload_file.ml,v 1.7 2004/09/23 11:56:47 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 @@ -51,14 +51,14 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ = Not_found -> error ~title:"No file" ~back_button:true q "No file was uploaded."; - raise CgiExit in + 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."); - raise CgiExit + return () ); (* Identify the MIME type from the extension. *)