X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fusers.ml;h=120998d8b9bb931a5f2ee4d05e9948a516f9ef68;hb=9ef45f7514ad67944e67e943451f80ac4e416d77;hp=8fff55c79adc8a9fdbe610f2ec9a390e32d7c358;hpb=1de828f0dde14a10388658c2b2893a0477f7e653;p=cocanwiki.git

diff --git a/scripts/users.ml b/scripts/users.ml
index 8fff55c..120998d 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.1 2004/09/08 10:42:20 rich Exp $
+ * $Id: users.ml,v 1.6 2004/09/22 10:19:26 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,12 +28,13 @@ open Cocanwiki
 open Cocanwiki_template
 open Cocanwiki_date
 
-let template = get_template "users.html"
+let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
+  let template = get_template dbh hostid "users.html" in
 
-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
          from users where hostid = ? order by name" in
   sth#execute [`Int hostid];
 
@@ -27,7 +43,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] ->
 	     let email = match email with `Null -> "" | `String s -> s in
 	     [ "userid", Template.VarString (string_of_int userid);
 	       "name", Template.VarString name;
@@ -35,7 +53,12 @@ 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; ]
 	 | _ -> assert false) in
 
   template#table "users" table;