About half way through switching cocanwiki to using the new PG interface.

[cocanwiki.git] / scripts / edit_user.ml

diff --git a/scripts/edit_user.ml b/scripts/edit_user.ml
index fb1da46..d9cb59c 100644 (file)
--- a/scripts/edit_user.ml
+++ b/scripts/edit_user.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.ml,v 1.6 2004/09/23 11:56:47 rich Exp $
+ * $Id: edit_user.ml,v 1.10 2005/11/24 14:54:12 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
@@ -44,7 +44,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ self =
   if original_name <> name then (
     if name = "" then (
       error ~back_button:true ~title:"Bad username"
-        q "The username you gave is empty.";
+        dbh hostid q "The username you gave is empty.";
       return ()
     );
 
@@ -56,7 +56,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ self =
     (try
        sth#fetch1 ();
        error ~back_button:true ~title:"Username already taken"
-        q ("That username has already been taken by another user.");
+        dbh hostid q
+        ("That username has already been taken by another user.");
        return ()
      with
         Not_found -> ());
@@ -66,35 +67,35 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ self =
     sth#execute [`String name; `Int hostid; `Int userid]
   );
 
-  (* Change email address and permissions. *)
-  let email = trim (q#param "email") in
-  let email = if email = "" then `Null else `String email in
-
+  (* Change permissions. *)
   let can_edit = q#param_true "can_edit" in
   let can_manage_users = q#param_true "can_manage_users" in
   let can_manage_contacts = q#param_true "can_manage_contacts" in
   let can_manage_site = q#param_true "can_manage_site" in
   let can_edit_global_css = q#param_true "can_edit_global_css" in
+  let can_import_mail = q#param_true "can_import_mail" in
 
   (* Trying to remove manage users permission from self? *)
   (match can_manage_users, self with
-     | false, User (id, _, _) when id = userid ->
+     | false, User (id, _, _, _) when id = userid ->
         error ~back_button:true ~title:"Remove manage users from self"
-          q ("You tried to remove 'Manage users' permission from yourself. "^
-             "You can't do this.  You'll have to do it from another "^
-             "user account.");
+          dbh hostid q
+          ("You tried to remove 'Manage users' permission from yourself. " ^
+           "You can't do this.  You'll have to do it from another " ^
+           "user account.");
         return ()
      | _ -> ());
 
-  let sth = dbh#prepare_cached "update users set email = ?,
+  let sth = dbh#prepare_cached "update users set
                                        can_edit = ?, can_manage_users = ?,
                                        can_manage_contacts = ?,
                                        can_manage_site = ?,
-                                       can_edit_global_css = ?
+                                       can_edit_global_css = ?,
+                                       can_import_mail = ?
                                  where hostid = ? and id = ?" in
-  sth#execute [email; `Bool can_edit; `Bool can_manage_users;
+  sth#execute [`Bool can_edit; `Bool can_manage_users;
               `Bool can_manage_contacts; `Bool can_manage_site;
-              `Bool can_edit_global_css;
+              `Bool can_edit_global_css; `Bool can_import_mail;
               `Int hostid; `Int userid];
 
   (* Finish up. *)
@@ -102,7 +103,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ self =
 
   let buttons = [ ok_button "/_users" ] in
   ok ~buttons ~title:"Saved"
-    q "Changes were saved."
+    dbh hostid q "Changes were saved."
 
 let () =
   register_script ~restrict:[CanManageUsers] run