X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fusers.ml;h=5af40e5b66141cede9b5ecdbe141370804a31a7f;hb=6ad484dd47c27fd54c2f26fb931ba125bae9abc6;hp=057e70768cf8a92c904442a13033549bcf0a67d7;hpb=1f125fd7a6794f352f30de71a3905d5356a07008;p=cocanwiki.git

diff --git a/scripts/users.ml b/scripts/users.ml
index 057e707..5af40e5 100644
--- a/scripts/users.ml
+++ b/scripts/users.ml
@@ -1,7 +1,22 @@
-(* COCANWIKI scripts.
+(* 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.3 2004/09/09 09:35:34 rich Exp $
+ * $Id: users.ml,v 1.8 2004/10/23 15:00:16 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  *)
 
 open Apache
@@ -18,7 +33,10 @@ 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, invite is not null,
+              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];
 
@@ -26,16 +44,27 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
     sth#map
       (function
 	   [`Int userid; `String name; (`Null | `String _) as email;
-	    `Date registration_date;
-	    `Bool can_edit; `Bool can_manage_users] ->
+	    `Date registration_date; `Bool invite_pending;
+	    `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;
 	       "email", Template.VarString email;
 	       "registration_date",
 	         Template.VarString (printable_date' registration_date);
+	       "invite_pending",
+	         Template.VarConditional invite_pending;
 	       "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;