X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fedit_user.ml;h=b46b905cf272283255a80ec58d734f0e555b2e94;hb=32f71ff9f960ecb191f256a6cfc11a3f2c0c0cf7;hp=7f2148e47ef9b83cae24af03d40113cd0bb5454a;hpb=0d88075fa62c0a801ea1e9246d85389f9161a4e1;p=cocanwiki.git

diff --git a/scripts/edit_user.ml b/scripts/edit_user.ml
index 7f2148e..b46b905 100644
--- 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.5 2004/09/22 10:19:26 rich Exp $
+ * $Id: edit_user.ml,v 1.9 2004/10/30 10:16:10 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
@@ -45,7 +45,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ self =
     if name = "" then (
       error ~back_button:true ~title:"Bad username"
         q "The username you gave is empty.";
-      raise CgiExit
+      return ()
     );
 
     (* Check it's not a duplicate, then change it. *)
@@ -57,7 +57,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ self =
        sth#fetch1 ();
        error ~back_button:true ~title:"Username already taken"
 	 q ("That username has already been taken by another user.");
-       raise CgiExit
+       return ()
      with
 	 Not_found -> ());
 
@@ -66,35 +66,34 @@ 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.");
-	 raise CgiExit
+	 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. *)