X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fdiff.ml;h=a1995333266678cbcb392c1500f0c38565fb3437;hb=22c5eb291c13270f17f2cee76b760634f230347e;hp=24ffd4f26a1b6b0fe9955d545ecf1a14bfc1f0f0;hpb=714e5e5b4b585da1eca55274e3903ee9a1dbf0d6;p=cocanwiki.git diff --git a/scripts/diff.ml b/scripts/diff.ml index 24ffd4f..a199533 100644 --- a/scripts/diff.ml +++ b/scripts/diff.ml @@ -1,7 +1,22 @@ -(* COCANWIKI scripts. +(* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: diff.ml,v 1.2 2004/09/07 13:40:10 rich Exp $ + * $Id: diff.ml,v 1.7 2004/09/09 12:21:22 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,15 +24,13 @@ open Registry open Cgi open Printf -open Merjisforwiki - open Cocanwiki open Cocanwiki_template open Cocanwiki_diff -let template = get_template "diff.html" +let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ = + let template = get_template dbh hostid "diff.html" in -let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ = let page = q#param "page" in let page = if page = "" then "index" else page in @@ -49,4 +62,4 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ = q#template template let () = - register_script run + register_script ~restrict:[CanEdit] run