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

Try to fallback to a default login template if the configured one won't work. Fixes bug #11450.

Browse source
This commit is contained in:
Colin Kuskie 2010-03-02 08:51:13 -08:00
parent beb1337373
commit 119d5137e2
4 changed files with 56 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/WebGUI/Auth/LDAP.pm
View file

@ -605,6 +605,18 @@ sub getCreateAccountTemplateId {
#-------------------------------------------------------------------
=head2 getDefaultLoginTemplateId ( )
Get the default template ID for the login form.
=cut
sub getDefaultLoginTemplateId {
return "PBtmpl0000000000000006";
}
#-------------------------------------------------------------------
=head2 getLDAPConnection ( )
Get the properties of the LDAP connection we're using for Auth.
@ -643,8 +655,8 @@ Get the template ID for the login form.
sub getLoginTemplateId {
my $self = shift;
my $ldapConnect = $self->getLDAPConnection;
return "PBtmpl0000000000000006" unless $ldapConnect;
return ($self->getLDAPConnection->{ldapLoginTemplate} || "PBtmpl0000000000000006");
return $self->getDefaultLoginTemplateId unless $ldapConnect;
return ($self->getLDAPConnection->{ldapLoginTemplate} || $self->getDefaultLoginTemplateId);
}
#-------------------------------------------------------------------

7
lib/WebGUI/Auth/WebGUI.pm
View file

@ -679,6 +679,11 @@ sub getCreateAccountTemplateId {
return $self->session->setting->get("webguiCreateAccountTemplate") || "PBtmpl0000000000000011";
}
#-------------------------------------------------------------------
sub getDefaultLoginTemplateId {
return "PBtmpl0000000000000013";
}
#-------------------------------------------------------------------
sub getExpiredPasswordTemplateId {
my $self = shift;
@ -688,7 +693,7 @@ sub getExpiredPasswordTemplateId {
#-------------------------------------------------------------------
sub getLoginTemplateId {
my $self = shift;
return $self->session->setting->get("webguiLoginTemplate") || "PBtmpl0000000000000013";
return $self->session->setting->get("webguiLoginTemplate") || $self->getDefaultLoginTemplateId;
}
#-------------------------------------------------------------------