X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fdiff.ml;h=a1995333266678cbcb392c1500f0c38565fb3437;hb=5b036c1119e5871a8996c98639cd861ea7d93e75;hp=1d0ad7650bee70cbb730abc123f80ba24077f577;hpb=3062d573a7617339324c23cdd4755f8f04956b92;p=cocanwiki.git

diff --git a/scripts/diff.ml b/scripts/diff.ml
index 1d0ad76..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 <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: diff.ml,v 1.1 2004/09/07 10:14:09 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
@@ -10,13 +25,12 @@ open Cgi
 open Printf
 
 open Cocanwiki
+open Cocanwiki_template
 open Cocanwiki_diff
 
-open Merjisforwiki
+let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
+  let template = get_template dbh hostid "diff.html" in
 
-let template = get_template "diff.html"
-
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, _) _ =
   let page = q#param "page" in
   let page = if page = "" then "index" else page in
 
@@ -48,4 +62,4 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _) _ =
   q#template template
 
 let () =
-  register_script run
+  register_script ~restrict:[CanEdit] run