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

Fixed if direccion of any agents has NULL, snmp console fail to list 

unregistered agents' trap (by using "NOT IN" against NULL-inclued list).
This commit is contained in:
Hirofumi Kosaka 2016-01-08 17:26:28 +09:00
parent 9c29eb27d2
commit ce37bd659b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/operation/snmpconsole/snmp_view.php
View File

@ -176,7 +176,7 @@ switch ($config["dbtype"]) {
WHERE (`source` IN ( WHERE (`source` IN (
SELECT direccion FROM tagente SELECT direccion FROM tagente
WHERE id_grupo IN ($str_user_groups) WHERE id_grupo IN ($str_user_groups)
) OR `source`='' OR `source` NOT IN (SELECT direccion FROM tagente)) %s ) OR `source`='' OR `source` NOT IN (SELECT direccion FROM tagente WHERE direccion IS NOT NULL)) %s
ORDER BY timestamp DESC ORDER BY timestamp DESC
LIMIT %d,%d"; LIMIT %d,%d";
break; break;
@ -187,7 +187,7 @@ switch ($config["dbtype"]) {
WHERE (source IN ( WHERE (source IN (
SELECT direccion FROM tagente SELECT direccion FROM tagente
WHERE id_grupo IN ($str_user_groups) WHERE id_grupo IN ($str_user_groups)
) OR source='' OR source NOT IN (SELECT direccion FROM tagente)) %s ) OR source='' OR source NOT IN (SELECT direccion FROM tagente WHERE direccion IS NOT NULL)) %s
ORDER BY timestamp DESC ORDER BY timestamp DESC
LIMIT %d OFFSET %d"; LIMIT %d OFFSET %d";
break; break;
@ -198,7 +198,7 @@ $sql_all = "SELECT *
SELECT direccion FROM tagente SELECT direccion FROM tagente
WHERE id_grupo IN ($str_user_groups) WHERE id_grupo IN ($str_user_groups)
) )
OR source='' OR source NOT IN (SELECT direccion FROM tagente)) %s OR source='' OR source NOT IN (SELECT direccion FROM tagente WHERE direccion IS NOT NULL)) %s
ORDER BY timestamp DESC"; ORDER BY timestamp DESC";
$sql_count = "SELECT COUNT(id_trap) $sql_count = "SELECT COUNT(id_trap)
FROM ttrap FROM ttrap
@ -206,7 +206,7 @@ $sql_count = "SELECT COUNT(id_trap)
SELECT direccion FROM tagente SELECT direccion FROM tagente
WHERE id_grupo IN ($str_user_groups) WHERE id_grupo IN ($str_user_groups)
) )
OR source='' OR source NOT IN (SELECT direccion FROM tagente)) %s"; OR source='' OR source NOT IN (SELECT direccion FROM tagente WHERE direccion IS NOT NULL)) %s";
//$whereSubquery = 'WHERE 1=1'; //$whereSubquery = 'WHERE 1=1';
$whereSubquery = ''; $whereSubquery = '';