oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adding user-status and two bugfixes for pluggable auth.

Browse source
This commit is contained in:
Martin Kamerbeek 2002-11-27 21:03:35 +00:00
parent 0925fd17aa
commit 0ea8cd6845
4 changed files with 83 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/WebGUI/Operation/Account.pm
View file

@ -261,7 +261,7 @@ sub www_deactivateAccountConfirm {
return WebGUI::Privilege::vitalComponent();
} elsif (($session{user}{userId} != 1) and $session{setting}{selfDeactivation}) {
$u = WebGUI::User->new($session{user}{userId});
$u->delete;
$u->status("Selfdestructed");
WebGUI::Session::end($session{var}{sessionId});
}
return www_displayLogin();
@ -419,10 +419,13 @@ sub www_login {
if ($uid) {
$u = WebGUI::User->new($uid);
$cmd = $session{authentication}{$u->authMethod}."::validateUser";
$success = eval{&$cmd($uid, $session{form}{identifier})};
WebGUI::ErrorHandler::fatalError("Unable to load method validateUser on Authentication module: $_. ".$@) if($@);
if ($u->status eq 'Active') {
$cmd = $session{authentication}{$u->authMethod}."::validateUser";
$success = eval{&$cmd($uid, $session{form}{identifier})};
WebGUI::ErrorHandler::fatalError("Unable to load method validateUser on Authentication module: $_. ".$@) if($@);
} else {
$success = WebGUI::International::get(820);
}
} else {
$success = WebGUI::International::get(68);
}