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

Cleaned source code.

This commit is contained in:
mdtrooper 2016-01-27 13:15:23 +01:00
parent 694235c7ea
commit ab46cde699
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/include/functions_events.php
View File

@ -1330,7 +1330,7 @@ function events_get_agent ($id_agent, $period, $date = 0,
if ( $filter_event_validated && $filter_event_no_validated ) { if ( $filter_event_validated && $filter_event_no_validated ) {
$sql_where .= " AND (estado = 1 OR estado = 0)"; $sql_where .= " AND (estado = 1 OR estado = 0)";
} }
else { else {
if ($filter_event_validated) { if ($filter_event_validated) {
$sql_where .= ' AND estado = 1 '; $sql_where .= ' AND estado = 1 ';
@ -2279,19 +2279,19 @@ function events_page_custom_data ($event) {
if ($event['custom_data'] == '') { if ($event['custom_data'] == '') {
return ''; return '';
} }
$table->width = '100%'; $table->width = '100%';
$table->data = array (); $table->data = array ();
$table->head = array (); $table->head = array ();
$table->style[0] = 'width:35%; font-weight: bold; text-align: left;'; $table->style[0] = 'width:35%; font-weight: bold; text-align: left;';
$table->style[1] = 'text-align: left;'; $table->style[1] = 'text-align: left;';
$table->class = "alternate rounded_cells"; $table->class = "alternate rounded_cells";
$json_custom_data = base64_decode ($event['custom_data']); $json_custom_data = base64_decode ($event['custom_data']);
$custom_data = json_decode ($json_custom_data); $custom_data = json_decode ($json_custom_data);
if ($custom_data === NULL) { if ($custom_data === NULL) {
return '<div id="extended_event_custom_data_page" class="extended_event_pages">'.__('Invalid custom data: %s', $json_custom_data).'</div>'; return '<div id="extended_event_custom_data_page" class="extended_event_pages">'.__('Invalid custom data: %s', $json_custom_data).'</div>';
} }
$i = 0; $i = 0;
foreach ($custom_data as $field => $value) { foreach ($custom_data as $field => $value) {
@ -2299,7 +2299,7 @@ function events_page_custom_data ($event) {
$table->data[$i][1] = io_safe_output ($value); $table->data[$i][1] = io_safe_output ($value);
$i++; $i++;
} }
$custom_data = '<div id="extended_event_custom_data_page" class="extended_event_pages">'.html_print_table($table, true).'</div>'; $custom_data = '<div id="extended_event_custom_data_page" class="extended_event_pages">'.html_print_table($table, true).'</div>';
return $custom_data; return $custom_data;

7
pandora_console/include/functions_html.php
View File

@ -2064,10 +2064,11 @@ function html_print_autocomplete_modules($name = 'module',
if (empty($groups)) { if (empty($groups)) {
$id_groups = 0; $id_groups = 0;
} else { }
else {
$id_groups = implode(',', $groups); $id_groups = implode(',', $groups);
} }
$agents = db_get_all_rows_sql('SELECT id_agente $agents = db_get_all_rows_sql('SELECT id_agente
FROM tagente FROM tagente
WHERE id_grupo IN (' . $id_groups . ')'); WHERE id_grupo IN (' . $id_groups . ')');

2
pandora_console/include/functions_networkmap.php
View File

@ -760,7 +760,7 @@ function networkmap_generate_dot_groups ($pandora_name, $group = 0,
array ('id_grupo, nombre, id_os, id_agente, array ('id_grupo, nombre, id_os, id_agente,
normal_count, warning_count, critical_count, normal_count, warning_count, critical_count,
unknown_count, total_count, notinit_count')); unknown_count, total_count, notinit_count'));
} }
if ($agents === false) if ($agents === false)
$agents = array(); $agents = array();

9
pandora_console/include/functions_wmi.php
View File

@ -73,14 +73,15 @@ function wmi_create_wizard_modules($id_agent, $names, $wizard_mode, $values) {
// Add the query to values // Add the query to values
$values['snmp_oid'] = io_safe_input($wmi_query); $values['snmp_oid'] = io_safe_input($wmi_query);
$return = modules_create_agent_module ($id_agent, $name, $values); $return = modules_create_agent_module ($id_agent, $name, $values);
if($return < 0) { if($return < 0) {
$results[ERR_GENERIC][] = $name; $results[ERR_GENERIC][] = $name;
} else { }
else {
$results[NOERR][] = $name; $results[NOERR][] = $name;
} }
} }
return $results; return $results;
@ -94,7 +95,7 @@ function wmi_create_module_from_components($components, $values) {
} }
foreach ($components as $component_id) { foreach ($components as $component_id) {
$nc = db_get_row ("tnetwork_component", "id_nc", $component_id); $nc = db_get_row ("tnetwork_component", "id_nc", $component_id);
// Compatibilize the fields between components and modules table // Compatibilize the fields between components and modules table
$nc['descripcion'] = $nc['description']; $nc['descripcion'] = $nc['description'];
unset($nc['description']); unset($nc['description']);