Bug 15451: Koha::CsvProfiles - Remove GetCsvProfilesLoop

[srvgit] / opac / opac-readingrecord.pl

diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index 4f16c66..ca37612 100755 (executable)
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -2,24 +2,24 @@
 
 # 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 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.
 #
-# 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 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# 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 CGI;
+use CGI qw ( -utf8 );
 
 use C4::Auth;
 use C4::Koha;
@@ -33,13 +33,19 @@ use C4::Output;
 use C4::Charset qw(StripNonXmlChars);
 
 my $query = new CGI;
+
+# if opacreadinghistory is disabled, leave immediately
+if ( ! C4::Context->preference('opacreadinghistory') ) {
+    print $query->redirect("/cgi-bin/koha/errors/404.pl");
+    exit;
+}
+
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-readingrecord.tmpl",
+        template_name   => "opac-readingrecord.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 0,
-        flagsrequired   => { borrow => 1 },
         debug           => 1,
     }
 );
@@ -66,6 +72,7 @@ else {
 
 
 my $limit = $query->param('limit');
+$limit //= '';
 $limit = ( $limit eq 'full' ) ? 0 : 50;
 
 my $issues = GetAllIssues( $borrowernumber, $order, $limit );
@@ -77,8 +84,8 @@ my $opac_summary_html = C4::Context->preference('OPACMySummaryHTML');
 foreach my $issue ( @{$issues} ) {
     $issue->{normalized_isbn} = GetNormalizedISBN( $issue->{isbn} );
     if ( $issue->{$itype_attribute} ) {
-        $issue->{description} =
-          $itemtypes->{ $issue->{$itype_attribute} }->{description};
+        $issue->{translated_description} =
+          $itemtypes->{ $issue->{$itype_attribute} }->{translated_description};
         $issue->{imageurl} =
           getitemtypeimagelocation( 'opac',
             $itemtypes->{ $issue->{$itype_attribute} }->{imageurl} );
@@ -90,6 +97,7 @@ foreach my $issue ( @{$issues} ) {
             C4::Context->preference('marcflavour') );
         $issue->{subtitle} =
           GetRecordValue( 'subtitle', $marc_rec, $issue->{frameworkcode} );
+        $issue->{normalized_upc} = GetNormalizedUPC( $marc_rec, C4::Context->preference('marcflavour') );
     }
     # My Summary HTML
     if ($opac_summary_html) {
@@ -139,9 +147,8 @@ for(qw(AmazonCoverImages GoogleJackets)) {  # BakerTaylorEnabled handled above
 $template->param(
     READING_RECORD => $issues,
     limit          => $limit,
-    showfulllink   => 1,
     readingrecview => 1,
     OPACMySummaryHTML => $opac_summary_html ? 1 : 0,
 );
 
-output_html_with_http_headers $query, $cookie, $template->output;
+output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };