Commit 6cc554ac authored by Xavier Guimard's avatar Xavier Guimard

Optimization (#595)

parent 3db9bec5
......@@ -341,25 +341,12 @@ sub display {
}
## Common template params
my $skin = $self->getSkin($req);
my $portalPath = $self->conf->{portal};
$portalPath =~ s#^https?://[^/]+/?#/#;
$portalPath =~ s#[^/]+\.fcgi$##;
# Additional $req param
%templateParams = (
%templateParams,
SKIN_PATH => $portalPath . "skins",
ANTIFRAME => $self->conf->{portalAntiFrame},
SKIN_BG => $self->conf->{portalSkinBackground},
%{ $self->customParameters },
%{ $req->{customParameters} // {} },
);
## Custom template params
if ( my $customParams = $self->getCustomTemplateParameters() ) {
%templateParams = ( %templateParams, %$customParams );
}
$self->logger->debug("Skin returned: $skinfile");
return ( $skinfile, \%templateParams );
}
......@@ -438,26 +425,6 @@ sub getSkin {
return $skin;
}
# Find custom templates parameters
# @return Custom parameters
sub getCustomTemplateParameters {
my ($self) = @_;
my $conf = $self->conf;
my $customTplParams = {};
foreach ( keys %$conf ) {
next unless ( $_ =~ /^tpl_(.+)$/ );
my $tplParam = $1;
my $tplValue = $conf->{$_};
$self->logger->debug(
"Set custom template parameter $tplParam with $tplValue");
$customTplParams->{$tplParam} = $tplValue;
}
return $customTplParams;
}
# Build an HTML array to display sessions
# @param $sessions Array ref of hash ref containing sessions datas
# @param $title Title of the array
......
......@@ -571,7 +571,7 @@ sub setHiddenFormValue {
$base64 = 1 unless defined $base64;
# Store value
if ( $val or !($val & ~$val) ) {
if ( $val or !( $val & ~$val ) ) {
$key = $prefix . $key;
$val =~ s/\+/%2B/g;
$req->{portalHiddenFormValues}->{$key} = $val;
......@@ -764,9 +764,16 @@ sub rebuildCookies {
}
sub tplParams {
my $portalPath = $_[0]->conf->{portal};
$portalPath =~ s#^https?://[^/]+/?#/#;
$portalPath =~ s#[^/]+\.fcgi$##;
return (
SKIN => $_[0]->getSkin( $_[1] ),
PORTAL_URL => $_[0]->conf->{portal},
SKIN_PATH => $portalPath . "skins",
ANTIFRAME => $_[0]->conf->{portalAntiFrame},
SKIN_BG => $_[0]->conf->{portalSkinBackground},
( $_[0]->customParameters ? ( %{ $_[0]->customParameters } ) : () ),
);
}
......
......@@ -554,7 +554,7 @@ sub display {
}
# Custom template parameters
if ( my $customParams = $self->p->getCustomTemplateParameters() ) {
if ( my $customParams = $self->p->customParameters ) {
foreach ( keys %$customParams ) {
$tplPrm{$_} = $customParams->{$_};
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment