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

Merge branch 'ent-3428-error-grafica-events-per-agent-en-item-event-report-group-en-meta' into 'develop'

Browse Source 
fixed errors with graphs in meta

See merge request artica/pandorafms!2594
This commit is contained in:
Daniel Rodriguez 2019-07-15 13:10:55 +02:00
commit 244c00e96f
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_console/include/functions_events.php
View File

@ -25,13 +25,17 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* ============================================================================ * ============================================================================
*/ */
global $config;
require_once $config['homedir'].'/include/functions_ui.php'; require_once $config['homedir'].'/include/functions_ui.php';
require_once $config['homedir'].'/include/functions_tags.php'; require_once $config['homedir'].'/include/functions_tags.php';
require_once $config['homedir'].'/include/functions.php'; require_once $config['homedir'].'/include/functions.php';
require_once $config['homedir'].'/include/functions_reporting.php';
enterprise_include_once('include/functions_metaconsole.php');
enterprise_include_once('meta/include/functions_events_meta.php'); enterprise_include_once('meta/include/functions_events_meta.php');
enterprise_include_once('meta/include/functions_agents_meta.php'); enterprise_include_once('meta/include/functions_agents_meta.php');
enterprise_include_once('meta/include/functions_modules_meta.php'); enterprise_include_once('meta/include/functions_modules_meta.php');
enterprise_include_once('meta/include/functions_events_meta.php');
/** /**
@ -4852,10 +4856,6 @@ function events_get_count_events_by_agent(
$tagente = 'tagente'; $tagente = 'tagente';
$tevento = 'tevento'; $tevento = 'tevento';
if ($dbmeta) {
$tagente = 'tmetaconsole_agent';
$tevento = 'tmetaconsole_event';
}
$sql = sprintf( $sql = sprintf(
'SELECT id_agente, 'SELECT id_agente,
@ -5032,9 +5032,6 @@ function events_get_count_events_validated_by_user(
} }
$tevento = 'tevento'; $tevento = 'tevento';
if ($dbmeta) {
$tevento = 'tmetaconsole_event';
}
$sql = sprintf( $sql = sprintf(
'SELECT id_usuario, 'SELECT id_usuario,
@ -5210,9 +5207,6 @@ function events_get_count_events_by_criticity(
} }
$tevento = 'tevento'; $tevento = 'tevento';
if ($dbmeta) {
$tevento = 'tmetaconsole_event';
}
$sql = sprintf( $sql = sprintf(
'SELECT criticity, 'SELECT criticity,
@ -5418,9 +5412,6 @@ function events_get_count_events_validated(
} }
$tevento = 'tevento'; $tevento = 'tevento';
if ($dbmeta) {
$tevento = 'tmetaconsole_event';
}
$sql = sprintf('SELECT estado, COUNT(*) AS count FROM %s WHERE %s %s GROUP BY estado', $tevento, $sql_filter, $sql_where); $sql = sprintf('SELECT estado, COUNT(*) AS count FROM %s WHERE %s %s GROUP BY estado', $tevento, $sql_filter, $sql_where);