From 17f52645648e9adf1973f01ca2a847803f0a3f6e Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 6 Oct 2025 14:20:05 +0200 Subject: [PATCH] Bug 28146: Respect ReplytoDefault in error pages Test plan: Fill ReplytoDefault. Check an error page on OPAC and intranet. Verify that the send mail link refers to that email address. Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize --- errors/400.pl | 2 -- errors/401.pl | 2 -- errors/402.pl | 2 -- errors/403.pl | 2 -- errors/404.pl | 2 -- errors/500.pl | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt | 1 + koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt | 2 ++ opac/errors/400.pl | 2 -- opac/errors/401.pl | 2 -- opac/errors/402.pl | 2 -- opac/errors/403.pl | 2 -- opac/errors/404.pl | 2 -- opac/errors/500.pl | 2 -- 14 files changed, 3 insertions(+), 24 deletions(-) diff --git a/errors/400.pl b/errors/400.pl index 994c2db8a03..9edc0564134 100755 --- a/errors/400.pl +++ b/errors/400.pl @@ -23,7 +23,6 @@ use C4::Context; use List::MoreUtils qw( any ); my $query = CGI->new; -my $admin = C4::Context->preference('KohaAdminEmailAddress'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { template_name => 'errors/errorpage.tt', @@ -33,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( - admin => $admin, errno => 400, ); my $status = '400 Bad Request'; diff --git a/errors/401.pl b/errors/401.pl index 411c5d4b3a5..cdabefc1d74 100755 --- a/errors/401.pl +++ b/errors/401.pl @@ -23,7 +23,6 @@ use C4::Context; use List::MoreUtils qw( any ); my $query = CGI->new; -my $admin = C4::Context->preference('KohaAdminEmailAddress'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { template_name => 'errors/errorpage.tt', @@ -33,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( - admin => $admin, errno => 401, ); my $status = '401 Unauthorized'; diff --git a/errors/402.pl b/errors/402.pl index ca31e0c8281..30ad2f6916b 100755 --- a/errors/402.pl +++ b/errors/402.pl @@ -23,7 +23,6 @@ use C4::Context; use List::MoreUtils qw( any ); my $query = CGI->new; -my $admin = C4::Context->preference('KohaAdminEmailAddress'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { template_name => 'errors/errorpage.tt', @@ -33,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( - admin => $admin, errno => 402, ); my $status = '402 Payment Required'; diff --git a/errors/403.pl b/errors/403.pl index 7833f35d4c7..811f7413874 100755 --- a/errors/403.pl +++ b/errors/403.pl @@ -23,7 +23,6 @@ use C4::Context; use List::MoreUtils qw( any ); my $query = CGI->new; -my $admin = C4::Context->preference('KohaAdminEmailAddress'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { template_name => 'errors/errorpage.tt', @@ -33,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( - admin => $admin, errno => 403, csrf_error => $ENV{'plack.middleware.Koha.CSRF'}, ); diff --git a/errors/404.pl b/errors/404.pl index 8447d442081..13953dcc033 100755 --- a/errors/404.pl +++ b/errors/404.pl @@ -23,7 +23,6 @@ use C4::Context; use List::MoreUtils qw( any ); my $query = CGI->new; -my $admin = C4::Context->preference('KohaAdminEmailAddress'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { template_name => 'errors/errorpage.tt', @@ -33,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( - admin => $admin, errno => 404, ); my $status = '404 Not Found'; diff --git a/errors/500.pl b/errors/500.pl index 68618a8c4b3..a585f484bbf 100755 --- a/errors/500.pl +++ b/errors/500.pl @@ -23,7 +23,6 @@ use C4::Context; use List::MoreUtils qw( any ); my $query = CGI->new; -my $admin = C4::Context->preference('KohaAdminEmailAddress'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { template_name => 'errors/errorpage.tt', @@ -33,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( - admin => $admin, errno => 500, ); my $status = '500 Internal Server Error'; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt index 1eea9364e6a..87596b65949 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt @@ -1,5 +1,6 @@ [% USE raw %] [% USE Koha %] +[% SET admin = Koha.Preference('ReplytoDefault') || Koha.Preference('KohaAdminEmailAddress') %] [% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %] [% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %] +[% SET admin = Koha.Preference('ReplytoDefault') || Koha.Preference('KohaAdminEmailAddress') %] [% INCLUDE 'doc-head-open.inc' %] <title >[% FILTER collapse %] diff --git a/opac/errors/400.pl b/opac/errors/400.pl index b4558f67abd..ce9fae78109 100755 --- a/opac/errors/400.pl +++ b/opac/errors/400.pl @@ -23,7 +23,6 @@ use C4::Context; use List::MoreUtils qw( any ); my $query = CGI->new; -my $admin = C4::Context->preference('KohaAdminEmailAddress'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { template_name => "errors/errorpage.tt", @@ -33,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( - admin => $admin, errno => 400, ); my $status = '400 Bad Request'; diff --git a/opac/errors/401.pl b/opac/errors/401.pl index 4a61256ab87..0c8287684f5 100755 --- a/opac/errors/401.pl +++ b/opac/errors/401.pl @@ -23,7 +23,6 @@ use C4::Context; use List::MoreUtils qw( any ); my $query = CGI->new; -my $admin = C4::Context->preference('KohaAdminEmailAddress'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { template_name => "errors/errorpage.tt", @@ -33,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( - admin => $admin, errno => 401, ); my $status = '401 Unauthorized'; diff --git a/opac/errors/402.pl b/opac/errors/402.pl index 94abca5033d..5431750f93d 100755 --- a/opac/errors/402.pl +++ b/opac/errors/402.pl @@ -23,7 +23,6 @@ use C4::Context; use List::MoreUtils qw( any ); my $query = CGI->new; -my $admin = C4::Context->preference('KohaAdminEmailAddress'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { template_name => "errors/errorpage.tt", @@ -33,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( - admin => $admin, errno => 402, ); my $status = '402 Payment Required'; diff --git a/opac/errors/403.pl b/opac/errors/403.pl index 2dddd876d7c..a89a73d7b24 100755 --- a/opac/errors/403.pl +++ b/opac/errors/403.pl @@ -23,7 +23,6 @@ use C4::Context; use List::MoreUtils qw( any ); my $query = CGI->new; -my $admin = C4::Context->preference('KohaAdminEmailAddress'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { template_name => "errors/errorpage.tt", @@ -33,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( - admin => $admin, errno => 403, csrf_error => $ENV{'plack.middleware.Koha.CSRF'}, ); diff --git a/opac/errors/404.pl b/opac/errors/404.pl index 25b81bc4975..06924487c02 100755 --- a/opac/errors/404.pl +++ b/opac/errors/404.pl @@ -23,7 +23,6 @@ use C4::Context; use List::MoreUtils qw( any ); my $query = CGI->new; -my $admin = C4::Context->preference('KohaAdminEmailAddress'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { template_name => "errors/errorpage.tt", @@ -33,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( - admin => $admin, errno => 404, ); my $status = '404 Not Found'; diff --git a/opac/errors/500.pl b/opac/errors/500.pl index c874c567d01..1c95b677b6e 100755 --- a/opac/errors/500.pl +++ b/opac/errors/500.pl @@ -23,7 +23,6 @@ use C4::Context; use List::MoreUtils qw( any ); my $query = CGI->new; -my $admin = C4::Context->preference('KohaAdminEmailAddress'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { template_name => "errors/errorpage.tt", @@ -33,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( - admin => $admin, errno => 500, ); my $status = '500 Internal Server Error'; -- 2.51.0