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

2012-07-16 Dario Rodriguez <dario.rodriguez@artica.es> 

* operation/tree.php: Fixed a bug which shows agents with
        not init modules when they must be hidde.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6779 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2012-07-16 15:20:56 +00:00
parent b3242413f1
commit cbad3c3f7a
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-07-16 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/tree.php: Fixed a bug which shows agents with
not init modules when they must be hidde.
2012-07-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/constants.php

37
pandora_console/operation/tree.php
View File

@ -256,7 +256,12 @@ if (is_ajax ())
//Extract all rows of data for each type
switch ($type) {
case 'group':
case 'group':
//Skip agents which only have not init modules
$search_sql .= " AND id_agente NOT IN (SELECT tagente_estado.id_agente FROM
tagente_estado GROUP BY id_agente HAVING SUM(utimestamp) = 0)";
$sql = agents_get_agents(array (
'order' => 'nombre COLLATE utf8_general_ci ASC',
@ -272,6 +277,13 @@ if (is_ajax ())
break;
case 'os':
//Skip agents which only have not init modules
$search_sql .= " AND id_agente NOT IN (SELECT tagente_estado.id_agente FROM
tagente_estado GROUP BY id_agente HAVING SUM(utimestamp) = 0)";
$sql = agents_get_agents(array (
'order' => 'nombre COLLATE utf8_general_ci ASC',
'id_os' => $id,
@ -283,9 +295,17 @@ if (is_ajax ())
'AR',
false,
true);
break;
case 'module_group':
//Skip agents which only have not init modules
$search_sql .= " AND id_agente NOT IN (SELECT tagente_estado.id_agente FROM tagente_estado
WHERE id_agente_modulo IN
(SELECT id_agente_modulo FROM tagente_modulo
WHERE id_module_group = $id)
GROUP BY id_agente HAVING SUM(utimestamp) = 0)";
$sql = agents_get_agents(array (
'order' => 'nombre COLLATE utf8_general_ci ASC',
@ -878,7 +898,12 @@ function printTree_($type) {
switch ($type) {
default:
case 'os':
//Skip agent with all modules in not init status
$sql_search .= " AND id_agente NOT IN (SELECT tagente_estado.id_agente FROM
tagente_estado GROUP BY id_agente HAVING SUM(utimestamp) = 0)";
$sql = agents_get_agents(array (
'order' => 'nombre COLLATE utf8_general_ci ASC',
'disabled' => 0,
@ -918,6 +943,11 @@ function printTree_($type) {
case 'module_group':
//Skip agents which only have not init modules
$sql_search .= " AND id_agente NOT IN (SELECT tagente_estado.id_agente FROM
tagente_estado GROUP BY id_agente HAVING SUM(utimestamp) = 0)";
$sql = agents_get_agents(array (
'order' => 'nombre COLLATE utf8_general_ci ASC',
'disabled' => 0,
@ -1032,6 +1062,7 @@ function printTree_($type) {
$first = true;
foreach ($list as $item) {
$iconImg = '';
switch ($type) {
default: