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

Merge branch '1903-Autenticacion-erronea-en-modulos-web-Cepsa-2' into 'develop' 

Change web module options for curl commandos - #1903

See merge request artica/pandorafms!1304
This commit is contained in:
vgilc 2018-02-26 10:41:59 +01:00
parent 362194c042 1a50cdf950
commit d15c5b4519
1 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
pandora_console/godmode/agentes/configurar_agente.php
View File

@ -1184,6 +1184,9 @@ if ($update_module || $create_module) {
$month_to = get_parameter('month_to');
$wday_to = get_parameter('wday_to');
$http_user = get_parameter('http_user');
$http_pass = get_parameter('http_pass');
if ($hour_to != "*") {
$hour_to = "-" . $hour_to;
}
@ -1258,6 +1261,7 @@ if ($update_module || $create_module) {
if ($update_module) {
$id_agent_module = (int) get_parameter ('id_agent_module');
$values = array (
'id_agente_modulo' => $id_agent_module,
'descripcion' => $description,
@ -1321,6 +1325,27 @@ if ($update_module) {
'disabled_types_event' => addslashes($disabled_types_event),
'module_macros' => $module_macros);
if($id_module_type == 30 || $id_module_type == 31 || $id_module_type == 32 || $id_module_type == 33){
$plugin_parameter_split = explode("
", $values['plugin_parameter']);
$values['plugin_parameter'] = '';
foreach ($plugin_parameter_split as $key => $value) {
if($key == 1){
$values['plugin_parameter'] .= 'http_auth_user '.$http_user.'
';
$values['plugin_parameter'] .= 'http_auth_pass '.$http_pass.'
';
$values['plugin_parameter'] .= $value."
";
}
else{
$values['plugin_parameter'] .= $value."
";
}
}
}
// In local modules, the interval is updated by agent
$module_kind = (int) get_parameter ('moduletype');
if ($module_kind == MODULE_DATA) {
@ -1397,6 +1422,7 @@ if ($update_module) {
// MODULE INSERT
// =================
if ($create_module) {
if (isset ($_POST["combo_snmp_oid"])) {
$combo_snmp_oid = get_parameter_post ("combo_snmp_oid");
}
@ -1481,6 +1507,27 @@ if ($create_module) {
'disabled_types_event' => addslashes($disabled_types_event),
'module_macros' => $module_macros);
if($id_module_type == 30 || $id_module_type == 31 || $id_module_type == 32 || $id_module_type == 33){
$plugin_parameter_split = explode("
", $values['plugin_parameter']);
$values['plugin_parameter'] = '';
foreach ($plugin_parameter_split as $key => $value) {
if($key == 1){
$values['plugin_parameter'] .= 'http_auth_user '.$http_user.'
';
$values['plugin_parameter'] .= 'http_auth_pass '.$http_pass.'
';
$values['plugin_parameter'] .= $value."
";
}
else{
$values['plugin_parameter'] .= $value."
";
}
}
}
if ($prediction_module == 3 && $serialize_ops == '') {
$id_agent_module = false;
}