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

2013-02-07 Ramon Novoa <rnovoa@artica.es> 

* operation/menu.php: Fixed the SNMP menu.

	* operation/snmpconsole/snmp_browser.php: Small improvements.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7613 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2013-02-07 18:55:59 +00:00
parent db0b3b58fc
commit f08bc29916
3 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-02-07 Ramon Novoa <rnovoa@artica.es>
* operation/menu.php: Fixed the SNMP menu.
* operation/snmpconsole/snmp_browser.php: Small improvements.
2013-02-07 Ramon Novoa <rnovoa@artica.es> 2013-02-07 Ramon Novoa <rnovoa@artica.es>
* attachment/mibs, * attachment/mibs,

35
pandora_console/operation/menu.php
View File

@ -65,25 +65,6 @@ if (check_acl ($config['id_user'], 0, "AR")) {
enterprise_hook ('log_collector_menu'); enterprise_hook ('log_collector_menu');
} }
//SNMP Console
$sub["operation/snmpconsole/snmp_view"]["text"] = __('SNMP console');
$sub["operation/snmpconsole/snmp_view"]["refr"] = 0;
$sub["operation/snmpconsole/snmp_view"]["subsecs"] = array(
"enterprise/godmode/snmpconsole",
"godmode/snmpconsole/snmp_trap_editor",
"godmode/snmpconsole/snmp_alert",
"godmode/snmpconsole/snmp_filters",
"godmode/snmpconsole/snmp_trap_generator");
$sub2 = array();
$sub2["godmode/snmpconsole/snmp_alert"]["text"] = __("SNMP alerts");
$sub2['godmode/snmpconsole/snmp_filters']['text'] = __('SNMP filters');
enterprise_hook ('snmpconsole_submenu');
$sub2['godmode/snmpconsole/snmp_trap_generator']['text'] = __('SNMP trap generator');
$sub["operation/snmpconsole/snmp_view"]["sub2"] = $sub2;
$menu_operation["estado"]["sub"] = $sub; $menu_operation["estado"]["sub"] = $sub;
//End of view agents //End of view agents
@ -351,6 +332,22 @@ if (check_acl ($config['id_user'], 0, "IR")) {
// Rest of options, all with AR privilege (or should events be with incidents?) // Rest of options, all with AR privilege (or should events be with incidents?)
if (check_acl ($config['id_user'], 0, "AR")) { if (check_acl ($config['id_user'], 0, "AR")) {
//SNMP Console
$menu_operation["snmpconsole"]["text"] = __('SNMP console');
$menu_operation["snmpconsole"]["refr"] = 0;
$menu_operation["snmpconsole"]["sec2"] = "operation/snmpconsole/snmp_view";
$menu_operation["snmpconsole"]["id"] = "oper-snmpc";
$sub = array();
$sub["operation/snmpconsole/snmp_view"]["text"] = __("SNMP console");
$sub["operation/snmpconsole/snmp_browser"]["text"] = __("SNMP browser");
$sub["operation/snmpconsole/snmp_mib_uploader"]["text"] = __("MIB uploader");
$sub["godmode/snmpconsole/snmp_alert"]["text"] = __("SNMP alerts");
$sub["godmode/snmpconsole/snmp_filters"]["text"] = __("SNMP filters");
$sub["godmode/snmpconsole/snmp_trap_generator"]["text"] = __("SNMP trap generator");
enterprise_hook ('snmpconsole_submenu');
$menu_operation["snmpconsole"]["sub"] = $sub;
// Extensions menu additions // Extensions menu additions
if (is_array ($config['extensions'])) { if (is_array ($config['extensions'])) {
$menu_operation["extensions"]["text"] = __('Extensions'); $menu_operation["extensions"]["text"] = __('Extensions');

5
pandora_console/operation/snmpconsole/snmp_browser.php
View File

@ -114,6 +114,9 @@ function snmpBrowse () {
// Empty the SNMP tree // Empty the SNMP tree
$("#snmp_browser").html(''); $("#snmp_browser").html('');
// Hide the data div
hideOIDData();
// Show the spinner // Show the spinner
$("#spinner").css('display', ''); $("#spinner").css('display', '');
@ -137,7 +140,7 @@ function snmpBrowse () {
type: 'POST', type: 'POST',
url: action="<?php echo ui_get_full_url("ajax.php", false, false, false); ?>", url: action="<?php echo ui_get_full_url("ajax.php", false, false, false); ?>",
async: true, async: true,
timeout: 60000, timeout: 120000,
success: function (data) { success: function (data) {
// Hide the spinner // Hide the spinner