Chris/webperl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates to handle previous commit.

Browse Source
This commit is contained in:
Chris 2012-06-15 15:19:21 +01:00
parent 8702cf1a6e
commit 7092bf3664
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
AppUser.pm
View File

@ -237,7 +237,7 @@ sub set_user_authmethod {
my $result = $seth -> execute($methodid, $username)
or $self -> {"logger"} -> die_log($self -> {"cgi"} -> remote_host(), "Unable to execute user auth update query. Error was: ".$self -> {"dbh"} -> errstr);
$self -> {"lasterr"} .= "Unable to update user auth method, unkown user selected"
$self -> self_error("Unable to update user auth method, unknown user selected")
if($result != 1);
return ($result == 1);
@ -261,8 +261,8 @@ sub set_user_authmethod {
# @param auth A reference to the auth object calling this.
# @return true if the authentication process should continue, false if the
# user should not be authenticated or logged in. If this returns
# false, an error message will be appended to the specified auth's
# lasterr field.
# false, an error message will be set in the specified auth's
# errstr field.
sub pre_authenticate {
my $self = shift;
my $username = shift;
@ -293,7 +293,7 @@ sub pre_authenticate {
# @param auth A reference to the auth object calling this.
# @return A reference to a hash containing the user's data on success,
# undef otherwise. If this returns undef, an error message will be
# appended to the specified auth's lasterr field.
# set in the specified auth's errstr field.
sub post_authenticate {
my $self = shift;
my $username = shift;
@ -312,10 +312,8 @@ sub post_authenticate {
$user = $self -> get_user($username);
}
if(!$user) {
$auth -> {"lasterr"} .= "User addition failed.";
return undef;
}
return $auth -> self_error("User addition failed.")
if(!$user);
# Touch the user's record...
my $pokeh = $self -> {"dbh"} -> prepare("UPDATE ".$self -> {"settings"} -> {"database"} -> {"users"}."

2
AuthMethod.pm
View File

@ -61,7 +61,7 @@ sub new {
# @param password The password of the user to authenticate.
# @param auth A reference to the Auth object calling this function,
# if any errors are encountered while performing the
# authentication, they will be appended to $auth -> {"lasterr"}.
# authentication, they will be set in $auth -> {"errstr"}.
# @return true if the user's credentials are valid, false otherwise.
sub authenticate {
my $self = shift;

4
SessionHandler.pm
View File

@ -50,7 +50,7 @@
# current session user if no userid is specified.
# - valid_user() returns true if the provided user credentials are valid,
# false if they are not.
# - auth_error() lets you fetch the authenticator's `lasterr` message.
# - auth_error() lets you fetch the authenticator's `errstr` message.
# - anonymous_session() returns true if the session is anonymous, false
# if the session belongs to a logged-in user.
# - admin_session() returns true if the session belongs to a logged-in admin
@ -551,7 +551,7 @@ sub valid_user {
sub auth_error {
my $self = shift;
return $self -> {"auth"} -> {"lasterr"};
return $self -> {"auth"} -> {"errstr"};
}