X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fpage.ml;h=70c25b3027344cbfa865ba8d999710fc3e215745;hb=5def59b20559a1d352d0d9c3304d9b09c2523b41;hp=38eb595d6b27f211335e9a101fd12afcb8152159;hpb=4e3e7c6443e7dbe1570e8a2c18a71e5d4f5c8d89;p=cocanwiki.git

diff --git a/scripts/page.ml b/scripts/page.ml
index 38eb595..70c25b3 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.8 2004/09/08 15:46:53 rich Exp $
+ * $Id: page.ml,v 1.12 2004/09/17 15:24:54 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
@@ -23,7 +38,7 @@ 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
 
@@ -39,9 +54,10 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, edit_anon) user =
       | [ `Bool has_host_css ] -> has_host_css
       | _ -> assert false in
 
-  (* Can the user edit?  Manage users? *)
+  (* Can the user edit?  Manage users?  etc. *)
   let can_edit = can_edit edit_anon user in
   let can_manage_users = can_manage_users user in
+  let can_manage_contacts = can_manage_contacts user in
 
   (* This code generates ordinary pages. *)
   let make_page title description pageid last_modified_date has_page_css
@@ -51,8 +67,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';
@@ -68,6 +82,7 @@ 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;
+    t#conditional "can_manage_contacts" can_manage_contacts;
 
     (* Pull out the sections in this page. *)
     let sth = dbh#prepare_cached
@@ -112,18 +127,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
 
@@ -146,18 +149,7 @@ 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;
+    t#conditional "can_manage_contacts" can_manage_contacts;
 
     q#template t
   in