Change subject line so it shows the name of the site.

[cocanwiki.git] / scripts / signup.ml

diff --git a/scripts/signup.ml b/scripts/signup.ml
index 887700b..d3e28ac 100644 (file)
--- a/scripts/signup.ml
+++ b/scripts/signup.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: signup.ml,v 1.10 2006/03/27 18:09:46 rich Exp $
+ * $Id: signup.ml,v 1.11 2006/03/28 16:24:08 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
@@ -32,14 +32,17 @@ let run r (q : cgi) dbh hostid _ _ =
   (* Verify that we're allowed to create accounts anonymously
    * on this host.
    *)
-  let sth = dbh#prepare_cached "select create_account_anon from hosts
-                                 where id = ?" in
-  sth#execute [Some hostid];
-
-  let create_account_anon =
-    match sth#fetch1 () with
-       [ `Bool true ] -> ()
-      | _ -> assert false in
+  let create_account_anon = List.hd (
+    PGSQL(dbh) "select create_account_anon from hosts
+                 where id = $hostid"
+  ) in
+
+  if not create_account_anon then (
+    error ~title:"Not allowed to create accounts"
+      dbh hostid q ("To get an account on this service, please contact the " ^
+                   "administrator.");
+    return ()
+  );
 
   let username = trim (q#param "username") in
   let password1 = trim (q#param "password1") in
@@ -59,43 +62,41 @@ let run r (q : cgi) dbh hostid _ _ =
 
   let password = password1 in
 
-  (*
-    Uh oh ... Not making UNICODE assumptions ... XXX
-  if String.length username > 32 || String.length password > 32 then
-  *)
+  if UTF8.length username > 32 || UTF8.length password > 128 then (
+    error ~back_button:true ~title:"Username or password too long"
+      dbh hostid q "Usernames should be less than 32 characters long.  For passwords we let you have a generous 128 characters.";
+    return ()
+  );
 
   let email = trim (q#param "email") in
   let email = if string_is_whitespace email then None else Some email in
 
   (* Not a duplicate? *)
-  let sth = dbh#prepare_cached "select id from users
-                                 where hostid = ? and name = ?" in
-  sth#execute [Some hostid; Some username];
-
-  (try
-     sth#fetch1 ();
-     error ~back_button:true ~title:"Username already taken"
-       dbh hostid q
-       ("Someone, possibly you, has already taken that username. " ^
-       "If you think you have forgotten your password, try going back " ^
-       "and clicking on the 'Forgotten your password?' link.");
-     return ()
-   with
-       Not_found -> ());
+  let rows = PGSQL(dbh)
+    "select id from users where hostid = $hostid and name = $username" in
+
+  (match rows with
+   | [_] ->
+       error ~back_button:true ~title:"Username already taken"
+        dbh hostid q
+        ("Someone, possibly you, has already taken that username. " ^
+           "If you think you have forgotten your password, try going back " ^
+           "and clicking on the 'Forgotten your password?' link.");
+       return ()
+   | [] -> ()
+   | _ -> assert false
+  );
 
   (* Create the user account. *)
-  let sth = dbh#prepare_cached "insert into users (name, password, email,
-                                                   hostid)
-                                values (?, ?, ?, ?)" in
-  sth#execute [Some username; Some password; email; Some hostid];
+  PGSQL(dbh) "insert into users (name, password, email, hostid)
+              values ($username, $password, $?email, $hostid)";
 
-  let userid = Int64.to_int (sth#serial "users_id_seq") in
+  let userid = PGOCaml.serial4 dbh "users_id_seq" in
 
   (* Create a cookie. *)
   let cookie = random_sessionid () in
-  let sth = dbh#prepare_cached "insert into usercookies (userid, cookie)
-                                values (?, ?)" in
-  sth#execute [Some userid; Some cookie];
+  PGSQL(dbh) "insert into usercookies (userid, cookie)
+              values ($userid, $cookie)";
 
   PGOCaml.commit dbh;