X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fedit_user.ml;h=fb1da46389a92561c3bbb998be0e104627b82213;hb=6b0b6830a2e784eee99dcd1b1a3cb8b44e27c765;hp=7f2148e47ef9b83cae24af03d40113cd0bb5454a;hpb=3da6ded17ea2cca64328e5f3ea8903cd15103bc2;p=cocanwiki.git diff --git a/scripts/edit_user.ml b/scripts/edit_user.ml index 7f2148e..fb1da46 100644 --- a/scripts/edit_user.ml +++ b/scripts/edit_user.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: edit_user.ml,v 1.5 2004/09/22 10:19:26 rich Exp $ + * $Id: edit_user.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 @@ -45,7 +45,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ self = if name = "" then ( error ~back_button:true ~title:"Bad username" q "The username you gave is empty."; - raise CgiExit + return () ); (* Check it's not a duplicate, then change it. *) @@ -57,7 +57,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ self = sth#fetch1 (); error ~back_button:true ~title:"Username already taken" q ("That username has already been taken by another user."); - raise CgiExit + return () with Not_found -> ()); @@ -83,7 +83,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ self = q ("You tried to remove 'Manage users' permission from yourself. "^ "You can't do this. You'll have to do it from another "^ "user account."); - raise CgiExit + return () | _ -> ()); let sth = dbh#prepare_cached "update users set email = ?,