dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Working on BrowserID (#595)

Browse Source
This commit is contained in:
Xavier Guimard 2016-05-24 05:05:51 +00:00
parent 3894139c94
commit 6e837af219
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
View File

@ -13,9 +13,7 @@ sub display {
my ( $self, $req ) = @_;
my $skin_dir = $self->conf->{templatesDir};
my $skinfile;
my %templateParams =
( %{ $self->customParameters }, %{ $req->{customParameters} // {} } );
my ( $skinfile, %templateParams );
# 0. Display error page
if ( my $http_error = $req->param('lmError') ) {
@ -307,6 +305,8 @@ sub display {
SKIN => $skin,
ANTIFRAME => $self->conf->{portalAntiFrame},
SKIN_BG => $self->conf->{portalSkinBackground},
%{ $self->customParameters },
%{ $req->{customParameters} // {} },
);
## Custom template params

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Init.pm
View File

@ -73,7 +73,7 @@ sub init {
%$args
}
);
foreach my $k ( keys $self->localConfig ) {
foreach my $k ( keys %{ $self->localConfig } ) {
if ( $k =~ /tpl_(.*)/ ) {
$self->customParameters->{$1} = $self->localConfig->{$k};
}

4
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm
View File

@ -168,7 +168,9 @@ sub getModule {
return $self->$mod->can('name');
}
else {
return ref( $self->$mod );
my $s = ref( $self->$mod );
$s =~ s/^Lemonldap::NG::Portal::(?:(?:Issuer|UserDB|Auth)::)?//;
return $s;
}
}
elsif ( $type eq 'issuer' ) {