X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fcreate_user.ml;h=b8b8e6c2a0f0c173e240c87411448c07f8dc8efa;hb=295f2cde3f43ccf7f775d39b95925e10aa4c37cb;hp=dc72b3b5ab731bc405c90986dd89784de5acd01e;hpb=867889b6d04b6381c74974e338672ee02d61920e;p=cocanwiki.git

diff --git a/scripts/create_user.ml b/scripts/create_user.ml
index dc72b3b..b8b8e6c 100644
--- a/scripts/create_user.ml
+++ b/scripts/create_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: create_user.ml,v 1.1 2004/09/21 13:01:15 rich Exp $
+ * $Id: create_user.ml,v 1.5 2004/10/23 09:36:11 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
@@ -36,13 +36,13 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   if username = "" || password1 = "" || password2 = "" then (
     error ~back_button:true ~title:"Bad username or password"
       q "The username or password you gave is empty.";
-    raise CgiExit
+    return ()
   );
 
   if password1 <> password2 then (
     error ~back_button:true ~title:"Passwords don't match"
       q "The two passwords you gave aren't identical.";
-    raise CgiExit
+    return ()
   );
 
   let password = password1 in
@@ -52,9 +52,6 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   if String.length username > 32 || String.length password > 32 then
   *)
 
-  let email = trim (q#param "email") in
-  let email = if string_is_whitespace email then `Null else `String email in
-
   (* Not a duplicate? *)
   let sth = dbh#prepare_cached "select id from users
                                  where hostid = ? and name = ?" in
@@ -64,22 +61,30 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
      sth#fetch1 ();
      error ~back_button:true ~title:"Username already taken"
        q "Someone has already taken that username.";
-     raise CgiExit
+     return ()
    with
        Not_found -> ());
 
   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
+  let force_password_change = q#param_true "force_password_change" in
 
   (* Create the user account. *)
-  let sth = dbh#prepare_cached "insert into users (name, password, email,
+  let sth = dbh#prepare_cached "insert into users (name, password,
                                   hostid, can_edit, can_manage_users,
-                                  can_manage_contacts)
-                                values (?, ?, ?, ?, ?, ?, ?)" in
-  sth#execute [`String username; `String password; email; `Int hostid;
+                                  can_manage_contacts, can_manage_site,
+                                  can_edit_global_css, can_import_mail,
+                                  force_password_change)
+                                values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" in
+  sth#execute [`String username; `String password; `Int hostid;
 	       `Bool can_edit; `Bool can_manage_users;
-	       `Bool can_manage_contacts];
+	       `Bool can_manage_contacts; `Bool can_manage_site;
+	       `Bool can_edit_global_css; `Bool can_import_mail;
+	       `Bool force_password_change];
 
   dbh#commit ();