More thorough inclusion of the page bug. This should mean the page bug appears just...

[cocanwiki.git] / scripts / signup.ml

diff --git a/scripts/signup.ml b/scripts/signup.ml
index 0c946f5..b98cede 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.5 2004/09/09 12:21:22 rich Exp $
+ * $Id: signup.ml,v 1.9 2005/11/24 14:54:13 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
@@ -47,14 +47,14 @@ 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
+      dbh hostid q "The username or password you gave is empty.";
+    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
+      dbh hostid q "The two passwords you gave aren't identical.";
+    return ()
   );
 
   let password = password1 in
@@ -75,10 +75,11 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   (try
      sth#fetch1 ();
      error ~back_button:true ~title:"Username already taken"
-       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.");
-     raise CgiExit
+       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 -> ());
 
@@ -88,7 +89,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
                                 values (?, ?, ?, ?)" in
   sth#execute [`String username; `String password; email; `Int hostid];
 
-  let userid = sth#serial "users_id_seq" in
+  let userid = Int64.to_int (sth#serial "users_id_seq") in
 
   (* Create a cookie. *)
   let cookie = random_sessionid () in
@@ -99,13 +100,14 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   dbh#commit ();
 
   let buttons = [ ok_button "/" ] in
-  let cookie = Cookie.cookie ~name:"auth" ~value:cookie ~path:"/" () in
+  let cookie = Cookie.cookie "auth" cookie ~path:"/" in
 
   ok ~title:"Account created"
     ~buttons
     ~cookie
-    q ("An account was created for you, " ^ username ^ ". " ^
-       "We hope you enjoy using this service.")
+    dbh hostid q
+    ("An account was created for you, " ^ username ^ ". " ^
+     "We hope you enjoy using this service.")
 
 let () =
   register_script run