X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fupload_file.ml;h=a6ed439b6d1f4d454c7abbb3e24af24b7dede322;hb=c22e34dd58cdc2a79b71dedd3c52ed705c9b8b51;hp=3e500c7b881230c53ff6f77d9b6d17ec8affc509;hpb=1f125fd7a6794f352f30de71a3905d5356a07008;p=cocanwiki.git

diff --git a/scripts/upload_file.ml b/scripts/upload_file.ml
index 3e500c7..a6ed439 100644
--- a/scripts/upload_file.ml
+++ b/scripts/upload_file.ml
@@ -1,7 +1,22 @@
-(* COCANWIKI scripts.
+(* 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.5 2004/09/09 09:35:34 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  *)
 
 open Apache
@@ -36,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. *)