View | Details | Raw Unified | Return to bug 7282
Collapse All | Expand All

(-)a/C4/Templates.pm (-15 / +5 lines)
Lines 277-284 sub themelanguage { Link Here
277
    my @languages = split(",", C4::Context->preference(
277
    my @languages = split(",", C4::Context->preference(
278
        $is_intranet ? 'language' : 'opaclanguages'));
278
        $is_intranet ? 'language' : 'opaclanguages'));
279
    my $lang;
279
    my $lang;
280
    $lang = getlanguagecookie($query);
280
    if ( $query->cookie('KohaOpacLanguage') ) {
281
    unless ($lang) {
281
        $lang = $query->cookie('KohaOpacLanguage') ;
282
        $lang =~ s/[^a-zA-Z_-]*//; #sanitzie
283
    }
284
    else {
282
        my $http_accept_language = $ENV{ HTTP_ACCEPT_LANGUAGE };
285
        my $http_accept_language = $ENV{ HTTP_ACCEPT_LANGUAGE };
283
        $lang = accept_language( $http_accept_language, 
286
        $lang = accept_language( $http_accept_language, 
284
            getTranslatedLanguages($interface,'prog') );
287
            getTranslatedLanguages($interface,'prog') );
Lines 317-334 sub setlanguagecookie { Link Here
317
    );
320
    );
318
}
321
}
319
322
320
sub getlanguagecookie {
321
    my ($query) = @_;
322
    my $lang;
323
    if ($query->cookie('KohaOpacLanguage')){
324
        $lang = $query->cookie('KohaOpacLanguage') ;
325
    }else{
326
        $lang = $ENV{HTTP_ACCEPT_LANGUAGE};
327
        
328
    }
329
    $lang =~ s/[^a-zA-Z_-]*//; #sanitzie
330
    return $lang;
331
}
332
333
1;
323
1;
334
324
(-)a/catalogue/search.pl (-1 / +2 lines)
Lines 471-477 my ( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit Link Here
471
my @results;
471
my @results;
472
472
473
## I. BUILD THE QUERY
473
## I. BUILD THE QUERY
474
my $lang = C4::Templates::getlanguagecookie($cgi);
474
# Language cookie should have been set by previous page
475
my $lang = $cgi->cookie('KohaOpacLanguage') || 'en';
475
( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type) = buildQuery(\@operators,\@operands,\@indexes,\@limits,\@sort_by,$scan,$lang);
476
( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type) = buildQuery(\@operators,\@operands,\@indexes,\@limits,\@sort_by,$scan,$lang);
476
477
477
## parse the query_cgi string and put it into a form suitable for <input>s
478
## parse the query_cgi string and put it into a form suitable for <input>s
(-)a/opac/opac-search.pl (-2 / +2 lines)
Lines 388-394 my ($error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_ Link Here
388
my @results;
388
my @results;
389
389
390
## I. BUILD THE QUERY
390
## I. BUILD THE QUERY
391
my $lang = C4::Templates::getlanguagecookie($cgi);
391
# Language cookie should have been set by previous page
392
my $lang = $cgi->cookie('KohaOpacLanguage') || 'en';
392
( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type) = buildQuery(\@operators,\@operands,\@indexes,\@limits,\@sort_by, 0, $lang);
393
( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type) = buildQuery(\@operators,\@operands,\@indexes,\@limits,\@sort_by, 0, $lang);
393
394
394
sub _input_cgi_parse ($) { 
395
sub _input_cgi_parse ($) { 
395
- 

Return to bug 7282