X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fedit_user_form.ml;h=95740818ca25ce7a646d934e8416d889b0b059f3;hb=5def59b20559a1d352d0d9c3304d9b09c2523b41;hp=9a08c8ae92fda47fa822be60ce3b84794057df20;hpb=4e3e7c6443e7dbe1570e8a2c18a71e5d4f5c8d89;p=cocanwiki.git

diff --git a/scripts/edit_user_form.ml b/scripts/edit_user_form.ml
index 9a08c8a..9574081 100644
--- a/scripts/edit_user_form.ml
+++ b/scripts/edit_user_form.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: edit_user_form.ml,v 1.2 2004/09/08 15:46:53 rich Exp $
+ * $Id: edit_user_form.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
+ * 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,7 +28,7 @@ open Cocanwiki
 open Cocanwiki_template
 open Cocanwiki_date
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   let template = get_template dbh hostid "edit_user_form.html" in
 
   let userid = int_of_string (q#param "userid") in
@@ -21,22 +36,22 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
   let sth =
     dbh#prepare_cached
       "select u.name, u.email, u.registration_date,
-              u.can_edit, u.can_manage_users,
+              u.can_edit, u.can_manage_users, u.can_manage_contacts,
               (select count(*) from pages where logged_user = u.id),
               (select count(*) from pages
                 where logged_user = u.id and url_deleted is null)
          from users u where u.hostid = ? and u.id = ?" in
   sth#execute [`Int hostid; `Int userid];
 
-  let name, email, registration_date, can_edit, can_manage_users, nr_edits,
-      nr_edits_live =
+  let name, email, registration_date, can_edit, can_manage_users,
+      can_manage_contacts, nr_edits, nr_edits_live =
     match sth#fetch1 () with
 	[`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;
 	 `Int nr_edits; `Int nr_edits_live] ->
 	  name, email, registration_date, can_edit, can_manage_users,
-	  nr_edits, nr_edits_live
+	  can_manage_contacts, nr_edits, nr_edits_live
       | _ -> assert false in
 
   template#set "userid" (string_of_int userid);
@@ -45,6 +60,7 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
   template#set "registration_date" (printable_date' registration_date);
   template#conditional "can_edit" can_edit;
   template#conditional "can_manage_users" can_manage_users;
+  template#conditional "can_manage_contacts" can_manage_contacts;
   template#set "nr_edits" (string_of_int nr_edits);
   template#set "nr_edits_live" (string_of_int nr_edits_live);