X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-main.pl;h=f724b9daa4e61500dc674615ca049d5c8f1670db;hb=a3e0c11fe478c07a357835ac87a7f58f60f05b6d;hp=1f6adbc8f110cf5cb3bc2ec6d84821a19d2fbd81;hpb=52401c43238b9d6a40cddfab0ea2c4f987ff4f21;p=koha.git

diff --git a/opac/opac-main.pl b/opac/opac-main.pl
index 1f6adbc8f1..f724b9daa4 100755
--- a/opac/opac-main.pl
+++ b/opac/opac-main.pl
@@ -1,60 +1,85 @@
 #!/usr/bin/perl
+
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+
 use strict;
-require Exporter;
+use warnings;
 use CGI;
-use HTML::Template;
-
-use C4::Context;
-use C4::Auth;       # get_template_and_user
-use C4::Interface::CGI::Output;
-use C4::BookShelves;
-use C4::Koha;
-use C4::Members;
+use C4::Auth;    # get_template_and_user
+use C4::Output;
+use C4::VirtualShelves;
+use C4::Branch;          # GetBranches
+use C4::Members;         # GetMember
+use C4::NewsChannels;    # get_opac_news
+use C4::Acquisition;     # GetRecentAcqui
+use C4::Languages qw(getTranslatedLanguages accept_language);
 
 my $input = new CGI;
-my $kohaVersion = C4::Context->config("kohaversion");
-my $dbh = C4::Context->dbh;
-my $query="Select itemtype,description from itemtypes order by description";
-my $sth=$dbh->prepare($query);
-$sth->execute;
-my  @itemtype;
-my %itemtypes;
-while (my ($value,$lib) = $sth->fetchrow_array) {
-	push @itemtype, $value;
-	$itemtypes{$value}=$lib;
+my $dbh   = C4::Context->dbh;
+
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "opac-main.tmpl",
+        type            => "opac",
+        query           => $input,
+        authnotrequired => 1,
+        flagsrequired   => { borrow => 1 },
+    }
+);
+
+my $borrower = GetMember( $borrowernumber, 'borrowernumber' );
+$template->param(
+    textmessaging        => $borrower->{textmessaging},
+);
+
+# display news
+# use cookie setting for language, bug default to syspref if it's not set
+(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 $CGIitemtype=CGI::scrolling_list( -name     => 'value',
-			-values   => \@itemtype,
-			-labels   => \%itemtypes,
-			-size     => 1,
-			-multiple => 0 );
-$sth->finish;
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "opac-main.tmpl",
-			     type => "opac",
-			     query => $input,
-			     authnotrequired => 1,
-			     flagsrequired => {borrow => 1},
-			 });
-my $borrower = getmember('',$borrowernumber);
-my @options;
-my $counter=0;
-foreach my $language (getalllanguages()) {
-	next if $language eq 'images';
-	my $selected='0';
-#                            next if $currently_selected_languages->{$language};
-	push @options, { language => $language, counter => $counter };
-	$counter++;
+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 (not $news_lang) {
+        my @languages = split ",", C4::Context->preference("opaclanguages");
+        $news_lang = @languages[0];
+    }
 }
 
-$template->param(CGIitemtype => $CGIitemtype,
-				suggestion => C4::Context->preference("suggestion"),
-				virtualshelves => C4::Context->preference("virtualshelves"),
-				languages => \@options,
-				textmessaging => $borrower->{textmessaging},
-				opaclargeimage => C4::Context->preference("opaclargeimage"),
-                                kohaversion => $kohaVersion
+$news_lang = $news_lang ? $news_lang : 'en' ;
+
+my $all_koha_news   = &GetNewsToDisplay($news_lang);
+my $koha_news_count = scalar @$all_koha_news;
+
+$template->param(
+    koha_news       => $all_koha_news,
+    koha_news_count => $koha_news_count
 );
+
 output_html_with_http_headers $input, $cookie, $template->output;