Bugzilla – Attachment 175448 Details for
Bug 37826
Remove the use of the script_name variable where it is unnecessary
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 37826: Remove the use of the script_name variable where it is unnecessary
Bug-37826-Remove-the-use-of-the-scriptname-variabl.patch (text/plain), 58.57 KB, created by
Phil Ringnalda
on 2024-12-13 14:36:03 UTC
(
hide
)
Description:
Bug 37826: Remove the use of the script_name variable where it is unnecessary
Filename:
MIME Type:
Creator:
Phil Ringnalda
Created:
2024-12-13 14:36:03 UTC
Size:
58.57 KB
patch
obsolete
>From 85196917134fb2781dc795f08da9310b4dc7701a Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >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 <phil@chetcolibrary.org> >--- > 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 %] >- <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> >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 %] >- <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> >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 %] >- <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> >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 %] >- <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> >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 %] >- <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> >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 %] > <div class="btn-group"> >- <a id="exportbutton" class="btn btn-default" href="[% script_name | url %]?op=export&basketno=[% basketno | uri %]&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&basketno=[% basketno | uri %]&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> >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) %] > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a href="[% script_name | url %]?op=reopen&basketgroupid=[% basketgroupid | uri %]&booksellerid=[% booksellerid | uri %]&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&basketgroupid=[% basketgroupid | uri %]&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&basketgroupid=[% basketgroupid | uri %]&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&basketgroupid=[% basketgroupid | uri %]&booksellerid=[% booksellerid | uri %]&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&basketgroupid=[% basketgroupid | uri %]&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&basketgroupid=[% basketgroupid | uri %]&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&basketgroupid=[% basketgroupid | uri %]&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&basketgroupid=[% basketgroupid | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div> > [% END %] > </div> > [% 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 @@ > <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"> >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 @@ > </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&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&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."> >@@ -19,14 +19,14 @@ > </li> > [% ELSE %] > <li> >- <a class="dropdown-item" href="[% script_name | url %]?op=delete_confirm&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&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&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&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&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&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"> >@@ -318,7 +318,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 %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >index 4986b3f5cb..d36288d7e9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >@@ -140,7 +140,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 %]" /> >@@ -169,14 +169,14 @@ > [% FOREACH loo IN loop %] > <tr> > <td> >- <a href="[% loo.script_name | url %]?op=add_form&booksellerid=[% loo.booksellerid | uri %]&contractnumber=[% loo.contractnumber | uri %]">[% loo.contractname | html %]</a> >+ <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% loo.booksellerid | uri %]&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&contractnumber=[% loo.contractnumber | uri %]&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&contractnumber=[% loo.contractnumber | uri %]&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&contractnumber=[% loo.contractnumber | uri %]&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&contractnumber=[% loo.contractnumber | uri %]&booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash-can"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >index 571ae059e9..ab6d4eccbd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >@@ -97,7 +97,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 %]" /> >@@ -384,7 +384,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 %]" /> >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 @@ > <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 %] >@@ -184,7 +184,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> >@@ -194,7 +194,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> >@@ -202,7 +202,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 %]" /> >@@ -223,7 +223,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 %]" /> >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 %] > <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"> >@@ -213,7 +213,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"> >@@ -260,7 +260,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"> >@@ -332,9 +332,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"> >@@ -356,8 +356,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&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&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%]" /> >@@ -384,8 +384,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&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&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 %]" /> >@@ -412,8 +412,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&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&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 %]" /> >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 @@ > </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 %]" /> >@@ -329,7 +329,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> >@@ -396,7 +396,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 %]" /> >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 ) %] > >- <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"> >@@ -171,7 +171,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 %] >@@ -182,14 +182,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> >@@ -197,7 +197,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 %]" /> >@@ -214,7 +214,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 %]" /> >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 %] > <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"> >@@ -428,13 +428,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> >@@ -443,7 +443,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> >@@ -472,8 +472,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&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&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&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&matcher_id=[% available_matching_rule.matcher_id | uri %]"><i class="fa fa-trash-can"></i> Delete</a> > </td> > </tr> > [% 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 ) %] >- <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> >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. > </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&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&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&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&code=[% item.code | uri %]"><i class="fa fa-trash-can"></i> Delete</a> > </td> > </tr> > [% 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 @@ > </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' ) %] >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 ) %] >- <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> >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 @@ > <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"> >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 @@ > <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> >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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 37826
:
175271
| 175448