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

#13331 fixed date filter

Browse Source
This commit is contained in:
Daniel Cebrian 2024-04-04 17:21:52 +02:00
parent bade6328f9
commit 915a7b95ae
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pandora_console/include/functions_inventory.php
View File

@ -884,15 +884,11 @@ function get_data_basic_info_sql($params, $count=false)
} }
$where = 'WHERE 1=1 '; $where = 'WHERE 1=1 ';
if ($params['id_agent'] > 0 && $count === true) { if ($params['id_agent'] > 0) {
$where .= sprintf(' AND id_agente = %d', $params['id_agent']);
} else if ($params['id_agent'] > 0 && $count === false) {
$where .= sprintf(' AND %s.id_agente = %d', $table, $params['id_agent']); $where .= sprintf(' AND %s.id_agente = %d', $table, $params['id_agent']);
} }
if ($params['status'] >= 0 && $count === true) { if ($params['status'] >= 0) {
$where .= sprintf(' AND disabled = %d', $params['status']);
} else if ($params['status'] >= 0 && $count === false) {
$where .= sprintf(' AND %s.disabled = %d', $table, $params['status']); $where .= sprintf(' AND %s.disabled = %d', $table, $params['status']);
} }
@ -916,7 +912,7 @@ function get_data_basic_info_sql($params, $count=false)
); );
} }
if ($params['utimestamp'] > 0 && $count === false) { if ($params['utimestamp'] > 0) {
$where .= sprintf( $where .= sprintf(
' AND utimestamp BETWEEN %d AND %d', ' AND utimestamp BETWEEN %d AND %d',
($params['utimestamp'] - $params['period']), ($params['utimestamp'] - $params['period']),
@ -983,21 +979,20 @@ function get_data_basic_info_sql($params, $count=false)
$limit_condition = ''; $limit_condition = '';
$order_condition = ''; $order_condition = '';
$fields = 'count(*)';
$innerjoin = ''; $innerjoin = '';
$groupby = ''; $groupby = '';
if ($count !== true) { if (is_metaconsole() === true) {
if (is_metaconsole() === true) { $fields = 'tmetaconsole_agent.*, tagent_secondary_group.*, tagent_custom_data.*';
$fields = 'tmetaconsole_agent.*, tagent_secondary_group.*, tagent_custom_data.*'; } else {
} else { $fields = 'tagente.*, tagent_secondary_group.*, tagent_custom_data.*';
$fields = 'tagente.*, tagent_secondary_group.*, tagent_custom_data.*'; }
}
$innerjoin = 'LEFT JOIN tagente_estado ON '.$table.'.id_agente = tagente_estado.id_agente '; $innerjoin = 'LEFT JOIN tagente_estado ON '.$table.'.id_agente = tagente_estado.id_agente ';
$innerjoin .= 'LEFT JOIN tagent_secondary_group ON '.$table.'.id_agente = tagent_secondary_group.id_agent '; $innerjoin .= 'LEFT JOIN tagent_secondary_group ON '.$table.'.id_agente = tagent_secondary_group.id_agent ';
$innerjoin .= 'LEFT JOIN tagent_custom_data ON '.$table.'.id_agente = tagent_custom_data.id_agent '; $innerjoin .= 'LEFT JOIN tagent_custom_data ON '.$table.'.id_agente = tagent_custom_data.id_agent ';
$groupby = 'GROUP BY '.$table.'.id_agente';
if ($count !== true) {
$limit_condition = sprintf( $limit_condition = sprintf(
'LIMIT %d, %d', 'LIMIT %d, %d',
$params['start'], $params['start'],
@ -1005,8 +1000,12 @@ function get_data_basic_info_sql($params, $count=false)
); );
$order_condition = sprintf('ORDER BY %s', $params['order']); $order_condition = sprintf('ORDER BY %s', $params['order']);
} else {
$fields = 'COUNT(*)';
} }
$groupby = 'GROUP BY '.$table.'.id_agente';
$sql = sprintf( $sql = sprintf(
'SELECT %s 'SELECT %s
FROM %s FROM %s
@ -1024,13 +1023,19 @@ function get_data_basic_info_sql($params, $count=false)
$limit_condition $limit_condition
); );
$sql_count = sprintf(
'SELECT COUNT(*)
FROM (%s) AS sub_sql',
$sql
);
if ($count !== true) { if ($count !== true) {
$result = db_get_all_rows_sql($sql); $result = db_get_all_rows_sql($sql);
if ($result === false) { if ($result === false) {
$result = []; $result = [];
} }
} else { } else {
$result = db_get_sql($sql); $result = db_get_sql($sql_count);
if ($result === false) { if ($result === false) {
$result = 0; $result = 0;
} }