X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fpage.ml;h=bf3fd300cc21e338d94ab269f59d4e53503b485c;hb=7c61259403b6ecfad9d7924f319bb9dc3d252e17;hp=3657919e65846c7d7a7d112503c18fa013ec9bc6;hpb=7130fa13b57c8f83e30781ad9030f8759a0dedbe;p=cocanwiki.git

diff --git a/scripts/page.ml b/scripts/page.ml
index 3657919..bf3fd30 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.33 2004/10/17 19:43:19 rich Exp $
+ * $Id: page.ml,v 1.36 2004/10/23 15:00:15 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
@@ -76,12 +76,9 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid
 	  navigation
       | _ -> assert false in
 
-  (* Can the user edit?  Manage users?  etc. *)
+  (* User permissions. *)
   let can_edit = can_edit host user in
   let can_manage_users = can_manage_users host user in
-  let can_manage_contacts = can_manage_contacts host user in
-  let can_manage_site = can_manage_site host user in
-  let can_edit_global_css = can_edit_global_css host user in
 
   (* Do we have a stats page set up? *)
   let has_stats = server_settings_stats_page dbh <> None in
@@ -203,10 +200,6 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid
 
     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_manage_site" can_manage_site;
-    t#conditional "can_edit_global_css" can_edit_global_css;
-
     t#conditional "has_stats" has_stats;
 
     (* Pull out the sections in this page. *)
@@ -361,7 +354,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid
 
       (* Deliver the page. *)
       q#header ();
-      print_string r xhtml
+      ignore (print_string r xhtml)
     with
 	Not_found ->
 	  (* No referer / no search terms / not a search engine referer. *)
@@ -384,13 +377,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid
     t#set "search_terms" search_terms;
 
     t#conditional "has_host_css" has_host_css;
-
     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_manage_site" can_manage_site;
-    t#conditional "can_edit_global_css" can_edit_global_css;
-
     t#conditional "has_stats" has_stats;
 
     q#template t