From 0612c0402d3ce99ff29bcc6d36ff52bb0ab33aa8 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Tue, 2 Jan 2024 15:56:12 +0000
Subject: [PATCH] Bug 35681: Allow for ANSI color in database updates

This patch adds support for colored output in database updates.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 installer/install.pl                          | 22 +++++++++++++++++++
 .../prog/en/modules/installer/step3.tt        |  8 +++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/installer/install.pl b/installer/install.pl
index 275954359a..3c75d08e20 100755
--- a/installer/install.pl
+++ b/installer/install.pl
@@ -23,6 +23,7 @@ use diagnostics;
 use C4::InstallAuth qw( get_template_and_user );
 use CGI qw ( -utf8 );
 use POSIX;
+use HTML::FromANSI::Tiny;
 
 use C4::Context;
 use C4::Output qw( output_html_with_http_headers );
@@ -420,6 +421,7 @@ elsif ( $step && $step == 3 ) {
         my $fh;
         open( $fh, "<:encoding(utf-8)", $logfilepath )
           or die "Cannot open log file $logfilepath: $!";
+
         my @report = <$fh>;
         close $fh;
         if (@report) {
@@ -456,6 +458,8 @@ elsif ( $step && $step == 3 ) {
             my $atomic_update_files = get_atomic_updates;
             my $atomic_update_report = run_atomic_updates( $atomic_update_files );
 
+            colorize($report);
+            colorize($atomic_update_report);
             $template->param(
                 success        => $report->{success},
                 error          => $report->{error},
@@ -561,3 +565,21 @@ sub chk_log {    #returns a logfile in $dir or - if that failed - in temp dir
     }
     return $fn;
 }
+
+sub colorize {
+    my ($report) = @_;
+    my $h = HTML::FromANSI::Tiny->new(
+        auto_reverse => 0, background    => 'white', foreground => 'black',
+        inline_style => 1, no_plain_tags => 1
+    );
+
+    my @states = ( 'success', 'error' );
+    for my $state (@states) {
+        for my $result ( @{ $report->{$state} } ) {
+            #@{ $result->{output} } = map { s/^\t+//; $h->html($_) } @{ $result->{output} };
+            for my $output ( @{ $result->{output} } ) {
+                $output = $h->html($output);
+            }
+        }
+    }
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
index fabd7605d3..ec3d1af826 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
@@ -381,7 +381,7 @@
                         <ul>
                             [% FOR s IN success %]
                                 [% FOR o IN s.output %]
-                                    <li>[% o | html %]</li>
+                                    <li>[% o | $raw %]</li>
                                     [% IF s.output.size > 1 %]
                                         [% IF loop.first %]<ul>[% ELSIF loop.last %]</ul>[% END %]
                                     [% END %]
@@ -395,7 +395,7 @@
                         <ul>
                             [% FOR s IN atomic_updates.success %]
                                 [% FOR o IN s.output %]
-                                    <li>[% o | html %]</li>
+                                    <li>[% o | $raw %]</li>
                                     [% IF s.output.size > 1 %]
                                         [% IF loop.first %]<ul>[% ELSIF loop.last %]</ul>[% END %]
                                     [% END %]
@@ -423,7 +423,7 @@
                                         <li class="update_error">
                                             [% o | html %]
                                             <br/>
-                                            ERROR: [% e.error | html %]
+                                            ERROR: [% e.error | $raw %]
 
                                             [% IF e.output.size > 1 %]
                                                 [% IF loop.first %]<ul>[% ELSIF loop.last %]</ul>[% END %]
@@ -443,7 +443,7 @@
                                     <li class="update_error">
                                         [% o | html %]
                                         <br/>
-                                        ERROR: [% e.error | html %]
+                                        ERROR: [% e.error | $raw %]
 
                                         [% IF e.output.size > 1 %]
                                             [% IF loop.first %]<ul>[% ELSIF loop.last %]</ul>[% END %]
-- 
2.39.5