X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fusers.ml;h=b16d817f21419dd26cd7c6b53f03a490ca40582b;hb=844dcb8bb66df887e0d677359f0278f17934efad;hp=9c2030bb4e14e9392f8b28932b5f3c3461044264;hpb=11b93485a29771f4d826c50d9efc6d3607dfa50f;p=cocanwiki.git

diff --git a/scripts/users.ml b/scripts/users.ml
index 9c2030b..b16d817 100644
--- 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.4 2004/09/09 12:21:22 rich Exp $
+ * $Id: users.ml,v 1.7 2004/10/11 14:13:04 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
@@ -33,7 +33,9 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
 
   let sth =
     dbh#prepare_cached
-      "select id, name, email, registration_date, can_edit, can_manage_users
+      "select id, name, email, registration_date, can_edit, can_manage_users,
+              can_manage_contacts, can_manage_site, can_edit_global_css,
+              can_import_mail
          from users where hostid = ? order by name" in
   sth#execute [`Int hostid];
 
@@ -42,7 +44,9 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
       (function
 	   [`Int userid; `String name; (`Null | `String _) as email;
 	    `Date registration_date;
-	    `Bool can_edit; `Bool can_manage_users] ->
+	    `Bool can_edit; `Bool can_manage_users;
+	    `Bool can_manage_contacts; `Bool can_manage_site;
+	    `Bool can_edit_global_css; `Bool can_import_mail] ->
 	     let email = match email with `Null -> "" | `String s -> s in
 	     [ "userid", Template.VarString (string_of_int userid);
 	       "name", Template.VarString name;
@@ -50,7 +54,14 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
 	       "registration_date",
 	         Template.VarString (printable_date' registration_date);
 	       "can_edit", Template.VarConditional can_edit;
-	       "can_manage_users", Template.VarConditional can_manage_users ]
+	       "can_manage_users", Template.VarConditional can_manage_users;
+	       "can_manage_contacts",
+	         Template.VarConditional can_manage_contacts;
+	       "can_manage_site", Template.VarConditional can_manage_site;
+	       "can_edit_global_css",
+	         Template.VarConditional can_edit_global_css;
+	       "can_import_mail",
+	         Template.VarConditional can_import_mail;]
 	 | _ -> assert false) in
 
   template#table "users" table;