X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fupload_image.ml;h=c6d11e2a8abfd02cbae29c997d8543b558b4ee63;hb=6b0b6830a2e784eee99dcd1b1a3cb8b44e27c765;hp=7a0beab1b764d99832a2b02d12fb20a33de18b7f;hpb=3da6ded17ea2cca64328e5f3ea8903cd15103bc2;p=cocanwiki.git

diff --git a/scripts/upload_image.ml b/scripts/upload_image.ml
index 7a0beab..c6d11e2 100644
--- a/scripts/upload_image.ml
+++ b/scripts/upload_image.ml
@@ -1,7 +1,7 @@
 (* 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.6 2004/09/09 12:21:22 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
@@ -53,7 +53,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = 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 (
@@ -61,7 +61,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = 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. *)
@@ -72,7 +72,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = 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 =
@@ -91,7 +91,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = 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. *)
@@ -100,7 +100,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = 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