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

minor fixes

This commit is contained in:
alejandro-campos 2019-09-23 16:59:16 +02:00
parent 8d2820df37
commit b8e1caba9d
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/include/functions_integriaims.php
View File

@ -240,12 +240,19 @@ function get_array_from_csv_data_all($csv_data, &$array_values, $index=false)
if ($index !== false) {
foreach ($new_csv_value as $key => $value) {
$new_csv_value_index[$index[$key]] = $value;
$new_csv_value_index[$index[$key]] = str_replace(':::', ',', $value);
;
}
$array_values[$new_csv_value[0]] = $new_csv_value_index;
} else {
$array_values[$new_csv_value[0]] = $new_csv_value;
$new_csv_value_comma = array_map(
function ($item) {
return str_replace(':::', ',', $item);
},
$new_csv_value
);
$array_values[$new_csv_value[0]] = $new_csv_value_comma;
}
}
}

13
pandora_console/operation/incidents/configure_integriaims_incident.php
View File

@ -98,13 +98,24 @@ $incident_status = (int) get_parameter('status');
$incident_title = events_get_field_value_by_event_id($event_id, get_parameter('incident_title'));
$incident_content = events_get_field_value_by_event_id($event_id, get_parameter('incident_content'));
// Separator conversions.
$incident_title = str_replace(',', ':::', $incident_title);
$incident_content = str_replace(',', ':::', $incident_content);
// If incident id is specified, retrieve incident values from api to populate combos with such values.
if ($update) {
// Call Integria IMS API method to get details of an incident given its id.
$result_api_call = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_incident_details', [$incident_id_edit]);
// API call does not return indexes, therefore future modifications of API function in Integria IMS may lead to inconsistencies when accessing resulting array in this file.
$incident_details = explode(',', $result_api_call);
$incident_details_separator = explode(',', $result_api_call);
$incident_details = array_map(
function ($item) {
return str_replace(':::', ',', $item);
},
$incident_details_separator
);
}
// Perform action.

1
pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
View File

@ -207,6 +207,7 @@ if (check_acl($config['id_user'], 0, 'IW')) {
header('Content-Length: '.filesize($download_file_name));
ob_end_clean();
readfile($download_file_name);
unlink($download_file_name);
exit;
}