X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fupload_file.ml;h=77c5e9ef72b930e4d6d80a1d6a1a0e019f4eacce;hb=a9168cad656af034b671c9dea53057845e2196c9;hp=5c0f2c900d761bff6774c575b32deaab0e80f8c2;hpb=3062d573a7617339324c23cdd4755f8f04956b92;p=cocanwiki.git

diff --git a/scripts/upload_file.ml b/scripts/upload_file.ml
index 5c0f2c9..77c5e9e 100644
--- a/scripts/upload_file.ml
+++ b/scripts/upload_file.ml
@@ -1,7 +1,7 @@
 (* COCANWIKI scripts.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: upload_file.ml,v 1.1 2004/09/07 10:14:09 rich Exp $
+ * $Id: upload_file.ml,v 1.3 2004/09/07 14:58:34 rich Exp $
  *)
 
 open Apache
@@ -11,11 +11,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
@@ -23,7 +23,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, _) _ =
   let name = q#param "name" in
   let title = q#param "title" in