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

2014-05-27 Vanessa Gil <vanessa.gil@artica.es> 

* operation/snmpconsole/snmp_view.php: Changed ACLs. All 
	users can view traps whose source isn't in console.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10015 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2014-05-27 12:10:16 +00:00
parent 6119b2e4a6
commit f12fe11e59
2 changed files with 9 additions and 4 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 @@
2014-05-27 Vanessa Gil <vanessa.gil@artica.es>
* operation/snmpconsole/snmp_view.php: Changed ACLs. All
users can view traps whose source isn't in console.
2014-05-27 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager.php,

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

@ -165,12 +165,12 @@ foreach ($all_traps as $trap) {
//Make query to extract traps of DB.
switch ($config["dbtype"]) {
case "mysql":
$sql = "SELECT *
$sql = "SELECT *
FROM ttrap
WHERE (`source` IN (
SELECT direccion FROM tagente
WHERE id_grupo IN ($str_user_groups)
) OR `source`='') %s
) OR `source`='' OR `source` NOT IN (SELECT direccion FROM tagente)) %s
ORDER BY timestamp DESC
LIMIT %d,%d";
break;
@ -180,7 +180,7 @@ switch ($config["dbtype"]) {
WHERE (source IN (
SELECT direccion FROM tagente
WHERE id_grupo IN ($str_user_groups)
) OR source='') %s
) OR source='' OR source NOT IN (SELECT direccion FROM tagente)) %s
ORDER BY timestamp DESC
LIMIT %d OFFSET %d";
break;
@ -191,7 +191,7 @@ switch ($config["dbtype"]) {
SELECT direccion FROM tagente
WHERE id_grupo IN ($str_user_groups)
)
OR source='') %s
OR source='' OR source NOT IN (SELECT direccion FROM tagente)) %s
ORDER BY timestamp DESC
LIMIT %d OFFSET %d";
break;