From afe2b1448caae1fda10146a236baaa4c6c2d0150 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 17 Sep 2015 12:45:15 +0100 Subject: [PATCH] [PASSED QA] Bug 5371: Force no caching for private pages at the OPAC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In order no to slow too much the browsing, it is certainly not a good idea to add this cache-control value for all pages at the OPAC. This patch just adds where the author found it could be useful. Test plan: 1/ Login at the OPAC 2/ Go on the account page (opac/opac-account.pl) 3/ Click log out 4/ Use the back button of your browser Without this patch you will see the previous page. With this patch, the previous page will be reloaded and you will be redirected to the login form. Signed-off-by: Marc VĂ©ron Signed-off-by: Katrin Fischer --- opac/opac-account.pl | 3 +-- opac/opac-basket.pl | 2 +- opac/opac-browser.pl | 2 +- opac/opac-discharge.pl | 2 +- opac/opac-memberentry.pl | 2 +- opac/opac-mymessages.pl | 2 +- opac/opac-passwd.pl | 2 +- opac/opac-privacy.pl | 2 +- opac/opac-reserve.pl | 3 +-- opac/opac-search-history.pl | 2 +- opac/opac-user.pl | 3 +-- 11 files changed, 11 insertions(+), 14 deletions(-) diff --git a/opac/opac-account.pl b/opac/opac-account.pl index e575650..02bd4dc 100755 --- a/opac/opac-account.pl +++ b/opac/opac-account.pl @@ -74,5 +74,4 @@ $template->param ( accountview => 1 ); -output_html_with_http_headers $query, $cookie, $template->output; - +output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 }; diff --git a/opac/opac-basket.pl b/opac/opac-basket.pl index 296ac7d..d41b7a7 100755 --- a/opac/opac-basket.pl +++ b/opac/opac-basket.pl @@ -135,4 +135,4 @@ $template->param( BIBLIO_RESULTS => $resultsarray, ); -output_html_with_http_headers $query, $cookie, $template->output; +output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 }; diff --git a/opac/opac-browser.pl b/opac/opac-browser.pl index b82df1b..64abf21 100755 --- a/opac/opac-browser.pl +++ b/opac/opac-browser.pl @@ -101,4 +101,4 @@ $template->param( have_hierarchy => $have_hierarchy, ); -output_html_with_http_headers $query, $cookie, $template->output; +output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 }; diff --git a/opac/opac-discharge.pl b/opac/opac-discharge.pl index b8d8a4f..da4238e 100755 --- a/opac/opac-discharge.pl +++ b/opac/opac-discharge.pl @@ -99,4 +99,4 @@ else { $template->param( dischargeview => 1 ); -output_html_with_http_headers $input, $cookie, $template->output; +output_html_with_http_headers $input, $cookie, $template->output, undef, { force_no_caching => 1 }; diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl index f696208..9a18afa 100755 --- a/opac/opac-memberentry.pl +++ b/opac/opac-memberentry.pl @@ -244,7 +244,7 @@ $template->param( captcha_digest => md5_base64($captcha) ); -output_html_with_http_headers $cgi, $cookie, $template->output; +output_html_with_http_headers $cgi, $cookie, $template->output, undef, { force_no_caching => 1 }; sub GetHiddenFields { my ($mandatory) = @_; diff --git a/opac/opac-mymessages.pl b/opac/opac-mymessages.pl index dadbf6f..fa28a69 100755 --- a/opac/opac-mymessages.pl +++ b/opac/opac-mymessages.pl @@ -47,4 +47,4 @@ my $messages = C4::Letters::GetRSSMessages( { borrowernumber => $borrowernumber, $template->param( message_list => $messages, ); -output_html_with_http_headers $query, $cookie, $template->output; +output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 }; diff --git a/opac/opac-passwd.pl b/opac/opac-passwd.pl index 56e9967..c1d8ecd 100755 --- a/opac/opac-passwd.pl +++ b/opac/opac-passwd.pl @@ -110,7 +110,7 @@ $template->param(firstname => $borr->{'firstname'}, passwdview => 1, ); -output_html_with_http_headers $query, $cookie, $template->output; +output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 }; sub goodkey { my ( $dbh, $borrowernumber, $key ) = @_; diff --git a/opac/opac-privacy.pl b/opac/opac-privacy.pl index 2f660ac..6b8c495 100755 --- a/opac/opac-privacy.pl +++ b/opac/opac-privacy.pl @@ -75,4 +75,4 @@ $template->param( 'Ask_data' => '1', 'privacyview' => 1, ); -output_html_with_http_headers $query, $cookie, $template->output; +output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 }; diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl index 4dff9a2..51feeee 100755 --- a/opac/opac-reserve.pl +++ b/opac/opac-reserve.pl @@ -584,5 +584,4 @@ if ( ); } -output_html_with_http_headers $query, $cookie, $template->output; - +output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 }; diff --git a/opac/opac-search-history.pl b/opac/opac-search-history.pl index 6878068..7df51d9 100755 --- a/opac/opac-search-history.pl +++ b/opac/opac-search-history.pl @@ -158,4 +158,4 @@ unless ( $loggedinuser ) { $template->param(searchhistoryview => 1); -output_html_with_http_headers $cgi, $cookie, $template->output; +output_html_with_http_headers $cgi, $cookie, $template->output, undef, { force_no_caching => 1 }; diff --git a/opac/opac-user.pl b/opac/opac-user.pl index 28e73de..c6935de 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -398,5 +398,4 @@ $template->param( OpacHoldNotes => C4::Context->preference('OpacHoldNotes'), ); -output_html_with_http_headers $query, $cookie, $template->output; - +output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 }; -- 1.9.1