git.annexia.org
/
cocanwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Feedback form. You need to set the hosts.feedback_email field
[cocanwiki.git]
/
scripts
/
page.ml
diff --git
a/scripts/page.ml
b/scripts/page.ml
index
9378107
..
3ff3e01
100644
(file)
--- 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 <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
(* 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.1
5 2004/09/20 15:34:3
6 rich Exp $
+ * $Id: page.ml,v 1.1
6 2004/09/20 17:18:2
6 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
*
* 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
@@
-45,13
+45,15
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid {edit_anon=edit_anon} user =
let page = q#param "page" in
let page = if page = "" then "index" else page in
let page = q#param "page" in
let page = if page = "" then "index" else page in
- (* Host-specific CSS? *)
- let sth = dbh#prepare_cached "select css is not null from hosts
- where id = ?" in
+ (* Host-specific fields. *)
+ let sth = dbh#prepare_cached "select css is not null,
+ feedback_email is not null
+ from hosts where id = ?" in
sth#execute [`Int hostid];
sth#execute [`Int hostid];
- let has_host_css =
+ let has_host_css
, has_feedback_email
=
match sth#fetch1 () with
match sth#fetch1 () with
- | [ `Bool has_host_css ] -> has_host_css
+ | [ `Bool has_host_css; `Bool has_feedback_email ] ->
+ has_host_css, has_feedback_email
| _ -> assert false in
(* Can the user edit? Manage users? etc. *)
| _ -> assert false in
(* Can the user edit? Manage users? etc. *)
@@
-80,6
+82,8
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid {edit_anon=edit_anon} user =
t#conditional "has_host_css" has_host_css;
t#conditional "has_page_css" has_page_css;
t#conditional "has_host_css" has_host_css;
t#conditional "has_page_css" has_page_css;
+ t#conditional "has_feedback_email" has_feedback_email;
+
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_edit" can_edit;
t#conditional "can_manage_users" can_manage_users;
t#conditional "can_manage_contacts" can_manage_contacts;