Attachment 27207 Details for Bug 11944 – Bug 11944: Some refresh don't indicate the charset to use

[patch] Bug 11944: Some refresh don't indicate the charset to use

Bug-11944-Some-refresh-dont-indicate-the-charset-t.patch (text/plain), 11.88 KB, created by Jonathan Druart on 2014-04-16 14:13:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2014-04-16 14:13:35 UTC

Size: 11.88 KB

patch

obsolete

>From f5b1bdf2452b5efcfb13be24975d4754a5e3ddfe Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>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
>---
> admin/auth_subfields_structure.pl |    9 ++++-----
> admin/auth_tag_structure.pl       |    5 +++--
> admin/authorised_values.pl        |   11 ++++++-----
> admin/categorie.pl                |    8 ++++----
> 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, 25 insertions(+), 28 deletions(-)
>
>diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl
>index fb0e59c..4cbb054 100755
>--- a/admin/auth_subfields_structure.pl
>+++ b/admin/auth_subfields_structure.pl
>@@ -473,8 +473,8 @@ if ($op eq 'add_form') {
> 			}
> 		}
> 	}
>-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=auth_subfields_structure.pl?tagfield=$tagfield&authtypecode=$authtypecode\"></html>";
>-	exit;
>+    print $input->redirect("/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=$tagfield&amp;authtypecode=$authtypecode");
>+    exit;
> 
> 													# END $OP eq ADD_VALIDATE
> ################## DELETE_CONFIRM ##################################
>@@ -498,9 +498,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<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=auth_subfields_structure.pl?tagfield=$tagfield&authtypecode=$authtypecode\"></html>";
>-	exit;
>-	$template->param(tagfield => $tagfield);
>+    print $input->redirect("/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=$tagfield&amp;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 ae2d2da..1f60dc5 100755
>--- a/admin/auth_tag_structure.pl
>+++ b/admin/auth_tag_structure.pl
>@@ -165,7 +165,7 @@ if ($op eq 'add_form') {
>            );
>         }
>     }
>-    print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=auth_tag_structure.pl?searchfield=".$input->param('tagfield')."&authtypecode=$authtypecode\">";
>+    print $input->redirect("/cgi-bin/koha/admin/auth_tag_structure.pl?searchfield=$tagfield&amp;authtypecode=$authtypecode");
>     exit;
>                                                     # END $OP eq ADD_VALIDATE
> ################## DELETE_CONFIRM ##################################
>@@ -188,7 +188,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\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=auth_tag_structure.pl?searchfield=".$input->param('tagfield')."&authtypecode=$authtypecode\">";
>+    my $tagfield = $input->param('tagfield');
>+    print $input->redirect("/cgi-bin/koha/admin/auth_tag_structure.pl?searchfield=$tagfield&amp;authtypecode=$authtypecode");
>     exit;
>                                                     # END $OP eq DELETE_CONFIRMED
> ################## ITEMTYPE_CREATE ##################################
>diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl
>index 332f09a..f669301 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<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$new_category."&offset=$offset\"></html>";
>+            print $input->redirect("/cgi-bin/koha/admin/authorised_values.pl?searchfield=$new_category&amp;offset=$offset");
>             exit;
>         }
>     }
>@@ -192,8 +192,9 @@ if ($op eq 'add_form') {
>                     $sth->execute($id, $branchcode);
>                 }
>             }
>-    	    print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$input->param('category')."&offset=$offset\"></html>";
>-    	    exit;
>+            my $category = $input->param('category');
>+            print $input->redirect("/cgi-bin/koha/admin/authorised_values.pl?searchfield=$category&amp;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<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=$searchfield&offset=$offset\"></html>";
>-	exit;
>+    print $input->redirect("/cgi-bin/koha/admin/authorised_values.pl?searchfield=$searchfield&amp;offset=$offset");
>+    exit;
> 													# END $OP eq DELETE_CONFIRMED
> ################## DEFAULT ##################################
> } else { # DEFAULT
>diff --git a/admin/categorie.pl b/admin/categorie.pl
>index 6ea7b5a..f4b2bb0 100755
>--- a/admin/categorie.pl
>+++ b/admin/categorie.pl
>@@ -183,8 +183,8 @@ if ($op eq 'add_form') {
>         C4::Form::MessagingPreferences::handle_form_action($input, 
>                                                            { categorycode => $input->param('categorycode') }, $template);
>     }
>-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=categorie.pl\"></html>";
>-	exit;
>+    print $input->redirect("/cgi-bin/koha/admin/categorie.pl");
>+    exit;
> 
> 													# END $OP eq ADD_VALIDATE
> ################## DELETE_CONFIRM ##################################
>@@ -232,8 +232,8 @@ if ($op eq 'add_form') {
> 	my $sth=$dbh->prepare("delete from categories where categorycode=?");
> 	$sth->execute($categorycode);
> 	$sth->finish;
>-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=categorie.pl\"></html>";
>-	exit;
>+    print $input->redirect("/cgi-bin/koha/admin/categorie.pl");
>+    exit;
> 
> 													# END $OP eq DELETE_CONFIRMED
> } else { # DEFAULT
>diff --git a/admin/koha2marclinks.pl b/admin/koha2marclinks.pl
>index fc320ad..68ec0dc 100755
>--- a/admin/koha2marclinks.pl
>+++ b/admin/koha2marclinks.pl
>@@ -116,8 +116,7 @@ elsif ( $op eq 'add_validate' ) {
>     $dbh->do(
> "update marc_subfield_structure set kohafield='$tablename.$kohafield' where tagfield='$temp[0]' and tagsubfield='$temp[1]'"
>     );
>-    print
>-"Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=koha2marclinks.pl?tablename=$tablename\"></html>";
>+    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 0589968..9a6e4fa 100755
>--- a/admin/marc_subfields_structure.pl
>+++ b/admin/marc_subfields_structure.pl
>@@ -483,8 +483,7 @@ elsif ( $op eq 'add_validate' ) {
>     }
>     $sth_insert->finish;
>     $sth_update->finish;
>-    print
>-"Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=marc_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode\"></html>";
>+    print $input->redirect("/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=$tagfield&amp;frameworkcode=$frameworkcode");
>     exit;
> 
>     # END $OP eq ADD_VALIDATE
>@@ -524,10 +523,8 @@ elsif ( $op eq 'delete_confirmed' ) {
>         $sth->execute( $tagfield, $tagsubfield, $frameworkcode );
>         $sth->finish;
>     }
>-    print
>-"Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=marc_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode\"></html>";
>+    print $input->redirect("/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=$tagfield&amp;frameworkcode=$frameworkcode");
>     exit;
>-    $template->param( tagfield => $tagfield );
> 
>     # END $OP eq DELETE_CONFIRMED
> ################## DEFAULT ##################################
>diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl
>index d3b227d..862706e 100755
>--- a/admin/marctagstructure.pl
>+++ b/admin/marctagstructure.pl
>@@ -167,9 +167,9 @@ if ($op eq 'add_form') {
>                           $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 d41f2a7..8722897 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<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=systempreferences.pl?tab=\"></html>";
>+    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 0430aaf..6070bf5 100755
>--- a/serials/subscription-detail.pl
>+++ b/serials/subscription-detail.pl
>@@ -86,8 +86,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<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=serials-home.pl\"></html>";
>-		exit;
>+        print $query->redirect("/cgi-bin/koha/serials/serials-home.pl");
>+        exit;
>     }
> }
> my $hasRouting = check_routing($subscriptionid);
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 11944: 26364 | 26365 | 26366 | 26367 | 26368 | 26369 | 26370 | 26371 | 26372 | 26407 | 26408 | 26409 | 26737 | 26738 | 26739 | 26740 | 26741 | 26742 | 26743 | 26744 | 26745 | 26746 | 26747 | 26748 | 26794 | 26857 | 26858 | 26859 | 26860 | 26861 | 26862 | 26863 | 26864 | 26865 | 26866 | 26867 | 26868 | 26869 | 26870 | 26871 | 26895 | 26921 | 27021 | 27080 | 27094 | 27158 | 27159 | 27161 | 27193 | 27194 | 27195 | 27196 | 27198 | 27199 | 27200 | 27201 | 27202 | 27203 | 27204 | 27205 | 27206 | 27207 | 27208 | 27209 | 27210 | 27211 | 27212 | 27213 | 27214 | 27215 | 27216 | 27585 | 27586 | 27587 | 27588 | 27589 | 27590 | 27591 | 27592 | 27593 | 27594 | 27595 | 27596 | 27597 | 27598 | 27599 | 27600 | 27601 | 27602 | 27603 | 27880 | 27881 | 27882 | 27883 | 27884 | 27885 | 27886 | 27887 | 27888 | 27889 | 27890 | 27891 | 27892 | 27893 | 27894 | 27895 | 27896 | 27897 | 27898 | 28046 | 28047 | 28048 | 28049 | 28050 | 28051 | 28052 | 28053 | 28054 | 28055 | 28056 | 28057 | 28058 | 28059 | 28060 | 28061 | 28062 | 28063 | 28064 | 28065 | 28066 | 28097 | 28245 | 28246 | 28247 | 28248 | 28249 | 28250 | 28251 | 28252 | 28253 | 28732 | 29981 | 29982 | 29983 | 29984 | 29985 | 29986 | 29987 | 29988 | 29989 | 29990 | 29991 | 29992 | 29993 | 29994 | 29995 | 29996 | 29997 | 29998 | 29999 | 30000 | 30001 | 30002 | 30003 | 30004 | 30005 | 30006 | 30012 | 30016 | 30945 | 31299 | 35223 | 35224 | 35225 | 35226 | 35227 | 35228 | 35229 | 35230 | 35231 | 35232 | 35233 | 35234 | 35235 | 35236 | 35237 | 35238 | 35239 | 35240 | 35241 | 35242 | 35243 | 35244 | 35245 | 35246 | 35247 | 35248 | 35249 | 35250 | 35251 | 35252 | 35253