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

(-)a/installer/install.pl (+22 lines)
Lines 23-28 use diagnostics; Link Here
23
use C4::InstallAuth qw( get_template_and_user );
23
use C4::InstallAuth qw( get_template_and_user );
24
use CGI qw ( -utf8 );
24
use CGI qw ( -utf8 );
25
use POSIX;
25
use POSIX;
26
use HTML::FromANSI::Tiny;
26
27
27
use C4::Context;
28
use C4::Context;
28
use C4::Output qw( output_html_with_http_headers );
29
use C4::Output qw( output_html_with_http_headers );
Lines 413-418 elsif ( $step && $step == 3 ) { Link Here
413
        my $fh;
414
        my $fh;
414
        open( $fh, "<:encoding(utf-8)", $logfilepath )
415
        open( $fh, "<:encoding(utf-8)", $logfilepath )
415
          or die "Cannot open log file $logfilepath: $!";
416
          or die "Cannot open log file $logfilepath: $!";
417
416
        my @report = <$fh>;
418
        my @report = <$fh>;
417
        close $fh;
419
        close $fh;
418
        if (@report) {
420
        if (@report) {
Lines 449-454 elsif ( $step && $step == 3 ) { Link Here
449
            my $atomic_update_files = get_atomic_updates;
451
            my $atomic_update_files = get_atomic_updates;
450
            my $atomic_update_report = run_atomic_updates( $atomic_update_files );
452
            my $atomic_update_report = run_atomic_updates( $atomic_update_files );
451
453
454
            colorize($report);
455
            colorize($atomic_update_report);
452
            $template->param(
456
            $template->param(
453
                success        => $report->{success},
457
                success        => $report->{success},
454
                error          => $report->{error},
458
                error          => $report->{error},
Lines 550-552 sub chk_log { #returns a logfile in $dir or - if that failed - in temp dir Link Here
550
    }
554
    }
551
    return $fn;
555
    return $fn;
552
}
556
}
557
558
sub colorize {
559
    my ($report) = @_;
560
    my $h = HTML::FromANSI::Tiny->new(
561
        auto_reverse => 0, background    => 'white', foreground => 'black',
562
        inline_style => 1, no_plain_tags => 1
563
    );
564
565
    my @states = ( 'success', 'error' );
566
    for my $state (@states) {
567
        for my $result ( @{ $report->{$state} } ) {
568
            #@{ $result->{output} } = map { s/^\t+//; $h->html($_) } @{ $result->{output} };
569
            for my $output ( @{ $result->{output} } ) {
570
                $output = $h->html($output);
571
            }
572
        }
573
    }
574
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt (-5 / +4 lines)
Lines 367-373 Link Here
367
                        <ul>
367
                        <ul>
368
                            [% FOR s IN success %]
368
                            [% FOR s IN success %]
369
                                [% FOR o IN s.output %]
369
                                [% FOR o IN s.output %]
370
                                    <li>[% o | html %]</li>
370
                                    <li>[% o | $raw %]</li>
371
                                    [% IF s.output.size > 1 %]
371
                                    [% IF s.output.size > 1 %]
372
                                        [% IF loop.first %]<ul>[% ELSIF loop.last %]</ul>[% END %]
372
                                        [% IF loop.first %]<ul>[% ELSIF loop.last %]</ul>[% END %]
373
                                    [% END %]
373
                                    [% END %]
Lines 381-387 Link Here
381
                        <ul>
381
                        <ul>
382
                            [% FOR s IN atomic_updates.success %]
382
                            [% FOR s IN atomic_updates.success %]
383
                                [% FOR o IN s.output %]
383
                                [% FOR o IN s.output %]
384
                                    <li>[% o | html %]</li>
384
                                    <li>[% o | $raw %]</li>
385
                                    [% IF s.output.size > 1 %]
385
                                    [% IF s.output.size > 1 %]
386
                                        [% IF loop.first %]<ul>[% ELSIF loop.last %]</ul>[% END %]
386
                                        [% IF loop.first %]<ul>[% ELSIF loop.last %]</ul>[% END %]
387
                                    [% END %]
387
                                    [% END %]
Lines 409-415 Link Here
409
                                        <li class="update_error">
409
                                        <li class="update_error">
410
                                            [% o | html %]
410
                                            [% o | html %]
411
                                            <br/>
411
                                            <br/>
412
                                            ERROR: [% e.error | html %]
412
                                            ERROR: [% e.error | $raw %]
413
413
414
                                            [% IF e.output.size > 1 %]
414
                                            [% IF e.output.size > 1 %]
415
                                                [% IF loop.first %]<ul>[% ELSIF loop.last %]</ul>[% END %]
415
                                                [% IF loop.first %]<ul>[% ELSIF loop.last %]</ul>[% END %]
Lines 429-435 Link Here
429
                                    <li class="update_error">
429
                                    <li class="update_error">
430
                                        [% o | html %]
430
                                        [% o | html %]
431
                                        <br/>
431
                                        <br/>
432
                                        ERROR: [% e.error | html %]
432
                                        ERROR: [% e.error | $raw %]
433
433
434
                                        [% IF e.output.size > 1 %]
434
                                        [% IF e.output.size > 1 %]
435
                                            [% IF loop.first %]<ul>[% ELSIF loop.last %]</ul>[% END %]
435
                                            [% IF loop.first %]<ul>[% ELSIF loop.last %]</ul>[% END %]
436
- 

Return to bug 35681