From 75f0cc57717397dc5d56418d7c9bddbd58f192e1 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 3 Apr 2014 15:54:30 +0200 Subject: [PATCH] Bug 11944: Some refresh don't indicate the charset to use This patch replaces occurrences of META HTTP-EQUIV=Refresh with a redirection. Note: The list of modified files has been got with the following grep: git grep Content-Type | grep -v -i utf | grep Refresh | grep -v translator | grep -v \.js Test plan: 1) admin/auth_tag_structure.pl - Go on an authority MARC framework for an authority type (admin/auth_tag_structure.pl?authtypecode=CO for instance) - Click on the "Add a new tag" button - Fill fields - Save - You should be redirected on the auth_tag_structure.pl page - Try to modify an existing tag - The redirection should be done 2) admin/auth_subfields_structure.pl - From the previous page, click on a "subfields" link - Edit/Add a new subfields - Save - You should be redirected to the subfield list - Delete a subfield - You should be redirected to the subfield list 3) admin/authorised_values.pl - Add/Edit an authorised value - Save - You should be redirected to the authorised value list (with the right category selected) 4) admin/categorie.pl - Add/Edit a patron category - Save - You should be redirected to the category list - Delete a patron category - You should be redirected to the category list 5) admin/koha2marclinks.pl - Go on the Koha to MARC mapping configuration page - Edit a field - Map a field and click on "OK" - You should be redirected to the list 6) admin/marc_subfields_structure.pl - Go on the MARC frameworks page - Click on "MARC structure" for one on the list - Click on "Subfields" for one on the list - Add/Edit a subfield - Save - You should be redirected to the subfield list 7) admin/systempreferences.pl - Go on the system preferences admin page - Click on the "Local use" tab - Add/Edit a pref - Save - You shold be redirected to the Local use preference list 8) serials/subscription-detail.pl - Go on a subscription detail page - Delete the subscription (using Edit > Delete subscription) - You should be redirected on the serials home page Signed-off-by: Paola Rossi Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Dobrica Pavlinusic Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi --- admin/auth_subfields_structure.pl | 9 ++++----- admin/auth_tag_structure.pl | 5 +++-- admin/authorised_values.pl | 11 ++++++----- admin/categorie.pl | 5 ++--- admin/koha2marclinks.pl | 3 +-- admin/marc_subfields_structure.pl | 7 ++----- admin/marctagstructure.pl | 4 ++-- admin/systempreferences.pl | 2 +- serials/subscription-detail.pl | 4 ++-- 9 files changed, 23 insertions(+), 27 deletions(-) diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl index 96088bd..0376a0f 100755 --- a/admin/auth_subfields_structure.pl +++ b/admin/auth_subfields_structure.pl @@ -348,8 +348,8 @@ if ($op eq 'add_form') { } } } - print "Content-Type: text/html\n\n"; - exit; + print $input->redirect("/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=$tagfield&authtypecode=$authtypecode"); + exit; # END $OP eq ADD_VALIDATE ################## DELETE_CONFIRM ################################## @@ -373,9 +373,8 @@ if ($op eq 'add_form') { my $sth=$dbh->prepare("delete from auth_subfield_structure where tagfield=? and tagsubfield=? and authtypecode=?"); $sth->execute($tagfield,$tagsubfield,$authtypecode); } - print "Content-Type: text/html\n\n"; - exit; - $template->param(tagfield => $tagfield); + print $input->redirect("/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=$tagfield&authtypecode=$authtypecode"); + exit; # END $OP eq DELETE_CONFIRMED ################## DEFAULT ################################## } else { # DEFAULT diff --git a/admin/auth_tag_structure.pl b/admin/auth_tag_structure.pl index faf0727..bd9ed32 100755 --- a/admin/auth_tag_structure.pl +++ b/admin/auth_tag_structure.pl @@ -158,7 +158,7 @@ if ($op eq 'add_form') { ); } } - print "Content-Type: text/html\n\nparam('tagfield')."&authtypecode=$authtypecode\">"; + print $input->redirect("/cgi-bin/koha/admin/auth_tag_structure.pl?searchfield=$tagfield&authtypecode=$authtypecode"); exit; # END $OP eq ADD_VALIDATE ################## DELETE_CONFIRM ################################## @@ -181,7 +181,8 @@ if ($op eq 'add_form') { my $sth = $dbh->prepare("delete from auth_subfield_structure where tagfield=? and authtypecode=?"); $sth->execute($searchfield,$authtypecode); } - print "Content-Type: text/html\n\nparam('tagfield')."&authtypecode=$authtypecode\">"; + my $tagfield = $input->param('tagfield'); + print $input->redirect("/cgi-bin/koha/admin/auth_tag_structure.pl?searchfield=$tagfield&authtypecode=$authtypecode"); exit; # END $OP eq DELETE_CONFIRMED ################## ITEMTYPE_CREATE ################################## diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl index 35afaca..090fe90 100755 --- a/admin/authorised_values.pl +++ b/admin/authorised_values.pl @@ -162,7 +162,7 @@ if ($op eq 'add_form') { } } $sth->finish; - print "Content-Type: text/html\n\n"; + print $input->redirect("/cgi-bin/koha/admin/authorised_values.pl?searchfield=$new_category&offset=$offset"); exit; } } @@ -192,8 +192,9 @@ if ($op eq 'add_form') { $sth->execute($id, $branchcode); } } - print "Content-Type: text/html\n\nparam('category')."&offset=$offset\">"; - exit; + my $category = $input->param('category'); + print $input->redirect("/cgi-bin/koha/admin/authorised_values.pl?searchfield=$category&offset=$offset"); + exit; } } if ( $duplicate_entry ) { @@ -224,8 +225,8 @@ if ($op eq 'add_form') { my $id = $input->param('id'); my $sth=$dbh->prepare("delete from authorised_values where id=?"); $sth->execute($id); - print "Content-Type: text/html\n\n"; - exit; + print $input->redirect("/cgi-bin/koha/admin/authorised_values.pl?searchfield=$searchfield&offset=$offset"); + exit; # END $OP eq DELETE_CONFIRMED ################## DEFAULT ################################## } else { # DEFAULT diff --git a/admin/categorie.pl b/admin/categorie.pl index 1b4ad85..8fb5c64 100755 --- a/admin/categorie.pl +++ b/admin/categorie.pl @@ -267,8 +267,7 @@ elsif ( $op eq 'add_validate' ) { C4::Form::MessagingPreferences::handle_form_action( $input, { categorycode => $input->param('categorycode') }, $template ); } - - print "Content-Type: text/html\n\n"; + print $input->redirect("/cgi-bin/koha/admin/categorie.pl"); exit; # END $OP eq ADD_VALIDATE @@ -305,7 +304,7 @@ elsif ( $op eq 'delete_confirmed' ) { $sth->execute($categorycode); $sth->finish; - print "Content-Type: text/html\n\n"; + print $input->redirect("/cgi-bin/koha/admin/categorie.pl"); exit; # END $OP eq DELETE_CONFIRMED diff --git a/admin/koha2marclinks.pl b/admin/koha2marclinks.pl index 145a0f8..8458ad5 100755 --- a/admin/koha2marclinks.pl +++ b/admin/koha2marclinks.pl @@ -116,8 +116,7 @@ elsif ( $op eq 'add_validate' ) { # We could get a list of all frameworks and do them one-by-one, or zap # everything. $cache->flush_all(); - print -"Content-Type: text/html\n\n"; + print $input->redirect("/cgi-bin/koha/admin/koha2marclinks.pl?tablename=$tablename"); exit; # END $OP eq ADD_VALIDATE diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl index 44a9494..9c23196 100755 --- a/admin/marc_subfields_structure.pl +++ b/admin/marc_subfields_structure.pl @@ -428,8 +428,7 @@ elsif ( $op eq 'add_validate' ) { $cache->clear_from_cache("MarcStructure-0-$frameworkcode"); $cache->clear_from_cache("MarcStructure-1-$frameworkcode"); - print -"Content-Type: text/html\n\n"; + print $input->redirect("/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode"); exit; # END $OP eq ADD_VALIDATE @@ -471,10 +470,8 @@ elsif ( $op eq 'delete_confirmed' ) { } $cache->clear_from_cache("MarcStructure-0-$frameworkcode"); $cache->clear_from_cache("MarcStructure-1-$frameworkcode"); - print -"Content-Type: text/html\n\n"; + print $input->redirect("/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode"); exit; - $template->param( tagfield => $tagfield ); # END $OP eq DELETE_CONFIRMED ################## DEFAULT ################################## diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl index 21395c2..d195718 100755 --- a/admin/marctagstructure.pl +++ b/admin/marctagstructure.pl @@ -164,9 +164,9 @@ if ($op eq 'add_form') { } $cache->clear_from_cache("MarcStructure-0-$frameworkcode"); $cache->clear_from_cache("MarcStructure-1-$frameworkcode"); - } + } print $input->redirect("/cgi-bin/koha/admin/marctagstructure.pl?searchfield=$tagfield&frameworkcode=$frameworkcode"); - exit; + exit; # END $OP eq ADD_VALIDATE ################## DELETE_CONFIRM ################################## # called by default form, used to confirm deletion of data in DB diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl index f41fe76..1ac1b72 100755 --- a/admin/systempreferences.pl +++ b/admin/systempreferences.pl @@ -357,7 +357,7 @@ if ( $op eq 'add_form' ) { logaction( 'SYSTEMPREFERENCE', 'ADD', undef, $input->param('variable') . " | " . $value ); } } - print "Content-Type: text/html\n\n"; + print $input->redirect("/cgi-bin/koha/admin/systempreferences.pl?tab="); exit; ################## DELETE_CONFIRM ################################## # called by default form, used to confirm deletion of data in DB diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl index 7296e2e..a3186cb 100755 --- a/serials/subscription-detail.pl +++ b/serials/subscription-detail.pl @@ -88,8 +88,8 @@ if ($op eq 'del') { # If it's ok to delete the subscription, we do so if ($issueconfirmed eq "1") { &DelSubscription($subscriptionid); - print "Content-Type: text/html\n\n"; - exit; + print $query->redirect("/cgi-bin/koha/serials/serials-home.pl"); + exit; } } my $hasRouting = check_routing($subscriptionid); -- 2.1.0