Very primitive, but working, RSS feeds.

[cocanwiki.git] / scripts / page.ml

diff --git a/scripts/page.ml b/scripts/page.ml
index 7d7bd4d..9378107 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.
- * $Id: page.ml,v 1.11 2004/09/09 12:21:22 rich Exp $
+ * $Id: page.ml,v 1.15 2004/09/20 15:34:36 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
@@ -92,14 +94,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);
@@ -147,6 +158,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