Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 37826: Remove the use of the script_name variable where it is unnecessary

Browse source 
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 <phil@chetcolibrary.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Owen Leonard 2024-09-06 12:41:39 +00:00 committed by Katrin Fischer
parent 03392b660e
commit 8a433d4f20
Signed by: kfischer
GPG key ID: 0EF6E2C03357A834
36 changed files with 81 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
admin/auth_subfields_structure.pl
View file

@ -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' ) {

4
admin/auth_tag_structure.pl
View file

@ -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);

3
admin/classsources.pl
View file

@ -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 =

4
admin/marc_subfields_structure.pl
View file

@ -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

5
admin/marctagstructure.pl
View file

@ -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

4
admin/matching-rules.pl
View file

@ -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 );

6
admin/oai_servers.pl
View file

@ -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();

5
admin/patron-attr-types.pl
View file

@ -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;

20
admin/systempreferences.pl
View file

@ -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');

2
admin/z3950servers.pl
View file

@ -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();

2
koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
View file

@ -5,7 +5,7 @@
[% WRAPPER tabs id="header_search" %]
[% WRAPPER tab_panels %]
[% WRAPPER tab_panel tabname="city_search" bt_active= 1 %]
<form action="[% script_name | html %]" method="get">
<form action="/cgi-bin/koha/admin/cities.pl" method="get">
<div class="form-title">
<label class="control-label" for="city_name_filter"><span class="control-text">Search cities</span> <i class="fa fa-fw fa-building" aria-hidden="true"></i></label>
</div>

2
koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
View file

@ -5,7 +5,7 @@
[% WRAPPER tabs id="header_search" %]
[% WRAPPER tab_panels %]
[% WRAPPER tab_panel tabname="contract_description_search" bt_active= 1 %]
<form action="[% script_name | html %]" method="get">
<form action="/cgi-bin/koha/admin/aqcontract.pl" method="get">
<div class="form-title">
<label class="control-label" for="searchfield"><span class="control-text">Search contracts</span> <i class="fa-solid fa-fw fa-pen-to-square" aria-hidden="true"></i></label>
</div>

2
koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
View file

@ -5,7 +5,7 @@
[% WRAPPER tabs id="header_search" %]
[% WRAPPER tab_panels %]
[% WRAPPER tab_panel tabname="currency_search" bt_active= 1 %]
<form action="[% script_name | html %]" method="get">
<form action="/cgi-bin/koha/admin/currency.pl" method="get">
<div class="form-title">
<label class="control-label" for="description"><span class="control-text">Search currencies</span> <i class="fa-solid fa-fw fa-dollar-sign" aria-hidden="true"></i></label>
</div>

2
koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc
View file

@ -5,7 +5,7 @@
[% WRAPPER tabs id="header_search" %]
[% WRAPPER tab_panels %]
[% WRAPPER tab_panel tabname="desk_search" bt_active= 1 %]
<form action="[% script_name|html %]" method="get">
<form action="/cgi-bin/koha/admin/desks.pl" method="get">
<div class="form-title">
<label class="control-label" for="search_desk_name"><span class="control-text">Search desks</span> <i class="fa fa-fw fa-desktop" aria-hidden="true"></i></label>
</div>

2
koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
View file

@ -6,7 +6,7 @@
[% WRAPPER tabs id= "header_search" %]
[% WRAPPER tab_panels %]
[% WRAPPER tab_panel tabname="patron_category_search" bt_active= 1 %]
<form action="[% script_name | html %]" method="get">
<form action="/cgi-bin/koha/admin/categories.pl" method="get">
<div class="form-title">
<label class="control-label" for="category_search"><span class="control-text">Search patron categories</span> <i class="fa fa-fw fa-id-card" aria-hidden="true"></i></label>
</div>

2
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
View file

@ -5,7 +5,7 @@
[% PROCESS 'patron-search.inc' %]
[% BLOCK csv_export %]
<div class="btn-group">
<a id="exportbutton" class="btn btn-default" href="[% script_name | url %]?op=export&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]"><i class="fa fa-download"></i> Export as CSV</a>
<a id="exportbutton" class="btn btn-default" href="/cgi-bin/koha/acqui/basket.pl?op=export&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]"><i class="fa fa-download"></i> Export as CSV</a>
<button type="button" class="btn btn-default btn-sm dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
<span class="visually-hidden">Toggle dropdown</span>
</button>

8
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
View file

@ -53,11 +53,11 @@
[% IF ( grouping ) %]
[% IF (closedbg) %]
<div id="toolbar" class="btn-toolbar">
<div class="btn-group"><a href="[% script_name | url %]?op=reopen&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;mode=singlebg" class="btn btn-default" id="reopenbutton"><i class="fa fa-download"></i> Reopen basket group</a></div>
<div class="btn-group"><a href="[% script_name | url %]?op=export&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="exportbutton"><i class="fa fa-download"></i> Export basket group as CSV</a></div>
<div class="btn-group"><a href="[% script_name | url %]?op=print&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="printbutton"><i class="fa fa-download"></i> Print basket group in PDF</a></div>
<div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=reopen&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;mode=singlebg" class="btn btn-default" id="reopenbutton"><i class="fa fa-download"></i> Reopen basket group</a></div>
<div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=export&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="exportbutton"><i class="fa fa-download"></i> Export basket group as CSV</a></div>
<div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=print&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="printbutton"><i class="fa fa-download"></i> Print basket group in PDF</a></div>
[% IF (ediaccount) %]
<div class="btn-group"><a href="[% script_name | url %]?op=ediprint&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div>
<div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=ediprint&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div>
[% END %]
</div>
[% END %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
View file

@ -56,7 +56,7 @@
<h1>Edit basket [% basketname | html %]</h1>
[% ELSE %]<h1>Add a basket to [% booksellername | html %]</h1>
[% END %]
<form name="Aform" action="[% script_name | html %]" method="post" class="validated">
<form name="Aform" action="/cgi-bin/koha/acqui/basketheader.pl" method="post" class="validated">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
<fieldset class="rows">

10
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
View file

@ -12,7 +12,7 @@
</a>
<ul class="dropdown-menu dropdown-menu-end" role="menu" aria-labelledby="budgetmenu_[% block_budget.budget_period_id | html %]">
<li>
<a class="dropdown-item" href="[% script_name | url %]?op=add_form&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
<a class="dropdown-item" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
</li>
[% IF block_budget.count %]
<li data-bs-toggle="tooltip" data-bs-placement="left" title="[% block_budget.count | html %] fund(s) are attached to this budget. You must delete all attached funds before deleting this budget.">
@ -20,14 +20,14 @@
</li>
[% ELSE %]
<li>
<a class="dropdown-item" href="[% script_name | url %]?op=delete_confirm&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-trash-can"></i> Delete</a>
<a class="dropdown-item" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=delete_confirm&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-trash-can"></i> Delete</a>
</li>
[% END %]
<li>
<a class="dropdown-item" href="[% script_name | url %]?op=duplicate_form&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-copy"></i> Duplicate</a>
<a class="dropdown-item" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=duplicate_form&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-copy"></i> Duplicate</a>
</li>
<li>
<a class="dropdown-item" href="[% script_name | url %]?op=close_form&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-times-circle"></i> Close</a>
<a class="dropdown-item" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=close_form&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-times-circle"></i> Close</a>
</li>
[% IF ( block_budget.budget_period_locked ) %]
<li data-bs-toggle="tooltip" data-bs-placement="left" title="Budget is locked">
@ -319,7 +319,7 @@
<!-- "delete" and "cancel" buttons -->
<!-- ############################################################# -->
<form action="[% script_name | html %]" method="post">
<form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" method="post">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-delete_confirmed" />
<input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />

8
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
View file

@ -141,7 +141,7 @@
<tr><th scope="row">Contract end date:</th><td>[% contractenddate | $KohaDates %]</td></tr>
<tr><th scope="row">Vendor:</th><td>[% booksellername | html %]</td></tr>
</table>
<form action="[% script_name | html %]" method="post">
<form action="/cgi-bin/koha/admin/aqcontract.pl" method="post">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-delete_confirmed" />
<input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
@ -170,14 +170,14 @@
[% FOREACH loo IN loop %]
<tr>
<td>
<a href="[% loo.script_name | url %]?op=add_form&amp;booksellerid=[% loo.booksellerid | uri %]&amp;contractnumber=[% loo.contractnumber | uri %]">[% loo.contractname | html %]</a>
<a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% loo.booksellerid | uri %]&amp;contractnumber=[% loo.contractnumber | uri %]">[% loo.contractname | html %]</a>
</td>
<td>[% loo.contractdescription | html %]</td>
<td>[% loo.contractstartdate | html %]</td>
<td>[% loo.contractenddate | html %]</td>
<td class="actions">
<a href="[% loo.script_name | url %]?op=add_form&amp;contractnumber=[% loo.contractnumber | uri %]&amp;booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
<a href="[% loo.script_name | url %]?op=delete_confirm&amp;contractnumber=[% loo.contractnumber | uri %]&amp;booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash-can"></i> Delete</a>
<a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% loo.contractnumber | uri %]&amp;booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
<a href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&amp;contractnumber=[% loo.contractnumber | uri %]&amp;booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash-can"></i> Delete</a>
</td>
</tr>
[% END %]

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
View file

@ -98,7 +98,7 @@
[% IF ( heading_edit_subfields_p ) %]Edit MARC subfields constraints for field [% tagfield | html %] authority [% authtypecode | html %][% END %]
[% ELSE %][% action | html %][% END %]</h1>
<div class="hint">You can drag and drop the subfield tabs to change the order.</div>
<form action="[% script_name | html %]" name="Aform" method="post">
<form action="/cgi-bin/koha/admin/auth_subfields_structure.pl" name="Aform" method="post">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-add_validate" />
<input type="hidden" name="tagfield" value="[% tagfield | html %]" />
@ -385,7 +385,7 @@
</table>
</div> <!-- /.page-section -->
<form action="[% script_name | html %]" method="get">
<form action="/cgi-bin/koha/admin/auth_subfields_structure.pl" method="get">
<fieldset class="action"><input type="hidden" name="op" value="add_form" />
<input type="hidden" name="tagfield" value="[% edit_tagfield | html %]" />
<input type="hidden" name="authtypecode" value="[% edit_authtypecode | html %]" />

10
koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
View file

@ -129,7 +129,7 @@
<span>New tag</span>
[% END %]
</h2>
<form action="[% script_name | html %]" name="Aform" method="post" class="validated">
<form action="/cgi-bin/koha/admin/auth_tag_structure.pl" name="Aform" method="post" class="validated">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-add_validate" />
[% IF ( heading_modify_tag_p ) %]<input type="hidden" name="modif" value="1" />[% END %]
@ -185,7 +185,7 @@
[% IF ( delete_confirm ) %]
<div class="alert alert-warning">
<h3>[% tx("Confirm deletion of tag '{searchfield}'", { searchfield = searchfield }) | html %]</h3>
<form action="[% script_name | html %]" method="post">
<form action="/cgi-bin/koha/admin/auth_tag_structure.pl" method="post">
[% INCLUDE 'csrf-token.inc' %]
<table>
<tr><th scope="row">Tag: </th><td>[% searchfield | html %] [% liblibrarian | html %]</td></tr>
@ -195,7 +195,7 @@
<input type="hidden" name="searchfield" value="[% searchfield | html %]" />
<button type="submit" class="btn btn-default approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
</form>
<form action="[% script_name | html %]" method="get">
<form action="/cgi-bin/koha/admin/auth_tag_structure.pl" method="get">
<button type="submit" class="btn btn-default deny"><i class="fa fa-fw fa-times"></i> No, do not delete</button>
</form>
</div>
@ -203,7 +203,7 @@
[% IF ( authtype_create ) %]
<form action="[% script_name | html %]" method="post">
<form action="/cgi-bin/koha/admin/auth_tag_structure.pl" method="post">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-authtype_create_confirm" />
<input type="hidden" name="authtypecode" value="[% authtypecode | html %]" />
@ -224,7 +224,7 @@
[% IF ( else ) %]
<form action="[% script_name | html %]" method="get">
<form action="/cgi-bin/koha/admin/auth_tag_structure.pl" method="get">
<fieldset>
<label for="searchfield"><strong>Search for tag:</strong></label>
<input type="text" id="searchfield" name="searchfield" size="4" value="[% searchfield | html %]" />

24
koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
View file

@ -149,7 +149,7 @@
[% ELSE %]
<h1>New classification source</h1>
[% END %]
<form action="[% script_name | html %]" name="Aform" class="validated" method="post">
<form action="/cgi-bin/koha/admin/classsources.pl" name="Aform" class="validated" method="post">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-add_source_validate" />
<fieldset class="rows">
@ -214,7 +214,7 @@
[% ELSE %]
<h1>New filing rule</h1>
[% END %]
<form action="[% script_name | html %]" name="Aform" class="validated" method="post">
<form action="/cgi-bin/koha/admin/classsources.pl" name="Aform" class="validated" method="post">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-add_sort_rule_validate" />
<fieldset class="rows">
@ -261,7 +261,7 @@
[% ELSE %]
<h1>New splitting rule</h1>
[% END %]
<form action="[% script_name | html %]" name="Aform" class="validated" method="post">
<form action="/cgi-bin/koha/admin/classsources.pl" name="Aform" class="validated" method="post">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-add_split_rule_validate" />
<fieldset class="rows">
@ -333,9 +333,9 @@
[% IF op == 'list' %]
<div id="toolbar" class="btn-toolbar">
<a class="btn btn-default" id="newsource" href="[% script_name | url %]?op=add_source"><i class="fa fa-plus"></i> New classification source</a>
<a class="btn btn-default" id="newrule" href="[% script_name | url %]?op=add_sort_rule"><i class="fa fa-plus"></i> New filing rule</a>
<a class="btn btn-default" id="newrule" href="[% script_name | url %]?op=add_split_rule"><i class="fa fa-plus"></i> New splitting rule</a>
<a class="btn btn-default" id="newsource" href="/cgi-bin/koha/admin/classsources.pl?op=add_source"><i class="fa fa-plus"></i> New classification source</a>
<a class="btn btn-default" id="newrule" href="/cgi-bin/koha/admin/classsources.pl?op=add_sort_rule"><i class="fa fa-plus"></i> New filing rule</a>
<a class="btn btn-default" id="newrule" href="/cgi-bin/koha/admin/classsources.pl?op=add_split_rule"><i class="fa fa-plus"></i> New splitting rule</a>
</div>
<h1>Classification configuration</h1>
<div class="page-section">
@ -357,8 +357,8 @@
<td>[% class_source.class_sort_rule | html %]</td>
<td>[% class_source.class_split_rule | html %]</td>
<td class="actions">
<a class="btn btn-default btn-xs" href="[% script_name | url %]?op=add_source&amp;cn_source=[% class_source.cn_source | uri %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
<form action="[% script_name | url %]" method="post">
<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/classsources.pl?op=add_source&amp;cn_source=[% class_source.cn_source | uri %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
<form action="/cgi-bin/koha/admin/classsources.pl" method="post">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-delete_source_confirmed" />
<input type="hidden" name="cn_source" value="[% class_source.cn_source | uri%]" />
@ -385,8 +385,8 @@
<td>[% rule.description |html | html %]</td>
<td>[% rule.sort_routine | html %]</td>
<td class="actions">
<a class="btn btn-default btn-xs" href="[% script_name | html %]?op=add_sort_rule&amp;class_sort_rule=[% rule.class_sort_rule |url %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
<form action="[% script_name | url %]" method="post">
<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/classsources.pl?op=add_sort_rule&amp;class_sort_rule=[% rule.class_sort_rule |url %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
<form action="/cgi-bin/koha/admin/classsources.pl" method="post">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-delete_sort_rule" />
<input type="hidden" name="class_sort_rule" value="[% rule.class_sort_rule |url %]" />
@ -413,8 +413,8 @@
<td>[% rule.description | html %]</td>
<td>[% rule.split_routine | html %]</td>
<td class="actions">
<a class="btn btn-default btn-xs" href="[% script_name | url %]?op=add_split_rule&amp;class_split_rule=[% rule.class_split_rule | uri %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
<form action="[% script_name | url %]" method="post">
<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/classsources.pl?op=add_split_rule&amp;class_split_rule=[% rule.class_split_rule | uri %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
<form action="/cgi-bin/koha/admin/classsources.pl" method="post">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-delete_split_rule" />
<input type="hidden" name="class_split_rule" value="[% rule.class_split_rule | html %]" />

6
koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
View file

@ -94,7 +94,7 @@
</h1>
<div class="hint">You can drag and drop the subfield tabs to change the order.</div>
<form action="[% script_name | html %]" name="Aform" method="post">
<form action="/cgi-bin/koha/admin/marc_subfields_structure.pl" name="Aform" method="post">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-add_validate" />
<input type="hidden" name="tagfield" value="[% tagfield | html %]" />
@ -330,7 +330,7 @@
</form>
<form action="[% script_name | html %]" method="get">
<form action="/cgi-bin/koha/admin/marc_subfields_structure.pl" method="get">
<input type="hidden" name="tagfield" value="[% mss.tagfield | html %]" />
<input type="hidden" name="frameworkcode" value="[% mss.frameworkcode | html %]" />
<button type="submit" class="btn btn-default deny"><i class="fa fa-fw fa-times"></i> No, do not delete</button>
@ -397,7 +397,7 @@
</table> <!-- /#table_marcsubfieldstructure -->
</div><!-- /.page-section -->
<form action="[% script_name | html %]" method="get">
<form action="/cgi-bin/koha/admin/marc_subfields_structure.pl" method="get">
<fieldset class="action"><input type="hidden" name="op" value="add_form" />
<input type="hidden" name="tagfield" value="[% edit_tagfield | html %]" />
<input type="hidden" name="frameworkcode" value="[% edit_frameworkcode | html %]" />

12
koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
View file

@ -108,7 +108,7 @@
[% IF ( add_form ) %]
<form action="[% script_name | html %]" name="Aform" method="post" class="validated">
<form action="/cgi-bin/koha/admin/marctagstructure.pl" name="Aform" method="post" class="validated">
[% INCLUDE 'csrf-token.inc' %]
<fieldset class="rows">
@ -172,7 +172,7 @@
</ol></fieldset>
<fieldset class="action">
<input type="submit" class="btn btn-primary" value="Save changes" />
<a class="cancel" href="[% script_name | url %]?frameworkcode=[% framework.frameworkcode | uri %]">Cancel</a>
<a class="cancel" href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | uri %]">Cancel</a>
</fieldset>
</form>
[% END %]
@ -183,14 +183,14 @@
<h3>[% tx("Confirm deletion of tag {searchfield}?", { searchfield = searchfield }) | html %]</h3>
<p>Tag: [% searchfield | html %]</p>
<p>Description: [% liblibrarian | html %]</p>
<form action="[% script_name | html %]" method="post">
<form action="/cgi-bin/koha/admin/marctagstructure.pl" method="post">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-delete_confirmed" />
<input type="hidden" name="searchfield" value="[% searchfield | html %]" />
<input type="hidden" name="frameworkcode" value="[% framework.frameworkcode | html %]" />
<button type="submit" class="btn btn-default approve"><i class="fa fa-fw fa-check"></i> Yes, delete this tag</button>
</form>
<form action="[% script_name | html %]" method="get"><input type="hidden" name="frameworkcode" value="[% framework.frameworkcode | html %]" />
<form action="/cgi-bin/koha/admin/marctagstructure.pl" method="get"><input type="hidden" name="frameworkcode" value="[% framework.frameworkcode | html %]" />
<button type="submit" class="btn btn-default deny"><i class="fa fa-fw fa-times"></i> No, do not delete</button>
</form>
</div>
@ -198,7 +198,7 @@
[% IF ( framework_create ) %]
<form action="[% script_name | html %]" method="post">
<form action="/cgi-bin/koha/admin/marctagstructure.pl" method="post">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-framework_create_confirm" />
<input type="hidden" name="frameworkcode" value="[% framework.frameworkcode | html %]" />
@ -215,7 +215,7 @@
[% IF ( else ) %]
<form name="f" action="[% script_name | html %]" method="get">
<form name="f" action="/cgi-bin/koha/admin/marctagstructure.pl" method="get">
<fieldset style="padding:.5em;">
<label for="tag_search"><strong>Search for tag:</strong> </label>
<input type="text" name="searchfield" id="tag_search" size="4" value="[% searchfield | html %]" />

12
koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
View file

@ -114,7 +114,7 @@
[% ELSE %]
<h1>New record matching rule</h1>
[% END %]
<form action="[% script_name | html %]" name="Aform" method="post">
<form action="/cgi-bin/koha/admin/matching-rules.pl" name="Aform" method="post">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="[% confirm_op | html %]" />
<fieldset class="rows">
@ -429,13 +429,13 @@
[% IF ( delete_matching_rule_form ) %]
<div class="alert alert-warning">
<h1>Confirm deletion of record matching rule <span class="ex">'[% code | html %]' ([% description | html %])</span>?</h1>
<form action="[% script_name | html %]" name="Aform" method="post">
<form action="/cgi-bin/koha/admin/matching-rules.pl" name="Aform" method="post">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="[% confirm_op | html %]" />
<input type="hidden" name="matcher_id" value="[% matcher_id | html %]" />
<button type="submit" class="btn btn-default approve"><i class="fa fa-fw fa-check"></i> Yes, delete record matching rule</button>
</form>
<form action="[% script_name | html %]" method="get">
<form action="/cgi-bin/koha/admin/matching-rules.pl" method="get">
<button type="submit" class="btn btn-default deny"><i class="fa fa-fw fa-times"></i> No, do not delete</button>
</form>
</div>
@ -444,7 +444,7 @@
[% IF ( display_list ) %]
<div id="toolbar" class="btn-toolbar">
<a class="btn btn-default" id="newrule" href="[% script_name | url %]?op=add_matching_rule"><i class="fa fa-plus"></i> New record matching rule</a>
<a class="btn btn-default" id="newrule" href="/cgi-bin/koha/admin/matching-rules.pl?op=add_matching_rule"><i class="fa fa-plus"></i> New record matching rule</a>
</div>
<h1>Record matching rules</h1>
@ -473,8 +473,8 @@
<td>[% available_matching_rule.code | html %]</td>
<td>[% available_matching_rule.description | html %]</td>
<td class="actions">
<a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name | url %]?op=edit_matching_rule&amp;matcher_id=[% available_matching_rule.matcher_id | uri %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
<a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name | url %]?op=delete_matching_rule&amp;matcher_id=[% available_matching_rule.matcher_id | uri %]"><i class="fa fa-trash-can"></i> Delete</a>
<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/matching-rules.pl?op=edit_matching_rule&amp;matcher_id=[% available_matching_rule.matcher_id | uri %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/matching-rules.pl?op=delete_matching_rule&amp;matcher_id=[% available_matching_rule.matcher_id | uri %]"><i class="fa fa-trash-can"></i> Delete</a>
</td>
</tr>
[% END %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_servers.tt
View file

@ -69,7 +69,7 @@
[% END %]
[% IF ( add_form ) %]
<form action="[% script_name | html %]" name="Aform" method="post" id="serverentry">
<form action="/cgi-bin/koha/admin/oai_servers.pl" name="Aform" method="post" id="serverentry">
[% INCLUDE 'csrf-token.inc' %]
[% IF op == 'edit' %]
<h1>Modify OAI repository</h1>

12
koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
View file

@ -85,7 +85,7 @@
&mdash; one with that code already exists.
</div>
[% END %]
<form action="[% script_name | html %]" class="validated" method="post">
<form action="/cgi-bin/koha/admin/patron-attr-types.pl" class="validated" method="post">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="[% confirm_op | html %]" />
<fieldset class="rows">
@ -273,13 +273,13 @@
<h1>
[% tx("Confirm deletion of patron attribute type '{code}' ({description})?", { code = code, description = description }) | html %]
</h1>
<form action="[% script_name | html %]" name="Aform" method="post">
<form action="/cgi-bin/koha/admin/patron-attr-types.pl" name="Aform" method="post">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="[% confirm_op | html %]" />
<input type="hidden" name="code" value="[% code | html %]" />
<button type="submit" class="btn btn-default approve"><i class="fa fa-fw fa-check"></i> Yes, delete patron attribute type</button>
</form>
<form action="[% script_name | html %]" method="get">
<form action="/cgi-bin/koha/admin/patron-attr-types.pl" method="get">
<button type="submit" class="btn btn-default deny"><i class="fa fa-fw fa-times"></i> No, do not delete</button>
</form>
</div>
@ -288,7 +288,7 @@
[% IF ( display_list ) %]
<div id="toolbar" class="btn-toolbar">
<a class="btn btn-default" id="newrule" href="[% script_name | url %]?op=add_attribute_type"><i class="fa fa-plus"></i> New patron attribute type</a>
<a class="btn btn-default" id="newrule" href="/cgi-bin/koha/admin/patron-attr-types.pl?op=add_attribute_type"><i class="fa fa-plus"></i> New patron attribute type</a>
</div>
<h1>Patron attribute types</h1>
@ -377,8 +377,8 @@
[% END %]
</td>
<td class="actions">
<a class="btn btn-default btn-xs" href="[% script_name | url %]?op=edit_attribute_type&amp;code=[% item.code | uri %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
<a class="btn btn-default btn-xs" href="[% script_name | url %]?op=delete_attribute_type&amp;code=[% item.code | uri %]"><i class="fa fa-trash-can"></i> Delete</a>
<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/patron-attr-types.pl?op=edit_attribute_type&amp;code=[% item.code | uri %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/patron-attr-types.pl?op=delete_attribute_type&amp;code=[% item.code | uri %]"><i class="fa fa-trash-can"></i> Delete</a>
</td>
</tr>
[% END %]

12
koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
View file

@ -93,9 +93,9 @@
</h1>
[% IF ( type_upload ) %]
<form action="[% script_name | html %]" name="Aform" method="post" enctype="multipart/form-data">
<form action="/cgi-bin/koha/admin/systempreferences.pl" name="Aform" method="post" enctype="multipart/form-data">
[% ELSE %]
<form action="[% script_name | html %]" name="Aform" method="post">
<form action="/cgi-bin/koha/admin/systempreferences.pl" name="Aform" method="post">
[% END %]
[% INCLUDE 'csrf-token.inc' %]
<fieldset class="rows">
@ -282,14 +282,14 @@
<td>[% Tvalue | html %]</td>
</tr>
</table>
<form class="inline" action="[% script_name | html %]" method="post">
<form class="inline" action="/cgi-bin/koha/admin/systempreferences.pl" method="post">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-delete_confirmed" />
<input type="hidden" name="searchfield" value="[% searchfield | html %]" />
<input type="hidden" name="Tvalue" value="[% Tvalue | html %]" />
<button type="submit" class="btn btn-default approve"><i class="fa fa-check" aria-hidden="true"></i> Yes, delete</button>
</form>
<form class="inline" action="[% script_name | html %]" method="get">
<form class="inline" action="/cgi-bin/koha/admin/systempreferences.pl" method="get">
<button type="submit" class="btn btn-default deny"><i class="fa fa-remove" aria-hidden="true"></i> No, do not delete</button>
</form>
</div>
@ -298,7 +298,7 @@
[% IF ( delete_confirmed ) %]
<div class="alert alert-info">
<h1>Data deleted</h1>
<form action="[% script_name | html %]" method="get">
<form action="/cgi-bin/koha/admin/systempreferences.pl" method="get">
<button type="submit">Back to system preferences</button>
</form>
</div>
@ -307,7 +307,7 @@
[% IF ( else ) %]
<div id="toolbar" class="btn-toolbar">
<a class="btn btn-default" id="newstopword" href="[% script_name | url %]?op=add_form"><i class="fa fa-plus"></i> New system preference</a>
<a class="btn btn-default" id="newstopword" href="/cgi-bin/koha/admin/systempreferences.pl?op=add_form"><i class="fa fa-plus"></i> New system preference</a>
</div>
[% IF ( tab != 'local_use' ) %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
View file

@ -83,7 +83,7 @@
[% END %]
[% IF ( add_form ) %]
<form action="[% script_name | html %]" name="Aform" method="post" id="serverentry">
<form action="/cgi-bin/koha/admin/z3950servers.pl" name="Aform" method="post" id="serverentry">
[% INCLUDE 'csrf-token.inc' %]
[% IF op == 'edit' %]
<h1>[% tx("Modify {servertype} server '{servername}'", { servertype = servertype, servername = server.servername }) | html %]</h1>

2
koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
View file

@ -227,7 +227,7 @@
<div class="row">
<div class="col-sm-6">
<form method="post" action="[% SCRIPT_NAME | html %]" enctype="multipart/form-data">
<form method="post" action="/cgi-bin/koha/tools/import_borrowers.pl" enctype="multipart/form-data">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-import" />
<fieldset class="rows">

4
koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
View file

@ -575,7 +575,7 @@
<td>[% letter.name | html %]</td>
</tr>
</table>
<form action="[% action | html %]" method="post">
<form action="/cgi-bin/koha/tools/letter.pl" method="post">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-delete_confirmed">
<input type="hidden" name="branchcode" value="[% letter.branchcode | html %]" />
@ -584,7 +584,7 @@
<button type="submit" class="btn btn-default approve"><i class="fa fa-check"></i> Yes, delete</button>
</form>
<form action="[% action | html %]" method="get">
<form action="/cgi-bin/koha/tools/letter.pl" method="get">
<button type="submit" class="btn btn-default deny"><i class="fa fa-times"></i> No, do not delete</button>
</form>
</div>

1
tags/review.pl
View file

@ -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(

2
tools/import_borrowers.pl
View file

@ -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');

3
tools/letter.pl
View file

@ -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' ) {

1
tools/showdiffmarc.pl
View file

@ -86,7 +86,6 @@ if( $importid ) {
}
$template->param(
SCRIPT_NAME => '/cgi-bin/koha/tools/showdiffmarc.pl',
RECORDID => $recordid,
IMPORTID => $importid,
RECORDTITLE => $recordTitle,