use warnings;
use Carp;
use CGI;
-use List::Util qw/first/;
+use List::MoreUtils qw/any/;
# Copyright 2009 Chris Cormack and The Koha Dev Team
#
use C4::Context;
-__PACKAGE__->mk_accessors(qw( theme lang filename htdocs interface vars));
+__PACKAGE__->mk_accessors(qw( theme activethemes preferredtheme lang filename htdocs interface vars));
else {
$htdocs = C4::Context->config('intrahtdocs');
}
- my ($theme, $lang)= themelanguage( $htdocs, $tmplbase, $interface, $query);
+ my ($theme, $lang, $activethemes)= themelanguage( $htdocs, $tmplbase, $interface, $query);
+ my @includes;
+ foreach (@$activethemes) {
+ push @includes, "$htdocs/$_/$lang/includes";
+ push @includes, "$htdocs/$_/en/includes" unless $lang eq 'en';
+ }
my $template = Template->new(
{ EVAL_PERL => 1,
ABSOLUTE => 1,
PLUGIN_BASE => 'Koha::Template::Plugin',
COMPILE_EXT => C4::Context->config('template_cache_dir')?'.ttc':'',
COMPILE_DIR => C4::Context->config('template_cache_dir')?C4::Context->config('template_cache_dir'):'',,
- INCLUDE_PATH => [
- "$htdocs/$theme/$lang/includes",
- "$htdocs/$theme/en/includes"
- ],
+ INCLUDE_PATH => \@includes,
FILTERS => {},
}
) or die Template->error();
bless $self, $class;
$self->theme($theme);
$self->lang($lang);
+ $self->activethemes($activethemes);
+ $self->preferredtheme($activethemes->[0]);
$self->filename($filename);
$self->htdocs($htdocs);
$self->interface($interface);
$vars->{themelang} = '/opac-tmpl';
}
$vars->{lang} = $self->lang;
- $vars->{themelang} .= '/' . $self->theme . '/' . $self->lang;
+ $vars->{themelang} .= '/' . $self->preferredtheme . '/' . $self->lang;
$vars->{yuipath} =
( C4::Context->preference("yuipath") eq "local"
- ? $vars->{themelang} . "/lib/yui"
+ ? ( $self->interface eq 'intranet' ? $vars->{themelang} . "/lib/yui" : "/opac-tmpl/lib/yui" )
: C4::Context->preference("yuipath") );
$vars->{interface} =
( $self->{interface} ne 'intranet' ? '/opac-tmpl' : '/intranet-tmpl' );
$vars->{theme} = $self->theme;
$vars->{opaccolorstylesheet} =
- C4::Context->preference('opaccolorstylesheet');
+ C4::Context->preference('opaccolorstylesheet');
$vars->{opacsmallimage} = C4::Context->preference('opacsmallimage');
- $vars->{opacstylesheet} = C4::Context->preference('opacstylesheet');
+ $vars->{opaclayoutstylesheet} =
+ C4::Context->preference('opaclayoutstylesheet');
# add variables set via param to $vars for processing
# and clean any utf8 mess
my $is_intranet = $interface eq 'intranet';
my $htdocs = C4::Context->config($is_intranet ? 'intrahtdocs' : 'opachtdocs');
- my ($theme, $lang) = themelanguage($htdocs, $tmplbase, $interface, $query);
- my $opacstylesheet = C4::Context->preference('opacstylesheet');
+ my ($theme, $lang, $availablethemes) = themelanguage($htdocs, $tmplbase, $interface, $query);
# if the template doesn't exist, load the English one as a last resort
my $filename = "$htdocs/$theme/$lang/modules/$tmplbase";
sub gettemplate {
- my ( $tmplbase, $interface, $query ) = @_;
+ my ( $tmplbase, $interface, $query, $is_plugin ) = @_;
($query) or warn "no query in gettemplate";
my $path = C4::Context->preference('intranet_includes') || 'includes';
- my $opacstylesheet = C4::Context->preference('opacstylesheet');
$tmplbase =~ s/\.tmpl$/.tt/;
my ($htdocs, $theme, $lang, $filename)
= _get_template_file($tmplbase, $interface, $query);
+ $filename = $tmplbase if ( $is_plugin );
my $template = C4::Templates->new($interface, $filename, $tmplbase, $query);
- my $is_intranet = $interface eq 'intranet';
- my $themelang =
- ($is_intranet ? '/intranet-tmpl' : '/opac-tmpl') .
- "/$theme/$lang";
- $template->param(
- themelang => $themelang,
- yuipath => C4::Context->preference("yuipath") eq "local"
- ? "$themelang/lib/yui"
- : C4::Context->preference("yuipath"),
- interface => $is_intranet ? '/intranet-tmpl' : '/opac-tmpl',
- theme => $theme,
- lang => $lang
- );
+
+# NOTE: Commenting these out rather than deleting them so that those who need
+# to know how we previously shimmed these directories will be able to understand.
+# my $is_intranet = $interface eq 'intranet';
+# my $themelang =
+# ($is_intranet ? '/intranet-tmpl' : '/opac-tmpl') .
+# "/$theme/$lang";
+# $template->param(
+# themelang => $themelang,
+# yuipath => C4::Context->preference("yuipath") eq "local"
+# ? "$themelang/lib/yui"
+# : C4::Context->preference("yuipath"),
+# interface => $is_intranet ? '/intranet-tmpl' : '/opac-tmpl',
+# theme => $theme,
+# lang => $lang
+# );
# Bidirectionality
my $current_lang = regex_lang_subtags($lang);
for my $theme (@themes) {
if ( -e "$htdocs/$theme/$lang/modules/$tmpl" ) {
$_current_language = $lang;
- return ($theme, $lang)
+ return ($theme, $lang, \@themes)
}
}
# Otherwise, return prog theme in English 'en'
- return ('prog', 'en');
+ return ('prog', 'en', \@themes);
}
my $cookie = $query->cookie(
-name => 'KohaOpacLanguage',
-value => $language,
- -expires => ''
+ -HttpOnly => 1,
+ -expires => '+3y'
);
print $query->redirect(
-uri => $uri,
);
}
+=head2 getlanguagecookie
+
+ my $cookie = getlanguagecookie($query,$language);
+
+Returns a cookie object containing the calculated language to be used.
+
+=cut
+
+sub getlanguagecookie {
+ my ( $query, $language ) = @_;
+ my $cookie = $query->cookie(
+ -name => 'KohaOpacLanguage',
+ -value => $language,
+ -HttpOnly => 1,
+ -expires => '+3y'
+ );
+
+ return $cookie;
+}
+
+=head2 getlanguage
+
+ Select a language based on the URL parameter 'language', a cookie,
+ syspref available languages & browser
+
+=cut
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 $preference_to_check =
+ $interface eq 'intranet' ? 'language' : 'opaclanguages';
+ # Get the available/valid languages list
+ my @languages = split /,/, C4::Context->preference($preference_to_check);
my $lang;
+ # Chose language from the URL
+ $lang = $query->param( 'language' );
+ if ( defined $lang && any { $_ eq $lang } @languages) {
+ return $lang;
+ }
+
# cookie
if ( $query->cookie('KohaOpacLanguage') ) {
$lang = $query->cookie('KohaOpacLanguage');
}
# HTTP_ACCEPT_LANGUAGE
- unless ($lang) {
- my $http_accept_language = $ENV{ HTTP_ACCEPT_LANGUAGE };
- $lang = accept_language( $http_accept_language,
- getTranslatedLanguages($interface,'prog') );
+ if ( !$lang && $ENV{HTTP_ACCEPT_LANGUAGE} ) {
+ $lang = accept_language( $ENV{HTTP_ACCEPT_LANGUAGE},
+ getTranslatedLanguages( $interface, 'prog' ) );
}
# Ignore a lang not selected in sysprefs
- $lang = undef unless first { $_ eq $lang } @languages;
+ if ( $lang && any { $_ eq $lang } @languages ) {
+ return $lang;
+ }
- # Fall back to English if necessary
- $lang = 'en' unless $lang;
+ # Pick the first selected syspref language
+ $lang = shift @languages;
+ return $lang if $lang;
- return $lang;
+ # Fall back to English if necessary
+ return 'en';
}
1;
-
projects / koha.git / blobdiff