X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fupload_file.ml;h=543cd666864e6425347c59399f3f1e1da92619fa;hb=bfc0f85bc1869f5139505dd6ffbacecb1af564a4;hp=bca6237d0b1f96af6dcc8ede7c15783d1b215f59;hpb=ca4d4140c5ab4b351dd5483337cf61e8e9fa94e6;p=cocanwiki.git

diff --git a/scripts/upload_file.ml b/scripts/upload_file.ml
index bca6237..543cd66 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.4 2004/09/08 09:54:28 rich Exp $
+ * $Id: upload_file.ml,v 1.8 2004/10/21 19:54:29 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
@@ -23,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 } user=
   let name = q#param "name" in
   let title = q#param "title" in
 
@@ -36,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. *)
@@ -66,7 +81,7 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
   let body = fun () ->
     "Page: http://" ^ hostname ^ "/_files" in
 
-  email_notify ~body ~subject dbh hostid;
+  email_notify ~body ~subject ~user dbh hostid;
 
   let buttons = [ ok_button "/_files" ] in
   ok ~title:"File uploaded" ~buttons