X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fupload_image.ml;h=c6d11e2a8abfd02cbae29c997d8543b558b4ee63;hb=b9bed1282a309aaf3227ec93ccdeacce8cbb89b2;hp=64eb357f46cdf18dd2d385cccf567e9929dbaacf;hpb=714e5e5b4b585da1eca55274e3903ee9a1dbf0d6;p=cocanwiki.git

diff --git a/scripts/upload_image.ml b/scripts/upload_image.ml
index 64eb357..c6d11e2 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.2 2004/09/07 13:40:10 rich Exp $
+ * $Id: upload_image.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,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
@@ -39,7 +53,7 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
 	Not_found ->
 	  error ~title:"No image" ~back_button:true
 	    q "No image was uploaded.";
-	  raise CgiExit in
+	  return () in
 
   (* Check the name is valid. *)
   if not (Pcre.pmatch ~rex:image_ok_re name) then (
@@ -47,7 +61,7 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
       q ("The Image Name must contain only lowercase English letters, " ^
 	 "numbers and underscore.  It must end with .jpg, .gif or .png " ^
 	 "depending on the image format.");
-    raise CgiExit
+    return ()
   );
 
   (* Check the image is an image, and get the size. *)
@@ -58,7 +72,7 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
 	  error ~title:"Bad image" ~back_button:true
 	    q ("Unknown image type.  Is the file you uploaded really an " ^
 	       "image?");
-	  raise CgiExit in
+	  return () in
 
   (* Check the image filename extension matches the MIME type. *)
   let ext_ok =
@@ -77,7 +91,7 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
 	 "For example if the image is in JPEG format, the name must " ^
 	 "be 'something.jpg'.  I detected the following image type " ^
 	 "in the file you uploaded: " ^ mime_type);
-    raise CgiExit
+    return ()
   );
 
   (* Check some ALT text was supplied. *)
@@ -86,7 +100,7 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
       q ("You must supply Alt text describing the image.  This is required " ^
 	 "by accessibility laws and to allow search engines to discover the " ^
 	 "content of images.");
-    raise CgiExit
+    return ()
   );
 
   let title = if is_whitespace title then `Null else `String 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