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

diff --git a/scripts/page.ml b/scripts/page.ml
index 70c25b3..3ff3e01 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 <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: page.ml,v 1.12 2004/09/17 15:24:54 rich Exp $
+ * $Id: page.ml,v 1.16 2004/09/20 17:18:26 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
@@ -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
 
-  (* 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];
-  let has_host_css =
+  let has_host_css, has_feedback_email =
     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. *)
@@ -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_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;
@@ -94,14 +98,23 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {edit_anon=edit_anon} user =
 
     let sections =
       sth#map
-	(function [`Int ordering; `String sectionname; `String content;
+	(function [`Int ordering;
+		   (`Null | `String _) as sectionname;
+		   `String content;
 		   (`Null | `String _) as divname] ->
 	   let divname, has_divname =
 	     match divname with
 		 `Null -> "", false
 	       | `String divname -> divname, true in
+	   let sectionname, has_sectionname =
+	     match sectionname with
+		 `Null -> "", false
+	       | `String sectionname -> sectionname, true in
+	   let linkname = linkname_of_sectionname sectionname in
 	   [ "ordering", Template.VarString (string_of_int ordering);
+	     "has_sectionname", Template.VarConditional has_sectionname;
 	     "sectionname", Template.VarString sectionname;
+	     "linkname", Template.VarString linkname;
 	     "content",
 	       Template.VarString
 		 (Wikilib.xhtml_of_content dbh hostid content);