X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fpage.ml;h=937810781e67f8efccc4b4d0a2cc54e3480f7278;hb=35f3941cfe3d70d720604da0b2c8850ef704a92d;hp=0f85ca800320333d93a430c7a9a325a22b968dd8;hpb=1f125fd7a6794f352f30de71a3905d5356a07008;p=cocanwiki.git

diff --git a/scripts/page.ml b/scripts/page.ml
index 0f85ca8..9378107 100644
--- a/scripts/page.ml
+++ b/scripts/page.ml
@@ -1,7 +1,22 @@
-(* COCANWIKI scripts.
+(* 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.10 2004/09/09 09:35:33 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  *)
 
 open Apache
@@ -39,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
@@ -66,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
@@ -77,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);
@@ -132,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