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

Merge branch 'ent-3380-Parametro-API--en-creacion-de-eventos-no-funciona-con-encoding-HTML-en-v730' into 'develop'

Browse Source 
Fixed bug in functions_api

See merge request artica/pandorafms!2125

Former-commit-id: ee373ced704fd3162d6c72d9dd68aff2d5106674
This commit is contained in:
Manuel Montes 2019-01-15 17:03:55 +01:00
commit f485b2f436
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/include/functions_api.php
View File

@ -9774,6 +9774,11 @@ function api_set_create_event($id, $trash1, $other, $returnType) {
return; return;
} }
$values['id_grupo'] = $other['data'][1]; $values['id_grupo'] = $other['data'][1];
if (groups_get_name($values['id_grupo']) === false) {
returnError('error_parameter', 'Group ID does not exist');
return;
}
} }
else { else {
returnError('error_parameter', 'Group ID required.'); returnError('error_parameter', 'Group ID required.');
@ -10117,7 +10122,7 @@ function api_get_netflow_get_summary ($discard_1, $discard_2, $params) {
} }
//http://localhost/pandora_console/include/api.php?op=set&op2=validate_event_by_id&id=23&apipass=1234&user=admin&pass=pandora //http://localhost/pandora_console/include/api.php?op=set&op2=validate_event_by_id&id=23&apipass=1234&user=admin&pass=pandora
function api_set_validate_event_by_id ($id, $trash1, $trash2, $returnType) { function api_set_validate_event_by_id ($id, $trash1 = null, $trash2 = null, $returnType = 'string') {
global $config; global $config;
$data['type'] = 'string'; $data['type'] = 'string';
$check_id = db_get_value('id_evento', 'tevento', 'id_evento', $id); $check_id = db_get_value('id_evento', 'tevento', 'id_evento', $id);
@ -10136,7 +10141,7 @@ function api_set_validate_event_by_id ($id, $trash1, $trash2, $returnType) {
'ack_utimestamp' => $ack_utimestamp, 'ack_utimestamp' => $ack_utimestamp,
'estado' => 1 'estado' => 1
); );
$result = db_process_sql_update('tevento', $values, array('id_evento' => $id)); $result = db_process_sql_update('tevento', $values, array('id_evento' => $id));
if ($result === false) { if ($result === false) {