Bug Fixing : Bullet Proofing

[koha.git] / opac / opac-main.pl

diff --git a/opac/opac-main.pl b/opac/opac-main.pl
index d72e55b..ec2be65 100755 (executable)
--- a/opac/opac-main.pl
+++ b/opac/opac-main.pl
@@ -17,7 +17,7 @@
 
 
 use strict;
-require Exporter;
+use warnings;
 use CGI;
 use C4::Auth;    # get_template_and_user
 use C4::Output;
@@ -26,6 +26,7 @@ use C4::Branch;          # GetBranches
 use C4::Members;         # GetMember
 use C4::NewsChannels;    # get_opac_news
 use C4::Acquisition;     # GetRecentAcqui
+use C4::Languages qw(getTranslatedLanguages);
 
 my $input = new CGI;
 my $dbh   = C4::Context->dbh;
@@ -43,11 +44,32 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 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
-my $news_lang = $input->cookie('KohaOpacLanguage') || 'en';
+(my $theme) = themelanguage(C4::Context->config('opachtdocs'),'opac-main.tmpl','opac',$input);
+
+my $translations = getTranslatedLanguages('opac',$theme);
+my @languages = ();
+foreach my $trans (@$translations)
+{
+    push(@languages, $trans->{rfc4646_subtag});
+}
+
+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];
+        }
+    }
+}
+
+$news_lang = $news_lang ? $news_lang : 'en' ;
+
 my $all_koha_news   = &GetNewsToDisplay($news_lang);
 my $koha_news_count = scalar @$all_koha_news;
 
@@ -56,8 +78,9 @@ $template->param(
     koha_news_count => $koha_news_count
 );
 
-$template->param(
-    'Disable_Dictionary' => C4::Context->preference("Disable_Dictionary") )
-  if ( C4::Context->preference("Disable_Dictionary") );
+# 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);
+}
 
 output_html_with_http_headers $input, $cookie, $template->output;