X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fupload_file.ml;h=a6ed439b6d1f4d454c7abbb3e24af24b7dede322;hb=019c80476c64b5cd86b6e9d115c86162b2ae462c;hp=0f90e1961c5762c6f2d01671a230751e19aa4e23;hpb=714e5e5b4b585da1eca55274e3903ee9a1dbf0d6;p=cocanwiki.git

diff --git a/scripts/upload_file.ml b/scripts/upload_file.ml
index 0f90e19..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.2 2004/09/07 13:40:10 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
@@ -11,12 +26,11 @@ open Printf
 
 open ExtString
 
-open Merjisforwiki
-
 open Cocanwiki
 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
@@ -24,7 +38,7 @@ let is_whitespace str = Pcre.pmatch ~rex:is_ws_re str
 (* Valid file names. *)
 let file_ok_re = Pcre.regexp "^[a-z0-9][-._a-z0-9]*$"
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ =
   let name = q#param "name" in
   let title = q#param "title" in
 
@@ -37,14 +51,14 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, 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. *)
@@ -74,4 +88,4 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
     q "File was uploaded successfully."
 
 let () =
-  register_script run
+  register_script ~restrict:[CanEdit] run