Refuse to serve deleted files or images to other sites. Stops bandwidth

[cocanwiki.git] / scripts / create_user.ml

diff --git a/scripts/create_user.ml b/scripts/create_user.ml
index 2e08209..2767434 100644 (file)
--- 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.2 2004/09/22 10:19:26 rich Exp $
+ * $Id: create_user.ml,v 1.4 2004/10/11 14:13:04 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
@@ -64,7 +64,7 @@ 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 -> ());
 
@@ -73,17 +73,21 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   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,
                                   hostid, can_edit, can_manage_users,
                                   can_manage_contacts, can_manage_site,
-                                  can_edit_global_css)
-                                values (?, ?, ?, ?, ?, ?, ?, ?, ?)" in
+                                  can_edit_global_css, can_import_mail,
+                                  force_password_change)
+                                values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" in
   sth#execute [`String username; `String password; email; `Int hostid;
               `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;
+              `Bool force_password_change];
 
   dbh#commit ();