diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm index 669325e14..6690fc6a5 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm @@ -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 diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Init.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Init.pm index 61e633263..05a46a9a6 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Init.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Init.pm @@ -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}; } diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm index 1db802e85..6ca620221 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm @@ -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' ) {