From 80c433c4449469831c95a9d59ef952ef161cb96a 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 (cherry picked from commit 542ab0bce949eba3abc98ff1c433fe6099db105d) Signed-off-by: Frédéric Demians --- 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 9c0717d924..af64ffdf77 100755 --- a/opac/opac-account.pl +++ b/opac/opac-account.pl @@ -75,5 +75,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 89e12286ae..84978abd6a 100755 --- a/opac/opac-basket.pl +++ b/opac/opac-basket.pl @@ -136,4 +136,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 800222cd4b..200c3df671 100755 --- a/opac/opac-discharge.pl +++ b/opac/opac-discharge.pl @@ -95,4 +95,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 9a82fc6268..a6e39b7752 100755 --- a/opac/opac-memberentry.pl +++ b/opac/opac-memberentry.pl @@ -231,7 +231,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 393acd3b5f..48dda6eed5 100755 --- a/opac/opac-mymessages.pl +++ b/opac/opac-mymessages.pl @@ -48,4 +48,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 d16a554927..478509628a 100755 --- a/opac/opac-passwd.pl +++ b/opac/opac-passwd.pl @@ -111,7 +111,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 0f2c6c800d..dc9b1a5ded 100755 --- a/opac/opac-privacy.pl +++ b/opac/opac-privacy.pl @@ -77,4 +77,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 eac5b94202..f4f8532925 100755 --- a/opac/opac-reserve.pl +++ b/opac/opac-reserve.pl @@ -592,5 +592,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 18dfec64e1..8dc222d0df 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -397,5 +397,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