X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fdiff.ml;h=09d21a11ae3d33f4eab6f3f6514d82c65f0f4ec6;hb=beee5bf06fd433c105fda1386b3e288768221216;hp=bf5eb42a9238646b054142338c596c5ec30e3b39;hpb=afe5e5f759988c04d9b3bcee7cf75e2c15e1d1d5;p=cocanwiki.git diff --git a/scripts/diff.ml b/scripts/diff.ml index bf5eb42..09d21a1 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.3 2004/09/07 14:58:34 rich Exp $ + * $Id: diff.ml,v 1.9 2004/11/01 12:57:53 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 @@ -13,9 +28,9 @@ open Cocanwiki open Cocanwiki_template open Cocanwiki_diff -let template = get_template "diff.html" +let run r (q : cgi) (dbh : Dbi.connection) hostid _ user = + 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 @@ -47,4 +62,4 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ = q#template template let () = - register_script run + register_script ~restrict:[CanEdit] run