From 85196917134fb2781dc795f08da9310b4dc7701a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 6 Sep 2024 12:41:39 +0000 Subject: [PATCH] Bug 37826: Remove the use of the script_name variable where it is unnecessary Most of the places where a "script_name" variable used it is not strictly necessary. Because it is also used inconsistently, I think it's better to simply remove the use of the variable where it isn't strictly necessary. This patch removes creation of the template variable from several scripts and updates the corresponding template with the URL itself. To test, apply the patch and restart services. Test the following pages, including the various permutations where they are present, e.g. New, Edit, Delete. - Administration -> Cities and towns -> Search via the header search form - Administratoin -> Currencies and exchange rates -> Search via the header search form - Administration -> Desks - Administration -> Budgets - Administration -> Authority types - Administration -> Authority types -> MARC structure -> Subfields - Administration -> Classification configuration - Administration -> MARC bibliographic framework - Administration -> MARC bibliographic framework -> MARC structure -> Subfields - Administration -> Record matching rules - Administration -> OAI repositories - Administration -> Patron attribute types - Administration -> System preferences -> Local use - Administration -> Z39.50/SRU servers - Acquisitions -> Vendor -> Contracts - Acquisitions -> Vendor -> Basket -> Export as CSV - Acquisitions -> Vendor -> Basket -> Edit basket - Acquisitions -> Vendor -> Basket groups - Tools -> Import patrons - Tools -> Notices and slips Sponsored-by: Athens County Public Libraries Signed-off-by: Phil Ringnalda --- admin/auth_subfields_structure.pl | 6 ++--- admin/auth_tag_structure.pl | 4 +--- admin/classsources.pl | 3 --- admin/marc_subfields_structure.pl | 4 ---- admin/marctagstructure.pl | 5 ---- admin/matching-rules.pl | 4 ---- admin/oai_servers.pl | 6 ++--- admin/patron-attr-types.pl | 5 ---- admin/systempreferences.pl | 20 ++++------------ admin/z3950servers.pl | 2 -- .../prog/en/includes/cities-admin-search.inc | 2 +- .../en/includes/contracts-admin-search.inc | 2 +- .../en/includes/currencies-admin-search.inc | 2 +- .../prog/en/includes/desks-admin-search.inc | 2 +- .../prog/en/includes/patrons-admin-search.inc | 2 +- .../prog/en/modules/acqui/basket.tt | 2 +- .../prog/en/modules/acqui/basketgroup.tt | 8 +++---- .../prog/en/modules/acqui/basketheader.tt | 2 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 10 ++++---- .../prog/en/modules/admin/aqcontract.tt | 8 +++---- .../modules/admin/auth_subfields_structure.tt | 4 ++-- .../en/modules/admin/auth_tag_structure.tt | 10 ++++---- .../prog/en/modules/admin/classsources.tt | 24 +++++++++---------- .../modules/admin/marc_subfields_structure.tt | 6 ++--- .../prog/en/modules/admin/marctagstructure.tt | 12 +++++----- .../prog/en/modules/admin/matching-rules.tt | 12 +++++----- .../prog/en/modules/admin/oai_servers.tt | 2 +- .../en/modules/admin/patron-attr-types.tt | 12 +++++----- .../en/modules/admin/systempreferences.tt | 12 +++++----- .../prog/en/modules/admin/z3950servers.tt | 2 +- .../prog/en/modules/tools/import_borrowers.tt | 2 +- .../prog/en/modules/tools/letter.tt | 4 ++-- tags/review.pl | 1 - tools/import_borrowers.pl | 2 -- tools/letter.pl | 3 --- tools/showdiffmarc.pl | 1 - 36 files changed, 81 insertions(+), 127 deletions(-) diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl index 24597b3cc9..df8d10a211 100755 --- a/admin/auth_subfields_structure.pl +++ b/admin/auth_subfields_structure.pl @@ -34,7 +34,6 @@ my $tagfield = $input->param('tagfield'); my $tagsubfield = $input->param('tagsubfield'); my $authtypecode = $input->param('authtypecode'); my $op = $input->param('op') || ''; -my $script_name = "/cgi-bin/koha/admin/auth_subfields_structure.pl"; my ($template, $borrowernumber, $cookie) = get_template_and_user( { template_name => "admin/auth_subfields_structure.tt", @@ -47,12 +46,12 @@ my $pagesize = 30; $tagfield =~ s/\,//g; if ($op) { -$template->param(script_name => $script_name, + $template->param( tagfield =>$tagfield, authtypecode => $authtypecode, $op => 1); # we show only the TMPL_VAR names $op } else { -$template->param(script_name => $script_name, + $template->param( tagfield =>$tagfield, authtypecode => $authtypecode, else => 1); # we show only the TMPL_VAR names $op @@ -237,7 +236,6 @@ elsif ( $op eq 'delete_confirm' ) { ); $template->param( ass => $ass, - delete_link => $script_name, ); } elsif ( $op eq 'cud-delete_confirmed' ) { diff --git a/admin/auth_tag_structure.pl b/admin/auth_tag_structure.pl index 7769dee914..b4d8b58fa0 100755 --- a/admin/auth_tag_structure.pl +++ b/admin/auth_tag_structure.pl @@ -39,8 +39,6 @@ my $op = $input->param('op') || ''; $searchfield =~ s/\,//g; -my $script_name = "/cgi-bin/koha/admin/auth_tag_structure.pl"; - my $dbh = C4::Context->dbh; # open template @@ -70,7 +68,7 @@ if (!$op or $op eq 'cud-authtype_create_confirm') { } } } -$template->param(script_name => $script_name); + $template->param(authority_types => $authority_types ); if ($op && $op ne 'cud-authtype_create_confirm') { $template->param($op => 1); diff --git a/admin/classsources.pl b/admin/classsources.pl index 53aa3252c1..3a35860964 100755 --- a/admin/classsources.pl +++ b/admin/classsources.pl @@ -30,8 +30,6 @@ use Koha::ClassSources; use Koha::ClassSortRules; use Koha::ClassSplitRules; -my $script_name = "/cgi-bin/koha/admin/classsources.pl"; - my $input = CGI->new; my $op = $input->param('op') || 'list'; my $cn_source = $input->param('cn_source'); @@ -53,7 +51,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( ); my @messages; -$template->param( script_name => $script_name ); if ( $op eq "add_source" ) { my $class_source = diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl index 70801fefa7..2b6e9fb03a 100755 --- a/admin/marc_subfields_structure.pl +++ b/admin/marc_subfields_structure.pl @@ -38,7 +38,6 @@ my $frameworkcode = $input->param('frameworkcode'); my $pkfield = "tagfield"; my $offset = $input->param('offset'); $offset = 0 if not defined $offset or $offset < 0; -my $script_name = "/cgi-bin/koha/admin/marc_subfields_structure.pl"; my ( $template, $borrowernumber, $cookie ) = get_template_and_user( { @@ -57,7 +56,6 @@ my $framework = Koha::BiblioFrameworks->search({ frameworkcode => $frameworkcode if ($op) { $template->param( - script_name => $script_name, tagfield => $tagfield, frameworkcode => $frameworkcode, framework => $framework, @@ -66,7 +64,6 @@ if ($op) { } else { $template->param( - script_name => $script_name, tagfield => $tagfield, frameworkcode => $frameworkcode, framework => $framework, @@ -320,7 +317,6 @@ elsif ( $op eq 'delete_confirm' ) { ); $template->param( mss => $mss, - delete_link => $script_name, ); # END $OP eq DELETE_CONFIRM diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl index 1e89615e0d..06239bfda7 100755 --- a/admin/marctagstructure.pl +++ b/admin/marctagstructure.pl @@ -42,8 +42,6 @@ my $op = $input->param('op') || ''; my $dspchoice = $input->cookie("marctagstructure_selectdisplay") // $input->param('select_display'); my $pagesize = 20; -my $script_name = "/cgi-bin/koha/admin/marctagstructure.pl"; - my $dbh = C4::Context->dbh; my $cache = Koha::Caches->get_instance(); @@ -76,7 +74,6 @@ my $framework = $frameworks->search({ frameworkcode => $frameworkcode })->next; $template->param( frameworks => $frameworks, framework => $framework, - script_name => $script_name, ( $op || 'else' ) => 1, ); @@ -319,13 +316,11 @@ if ($op eq 'add_form') { $template->param(isprevpage => $offset, prevpage=> $offset-$pagesize, searchfield => $searchfield, - script_name => $script_name ); } if ($offset+$pagesize<$cnt) { $template->param(nextpage =>$offset+$pagesize, searchfield => $searchfield, - script_name => $script_name ); } } #---- END $OP eq DEFAULT diff --git a/admin/matching-rules.pl b/admin/matching-rules.pl index 3021bdb990..ba807e05db 100755 --- a/admin/matching-rules.pl +++ b/admin/matching-rules.pl @@ -26,8 +26,6 @@ use C4::Context; use C4::Output qw( output_html_with_http_headers ); use C4::Matcher qw/valid_normalization_routines/; -my $script_name = "/cgi-bin/koha/admin/matching-rules.pl"; - our $input = CGI->new; my $op = $input->param('op') || ''; @@ -39,8 +37,6 @@ my ($template, $loggedinuser, $cookie) flagsrequired => { parameters => 'manage_matching_rules' }, }); -$template->param(script_name => $script_name); - my $matcher_id = $input->param("matcher_id"); $template->param( max_matchpoint => 0 ); diff --git a/admin/oai_servers.pl b/admin/oai_servers.pl index 3edb2e118c..b124fb1ad9 100755 --- a/admin/oai_servers.pl +++ b/admin/oai_servers.pl @@ -44,10 +44,10 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( flagsrequired => { parameters => 'manage_search_targets' }, } ); -my $script_name = "/cgi-bin/koha/admin/oai_servers.pl"; -my $path = C4::Context->config('intrahtdocs') . "/prog/"; -$template->param( script_name => $script_name, xslt_path => $path ); +my $path = C4::Context->config('intrahtdocs') . "/prog/"; + +$template->param( xslt_path => $path ); my $schema = Koha::Database->new()->schema(); diff --git a/admin/patron-attr-types.pl b/admin/patron-attr-types.pl index d591383e48..401522b604 100755 --- a/admin/patron-attr-types.pl +++ b/admin/patron-attr-types.pl @@ -33,8 +33,6 @@ use Koha::AuthorisedValues; use Koha::Libraries; use Koha::Patron::Categories; -my $script_name = "/cgi-bin/koha/admin/patron-attr-types.pl"; - our $input = CGI->new; my $op = $input->param('op') || ''; @@ -47,9 +45,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); - -$template->param(script_name => $script_name); - my $code = $input->param("code"); my $display_list = 0; diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl index 4561ba6578..8031d1a490 100755 --- a/admin/systempreferences.pl +++ b/admin/systempreferences.pl @@ -223,15 +223,9 @@ my $op = $input->param('op') || ''; $searchfield =~ s/\,//g; if ($op) { - $template->param( - script_name => $script_name, - $op => 1 - ); # we show only the TMPL_VAR names $op + $template->param( $op => 1 ); # we show only the TMPL_VAR names $op } else { - $template->param( - script_name => $script_name, - else => 1 - ); # we show only the TMPL_VAR names $op + $template->param( else => 1 ); # we show only the TMPL_VAR names $op } if ( $op eq 'update_and_reedit' ) { @@ -260,17 +254,11 @@ if ( $op eq 'update_and_reedit' ) { $value = join ' ', @currentorder; if ($orderchanged) { $op = 'add_form'; - $template->param( - script_name => $script_name, - $op => 1 - ); # we show only the TMPL_VAR names $op + $template->param( $op => 1 ); # we show only the TMPL_VAR names $op } else { $op = ''; $searchfield = ''; - $template->param( - script_name => $script_name, - else => 1 - ); # we show only the TMPL_VAR names $op + $template->param( else => 1 ); # we show only the TMPL_VAR names $op } } my $variable = $input->param('variable'); diff --git a/admin/z3950servers.pl b/admin/z3950servers.pl index d1113c8b21..710a4ae2b4 100755 --- a/admin/z3950servers.pl +++ b/admin/z3950servers.pl @@ -46,8 +46,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { type => "intranet", flagsrequired => { parameters => 'manage_search_targets' }, }); -my $script_name = "/cgi-bin/koha/admin/z3950servers.pl"; -$template->param( script_name => $script_name ); my $schema = Koha::Database->new()->schema(); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc index 9a9a64bc81..42aa472a98 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc @@ -5,7 +5,7 @@ [% WRAPPER tabs id="header_search" %] [% WRAPPER tab_panels %] [% WRAPPER tab_panel tabname="city_search" bt_active= 1 %] -
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc index c62138a6e6..839da940c4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc @@ -5,7 +5,7 @@ [% WRAPPER tabs id="header_search" %] [% WRAPPER tab_panels %] [% WRAPPER tab_panel tabname="contract_description_search" bt_active= 1 %] - +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc index 9f2f6ddd09..55642a78ea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc @@ -5,7 +5,7 @@ [% WRAPPER tabs id="header_search" %] [% WRAPPER tab_panels %] [% WRAPPER tab_panel tabname="currency_search" bt_active= 1 %] - +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc index 38851530e9..a58dc24016 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc @@ -5,7 +5,7 @@ [% WRAPPER tabs id="header_search" %] [% WRAPPER tab_panels %] [% WRAPPER tab_panel tabname="desk_search" bt_active= 1 %] - +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc index e5bf3de2a3..b907a7153b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc @@ -6,7 +6,7 @@ [% WRAPPER tabs id= "header_search" %] [% WRAPPER tab_panels %] [% WRAPPER tab_panel tabname="patron_category_search" bt_active= 1 %] - +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 729661670b..3ba9f92946 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -5,7 +5,7 @@ [% PROCESS 'patron-search.inc' %] [% BLOCK csv_export %]
- Export as CSV + Export as CSV diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index 50168cf25f..8278005b2f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -53,11 +53,11 @@ [% IF ( grouping ) %] [% IF (closedbg) %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt index 75a5443193..5a314a6d61 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt @@ -56,7 +56,7 @@

Edit basket [% basketname | html %]

[% ELSE %]

Add a basket to [% booksellername | html %]

[% END %] - + [% INCLUDE 'csrf-token.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt index 210b1043d3..b692fbe1e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -11,7 +11,7 @@
- +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt index 7f6500c938..90f7ff440a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt @@ -128,7 +128,7 @@ New tag [% END %] - + [% INCLUDE 'csrf-token.inc' %] [% IF ( heading_modify_tag_p ) %][% END %] @@ -184,7 +184,7 @@ [% IF ( delete_confirm ) %]

[% tx("Confirm deletion of tag '{searchfield}'", { searchfield = searchfield }) | html %]

- + [% INCLUDE 'csrf-token.inc' %] @@ -194,7 +194,7 @@ - + @@ -202,7 +202,7 @@ [% IF ( authtype_create ) %] - + [% INCLUDE 'csrf-token.inc' %] @@ -223,7 +223,7 @@ [% IF ( else ) %] - +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt index 6d61effe87..b0bf26a84c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -148,7 +148,7 @@ [% ELSE %]

New classification source

[% END %] - + [% INCLUDE 'csrf-token.inc' %]
@@ -213,7 +213,7 @@ [% ELSE %]

New filing rule

[% END %] - + [% INCLUDE 'csrf-token.inc' %]
@@ -260,7 +260,7 @@ [% ELSE %]

New splitting rule

[% END %] - + [% INCLUDE 'csrf-token.inc' %]
@@ -332,9 +332,9 @@ [% IF op == 'list' %]

Classification configuration

@@ -356,8 +356,8 @@
Tag: [% searchfield | html %] [% liblibrarian | html %]
[% class_source.class_sort_rule | html %] [% class_source.class_split_rule | html %] - Edit - + Edit + [% INCLUDE 'csrf-token.inc' %] @@ -384,8 +384,8 @@ [% rule.description |html | html %] [% rule.sort_routine | html %] - Edit - + Edit + [% INCLUDE 'csrf-token.inc' %] @@ -412,8 +412,8 @@ [% rule.description | html %] [% rule.split_routine | html %] - Edit - + Edit + [% INCLUDE 'csrf-token.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt index 1c7ee58112..318581a403 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt @@ -93,7 +93,7 @@
You can drag and drop the subfield tabs to change the order.
- + [% INCLUDE 'csrf-token.inc' %] @@ -329,7 +329,7 @@ -
+ @@ -396,7 +396,7 @@
- +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index 440cc0d184..3c512819ee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -107,7 +107,7 @@ [% IF ( add_form ) %] - + [% INCLUDE 'csrf-token.inc' %]
@@ -171,7 +171,7 @@
- Cancel + Cancel
[% END %] @@ -182,14 +182,14 @@

[% tx("Confirm deletion of tag {searchfield}?", { searchfield = searchfield }) | html %]

Tag: [% searchfield | html %]

Description: [% liblibrarian | html %]

-
+ [% INCLUDE 'csrf-token.inc' %]
-
+
@@ -197,7 +197,7 @@ [% IF ( framework_create ) %] -
+ [% INCLUDE 'csrf-token.inc' %] @@ -214,7 +214,7 @@ [% IF ( else ) %] - +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt index 0de0a22dc8..21a36c4b36 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt @@ -113,7 +113,7 @@ [% ELSE %]

New record matching rule

[% END %] - + [% INCLUDE 'csrf-token.inc' %]
@@ -428,13 +428,13 @@ [% IF ( delete_matching_rule_form ) %]

Confirm deletion of record matching rule '[% code | html %]' ([% description | html %])?

- + [% INCLUDE 'csrf-token.inc' %] -
+
@@ -443,7 +443,7 @@ [% IF ( display_list ) %]

Record matching rules

@@ -472,8 +472,8 @@ [% available_matching_rule.code | html %] [% available_matching_rule.description | html %] - Edit - Delete + Edit + Delete [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_servers.tt index c64ed17674..e7756f0500 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_servers.tt @@ -68,7 +68,7 @@ [% END %] [% IF ( add_form ) %] -
+ [% INCLUDE 'csrf-token.inc' %] [% IF op == 'edit' %]

Modify OAI repository

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt index 5e846dc3e4..57748196e1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -85,7 +85,7 @@ — one with that code already exists. [% END %] - + [% INCLUDE 'csrf-token.inc' %]
@@ -273,13 +273,13 @@

[% tx("Confirm deletion of patron attribute type '{code}' ({description})?", { code = code, description = description }) | html %]

- + [% INCLUDE 'csrf-token.inc' %] -
+
@@ -288,7 +288,7 @@ [% IF ( display_list ) %]

Patron attribute types

@@ -377,8 +377,8 @@ [% END %] - Edit - Delete + Edit + Delete [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt index 302c7e0148..114744d15c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt @@ -93,9 +93,9 @@ [% IF ( type_upload ) %] -
+ [% ELSE %] - + [% END %] [% INCLUDE 'csrf-token.inc' %]
@@ -282,14 +282,14 @@ [% Tvalue | html %] - + [% INCLUDE 'csrf-token.inc' %] -
+
@@ -298,7 +298,7 @@ [% IF ( delete_confirmed ) %]

Data deleted

-
+
@@ -307,7 +307,7 @@ [% IF ( else ) %] [% IF ( tab != 'local_use' ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt index 3ba997b0cf..da53239401 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -82,7 +82,7 @@ [% END %] [% IF ( add_form ) %] -
+ [% INCLUDE 'csrf-token.inc' %] [% IF op == 'edit' %]

[% tx("Modify {servertype} server '{servername}'", { servertype = servertype, servername = server.servername }) | html %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt index 5a9ff18445..74435bfe9e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt @@ -227,7 +227,7 @@
- + [% INCLUDE 'csrf-token.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt index 784d15d0f8..bde0c920f1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -575,7 +575,7 @@ [% letter.name | html %] - + [% INCLUDE 'csrf-token.inc' %] @@ -584,7 +584,7 @@ -
+
diff --git a/tags/review.pl b/tags/review.pl index 6df5bc5b5f..019ec62fe9 100755 --- a/tags/review.pl +++ b/tags/review.pl @@ -197,7 +197,6 @@ $template->param( offset => $offset, # req'd for EXPR op => $op, op_count => scalar(@tags), - script_name => $script_name, approved => 0, # dummy value (also EXPR) tagloop => $tagloop, pagination_bar => pagination_bar( diff --git a/tools/import_borrowers.pl b/tools/import_borrowers.pl index 25686c205e..3b091d17b3 100755 --- a/tools/import_borrowers.pl +++ b/tools/import_borrowers.pl @@ -103,8 +103,6 @@ my $dt = dt_from_string(); my $timestamp = $dt->ymd('-').' '.$dt->hms(':'); my $patronlistname = $uploadborrowers . ' (' . $timestamp .')'; -$template->param( SCRIPT_NAME => '/cgi-bin/koha/tools/import_borrowers.pl' ); - if ( $op eq 'cud-import' && $uploadborrowers && length($uploadborrowers) > 0 ) { my $handle = $input->upload('uploadborrowers'); diff --git a/tools/letter.pl b/tools/letter.pl index 8a9a6301db..bb552d2cd9 100755 --- a/tools/letter.pl +++ b/tools/letter.pl @@ -62,7 +62,6 @@ sub protected_letters { our $input = CGI->new; my $searchfield = $input->param('searchfield'); -my $script_name = '/cgi-bin/koha/tools/letter.pl'; our $branchcode = $input->param('branchcode'); $branchcode = '' if defined $branchcode and $branchcode eq '*'; my $code = $input->param('code'); @@ -91,12 +90,10 @@ our $my_branch = C4::Context->preference("IndependentBranches") && !$staffflags- $template->param( independant_branch => $my_branch, - script_name => $script_name, searchfield => $searchfield, branchcode => $branchcode, section => $section, langtab => $langtab, - action => $script_name ); if ( $op eq 'cud-add_validate' or $op eq 'cud-copy_validate' ) { diff --git a/tools/showdiffmarc.pl b/tools/showdiffmarc.pl index d925975e4d..4729b3abe5 100755 --- a/tools/showdiffmarc.pl +++ b/tools/showdiffmarc.pl @@ -86,7 +86,6 @@ if( $importid ) { } $template->param( - SCRIPT_NAME => '/cgi-bin/koha/tools/showdiffmarc.pl', RECORDID => $recordid, IMPORTID => $importid, RECORDTITLE => $recordTitle, -- 2.47.1