X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fimage.ml;h=cad2ceb713c9a04f56d20b1c516364f1e17f9446;hb=fffce48503e09a21f9c5846a0fc378e6180e50f3;hp=a625d78ab51b2b3a33b3d8961b5e0a90d2908428;hpb=1d51371de1d046beac8f0519c6f789490c8033b1;p=cocanwiki.git

diff --git a/scripts/image.ml b/scripts/image.ml
index a625d78..cad2ceb 100644
--- a/scripts/image.ml
+++ b/scripts/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: image.ml,v 1.10 2004/10/24 08:48:38 rich Exp $
+ * $Id: image.ml,v 1.13 2004/11/01 16:24:32 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
@@ -28,7 +28,7 @@ open ExtString
 
 open Cocanwiki
 
-let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} _ =
   let image = q#param "image" in
   let is_thumbnail = q#param_true "thumbnail" in
   let version =
@@ -50,19 +50,20 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   sth#execute args;
 
   let data, mime_type, deleted =
-    match sth#fetch1 () with
-	[ `Binary data; `String mime_type; `Bool deleted ] ->
-	  data, mime_type, deleted
-      | _ -> assert false in
+    try
+      (match sth#fetch1 () with
+	   [ `Binary data; `String mime_type; `Bool deleted ] ->
+	     data, mime_type, deleted
+	 | _ -> assert false)
+    with
+	Not_found -> raise (HttpError cHTTP_NOT_FOUND) in
 
-  (* If deleted, refuse to serve this image except if called from the
-   * deleted images page.
-   *)
+  (* If deleted, refuse to serve this image except if shown on the site. *)
   if deleted then (
     let referer =
       try Table.get (Request.headers_in r) "Referer" with Not_found -> "" in
     let ok =
-      try String.find referer "/_images?deleted"; true
+      try String.find referer hostname; true
       with String.Invalid_string -> false in
 
     if not ok then (
@@ -71,9 +72,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
     )
   );
 
-  if version <> None then
-    (* Set a medium-length expiry time on this resource. *)
-    Table.set (Request.headers_out r) "Expires" (Expires.medium ());
+  (* Set a medium-length expiry time on this resource. *)
+  Table.set (Request.headers_out r) "Expires" (Expires.medium ());
 
   (* Content-length header. *)
   Table.set (Request.headers_out r) "Content-Length"