Merge branch 'v2.0' of gitlab.ow2.org:lemonldap-ng/lemonldap-ng into v2.0
This commit is contained in:
commit
73bba9f600
|
@ -418,14 +418,6 @@ sub display {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Additional $req param
|
|
||||||
%templateParams = ( %templateParams, %{ $req->{customParameters} // {} }, );
|
|
||||||
|
|
||||||
for my $session_key ( keys %{ $req->{sessionInfo} } ) {
|
|
||||||
$templateParams{ "session_" . $session_key } =
|
|
||||||
$req->{sessionInfo}->{$session_key};
|
|
||||||
}
|
|
||||||
|
|
||||||
$self->logger->debug("Skin returned: $skinfile");
|
$self->logger->debug("Skin returned: $skinfile");
|
||||||
return ( $skinfile, \%templateParams );
|
return ( $skinfile, \%templateParams );
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
#
|
#
|
||||||
package Lemonldap::NG::Portal::Main::Run;
|
package Lemonldap::NG::Portal::Main::Run;
|
||||||
|
|
||||||
our $VERSION = '2.0.1';
|
our $VERSION = '2.0.2';
|
||||||
|
|
||||||
package Lemonldap::NG::Portal::Main;
|
package Lemonldap::NG::Portal::Main;
|
||||||
|
|
||||||
|
@ -843,16 +843,30 @@ sub rebuildCookies {
|
||||||
}
|
}
|
||||||
|
|
||||||
sub tplParams {
|
sub tplParams {
|
||||||
my $portalPath = $_[0]->conf->{portal};
|
my ( $self, $req ) = @_;
|
||||||
|
my %templateParams;
|
||||||
|
|
||||||
|
my $portalPath = $self->conf->{portal};
|
||||||
$portalPath =~ s#^https?://[^/]+/?#/#;
|
$portalPath =~ s#^https?://[^/]+/?#/#;
|
||||||
$portalPath =~ s#[^/]+\.fcgi$##;
|
$portalPath =~ s#[^/]+\.fcgi$##;
|
||||||
|
|
||||||
|
for my $session_key ( keys %{ $req->{sessionInfo} } ) {
|
||||||
|
$templateParams{ "session_" . $session_key } =
|
||||||
|
$req->{sessionInfo}->{$session_key};
|
||||||
|
}
|
||||||
|
|
||||||
|
for my $env_key ( keys %{ $req->env } ) {
|
||||||
|
$templateParams{ "env_" . $env_key } = $req->env->{$env_key};
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
SKIN => $_[0]->getSkin( $_[1] ),
|
SKIN => $self->getSkin( $req ),
|
||||||
PORTAL_URL => $_[0]->conf->{portal},
|
PORTAL_URL => $self->conf->{portal},
|
||||||
SKIN_PATH => $portalPath . "skins",
|
SKIN_PATH => $portalPath . "skins",
|
||||||
ANTIFRAME => $_[0]->conf->{portalAntiFrame},
|
ANTIFRAME => $self->conf->{portalAntiFrame},
|
||||||
SKIN_BG => $_[0]->conf->{portalSkinBackground},
|
SKIN_BG => $self->conf->{portalSkinBackground},
|
||||||
( $_[0]->customParameters ? ( %{ $_[0]->customParameters } ) : () ),
|
( $self->customParameters ? ( %{ $self->customParameters } ) : () ),
|
||||||
|
%templateParams
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -594,12 +594,6 @@ sub display {
|
||||||
$tplPrm{DISPLAY_PASSWORD_FORM} = $req->sessionInfo->{pwdAllowed};
|
$tplPrm{DISPLAY_PASSWORD_FORM} = $req->sessionInfo->{pwdAllowed};
|
||||||
}
|
}
|
||||||
|
|
||||||
# Custom template parameters
|
|
||||||
if ( my $customParams = $self->p->customParameters ) {
|
|
||||||
foreach ( keys %$customParams ) {
|
|
||||||
$tplPrm{$_} = $customParams->{$_};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 'mail', \%tplPrm;
|
return 'mail', \%tplPrm;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -521,6 +521,7 @@ sub display {
|
||||||
DISPLAY_PASSWORD_FORM => 1,
|
DISPLAY_PASSWORD_FORM => 1,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return ( 'register', \%templateParams );
|
return ( 'register', \%templateParams );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user