Bug 12508: adding an error message if a contract cannot be removed

[koha_fer] / opac / opac-main.pl

diff --git a/opac/opac-main.pl b/opac/opac-main.pl
index c4a44e9..a58659c 100755 (executable)
--- a/opac/opac-main.pl
+++ b/opac/opac-main.pl
@@ -2,31 +2,29 @@
 
 # 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.
+# Parts Copyright (C) 2013  Mark Tompsett
 #
-# 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.
+# 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 3 of the License, or
+# (at your option) any later version.
 #
-# 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
+# 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, see <http://www.gnu.org/licenses>.
 
 
-use strict;
-use warnings;
+use Modern::Perl;
 use CGI;
 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::NewsChannels;    # GetNewsToDisplay
 use C4::Languages qw(getTranslatedLanguages accept_language);
+use C4::Koha qw( GetDailyQuote );
 
 my $input = new CGI;
 my $dbh   = C4::Context->dbh;
@@ -36,59 +34,44 @@ 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(
-    textmessaging        => $borrower->{textmessaging},
-) if (ref($borrower) eq "HASH");
+    casAuthentication   => $casAuthentication,
+);
+
 
 # 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 ($theme, $news_lang, $availablethemes) = C4::Templates::themelanguage(C4::Context->config('opachtdocs'),'opac-main.tt','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];
-        }
-    }
-    if (not $news_lang) {
-        my @languages = split ",", C4::Context->preference("opaclanguages");
-        $news_lang = @languages[0];
-    }
+my $homebranch;
+if (C4::Context->userenv) {
+    $homebranch = C4::Context->userenv->{'branch'};
 }
-
-$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 $all_koha_news   = &GetNewsToDisplay($news_lang,$homebranch);
 my $koha_news_count = scalar @$all_koha_news;
 
+my $quote = GetDailyQuote();   # other options are to pass in an exact quote id or select a random quote each pass... see perldoc C4::Koha
+
 $template->param(
-    koha_news       => $all_koha_news,
-    koha_news_count => $koha_news_count
+    koha_news           => $all_koha_news,
+    koha_news_count     => $koha_news_count,
+    display_daily_quote => C4::Context->preference('QuoteOfTheDay'),
+    daily_quote         => $quote,
 );
 
-# 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);
 }
 
+if (C4::Context->preference('OPACNumbersPreferPhrase')) {
+        $template->param('numbersphr' => 1);
+}
+
 output_html_with_http_headers $input, $cookie, $template->output;