tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug that did not create boxes in visual console. Ticket #2744

Browse Source
This commit is contained in:
Arturo Gonzalez Diaz 2015-09-23 16:52:13 +02:00
parent 9f1a301109
commit 0ffc7eab6c
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/include/ajax/visual_console_builder.ajax.php
View File

@ -95,7 +95,7 @@ $left = get_parameter('left', null);
$top = get_parameter('top', null); $top = get_parameter('top', null);
$agent = get_parameter('agent', null); $agent = get_parameter('agent', null);
$id_module = get_parameter('module', null); $id_module = get_parameter('module', null);
$period = get_parameter('period', null); $period = (int)get_parameter('period', null);
$width = get_parameter('width', null); $width = get_parameter('width', null);
$height = get_parameter('height', null); $height = get_parameter('height', null);
$parent = get_parameter('parent', null); $parent = get_parameter('parent', null);
@ -115,11 +115,11 @@ $id_agent = get_parameter('id_agent', null);
$id_metaconsole = get_parameter('id_metaconsole', null); $id_metaconsole = get_parameter('id_metaconsole', null);
$id_group = (int)get_parameter('id_group', 0); $id_group = (int)get_parameter('id_group', 0);
$id_custom_graph = get_parameter('id_custom_graph', null); $id_custom_graph = get_parameter('id_custom_graph', null);
$border_width = get_parameter('border_width', 0); $border_width = (int)get_parameter('border_width', 0);
$border_color = get_parameter('border_color', ''); $border_color = get_parameter('border_color', '');
$fill_color = get_parameter('fill_color', ''); $fill_color = get_parameter('fill_color', '');
$width_box = get_parameter('width_box', 0); $width_box = (int)get_parameter('width_box', 0);
$height_box = get_parameter('height_box', 0); $height_box = (int)get_parameter('height_box', 0);
$line_start_x = (int)get_parameter('line_start_x', 0); $line_start_x = (int)get_parameter('line_start_x', 0);
$line_start_y = (int)get_parameter('line_start_y', 0); $line_start_y = (int)get_parameter('line_start_y', 0);
$line_end_x = (int)get_parameter('line_end_x', 0); $line_end_x = (int)get_parameter('line_end_x', 0);

29
pandora_console/include/functions_visual_map.php
View File

@ -795,14 +795,27 @@ function visual_map_print_item($mode = "read", $layoutData,
switch ($type) { switch ($type) {
case BOX_ITEM: case BOX_ITEM:
$style = ""; if (!empty($proportion)){
$style .= "width: " . ($width * $proportion['proportion_width']) . "px; "; $style = "";
$style .= "height: " . ($height * $proportion['proportion_height']) . "px; "; $style .= "width: " . ($width * $proportion['proportion_width']) . "px; ";
$style .= "border-style: solid; "; $style .= "height: " . ($height * $proportion['proportion_height']) . "px; ";
$style .= "border-width: " . $border_width . "px; "; $style .= "border-style: solid; ";
$style .= "border-color: " . $border_color . "; "; $style .= "border-width: " . $border_width . "px; ";
$style .= "background-color: " . $fill_color . "; "; $style .= "border-color: " . $border_color . "; ";
echo "<div style='" . $style . "'></div>"; $style .= "background-color: " . $fill_color . "; ";
echo "<div style='" . $style . "'></div>";
}
else{
$style = "";
$style .= "width: " . $width . "px; ";
$style .= "height: " . $height . "px; ";
$style .= "border-style: solid; ";
$style .= "border-width: " . $border_width . "px; ";
$style .= "border-color: " . $border_color . "; ";
$style .= "background-color: " . $fill_color . "; ";
echo "<div style='" . $style . "'></div>";
}
break; break;
case STATIC_GRAPH: case STATIC_GRAPH:
case GROUP_ITEM: case GROUP_ITEM: