From: Sam H. v. a. <we...@ma...> - 2005-09-27 21:44:03
|
Log Message: ----------- formatting Modified Files: -------------- webwork2/lib/WeBWorK: Authen.pm Revision Data ------------- Index: Authen.pm =================================================================== RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/Authen.pm,v retrieving revision 1.42 retrieving revision 1.43 diff -Llib/WeBWorK/Authen.pm -Llib/WeBWorK/Authen.pm -u -r1.42 -r1.43 --- lib/WeBWorK/Authen.pm +++ lib/WeBWorK/Authen.pm @@ -433,9 +433,7 @@ } } - ######################################################### # a password was supplied. - ######################################################### if ($passwd) { if ($self->checkPassword($user, $passwd)) { @@ -459,9 +457,8 @@ # neither a key or a password were supplied. $error = "You must enter a password." } - ############################################# - # Check for multiply defined users - ############################################ + + # check for multiply defined users my @test_users = $r->param("user"); if (@test_users>1) { warn "User has been multiply defined in Authen.pm ", join(" ", @test_users) ; @@ -469,12 +466,10 @@ @test_users = $r->param("user"); warn "New value of user is ", join(" ", @test_users); } - ##### end check ###################### - if (defined $error) { # authentication failed, store the error message - $r->notes("authen_error",$error); + $r->notes("authen_error", $error); # if we got a cookie, it probably has incorrect information in it. so # we want to get rid of it |