X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fsignup.ml;h=5e8fc5f9465bb6de525afcf4fb5a1cd547018f6e;hb=1b592b922676bd3080338cf532a3d29d38137189;hp=0c946f5253f5d55675de42fe095b04d888507eb7;hpb=11b93485a29771f4d826c50d9efc6d3607dfa50f;p=cocanwiki.git diff --git a/scripts/signup.ml b/scripts/signup.ml index 0c946f5..5e8fc5f 100644 --- 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 . * Copyright (C) 2004 Merjis Ltd. - * $Id: signup.ml,v 1.5 2004/09/09 12:21:22 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 @@ -48,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 @@ -78,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 -> ());