Working on BrowserID (#595)
This commit is contained in:
parent
3894139c94
commit
6e837af219
|
@ -13,9 +13,7 @@ sub display {
|
||||||
my ( $self, $req ) = @_;
|
my ( $self, $req ) = @_;
|
||||||
|
|
||||||
my $skin_dir = $self->conf->{templatesDir};
|
my $skin_dir = $self->conf->{templatesDir};
|
||||||
my $skinfile;
|
my ( $skinfile, %templateParams );
|
||||||
my %templateParams =
|
|
||||||
( %{ $self->customParameters }, %{ $req->{customParameters} // {} } );
|
|
||||||
|
|
||||||
# 0. Display error page
|
# 0. Display error page
|
||||||
if ( my $http_error = $req->param('lmError') ) {
|
if ( my $http_error = $req->param('lmError') ) {
|
||||||
|
@ -307,6 +305,8 @@ sub display {
|
||||||
SKIN => $skin,
|
SKIN => $skin,
|
||||||
ANTIFRAME => $self->conf->{portalAntiFrame},
|
ANTIFRAME => $self->conf->{portalAntiFrame},
|
||||||
SKIN_BG => $self->conf->{portalSkinBackground},
|
SKIN_BG => $self->conf->{portalSkinBackground},
|
||||||
|
%{ $self->customParameters },
|
||||||
|
%{ $req->{customParameters} // {} },
|
||||||
);
|
);
|
||||||
|
|
||||||
## Custom template params
|
## Custom template params
|
||||||
|
|
|
@ -73,7 +73,7 @@ sub init {
|
||||||
%$args
|
%$args
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
foreach my $k ( keys $self->localConfig ) {
|
foreach my $k ( keys %{ $self->localConfig } ) {
|
||||||
if ( $k =~ /tpl_(.*)/ ) {
|
if ( $k =~ /tpl_(.*)/ ) {
|
||||||
$self->customParameters->{$1} = $self->localConfig->{$k};
|
$self->customParameters->{$1} = $self->localConfig->{$k};
|
||||||
}
|
}
|
||||||
|
|
|
@ -168,7 +168,9 @@ sub getModule {
|
||||||
return $self->$mod->can('name');
|
return $self->$mod->can('name');
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return ref( $self->$mod );
|
my $s = ref( $self->$mod );
|
||||||
|
$s =~ s/^Lemonldap::NG::Portal::(?:(?:Issuer|UserDB|Auth)::)?//;
|
||||||
|
return $s;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
elsif ( $type eq 'issuer' ) {
|
elsif ( $type eq 'issuer' ) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user