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

Merge branch 'ent-4771-Revision-llamada-API-create-event-en-metaconsola' into 'develop' 

Ent 4771 revision llamada api create event en metaconsola

See merge request artica/pandorafms!2793
This commit is contained in:
Alejandro Fraguas 2020-02-11 09:37:40 +01:00
parent 0db7abbe9e 740dcdb35b
commit f1a52d6272
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_api.php
View File

@ -12195,7 +12195,7 @@ function api_set_create_event($id, $trash1, $other, $returnType)
$id_agent = $other['data'][2];
if (is_metaconsole()) {
// On metaconsole, connect with the node to check the permissions
$agent_cache = db_get_row('tmetaconsole_agent', 'id_agente', $id_agent);
$agent_cache = db_get_row('tmetaconsole_agent', 'id_tagente', $id_agent);
if ($agent_cache === false) {
returnError('id_not_found', 'string');
return;
@ -12372,7 +12372,7 @@ function api_set_create_event($id, $trash1, $other, $returnType)
$return,
$user_comment,
'Added comment',
defined('METACONSOLE'),
is_metaconsole(),
$config['history_db_enabled']
);
if ($other['data'][13] != '') {
@ -12384,7 +12384,7 @@ function api_set_create_event($id, $trash1, $other, $returnType)
$return,
$owner_user,
true,
defined('METACONSOLE'),
is_metaconsole(),
$config['history_db_enabled']
);
}

2
pandora_console/include/functions_events.php
View File

@ -2231,7 +2231,7 @@ function events_create_event(
}
$table_events = 'tevento';
if (defined('METACONSOLE')) {
if (is_metaconsole()) {
$table_events = 'tmetaconsole_event';
$sql = sprintf(