X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fupload_image.ml;h=7a0beab1b764d99832a2b02d12fb20a33de18b7f;hb=3e686452bc8b27781edb06b68749f7c34bf5fab4;hp=58bc7aa0d2b571c940ced8820491a438a7445454;hpb=3062d573a7617339324c23cdd4755f8f04956b92;p=cocanwiki.git

diff --git a/scripts/upload_image.ml b/scripts/upload_image.ml
index 58bc7aa..7a0beab 100644
--- a/scripts/upload_image.ml
+++ b/scripts/upload_image.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_image.ml,v 1.1 2004/09/07 10:14:09 rich Exp $
+ * $Id: upload_image.ml,v 1.6 2004/09/09 12:21:22 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,11 +26,10 @@ open Printf
 
 open ExtString
 
-open Merjisforwiki
-
 open Cocanwiki
 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 +37,7 @@ let is_whitespace str = Pcre.pmatch ~rex:is_ws_re str
 (* Valid image names. *)
 let image_ok_re = Pcre.regexp "^[a-z0-9][_a-z0-9]*\\.(jpg|jpeg|gif|ico|png)$"
 
-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 alt = q#param "alt" in
   let title = q#param "title" in
@@ -123,4 +137,4 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname) _ =
     q "Image was uploaded successfully."
 
 let () =
-  register_script run
+  register_script ~restrict:[CanEdit] run