tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cherry-pick-b333e79e' into 'develop'

Browse Source 
Fixed name of agents and images status in report Agents/Modules. Gitlab: #553

See merge request !286
This commit is contained in:
vgilc 2017-04-04 09:16:01 +02:00
commit fb0cca8bad
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pandora_console/include/functions_reporting_html.php
View File

@ -1361,7 +1361,7 @@ function reporting_html_agent_module($table, $item) {
break; break;
} }
$file_name = ui_print_truncate_text($row['agent_alias'], 'agent_small', $file_name = ui_print_truncate_text($row['agent_name'], 'agent_small',
false, true, false, '...'); false, true, false, '...');
$table_data .= "<td style='background-color: " . $rowcolor . ";'>" . $table_data .= "<td style='background-color: " . $rowcolor . ";'>" .
$file_name . "</td>"; $file_name . "</td>";
@ -1379,7 +1379,8 @@ function reporting_html_agent_module($table, $item) {
__("%s in %s : NORMAL", __("%s in %s : NORMAL",
$module_name, $module_name,
$row['agent_name']), $row['agent_name']),
true, array('width' => '20px', 'height' => '20px')); true, array('width' => '20px', 'height' => '20px'),
'images/status_sets/default/');
break; break;
case AGENT_STATUS_CRITICAL: case AGENT_STATUS_CRITICAL:
$table_data .= ui_print_status_image( $table_data .= ui_print_status_image(
@ -1387,7 +1388,8 @@ function reporting_html_agent_module($table, $item) {
__("%s in %s : CRITICAL", __("%s in %s : CRITICAL",
$module_name, $module_name,
$row['agent_name']), $row['agent_name']),
true, array('width' => '20px', 'height' => '20px')); true, array('width' => '20px', 'height' => '20px'),
'images/status_sets/default/');
break; break;
case AGENT_STATUS_WARNING: case AGENT_STATUS_WARNING:
$table_data .= ui_print_status_image( $table_data .= ui_print_status_image(
@ -1395,7 +1397,8 @@ function reporting_html_agent_module($table, $item) {
__("%s in %s : WARNING", __("%s in %s : WARNING",
$module_name, $module_name,
$row['agent_name']), $row['agent_name']),
true, array('width' => '20px', 'height' => '20px')); true, array('width' => '20px', 'height' => '20px'),
'images/status_sets/default/');
break; break;
case AGENT_STATUS_UNKNOWN: case AGENT_STATUS_UNKNOWN:
$table_data .= ui_print_status_image( $table_data .= ui_print_status_image(
@ -1403,7 +1406,8 @@ function reporting_html_agent_module($table, $item) {
__("%s in %s : UNKNOWN", __("%s in %s : UNKNOWN",
$module_name, $module_name,
$row['agent_name']), $row['agent_name']),
true, array('width' => '20px', 'height' => '20px')); true, array('width' => '20px', 'height' => '20px'),
'images/status_sets/default/');
break; break;
case AGENT_MODULE_STATUS_NORMAL_ALERT: case AGENT_MODULE_STATUS_NORMAL_ALERT:
case AGENT_MODULE_STATUS_WARNING_ALERT: case AGENT_MODULE_STATUS_WARNING_ALERT:
@ -1413,7 +1417,8 @@ function reporting_html_agent_module($table, $item) {
__("%s in %s : ALERTS FIRED", __("%s in %s : ALERTS FIRED",
$module_name, $module_name,
$row['agent_name']), $row['agent_name']),
true, array('width' => '20px', 'height' => '20px')); true, array('width' => '20px', 'height' => '20px'),
'images/status_sets/default/');
break; break;
case 4: case 4:
$table_data .= ui_print_status_image( $table_data .= ui_print_status_image(
@ -1421,7 +1426,8 @@ function reporting_html_agent_module($table, $item) {
__("%s in %s : Not initialize", __("%s in %s : Not initialize",
$module_name, $module_name,
$row['agent_name']), $row['agent_name']),
true, array('width' => '20px', 'height' => '20px')); true, array('width' => '20px', 'height' => '20px'),
'images/status_sets/default/');
break; break;
} }
$table_data .= "</td>"; $table_data .= "</td>";