tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#11807 new report vulnerability by category

This commit is contained in:
Daniel Cebrian 2023-08-10 11:36:50 +02:00
parent f871f4e4d0
commit 85de06fbec
3 changed files with 51 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -200,12 +200,10 @@ $text_agent_module = '';
$only_data = false; $only_data = false;
$categories_security_hardening = [];
if (security_hardening_installed() === true) { $categories_security_hardening = categories_of_cis();
$categories_security_hardening = categories_of_cis(); foreach ($categories_security_hardening as $key => $cat) {
foreach ($categories_security_hardening as $key => $cat) { $categories_security_hardening[$key] = implode(' ', $cat);
$categories_security_hardening[$key] = implode(' ', $cat);
}
} }
// Users. // Users.
@ -1037,7 +1035,7 @@ switch ($action) {
$group = $item['id_group']; $group = $item['id_group'];
$recursion = $item['recursion']; $recursion = $item['recursion'];
$cat_selected = $item['cat_security_hardening']; $cat_selected = $item['cat_security_hardening'];
$ignore_skipped = ($item['ignore_skipped'] !== null) ? $item['ignore_skipped'] : true; $ignore_skipped = $item['ignore_skipped'];
break; break;
default: default:
@ -3718,7 +3716,7 @@ $class = 'databox filters';
html_print_checkbox_switch( html_print_checkbox_switch(
'ignore_skipped', 'ignore_skipped',
1, 1,
$ignore_skipped, ($ignore_skipped !== null) ? $ignore_skipped : true,
); );
?> ?>
</td> </td>

2
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -1996,6 +1996,7 @@ switch ($action) {
case 'vul_by_cat': case 'vul_by_cat':
$values['id_group'] = get_parameter('combo_group'); $values['id_group'] = get_parameter('combo_group');
$values['cat_security_hardening'] = get_parameter('cat_security_hardening'); $values['cat_security_hardening'] = get_parameter('cat_security_hardening');
$values['ignore_skipped'] = get_parameter('ignore_skipped');
$good_format = true; $good_format = true;
break; break;
@ -2884,6 +2885,7 @@ switch ($action) {
case 'vul_by_cat': case 'vul_by_cat':
$values['id_group'] = get_parameter('combo_group'); $values['id_group'] = get_parameter('combo_group');
$values['cat_security_hardening'] = get_parameter('cat_security_hardening'); $values['cat_security_hardening'] = get_parameter('cat_security_hardening');
$values['ignore_skipped'] = get_parameter('ignore_skipped');
$good_format = true; $good_format = true;
break; break;

43
pandora_console/vendor/artica/phpchartjs/src/Renderer/JavaScript.php vendored
View File

@ -32,6 +32,49 @@ class JavaScript extends Renderer
if (empty($this->chart->defaults()->getWatermark()) === false) { if (empty($this->chart->defaults()->getWatermark()) === false) {
$script[] = 'const chart_watermark_'.$this->chart->getId().' = { $script[] = 'const chart_watermark_'.$this->chart->getId().' = {
id: "chart_watermark_'.$this->chart->getId().'", id: "chart_watermark_'.$this->chart->getId().'",
beforeDraw: (chart) => {
if (Object.prototype.hasOwnProperty.call(chart, "config") &&
Object.prototype.hasOwnProperty.call(chart.config.options, "elements") &&
Object.prototype.hasOwnProperty.call(chart.config.options.elements, "center"))
{
var ctx = chart.ctx;
ctx.save();
var centerConfig = chart.config.options.elements.center;
var txt = centerConfig.text;
var color = centerConfig.color || "#000";
ctx.textAlign = "center";
ctx.textBaseline = "middle";
var centerX = (chart.chartArea.left + chart.chartArea.right) / 2;
var centerY = (chart.chartArea.top + chart.chartArea.bottom) / 2;
var outerRadius = Math.min(ctx.canvas.width, ctx.canvas.height) / 2;
var padding = 20;
var innerRadius = outerRadius - padding;
ctx.font = "30px ";
var sidePaddingCalculated = (92/100) * (innerRadius * 2)
var stringWidth = ctx.measureText(txt).width;
var elementWidth = (innerRadius * 2) - sidePaddingCalculated;
var widthRatio = elementWidth / stringWidth;
var newFontSize = Math.floor(30 * widthRatio);
var elementHeight = (innerRadius * 2);
var fontSizeToUse = Math.min(newFontSize, elementHeight);
ctx.font = fontSizeToUse + "px Lato, sans-serif";
ctx.fillStyle = color;
ctx.fillText(txt, centerX, centerY);
ctx.restore();
}
},
afterDraw: (chart) => { afterDraw: (chart) => {
const image = new Image(); const image = new Image();
image.src = "'.$this->chart->defaults()->getWatermark()->getSrc().'"; image.src = "'.$this->chart->defaults()->getWatermark()->getSrc().'";