(* 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
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 (
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. *)
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 =
"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. *)
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