Tweakedwarning and suggestion tables to better match new function fields

This commit is contained in:
d4t4king 2019-10-02 21:07:04 -07:00
parent 082e5c736a
commit 6895c71a5f

View File

@ -475,10 +475,10 @@ if ($json) {
'banded_columns' => 0, 'banded_columns' => 0,
'banded_rows' => 1, 'banded_rows' => 1,
'columns' => [ 'columns' => [
{ 'header' => 'Warning ID' }, { 'header' => 'Test ID' },
{ 'header' => 'Description' }, { 'header' => 'Description' },
{ 'header' => 'Severity' }, { 'header' => 'Details' },
{ 'header' => 'F4' }, { 'header' => 'Solution' },
] ]
); );
#print STDERR Dumper(\%params); #print STDERR Dumper(\%params);
@ -509,10 +509,10 @@ if ($json) {
'banded_columns' => 0, 'banded_columns' => 0,
'banded_rows' => 1, 'banded_rows' => 1,
'columns' => [ 'columns' => [
{ 'header' => 'Suggestion ID' }, { 'headet' => 'Test ID' },
{ 'header' => 'Description' }, { 'header' => 'Description' },
{ 'header' => 'Severity' }, { 'header' => 'Details' },
{ 'header' => 'F4' }, { 'header' => 'Solution' },
] ]
); );
$last_row_number = $next_row + scalar(@table_data); $last_row_number = $next_row + scalar(@table_data);
@ -1297,7 +1297,7 @@ END
print OUT <<END; print OUT <<END;
<div class="content_subsection"> <div class="content_subsection">
<table> <table>
<tr><td>Warning ID</td><td>Description</td><td>Severity</td><td>F4</td></tr> <tr><td>Test ID</td><td>Description</td><td>Details</td><td>Solution</td></tr>
END END
if (exists($lynis_report_data{'warning[]'})) { if (exists($lynis_report_data{'warning[]'})) {
if (ref($lynis_report_data{'warning[]'}) eq 'ARRAY') { if (ref($lynis_report_data{'warning[]'}) eq 'ARRAY') {
@ -1333,7 +1333,7 @@ END
print OUT <<END; print OUT <<END;
<div class="content_subsection"> <div class="content_subsection">
<table> <table>
<tr><td>Suggestion ID</td><td>Description</td><td>Severity</td><td>F4</td></tr> <tr><td>Test ID</td><td>Description</td><td>Details</td><td>Solution</td></tr>
END END
if ((ref($lynis_report_data{'suggestion[]'}) eq 'ARRAY') and if ((ref($lynis_report_data{'suggestion[]'}) eq 'ARRAY') and
(${$lynis_report_data{'suggestion[]'}}[0] =~ /\|/)) { (${$lynis_report_data{'suggestion[]'}}[0] =~ /\|/)) {