X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fpage.ml;h=535b49ecfa67072be9254a26c96bdb31ecf666e6;hb=87d984d47202cacb0ba3f6c1c1dc7d5769ade146;hp=496efe8d625e0a03f24c390446910c61a32268b6;hpb=1e757a53a78e6b288f483b3b689a600d20575562;p=cocanwiki.git

diff --git a/scripts/page.ml b/scripts/page.ml
index 496efe8..535b49e 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.35 2004/10/23 12:00:23 rich Exp $
+ * $Id: page.ml,v 1.38 2004/11/03 13:36:45 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
@@ -65,19 +65,19 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid
   (* Host-specific fields. *)
   let sth = dbh#prepare_cached "select css is not null,
                                        feedback_email is not null,
-                                       mailing_list, search_box, navigation
+                                       mailing_list, navigation
                                   from hosts where id = ?" in
   sth#execute [`Int hostid];
-  let has_host_css, has_feedback_email, mailing_list, search_box, navigation =
+  let has_host_css, has_feedback_email, mailing_list, navigation =
     match sth#fetch1 () with
       | [ `Bool has_host_css; `Bool has_feedback_email; `Bool mailing_list;
-	  `Bool search_box; `Bool navigation ] ->
-	  has_host_css, has_feedback_email, mailing_list, search_box,
-	  navigation
+	  `Bool navigation ] ->
+	  has_host_css, has_feedback_email, mailing_list, navigation
       | _ -> assert false in
 
-  (* Can the user edit? *)
+  (* User permissions. *)
   let can_edit = can_edit host user in
+  let can_manage_users = can_manage_users host user in
 
   (* Do we have a stats page set up? *)
   let has_stats = server_settings_stats_page dbh <> None in
@@ -194,10 +194,10 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid
 
     t#conditional "has_feedback_email" has_feedback_email;
     t#conditional "mailing_list" mailing_list;
-    t#conditional "search_box" search_box;
     t#conditional "navigation" navigation;
 
     t#conditional "can_edit" can_edit;
+    t#conditional "can_manage_users" can_manage_users;
     t#conditional "has_stats" has_stats;
 
     (* Pull out the sections in this page. *)
@@ -266,14 +266,14 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid
     (match user with
 	 Anonymous ->
 	   t#conditional "user_logged_in" false
-       | User (_, username, _) ->
+       | User (_, username, _, _) ->
 	   t#conditional "user_logged_in" true;
 	   t#set "username" username);
 
     (* If logged in, we want to update the recently_visited table. *)
     if pageid <> None then (
       match user with
-	| User (userid, _, _) ->
+	| User (userid, _, _, _) ->
 	    let sth = dbh#prepare_cached "delete from recently_visited
                                            where hostid = ? and userid = ?
                                              and url = ?" in
@@ -297,7 +297,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid
 
       let rv =
 	match user with
-	  | User (userid, _, _) ->
+	  | User (userid, _, _, _) ->
 	      (* Recently visited URLs, but don't repeat any from the 'what
 	       * links here' section, and don't link to self.
 	       *)
@@ -376,6 +376,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid
 
     t#conditional "has_host_css" has_host_css;
     t#conditional "can_edit" can_edit;
+    t#conditional "can_manage_users" can_manage_users;
     t#conditional "has_stats" has_stats;
 
     q#template t