X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fusers.ml;h=1f1b033135478394c012582c36b25c4f816c4b77;hb=ce5309fcde2bd29b042efc5868e7721a951dd846;hp=9c2030bb4e14e9392f8b28932b5f3c3461044264;hpb=11b93485a29771f4d826c50d9efc6d3607dfa50f;p=cocanwiki.git diff --git a/scripts/users.ml b/scripts/users.ml index 9c2030b..1f1b033 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 . * Copyright (C) 2004 Merjis Ltd. - * $Id: users.ml,v 1.4 2004/09/09 12:21:22 rich Exp $ + * $Id: users.ml,v 1.5 2004/09/17 15:24:54 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,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 + "select id, name, email, registration_date, can_edit, can_manage_users, + can_manage_contacts from users where hostid = ? order by name" in sth#execute [`Int hostid]; @@ -42,7 +43,8 @@ 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] -> let email = match email with `Null -> "" | `String s -> s in [ "userid", Template.VarString (string_of_int userid); "name", Template.VarString name; @@ -50,7 +52,9 @@ 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 ] | _ -> assert false) in template#table "users" table;