Updated MANIFEST.

[cocanwiki.git] / scripts / users.ml

diff --git a/scripts/users.ml b/scripts/users.ml
index e36c836..f747187 100644 (file)
--- 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.2 2004/09/08 15:46:53 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
+ * 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
@@ -13,30 +28,43 @@ open Cocanwiki
 open Cocanwiki_template
 open Cocanwiki_date
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
-  let template = get_template dbh hostid "users.html" in
+let run r (q : cgi) dbh hostid _ _ =
+  let template = get_template r dbh hostid "users.html" in
 
-  let sth =
-    dbh#prepare_cached
-      "select id, name, email, registration_date, can_edit, can_manage_users
-         from users where hostid = ? order by name" in
-  sth#execute [`Int hostid];
+  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_edit_macros
+         from users where hostid = $hostid order by name" in
 
   let table =
-    sth#map
-      (function
-          [`Int userid; `String name; (`Null | `String _) as email;
-           `Date registration_date;
-           `Bool can_edit; `Bool can_manage_users] ->
-            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);
-              "can_edit", Template.VarConditional can_edit;
-              "can_manage_users", Template.VarConditional can_manage_users ]
-        | _ -> assert false) in
+    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_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);
+          "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_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;
+          "can_edit_macros",
+          Template.VarConditional can_edit_macros;]
+      ) rows in
 
   template#table "users" table;