Updated MANIFEST.

[cocanwiki.git] / scripts / users.ml

diff --git a/scripts/users.ml b/scripts/users.ml
index 8a3fcec..f747187 100644 (file)
--- a/scripts/users.ml
+++ b/scripts/users.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: users.ml,v 1.10 2006/03/28 16:24:08 rich Exp $
+ * $Id: users.ml,v 1.12 2006/12/06 09:46:57 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
@@ -29,21 +29,21 @@ open Cocanwiki_template
 open Cocanwiki_date
 
 let run r (q : cgi) dbh hostid _ _ =
-  let template = get_template dbh hostid "users.html" in
+  let template = get_template r dbh hostid "users.html" in
 
   let rows =
     PGSQL(dbh)
       "select id, name, email, registration_date, invite is not null,
               can_edit, can_manage_users,
               can_manage_contacts, can_manage_site, can_edit_global_css,
-              can_import_mail
+              can_import_mail, can_edit_macros
          from users where hostid = $hostid order by name" in
 
   let table =
     List.map
       (fun (userid, name, email, registration_date, invite_pending,
            can_edit, can_manage_users, can_manage_contacts, can_manage_site,
-           can_edit_global_css, can_import_mail) ->
+           can_edit_global_css, can_import_mail, can_edit_macros) ->
         let email = match email with None -> "" | Some s -> s in
         let invite_pending = Option.get invite_pending in
         [ "userid", Template.VarString (Int32.to_string userid);
@@ -61,7 +61,9 @@ let run r (q : cgi) dbh hostid _ _ =
           "can_edit_global_css",
           Template.VarConditional can_edit_global_css;
           "can_import_mail",
-          Template.VarConditional can_import_mail;]
+          Template.VarConditional can_import_mail;
+          "can_edit_macros",
+          Template.VarConditional can_edit_macros;]
       ) rows in
 
   template#table "users" table;