(* 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.33 2004/10/17 19:43:19 rich Exp $
+ * $Id: page.ml,v 1.37 2004/10/30 10:16:10 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
navigation
| _ -> assert false in
- (* Can the user edit? Manage users? etc. *)
+ (* User permissions. *)
let can_edit = can_edit host user in
let can_manage_users = can_manage_users host user in
- let can_manage_contacts = can_manage_contacts host user in
- let can_manage_site = can_manage_site host user in
- let can_edit_global_css = can_edit_global_css host user in
(* Do we have a stats page set up? *)
let has_stats = server_settings_stats_page dbh <> None in
t#conditional "can_edit" can_edit;
t#conditional "can_manage_users" can_manage_users;
- t#conditional "can_manage_contacts" can_manage_contacts;
- t#conditional "can_manage_site" can_manage_site;
- t#conditional "can_edit_global_css" can_edit_global_css;
-
t#conditional "has_stats" has_stats;
(* Pull out the sections in this page. *)
(match user with
Anonymous ->
t#conditional "user_logged_in" false
- | User (_, username, _) ->
+ | User (_, username, _, _) ->
t#conditional "user_logged_in" true;
t#set "username" username);
(* If logged in, we want to update the recently_visited table. *)
if pageid <> None then (
match user with
- | User (userid, _, _) ->
+ | User (userid, _, _, _) ->
let sth = dbh#prepare_cached "delete from recently_visited
where hostid = ? and userid = ?
and url = ?" in
let rv =
match user with
- | User (userid, _, _) ->
+ | User (userid, _, _, _) ->
(* Recently visited URLs, but don't repeat any from the 'what
* links here' section, and don't link to self.
*)
(* Deliver the page. *)
q#header ();
- print_string r xhtml
+ ignore (print_string r xhtml)
with
Not_found ->
(* No referer / no search terms / not a search engine referer. *)
t#set "search_terms" search_terms;
t#conditional "has_host_css" has_host_css;
-
t#conditional "can_edit" can_edit;
t#conditional "can_manage_users" can_manage_users;
- t#conditional "can_manage_contacts" can_manage_contacts;
- t#conditional "can_manage_site" can_manage_site;
- t#conditional "can_edit_global_css" can_edit_global_css;
-
t#conditional "has_stats" has_stats;
q#template t