X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fpage.ml;h=d9b85ec7589f8889af5b40eaacd4ec83ae79ab33;hb=c22e34dd58cdc2a79b71dedd3c52ed705c9b8b51;hp=1ea4acde5fe3de1621c7c71ed1e3408d5115438b;hpb=3f36aa55afe2e7ddf3054d019cd35750071f2163;p=cocanwiki.git diff --git a/scripts/page.ml b/scripts/page.ml index 1ea4acd..d9b85ec 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.20 2004/09/24 10:44:55 rich Exp $ + * $Id: page.ml,v 1.21 2004/09/24 16:30:07 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 @@ -60,13 +60,14 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {edit_anon=edit_anon} user = (* Host-specific fields. *) let sth = dbh#prepare_cached "select css is not null, - feedback_email is not null + feedback_email is not null, + mailing_list from hosts where id = ?" in sth#execute [`Int hostid]; - let has_host_css, has_feedback_email = + let has_host_css, has_feedback_email, mailing_list = match sth#fetch1 () with - | [ `Bool has_host_css; `Bool has_feedback_email ] -> - has_host_css, has_feedback_email + | [ `Bool has_host_css; `Bool has_feedback_email; `Bool mailing_list ] -> + has_host_css, has_feedback_email, mailing_list | _ -> assert false in (* Can the user edit? Manage users? etc. *) @@ -166,6 +167,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {edit_anon=edit_anon} user = t#conditional "has_page_css" has_page_css; t#conditional "has_feedback_email" has_feedback_email; + t#conditional "mailing_list" mailing_list; t#conditional "can_edit" can_edit; t#conditional "can_manage_users" can_manage_users;