git.annexia.org
/
cocanwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
BIG, experimental patch.
[cocanwiki.git]
/
scripts
/
users.ml
diff --git
a/scripts/users.ml
b/scripts/users.ml
index
1f1b033
..
b16d817
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.
(* 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.
5 2004/09/17 15:24:5
4 rich Exp $
+ * $Id: users.ml,v 1.
7 2004/10/11 14:13:0
4 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
*
* 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
@@
-34,7
+34,8
@@
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,
let sth =
dbh#prepare_cached
"select id, name, email, registration_date, can_edit, can_manage_users,
- can_manage_contacts
+ 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];
from users where hostid = ? order by name" in
sth#execute [`Int hostid];
@@
-44,7
+45,8
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
[`Int userid; `String name; (`Null | `String _) as email;
`Date registration_date;
`Bool can_edit; `Bool can_manage_users;
[`Int userid; `String name; (`Null | `String _) as email;
`Date registration_date;
`Bool can_edit; `Bool can_manage_users;
- `Bool can_manage_contacts] ->
+ `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;
let email = match email with `Null -> "" | `String s -> s in
[ "userid", Template.VarString (string_of_int userid);
"name", Template.VarString name;
@@
-54,7
+56,12
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
"can_edit", Template.VarConditional can_edit;
"can_manage_users", Template.VarConditional can_manage_users;
"can_manage_contacts",
"can_edit", Template.VarConditional can_edit;
"can_manage_users", Template.VarConditional can_manage_users;
"can_manage_contacts",
- Template.VarConditional 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;
| _ -> assert false) in
template#table "users" table;