COCANWIKI is now ~95% UTF-8 safe.

[cocanwiki.git] / scripts / edit_user_form.ml

diff --git a/scripts/edit_user_form.ml b/scripts/edit_user_form.ml
index 76caf6a..f9695a5 100644 (file)
--- a/scripts/edit_user_form.ml
+++ b/scripts/edit_user_form.ml
@@ -1,7 +1,7 @@
 (* 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.10 2006/03/27 19:10:29 rich Exp $
+ * $Id: edit_user_form.ml,v 1.11 2006/07/26 16:34:18 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
@@ -38,6 +38,7 @@ let run r (q : cgi) dbh hostid _ _ =
       "select u.name, u.email, u.registration_date,
               u.can_edit, u.can_manage_users, u.can_manage_contacts,
               u.can_manage_site, u.can_edit_global_css, u.can_import_mail,
+              u.can_edit_macros,
               (select count(*) from pages where logged_user = u.id)::int4,
               (select count(*) from pages
                 where logged_user = u.id and url_deleted is null)::int4
@@ -45,16 +46,16 @@ let run r (q : cgi) dbh hostid _ _ =
 
   let name, email, registration_date, can_edit, can_manage_users,
       can_manage_contacts, can_manage_site, can_edit_global_css,
-      can_import_mail, nr_edits, nr_edits_live =
+      can_import_mail, can_edit_macros, nr_edits, nr_edits_live =
     match rows with
     | [name, email, registration_date,
        can_edit, can_manage_users, can_manage_contacts,
        can_manage_site, can_edit_global_css,
-       can_import_mail,
+       can_import_mail, can_edit_macros,
        nr_edits, nr_edits_live] ->
        name, email, registration_date, can_edit, can_manage_users,
        can_manage_contacts, can_manage_site, can_edit_global_css,
-       can_import_mail, nr_edits, nr_edits_live
+       can_import_mail, can_edit_macros, nr_edits, nr_edits_live
     | _ -> assert false in
 
   template#set "userid" (Int32.to_string userid);
@@ -67,6 +68,7 @@ let run r (q : cgi) dbh hostid _ _ =
   template#conditional "can_manage_site" can_manage_site;
   template#conditional "can_edit_global_css" can_edit_global_css;
   template#conditional "can_import_mail" can_import_mail;
+  template#conditional "can_edit_macros" can_edit_macros;
   template#set "nr_edits" (Int32.to_string (Option.get nr_edits));
   template#set "nr_edits_live" (Int32.to_string (Option.get nr_edits_live));