X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-main.pl;h=5d6c2e1c9a8a0d59b60c14fa50076d595505f4ea;hb=93ccaaf690d38e531baae78e114adc250961d8b5;hp=755652d3719e392c78ee98b12beb64f0a0f2bc5c;hpb=e02fd93801864882b52b730dc6c71f993847b538;p=koha_gimpoz

diff --git a/opac/opac-main.pl b/opac/opac-main.pl
index 755652d371..5d6c2e1c9a 100755
--- a/opac/opac-main.pl
+++ b/opac/opac-main.pl
@@ -1,86 +1,63 @@
 #!/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::NewsChannels;    # get_opac_news
+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  @itemtypeloop;
-my %itemtypes;
-while (my ($value,$lib) = $sth->fetchrow_array) {
-	my %row =(	value => $value,
-				description => $lib,
-			);
-	push @itemtypeloop, \%row;
-}
-$sth->finish;
+my $dbh   = C4::Context->dbh;
 
-my @branches;
-my @select_branch;
-my %select_branches;
-my $branches = getallbranches();
-my @branchloop;
-foreach my $thisbranch (keys %$branches) {
-        my $selected = 1 if (C4::Context->userenv && ($thisbranch eq C4::Context->userenv->{branch}));
-        my %row =(value => $thisbranch,
-                                selected => $selected,
-                                branchname => $branches->{$thisbranch}->{'branchname'},
-                        );
-        push @branchloop, \%row;
-}
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "opac-main.tmpl",
+        type            => "opac",
+        query           => $input,
+        authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
+        flagsrequired   => { borrow => 1 },
+    }
+);
 
-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';
-	next if $language eq 'CVS';
-	next if $language=~ /png$/;
-	next if $language=~ /css$/;
-	my $selected='0';
-#                            next if $currently_selected_languages->{$language};
-	push @options, { language => $language, counter => $counter };
-	$counter++;
-}
-my $languages_count = @options;
+my $casAuthentication = C4::Context->preference('casAuthentication');
+$template->param(
+    casAuthentication   => $casAuthentication,
+);
 
-if($languages_count > 1){
-		$template->param(languages => \@options);
-}
-$template->param(CGIitemtype => $CGIitemtype,
-				suggestion => C4::Context->preference("suggestion"),
-				virtualshelves => C4::Context->preference("virtualshelves"),
-				textmessaging => $borrower->{textmessaging},
-				opaclargeimage => C4::Context->preference("opaclargeimage"),
-				LibraryName => C4::Context->preference("LibraryName"),
-				OpacNav => C4::Context->preference("OpacNav"),
-				opaccredits => C4::Context->preference("opaccredits"),
-				opacreadinghistory => C4::Context->preference("opacreadinghistory"),
-				opacsmallimage => C4::Context->preference("opacsmallimage"),
-				opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
-				opaccolorstylesheet => C4::Context->preference("opaccolorstylesheet"),
-				opaclanguagesdisplay => C4::Context->preference("opaclanguagesdisplay"),
+
+# display news
+# use cookie setting for language, bug default to syspref if it's not set
+my ($theme, $news_lang) = C4::Templates::themelanguage(C4::Context->config('opachtdocs'),'opac-main.tt','opac',$input);
+
+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
 );
 
-$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;