Merge branch '1564-Error-al-crear-módulos-SNMPv3-desde-snmpwalk-dev' into 'develop'

Fixed creating network components by snmpwalk

See merge request artica/pandorafms!1065
This commit is contained in:
vgilc 2017-11-29 16:15:21 +01:00
commit 019829685c
2 changed files with 23 additions and 22 deletions

View File

@ -33,8 +33,6 @@ if(is_ajax()){
$snmp3_privacy_pass = io_safe_output(get_parameter('snmp3_browser_privacy_pass'));
$targets_oids = get_parameter ("oids", "");
$targets_oids = explode(",", $targets_oids);
$custom_action = get_parameter ("custom_action", "");
if ($custom_action != "") {

View File

@ -725,35 +725,38 @@ function snmp_browser_print_container ($return = false, $width = '100%', $height
});
// Prepare the AJAX call
var params = [
"target_ip=" + target_ip,
"community=" + community,
"oids=" + oids,
"snmp_browser_version=" + snmp_version,
"snmp3_browser_auth_user=" + snmp3_auth_user,
"snmp3_browser_security_level=" + snmp3_security_level,
"snmp3_browser_auth_method=" + snmp3_auth_method,
"snmp3_browser_auth_pass=" + snmp3_auth_pass,
"snmp3_browser_privacy_method=" + snmp3_privacy_method,
"snmp3_browser_privacy_pass=" + snmp3_privacy_pass,
"action=" + "create_modules_snmp",
"custom_action=" + custom_action,
"page=include/ajax/snmp_browser.ajax"
];
var params = {};
params["target_ip"] = target_ip;
params["community"] = community;
params["oids"] = oids;
params["snmp_browser_version"] = snmp_version;
params["snmp3_browser_auth_user"] = snmp3_auth_user;
params["snmp3_browser_security_level"] = snmp3_security_level;
params["snmp3_browser_auth_method"] = snmp3_auth_method;
params["snmp3_browser_auth_pass"] = snmp3_auth_pass;
params["snmp3_browser_privacy_method"] = snmp3_privacy_method;
params["snmp3_browser_privacy_pass"] = snmp3_privacy_pass;
params["action"] = "create_modules_snmp";
params["custom_action"] = custom_action;
params["page"] = "include/ajax/snmp_browser.ajax";
$.ajax({
type: "GET",
url: "ajax.php",
data: params.join ("&"),
dataType: "json",
data: params,
dataType: "html",
success: function(data) {
var dato = data.replace(/[^]+(?=\[)/,"");
$('input[name*=create_network_component]').removeClass("sub spinn");
$('input[name*=create_network_component]').addClass("sub add");
if(data.length !== 0){
dato = JSON.parse(dato);
if(dato.length !== 0){
$('#error_text').text("");
data.forEach( function(valor, indice, array) {
console.log(valor);
dato.forEach( function(valor, indice, array) {
$('#error_text').append('<br/>'+ valor );
});
$("#dialog_error")