X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fpage.ml;h=70c25b3027344cbfa865ba8d999710fc3e215745;hb=5def59b20559a1d352d0d9c3304d9b09c2523b41;hp=7d7bd4db76740dc141e8dfa28ba02c838866c6ac;hpb=619782929c11102f75892758fd94772bc747dfb0;p=cocanwiki.git diff --git a/scripts/page.ml b/scripts/page.ml index 7d7bd4d..70c25b3 100644 --- a/scripts/page.ml +++ b/scripts/page.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: page.ml,v 1.11 2004/09/09 12:21:22 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 @@ -54,9 +54,10 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {edit_anon=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 @@ -81,6 +82,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {edit_anon=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 @@ -147,6 +149,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {edit_anon=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; q#template t in