(Bug 4049) Searching itemtypes returning noise

[koha_fer] / opac / opac-main.pl

diff --git a/opac/opac-main.pl b/opac/opac-main.pl
index c4a44e9..177d812 100755 (executable)
--- a/opac/opac-main.pl
+++ b/opac/opac-main.pl
@@ -36,21 +36,24 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-main.tmpl",
         type            => "opac",
         query           => $input,
-        authnotrequired => 1,
+        authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
         flagsrequired   => { borrow => 1 },
     }
 );
 
-my $borrower = GetMember( 'borrowernumber'=> $borrowernumber );
+my $casAuthentication = C4::Context->preference('casAuthentication');
+$template->param(
+    casAuthentication   => $casAuthentication,
+);
+
+
+my $borrower = GetMember( borrowernumber=>$borrowernumber );
 $template->param(
     textmessaging        => $borrower->{textmessaging},
 ) if (ref($borrower) eq "HASH");
 
 # display news
 # use cookie setting for language, bug default to syspref if it's not set
-<<<<<<< HEAD:opac/opac-main.pl
-my $news_lang = $input->cookie('KohaOpacLanguage') || 'en';
-=======
 (my $theme) = themelanguage(C4::Context->config('opachtdocs'),'opac-main.tmpl','opac',$input);
 
 my $translations = getTranslatedLanguages('opac',$theme);
@@ -64,20 +67,21 @@ my $news_lang;
 if($input->cookie('KohaOpacLanguage')){
     $news_lang = $input->cookie('KohaOpacLanguage');
 }else{
-    while( !$news_lang && ( $ENV{HTTP_ACCEPT_LANGUAGE} =~ m/([a-zA-Z]{2,}-?[a-zA-Z]*)(;|,)?/g ) ){
-        if( my @lang = grep { /^$1$/i } @languages ) {
-            $news_lang = $lang[0];
+    if ($ENV{HTTP_ACCEPT_LANGUAGE}) {
+        while( !$news_lang && ( $ENV{HTTP_ACCEPT_LANGUAGE} =~ m/([a-zA-Z]{2,}-?[a-zA-Z]*)(;|,)?/g ) ){
+            if( my @lang = grep { /^$1$/i } @languages ) {
+                $news_lang = $lang[0];
+            }
         }
     }
     if (not $news_lang) {
         my @languages = split ",", C4::Context->preference("opaclanguages");
-        $news_lang = @languages[0];
+        $news_lang = $languages[0];
     }
 }
 
 $news_lang = $news_lang ? $news_lang : 'en' ;
 
->>>>>>> e25ac14... (bug #3655) fix news language detection:opac/opac-main.pl
 my $all_koha_news   = &GetNewsToDisplay($news_lang);
 my $koha_news_count = scalar @$all_koha_news;
 
@@ -86,7 +90,7 @@ $template->param(
     koha_news_count => $koha_news_count
 );
 
-# If GoogleIndicTransliteration system preference is On Set paramter to load Google's javascript in OPAC search screens 
+# If GoogleIndicTransliteration system preference is On Set paramter to load Google's javascript in OPAC search screens
 if (C4::Context->preference('GoogleIndicTransliteration')) {
         $template->param('GoogleIndicTransliteration' => 1);
 }