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

Merge branch '2015-implementacion-de-grupos-secundarios-2' into 'develop'

Browse Source 
2015 implementacion de grupos secundarios 2

See merge request artica/pandorafms!1418
This commit is contained in:
vgilc 2018-04-11 09:09:33 +02:00
commit a958dc98f3
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/include/class/Tree.class.php
View File

@ -384,6 +384,7 @@ class Tree {
); );
} }
else{ else{
//html_debug("001: $item_for_count", true);
$id_groups_agents = db_get_all_rows_sql( $id_groups_agents = db_get_all_rows_sql(
" SELECT DISTINCT(ta.id_grupo) " SELECT DISTINCT(ta.id_grupo)
FROM tagente ta FROM tagente ta
@ -440,6 +441,8 @@ class Tree {
if (! is_metaconsole()) { if (! is_metaconsole()) {
// Groups SQL // Groups SQL
if ($item_for_count === false) { if ($item_for_count === false) {
//html_debug("002: $item_for_count", true);
$sql = "SELECT $columns $sql = "SELECT $columns
FROM tgrupo tg FROM tgrupo tg
WHERE tg.id_grupo IN ($user_groups_str) WHERE tg.id_grupo IN ($user_groups_str)
@ -465,6 +468,8 @@ class Tree {
$agent_search_filter $agent_search_filter
$agent_status_filter"; $agent_status_filter";
$sql = $this->getAgentCountersSql($agent_table); $sql = $this->getAgentCountersSql($agent_table);
//html_debug("003: $item_for_count", true);
//html_debug("$sql", true);
} }
} }
// Metaconsole // Metaconsole
@ -1203,6 +1208,7 @@ class Tree {
} }
protected function getItems ($item_for_count = false) { protected function getItems ($item_for_count = false) {
//html_debug($item_for_count, true);
$sql = $this->getSql($item_for_count); $sql = $this->getSql($item_for_count);
if (empty($sql)) if (empty($sql))
return array(); return array();
@ -1210,10 +1216,10 @@ class Tree {
$data = db_process_sql($sql); $data = db_process_sql($sql);
if (empty($data)) if (empty($data))
return array(); return array();
foreach ($data[0] as $key => $value) { foreach ($data[0] as $key => $value) {
if($key != 'total_count' && strpos($key, 'count')){ if($key != 'total_count' && $key != 'total_fired_count' && strpos($key, 'count')){
$zero_counter += $value; $zero_counter += $value;
} }
@ -2830,6 +2836,7 @@ class Tree {
global $config; global $config;
static $group_stats = false; static $group_stats = false;
# Do not use the group stat cache when using tags or real time group stats. # Do not use the group stat cache when using tags or real time group stats.
//html_debug($this->getCounters($group_id), true);
return $this->getCounters($group_id); return $this->getCounters($group_id);
// FIXME: AVOID TO REACH CACHE // FIXME: AVOID TO REACH CACHE
if ($config['realtimestats'] == 1 || if ($config['realtimestats'] == 1 ||
@ -2842,7 +2849,6 @@ class Tree {
if ( $group_stats === false) { if ( $group_stats === false) {
$group_stats = array(); $group_stats = array();
$stats = db_get_all_rows_sql('SELECT * FROM tgroup_stat'); $stats = db_get_all_rows_sql('SELECT * FROM tgroup_stat');
foreach ($stats as $group) { foreach ($stats as $group) {
if ($group['modules'] > 0) { if ($group['modules'] > 0) {
$group_stats[$group['id_group']]['total_count'] = $group['modules'] > 0 ? $group['agents'] : 0; $group_stats[$group['id_group']]['total_count'] = $group['modules'] > 0 ? $group['agents'] : 0;