View | Details | Raw Unified | Return to bug 28146
Collapse All | Expand All

(-)a/errors/400.pl (-2 lines)
Lines 23-29 use C4::Context; Link Here
23
use List::MoreUtils qw( any );
23
use List::MoreUtils qw( any );
24
24
25
my $query = CGI->new;
25
my $query = CGI->new;
26
my $admin = C4::Context->preference('KohaAdminEmailAddress');
27
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
26
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
28
    {
27
    {
29
        template_name   => 'errors/errorpage.tt',
28
        template_name   => 'errors/errorpage.tt',
Lines 33-39 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
33
    }
32
    }
34
);
33
);
35
$template->param(
34
$template->param(
36
    admin => $admin,
37
    errno => 400,
35
    errno => 400,
38
);
36
);
39
my $status = '400 Bad Request';
37
my $status = '400 Bad Request';
(-)a/errors/401.pl (-2 lines)
Lines 23-29 use C4::Context; Link Here
23
use List::MoreUtils qw( any );
23
use List::MoreUtils qw( any );
24
24
25
my $query = CGI->new;
25
my $query = CGI->new;
26
my $admin = C4::Context->preference('KohaAdminEmailAddress');
27
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
26
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
28
    {
27
    {
29
        template_name   => 'errors/errorpage.tt',
28
        template_name   => 'errors/errorpage.tt',
Lines 33-39 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
33
    }
32
    }
34
);
33
);
35
$template->param(
34
$template->param(
36
    admin => $admin,
37
    errno => 401,
35
    errno => 401,
38
);
36
);
39
my $status = '401 Unauthorized';
37
my $status = '401 Unauthorized';
(-)a/errors/402.pl (-2 lines)
Lines 23-29 use C4::Context; Link Here
23
use List::MoreUtils qw( any );
23
use List::MoreUtils qw( any );
24
24
25
my $query = CGI->new;
25
my $query = CGI->new;
26
my $admin = C4::Context->preference('KohaAdminEmailAddress');
27
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
26
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
28
    {
27
    {
29
        template_name   => 'errors/errorpage.tt',
28
        template_name   => 'errors/errorpage.tt',
Lines 33-39 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
33
    }
32
    }
34
);
33
);
35
$template->param(
34
$template->param(
36
    admin => $admin,
37
    errno => 402,
35
    errno => 402,
38
);
36
);
39
my $status = '402 Payment Required';
37
my $status = '402 Payment Required';
(-)a/errors/403.pl (-2 lines)
Lines 23-29 use C4::Context; Link Here
23
use List::MoreUtils qw( any );
23
use List::MoreUtils qw( any );
24
24
25
my $query = CGI->new;
25
my $query = CGI->new;
26
my $admin = C4::Context->preference('KohaAdminEmailAddress');
27
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
26
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
28
    {
27
    {
29
        template_name   => 'errors/errorpage.tt',
28
        template_name   => 'errors/errorpage.tt',
Lines 33-39 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
33
    }
32
    }
34
);
33
);
35
$template->param(
34
$template->param(
36
    admin      => $admin,
37
    errno      => 403,
35
    errno      => 403,
38
    csrf_error => $ENV{'plack.middleware.Koha.CSRF'},
36
    csrf_error => $ENV{'plack.middleware.Koha.CSRF'},
39
);
37
);
(-)a/errors/404.pl (-2 lines)
Lines 23-29 use C4::Context; Link Here
23
use List::MoreUtils qw( any );
23
use List::MoreUtils qw( any );
24
24
25
my $query = CGI->new;
25
my $query = CGI->new;
26
my $admin = C4::Context->preference('KohaAdminEmailAddress');
27
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
26
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
28
    {
27
    {
29
        template_name   => 'errors/errorpage.tt',
28
        template_name   => 'errors/errorpage.tt',
Lines 33-39 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
33
    }
32
    }
34
);
33
);
35
$template->param(
34
$template->param(
36
    admin => $admin,
37
    errno => 404,
35
    errno => 404,
38
);
36
);
39
my $status = '404 Not Found';
37
my $status = '404 Not Found';
(-)a/errors/500.pl (-2 lines)
Lines 23-29 use C4::Context; Link Here
23
use List::MoreUtils qw( any );
23
use List::MoreUtils qw( any );
24
24
25
my $query = CGI->new;
25
my $query = CGI->new;
26
my $admin = C4::Context->preference('KohaAdminEmailAddress');
27
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
26
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
28
    {
27
    {
29
        template_name   => 'errors/errorpage.tt',
28
        template_name   => 'errors/errorpage.tt',
Lines 33-39 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
33
    }
32
    }
34
);
33
);
35
$template->param(
34
$template->param(
36
    admin => $admin,
37
    errno => 500,
35
    errno => 500,
38
);
36
);
39
my $status = '500 Internal Server Error';
37
my $status = '500 Internal Server Error';
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt (+1 lines)
Lines 1-5 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE Koha %]
2
[% USE Koha %]
3
[% SET admin = Koha.Preference('ReplytoDefault') || Koha.Preference('KohaAdminEmailAddress') %]
3
[% PROCESS 'i18n.inc' %]
4
[% PROCESS 'i18n.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
5
<title
6
<title
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt (+2 lines)
Lines 1-9 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE AdditionalContents %]
2
[% USE AdditionalContents %]
3
[% USE Koha %]
3
[% PROCESS 'i18n.inc' %]
4
[% PROCESS 'i18n.inc' %]
4
[% PROCESS 'html_helpers.inc' %]
5
[% PROCESS 'html_helpers.inc' %]
5
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
6
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
6
[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
7
[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
8
[% SET admin = Koha.Preference('ReplytoDefault') || Koha.Preference('KohaAdminEmailAddress') %]
7
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
8
<title
10
<title
9
    >[% FILTER collapse %]
11
    >[% FILTER collapse %]
(-)a/opac/errors/400.pl (-2 lines)
Lines 23-29 use C4::Context; Link Here
23
use List::MoreUtils qw( any );
23
use List::MoreUtils qw( any );
24
24
25
my $query = CGI->new;
25
my $query = CGI->new;
26
my $admin = C4::Context->preference('KohaAdminEmailAddress');
27
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
26
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
28
    {
27
    {
29
        template_name   => "errors/errorpage.tt",
28
        template_name   => "errors/errorpage.tt",
Lines 33-39 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
33
    }
32
    }
34
);
33
);
35
$template->param(
34
$template->param(
36
    admin => $admin,
37
    errno => 400,
35
    errno => 400,
38
);
36
);
39
my $status = '400 Bad Request';
37
my $status = '400 Bad Request';
(-)a/opac/errors/401.pl (-2 lines)
Lines 23-29 use C4::Context; Link Here
23
use List::MoreUtils qw( any );
23
use List::MoreUtils qw( any );
24
24
25
my $query = CGI->new;
25
my $query = CGI->new;
26
my $admin = C4::Context->preference('KohaAdminEmailAddress');
27
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
26
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
28
    {
27
    {
29
        template_name   => "errors/errorpage.tt",
28
        template_name   => "errors/errorpage.tt",
Lines 33-39 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
33
    }
32
    }
34
);
33
);
35
$template->param(
34
$template->param(
36
    admin => $admin,
37
    errno => 401,
35
    errno => 401,
38
);
36
);
39
my $status = '401 Unauthorized';
37
my $status = '401 Unauthorized';
(-)a/opac/errors/402.pl (-2 lines)
Lines 23-29 use C4::Context; Link Here
23
use List::MoreUtils qw( any );
23
use List::MoreUtils qw( any );
24
24
25
my $query = CGI->new;
25
my $query = CGI->new;
26
my $admin = C4::Context->preference('KohaAdminEmailAddress');
27
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
26
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
28
    {
27
    {
29
        template_name   => "errors/errorpage.tt",
28
        template_name   => "errors/errorpage.tt",
Lines 33-39 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
33
    }
32
    }
34
);
33
);
35
$template->param(
34
$template->param(
36
    admin => $admin,
37
    errno => 402,
35
    errno => 402,
38
);
36
);
39
my $status = '402 Payment Required';
37
my $status = '402 Payment Required';
(-)a/opac/errors/403.pl (-2 lines)
Lines 23-29 use C4::Context; Link Here
23
use List::MoreUtils qw( any );
23
use List::MoreUtils qw( any );
24
24
25
my $query = CGI->new;
25
my $query = CGI->new;
26
my $admin = C4::Context->preference('KohaAdminEmailAddress');
27
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
26
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
28
    {
27
    {
29
        template_name   => "errors/errorpage.tt",
28
        template_name   => "errors/errorpage.tt",
Lines 33-39 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
33
    }
32
    }
34
);
33
);
35
$template->param(
34
$template->param(
36
    admin      => $admin,
37
    errno      => 403,
35
    errno      => 403,
38
    csrf_error => $ENV{'plack.middleware.Koha.CSRF'},
36
    csrf_error => $ENV{'plack.middleware.Koha.CSRF'},
39
);
37
);
(-)a/opac/errors/404.pl (-2 lines)
Lines 23-29 use C4::Context; Link Here
23
use List::MoreUtils qw( any );
23
use List::MoreUtils qw( any );
24
24
25
my $query = CGI->new;
25
my $query = CGI->new;
26
my $admin = C4::Context->preference('KohaAdminEmailAddress');
27
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
26
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
28
    {
27
    {
29
        template_name   => "errors/errorpage.tt",
28
        template_name   => "errors/errorpage.tt",
Lines 33-39 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
33
    }
32
    }
34
);
33
);
35
$template->param(
34
$template->param(
36
    admin => $admin,
37
    errno => 404,
35
    errno => 404,
38
);
36
);
39
my $status = '404 Not Found';
37
my $status = '404 Not Found';
(-)a/opac/errors/500.pl (-3 lines)
Lines 23-29 use C4::Context; Link Here
23
use List::MoreUtils qw( any );
23
use List::MoreUtils qw( any );
24
24
25
my $query = CGI->new;
25
my $query = CGI->new;
26
my $admin = C4::Context->preference('KohaAdminEmailAddress');
27
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
26
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
28
    {
27
    {
29
        template_name   => "errors/errorpage.tt",
28
        template_name   => "errors/errorpage.tt",
Lines 33-39 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
33
    }
32
    }
34
);
33
);
35
$template->param(
34
$template->param(
36
    admin => $admin,
37
    errno => 500,
35
    errno => 500,
38
);
36
);
39
my $status = '500 Internal Server Error';
37
my $status = '500 Internal Server Error';
40
- 

Return to bug 28146