Global replace 'raise CgiExit' -> 'return ()' to match a future version of mod_caml.

[cocanwiki.git] / scripts / signup.ml

diff --git a/scripts/signup.ml b/scripts/signup.ml
index 84c560e..5e8fc5f 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.2 2004/09/07 17:16:46 rich Exp $
+ * $Id: signup.ml,v 1.6 2004/09/23 11:56:47 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
@@ -13,7 +28,7 @@ open Cocanwiki
 open Cocanwiki_ok
 open Cocanwiki_strings
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
   (* Verify that we're allowed to create accounts anonymously
    * on this host.
    *)
@@ -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
@@ -53,8 +68,9 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
   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 name = ?" in
-  sth#execute [`String username];
+  let sth = dbh#prepare_cached "select id from users
+                                 where hostid = ? and name = ?" in
+  sth#execute [`Int hostid; `String username];
 
   (try
      sth#fetch1 ();
@@ -62,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 -> ());