X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fpage.ml;h=7d7bd4db76740dc141e8dfa28ba02c838866c6ac;hb=619782929c11102f75892758fd94772bc747dfb0;hp=c405ffe6c4a59276a7fcf70cbd3a333e4e15b109;hpb=1bb9dd1b7a217aae3c47cc03da897427c9a8b91b;p=cocanwiki.git

diff --git a/scripts/page.ml b/scripts/page.ml
index c405ffe..7d7bd4d 100644
--- a/scripts/page.ml
+++ b/scripts/page.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: page.ml,v 1.7 2004/09/08 14:01:17 rich Exp $
+ * $Id: page.ml,v 1.11 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
@@ -16,9 +31,6 @@ open Cocanwiki_template
 open Cocanwiki_ok
 open Cocanwiki_date
 
-let template_page = get_template "page.html"
-let template_404  = get_template "page_404.html"
-
 (* Maximum level of redirection. *)
 let max_redirect = 4
 
@@ -26,7 +38,10 @@ type fp_status = FPOK of int * string * string * Dbi.datetime * bool
 	       | FPRedirect of string
 	       | FPNotFound
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, edit_anon) user =
+let run r (q : cgi) (dbh : Dbi.connection) hostid {edit_anon=edit_anon} user =
+  let template_page = get_template dbh hostid "page.html" in
+  let template_404  = get_template dbh hostid "page_404.html" in
+
   let page = q#param "page" in
   let page = if page = "" then "index" else page in
 
@@ -51,8 +66,6 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, edit_anon) user =
     t#set "description" description;
     t#set "pageid" (string_of_int pageid);
     t#set "last_modified_date" (printable_date last_modified_date);
-    t#set "cocanwiki_package" Cocanwiki_version.package;
-    t#set "cocanwiki_version" Cocanwiki_version.version;
 
     if page <> page' then (* redirection *) (
       t#set "page" page';
@@ -112,18 +125,6 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, edit_anon) user =
 	   t#conditional "user_logged_in" true;
 	   t#set "username" username);
 
-    (* Site menu. *)
-    let sth = dbh#prepare_cached "select url, label, ordering from sitemenu
-                                   where hostid = ? order by ordering" in
-    sth#execute [`Int hostid];
-
-    let table = sth#map (function [`String url; `String label; _] ->
-			   [ "url", Template.VarString url;
-			     "label", Template.VarString label ]
-			   | _ -> assert false) in
-
-    t#table "sitemenu" table;
-
     q#template t
   in
 
@@ -147,18 +148,6 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, edit_anon) user =
     t#conditional "can_edit" can_edit;
     t#conditional "can_manage_users" can_manage_users;
 
-    (* Site menu. *)
-    let sth = dbh#prepare_cached "select url, label, ordering from sitemenu
-                                   where hostid = ? order by ordering" in
-    sth#execute [`Int hostid];
-
-    let table = sth#map (function [`String url; `String label; _] ->
-			   [ "url", Template.VarString url;
-			     "label", Template.VarString label ]
-			   | _ -> assert false) in
-
-    t#table "sitemenu" table;
-
     q#template t
   in