X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fimage.ml;h=e569d44cfd5510f4241da82a83bd5d0a2f205ae5;hb=247bf3832dcd02aae202dcb706ac20458f6ab1f1;hp=b6a1f4d58fbb96d3fc27cd1e14627ddebbcbae1f;hpb=714e5e5b4b585da1eca55274e3903ee9a1dbf0d6;p=cocanwiki.git

diff --git a/scripts/image.ml b/scripts/image.ml
index b6a1f4d..e569d44 100644
--- a/scripts/image.ml
+++ b/scripts/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: image.ml,v 1.2 2004/09/07 13:40:10 rich Exp $
+ * $Id: image.ml,v 1.7 2004/10/04 15:19:56 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
@@ -9,12 +24,9 @@ open Registry
 open Cgi
 open Printf
 
-open Merjisforwiki
-
-open Cocanwiki
 open Cocanwiki
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   let image = q#param "image" in
   let is_thumbnail = q#param_true "thumbnail" in
   let version =
@@ -43,10 +55,10 @@ 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" (Cgi_expires.expires_medium());
+    Table.set (Request.headers_out r) "Expires" (Expires.medium ());
 
   q#header ~content_type:mime_type ();
   print_string r data
 
 let () =
-  register_script run
+  register_script ~restrict:[CanView] run