Bug 25898: Prohibit indirect object notation

[srvgit] / opac / opac-main.pl

diff --git a/opac/opac-main.pl b/opac/opac-main.pl
index a58659c..c572866 100755 (executable)
--- a/opac/opac-main.pl
+++ b/opac/opac-main.pl
@@ -19,23 +19,27 @@
 
 
 use Modern::Perl;
-use CGI;
+use CGI qw ( -utf8 );
 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(
     {
-        template_name   => "opac-main.tmpl",
+        template_name   => "opac-main.tt",
         type            => "opac",
         query           => $input,
         authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
-        flagsrequired   => { borrow => 1 },
     }
 );
 
@@ -44,34 +48,58 @@ $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'};
 }
-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
+if (defined $input->param('branch') and length $input->param('branch')) {
+    $homebranch = $input->param('branch');
+}
+elsif (C4::Context->userenv and defined $input->param('branch') and length $input->param('branch') == 0 ){
+   $homebranch = "";
+}
 
-$template->param(
-    koha_news           => $all_koha_news,
-    koha_news_count     => $koha_news_count,
-    display_daily_quote => C4::Context->preference('QuoteOfTheDay'),
-    daily_quote         => $quote,
-);
+my $news_id = $input->param('news_id');
+my @all_koha_news;
 
-# 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 (defined $news_id){
+    @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( $template->lang, $homebranch);
 }
 
-if (C4::Context->preference('OPACNumbersPreferPhrase')) {
-        $template->param('numbersphr' => 1);
+# For dashboard
+my $patron = Koha::Patrons->find( $borrowernumber );
+
+if ( $patron ) {
+    my $checkouts = Koha::Checkouts->search({ borrowernumber => $borrowernumber })->count;
+    my ( $overdues_count, $overdues ) = checkoverdues($borrowernumber);
+    my $holds_pending = Koha::Holds->search({ borrowernumber => $borrowernumber, found => undef })->count;
+    my $holds_waiting = Koha::Holds->search({ borrowernumber => $borrowernumber })->waiting->count;
+
+    my $total = $patron->account->balance;
+
+    if  ( $checkouts > 0 || $overdues_count > 0 || $holds_pending > 0 || $holds_waiting > 0 || $total > 0 ) {
+        $template->param(
+            dashboard_info => 1,
+            checkouts           => $checkouts,
+            overdues            => $overdues_count,
+            holds_pending       => $holds_pending,
+            holds_waiting       => $holds_waiting,
+            total_owing         => $total,
+        );
+    }
 }
 
+$template->param(
+    koha_news           => @all_koha_news,
+    branchcode          => $homebranch,
+    daily_quote         => Koha::Quotes->get_daily_quote(),
+);
+
 output_html_with_http_headers $input, $cookie, $template->output;