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

(-)a/C4/Output.pm (-1 / +20 lines)
Lines 31-36 use strict; Link Here
31
use URI::Escape;
31
use URI::Escape;
32
use Scalar::Util qw( looks_like_number );
32
use Scalar::Util qw( looks_like_number );
33
33
34
use C4::Auth qw(get_template_and_user);
34
use C4::Context;
35
use C4::Context;
35
use C4::Templates;
36
use C4::Templates;
36
37
Lines 51-57 BEGIN { Link Here
51
    );
52
    );
52
    push @EXPORT, qw(
53
    push @EXPORT, qw(
53
        &output_html_with_http_headers &output_ajax_with_http_headers &output_with_http_headers
54
        &output_html_with_http_headers &output_ajax_with_http_headers &output_with_http_headers
54
        &output_and_exit_if_error &output_and_exit
55
        &output_and_exit_if_error &output_and_exit &output_error
55
    );
56
    );
56
57
57
}
58
}
Lines 365-370 sub output_and_exit { Link Here
365
    exit;
366
    exit;
366
}
367
}
367
368
369
sub output_error {
370
    my ( $query, $error ) = @_;
371
    my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
372
        {
373
            template_name   => 'errors/errorpage.tt',
374
            query           => $query,
375
            type            => 'intranet',
376
            authnotrequired => 1,
377
        }
378
    );
379
    my $admin = C4::Context->preference('KohaAdminEmailAddress');
380
    $template->param (
381
        admin => $admin,
382
        errno => $error,
383
    );
384
    output_with_http_headers $query, $cookie, $template->output, 'html', '404 Not Found';
385
}
386
368
sub parametrized_url {
387
sub parametrized_url {
369
    my $url = shift || ''; # ie page.pl?ln={LANG}
388
    my $url = shift || ''; # ie page.pl?ln={LANG}
370
    my $vars = shift || {}; # ie { LANG => en }
389
    my $vars = shift || {}; # ie { LANG => en }
(-)a/errors/404.pl (-18 / +1 lines)
Lines 18-40 Link Here
18
18
19
use Modern::Perl;
19
use Modern::Perl;
20
use CGI qw ( -utf8 );
20
use CGI qw ( -utf8 );
21
use C4::Auth;
22
use C4::Output;
21
use C4::Output;
23
use C4::Context;
24
22
25
my $query = CGI->new;
23
my $query = CGI->new;
26
my $admin = C4::Context->preference('KohaAdminEmailAddress');
24
output_error( $query, '404' );
27
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
28
    {
29
        template_name   => 'errors/errorpage.tt',
30
        query           => $query,
31
        type            => 'intranet',
32
        authnotrequired => 1,
33
        debug           => 1,
34
    }
35
);
36
$template->param (
37
    admin => $admin,
38
    errno => 404,
39
);
40
output_with_http_headers $query, $cookie, $template->output, 'html', '404 Not Found';
41
- 

Return to bug 23329