Bug 25898: Prohibit indirect object notation

[srvgit] / opac / opac-main.pl

diff --git a/opac/opac-main.pl b/opac/opac-main.pl
index e651a55..c572866 100755 (executable)
--- a/opac/opac-main.pl
+++ b/opac/opac-main.pl
@@ -24,14 +24,14 @@ use C4::Auth;    # get_template_and_user
 use C4::Output;
 use C4::NewsChannels;    # GetNewsToDisplay
 use C4::Languages qw(getTranslatedLanguages accept_language);
-use C4::Koha qw( GetDailyQuote );
+use Koha::Quotes;
 use C4::Members;
 use C4::Overdues;
 use Koha::Checkouts;
 use Koha::Holds;
 use Koha::News;
 
-my $input = new CGI;
+my $input = CGI->new;
 my $dbh   = C4::Context->dbh;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
@@ -48,10 +48,6 @@ $template->param(
     casAuthentication   => $casAuthentication,
 );
 
-# display news
-# use cookie setting for language, bug default to syspref if it's not set
-my ($theme, $news_lang, $availablethemes) = C4::Templates::themelanguage(C4::Context->config('opachtdocs'),'opac-main.tt','opac',$input);
-
 my $homebranch;
 if (C4::Context->userenv) {
     $homebranch = C4::Context->userenv->{'branch'};
@@ -67,21 +63,16 @@ my $news_id = $input->param('news_id');
 my @all_koha_news;
 
 if (defined $news_id){
-    @all_koha_news = Koha::News->search({
-        idnew => $news_id,
-        lang  => $news_lang,
-    });
-    if (scalar @all_koha_news > 0){
-        $template->param( news_item => @all_koha_news );
+    @all_koha_news = Koha::News->search({ idnew => $news_id, lang => { '!=', 'koha' } }); # get news that is not staff-only news
+    if( @all_koha_news ) { # we only expect one btw
+        $template->param( news_item => $all_koha_news[0] );
     } else {
         $template->param( single_news_error => 1 );
     }
 } else {
-    @all_koha_news   = &GetNewsToDisplay($news_lang,$homebranch);
+    @all_koha_news   = &GetNewsToDisplay( $template->lang, $homebranch);
 }
 
-my $quote = GetDailyQuote();   # other options are to pass in an exact quote id or select a random quote each pass... see perldoc C4::Koha
-
 # For dashboard
 my $patron = Koha::Patrons->find( $borrowernumber );
 
@@ -108,13 +99,7 @@ if ( $patron ) {
 $template->param(
     koha_news           => @all_koha_news,
     branchcode          => $homebranch,
-    display_daily_quote => C4::Context->preference('QuoteOfTheDay'),
-    daily_quote         => $quote,
+    daily_quote         => Koha::Quotes->get_daily_quote(),
 );
 
-# If GoogleIndicTransliteration system preference is On Set parameter 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;