my ($theme, $lang)= themelanguage( $htdocs, $tmplbase, $interface, $query);
my $template = Template->new(
- {
- EVAL_PERL => 1,
+ { EVAL_PERL => 1,
ABSOLUTE => 1,
- INCLUDE_PATH => "$htdocs/$theme/$lang/includes",
- FILTERS => {},
-
+ PLUGIN_BASE => 'Koha::Template::Plugin',
+ INCLUDE_PATH => [
+ "$htdocs/$theme/$lang/includes",
+ "$htdocs/$theme/en/includes"
+ ],
+ FILTERS => {},
}
) or die Template->error();
my $self = {
my $val = shift;
if ( ref($val) eq 'ARRAY' && !scalar @$val ) { $val = undef; }
elsif ( ref($val) eq 'HASH' && !scalar %$val ) { $val = undef; }
- $self->{VARS}->{$key} = $val;
+ if ( $key ) {
+ $self->{VARS}->{$key} = $val;
+ } else {
+ warn "Problem = a value of $val has been passed to param without key";
+ }
}
}
($query) or warn "no query in themelanguage";
# Select a language based on cookie, syspref available languages & browser
- my $is_intranet = $interface eq 'intranet';
- my @languages = split(",", C4::Context->preference(
- $is_intranet ? 'language' : 'opaclanguages'));
- my $lang;
- $lang = $query->cookie('KohaOpacLanguage')
- if defined $query and $query->cookie('KohaOpacLanguage');
- unless ($lang) {
- my $http_accept_language = $ENV{ HTTP_ACCEPT_LANGUAGE };
- $lang = accept_language( $http_accept_language,
- getTranslatedLanguages($interface,'prog') );
- }
- # Ignore a lang not selected in sysprefs
- $lang = undef unless first { $_ eq $lang } @languages;
- # Fall back to English if necessary
- $lang = 'en' unless $lang;
+ my $lang = getlanguage($query, $interface);
+ # Select theme
+ my $is_intranet = $interface eq 'intranet';
my @themes = split(" ", C4::Context->preference(
$is_intranet ? "template" : "opacthemes" ));
push @themes, 'prog';
);
}
-sub getlanguagecookie {
- my ($query) = @_;
+
+sub getlanguage {
+ my ($query, $interface) = @_;
+
+ # Select a language based on cookie, syspref available languages & browser
+ my $is_intranet = $interface eq 'intranet';
+ my @languages = split(",", C4::Context->preference(
+ $is_intranet ? 'language' : 'opaclanguages'));
+
my $lang;
- if ($query->cookie('KohaOpacLanguage')){
- $lang = $query->cookie('KohaOpacLanguage') ;
- }else{
- $lang = $ENV{HTTP_ACCEPT_LANGUAGE};
-
+
+ # cookie
+ if ( $query->cookie('KohaOpacLanguage') ) {
+ $lang = $query->cookie('KohaOpacLanguage');
+ $lang =~ s/[^a-zA-Z_-]*//; # sanitize cookie
}
- $lang = substr($lang, 0, 2);
+
+ # HTTP_ACCEPT_LANGUAGE
+ unless ($lang) {
+ my $http_accept_language = $ENV{ HTTP_ACCEPT_LANGUAGE };
+ $lang = accept_language( $http_accept_language,
+ getTranslatedLanguages($interface,'prog') );
+ }
+
+ # Ignore a lang not selected in sysprefs
+ $lang = undef unless first { $_ eq $lang } @languages;
+
+ # Fall back to English if necessary
+ $lang = 'en' unless $lang;
return $lang;
}