Updated MANIFEST. Bumped version for release.

[cocanwiki.git] / scripts / signup.ml

diff --git a/scripts/signup.ml b/scripts/signup.ml
index 70280f0..84a44aa 100644 (file)
--- a/scripts/signup.ml
+++ b/scripts/signup.ml
@@ -1,7 +1,22 @@
-(* COCANWIKI scripts.
+(* 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.4 2004/09/09 09:35:34 rich Exp $
+ * $Id: signup.ml,v 1.8 2005/11/17 10:14:42 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  *)
 
 open Apache
@@ -33,13 +48,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
@@ -63,7 +78,7 @@ let run r (q : cgi) (dbh : Dbi.connection) 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.");
-     raise CgiExit
+     return ()
    with
        Not_found -> ());
 
@@ -73,7 +88,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
@@ -84,7 +99,7 @@ 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