From 542ab0bce949eba3abc98ff1c433fe6099db105d Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 17 Sep 2015 12:45:15 +0100 Subject: [PATCH] Bug 5371: Force no caching for private pages at the OPAC MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 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 Signed-off-by: Tomas Cohen Arazi --- 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 e575650058..02bd4dce44 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 296ac7d7c4..d41b7a7fe9 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 b82df1b044..64abf2189e 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 b8d8a4fe6a..da4238e76b 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 f696208ec4..9a18afa47a 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 dadbf6f9ba..fa28a697bc 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 56e99675e4..c1d8ecd25e 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 2f660ac4de..6b8c495594 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 4dff9a2d23..51feeeed7e 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 6878068042..7df51d90ec 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 28e73de023..c6935dee05 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 }; -- 2.39.5