diff --git a/errors/400.pl b/errors/400.pl index 078920f101..3fca911437 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 33a43c00f8..cca6b8980c 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 2bd02a4fab..97640448a9 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 b8c6943647..fe70e69c8c 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 d12102b0fe..df3458a2fe 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 c299f22a19..69a7215eef 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 23f3b635e8..6028c1c0f6 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 e993018172..4f3c76a2bf 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 6a397fb773..5ea8c1e3d5 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 e582bfd279..c655f2f17e 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 9c49ee330c..f39fda0a6b 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 23eb462114..981e5c09df 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 0c7515d32b..6ca7706202 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';